Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-admin/src/main/resources/application.yml

@@ -35,9 +35,18 @@ server:
 
 # 日志配置
 logging:
+  # 定义全局日志级别，此处可以针对不同包或类设置不同的日志输出级别
   level:
+    # 设置com.zkqy包及其子包下的日志级别为debug
     com.zkqy: debug
+    # 设置org.springframework包及其子包下的日志级别为warn
     org.springframework: warn
+  # 文件日志相关配置
+  file:
+    # 指定日志文件的输出目录
+    # 此处将所有生成的日志文件存储在D:/rz/logs路径下（日志文件必须名为）
+    # logback-spring.xml中可以读取这个配置项（注意:日志配置文件必须叫logback-spring.xml）
+    path: D:/logs
 
 # 用户配置
 user:
@@ -74,7 +83,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 11
     # 密码
     password:
     # 连接超时时间
@@ -134,10 +143,10 @@ xss:
 parameter:
   ip:
     # 数据引擎切换数据源接口地址
-    DATA_ENGINE_IP: http://192.168.110.59:8099/dataSource/changeDataSource
+    DATA_ENGINE_IP: http://192.168.110.83:8099/dataSource/changeDataSource
     # 动态表单切换数据源接口地址
-    DRAG_FORM_IP: http://192.168.110.59:8088/dataSource/changeDataSource
+    DRAG_FORM_IP: http://192.168.110.83:8088/dataSource/changeDataSource
     # 流程引擎切换数据源接口地址
-    PROCESS_ENGINE_IP: http://192.168.110.59:8055/dataSource/changeDataSource
+    PROCESS_ENGINE_IP: http://192.168.110.83:8055/dataSource/changeDataSource
     #数据引擎初始化数据库表接口地址
-    DATA_ENGINE_INITDATABASE_IP: http://192.168.110.59:8099/tableInfo/initDatabase
+    DATA_ENGINE_INITDATABASE_IP: http://192.168.110.83:8099/tableInfo/initDatabase

zkqy-admin/src/main/resources/logback.xml → zkqy-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="./logs" />
+	<!--<property name="log.path" value="./logs" />-->
+    <!-- 日志存放路径 -->
+    <!-- 引入Spring Boot的环境变量 文件名必须叫 logback-spring 否则不能引用logging.file.path -->
+    <springProperty scope="context" name="log.path" source="logging.file.path"/>
+
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysTenantServiceImpl.java

@@ -2,6 +2,7 @@ package com.zkqy.system.service.impl;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
@@ -83,7 +84,29 @@ public class SysTenantServiceImpl implements ISysTenantService
     @Override
     public List<SysTenant> selectSysTenantList(SysTenant sysTenant)
     {
-        return sysTenantMapper.selectSysTenantList(sysTenant);
+        SymmetricCrypto symmetricCrypto = new SymmetricCrypto(SymmetricAlgorithm.DES, "sgEsnN6QWq8W7j5H01020304".getBytes());
+        List<SysTenant> sysTenants = sysTenantMapper.selectSysTenantList(sysTenant);
+        sysTenants.stream().forEach(item->{
+            if(item.getTenantExpirationTime()!= null){
+                String decryptStr = symmetricCrypto.decryptStr(item.getTenantExpirationTime(), CharsetUtil.CHARSET_UTF_8);
+                LocalDateTime localDateTime = DateUtils.toLocalDateTime(decryptStr.toString(), "yyyy-MM-dd HH:mm:ss");
+                LocalDateTime start = LocalDateTimeUtil.parse(LocalDateTime.now().toString());
+                LocalDateTime end = LocalDateTimeUtil.parse(localDateTime.toString());
+                Duration between = LocalDateTimeUtil.between(start, end);
+                Long l = between.toDays();
+                if(l<0){
+                    //String endDay = l.toString().replace("-", "").toString();
+                    //item.setTenantExpirationTime("已到期"+endDay+"天");
+                    item.setTenantExpirationTime("已到期");
+                }else{
+                    item.setTenantExpirationTime(l.toString());
+                }
+            }else {
+                item.setTenantExpirationTime("未激活");
+            }
+        });
+        //return sysTenantMapper.selectSysTenantList(sysTenant);
+        return sysTenants;
     }
 
     /**

zkqy-system/src/main/resources/sql/initialize_sys_tenant_menu.json

@@ -6,7 +6,7 @@
         "updateTime": null,
         "remark": null,
         "menuId": 1,
-        "menuName": "门户引擎",
+        "menuName": "系统管理",
         "parentName": null,
         "parentId": 0,
         "orderNum": 1,
@@ -684,7 +684,7 @@
         "menuName": "数据引擎",
         "parentName": null,
         "parentId": 0,
-        "orderNum": 4,
+        "orderNum": 3,
         "path": "data",
         "component": null,
         "query": null,
@@ -734,7 +734,7 @@
         "menuName": "流程引擎",
         "parentName": null,
         "parentId": 0,
-        "orderNum": 5,
+        "orderNum": 4,
         "path": "processModeling",
         "component": null,
         "query": null,
@@ -809,7 +809,7 @@
         "menuName": "表单引擎",
         "parentName": null,
         "parentId": 0,
-        "orderNum": 11,
+        "orderNum": 5,
         "path": "system/fromModel/index",
         "component": null,
         "query": null,
@@ -909,7 +909,7 @@
         "menuName": "字典管理",
         "parentName": null,
         "parentId": 1,
-        "orderNum": 10,
+        "orderNum": 6,
         "path": "tenantDict",
         "component": "system/tenant/dict/index",
         "query": null,
@@ -1059,7 +1059,7 @@
         "menuName": "管道管理",
         "parentName": null,
         "parentId": 0,
-        "orderNum": 1,
+        "orderNum": 2,
         "path": "processMange",
         "component": null,
         "query": null,
@@ -1081,7 +1081,7 @@
         "updateTime": null,
         "remark": null,
         "menuId": 4218,
-        "menuName": "管道执行",
+        "menuName": "管道流程",
         "parentName": null,
         "parentId": 4216,
         "orderNum": 1,
@@ -1126,50 +1126,25 @@
     },
     {
         "createBy": null,
-        "createTime": "2023-10-11 09:28:10",
+        "createTime": "2023-08-08 17:38:07",
         "updateBy": null,
         "updateTime": null,
         "remark": null,
-        "menuId": 4409,
-        "menuName": "弹窗管理",
+        "menuId": 5008,
+        "menuName": "工程部署",
         "parentName": null,
-        "parentId": 1103,
-        "orderNum": 5,
-        "path": "tableDialog",
-        "component": "dialogTemplate/indexTable",
+        "parentId": 1,
+        "orderNum": 7,
+        "path": "engineering",
+        "component": "system/engineeringManage/index",
         "query": null,
         "isFrame": "1",
         "isCache": "0",
         "menuType": "C",
         "visible": "0",
         "status": "0",
-        "perms": "",
-        "icon": "bpmn-icon-call-activity",
-        "children": [],
-        "tenantName": null,
-        "tenantId": null
-    },
-    {
-        "createBy": null,
-        "createTime": "2023-10-11 09:28:10",
-        "updateBy": null,
-        "updateTime": null,
-        "remark": null,
-        "menuId": 4410,
-        "menuName": "弹窗编辑",
-        "parentName": null,
-        "parentId": 1103,
-        "orderNum": 6,
-        "path": "dialogMange",
-        "component": "dialogMange/index",
-        "query": null,
-        "isFrame": "1",
-        "isCache": "0",
-        "menuType": "C",
-        "visible": "1",
-        "status": "0",
-        "perms": "",
-        "icon": "bpmn-icon-collaboration",
+        "perms": "system:user:engineering",
+        "icon": "download",
         "children": [],
         "tenantName": null,
         "tenantId": null

zkqy-system/src/main/resources/sql/initialize_sys_tenant_menu.sql

@@ -1,39 +0,0 @@
-1
-100
-101
-102
-103
-104
-1000
-1001
-1002
-1003
-1004
-1005
-1006
-1007
-1008
-1009
-1010
-1011
-1016
-1017
-1018
-1019
-1020
-1021
-1022
-1023
-1024
-1073
-1078
-1082
-1083
-1084
-1103
-1104
-1106
-1107
-1109
-1172
-2811

zkqy-ui/src/views/system/tenant/index.vue

@@ -134,6 +134,11 @@
       <el-table-column label="负责人" align="center" prop="owner" />
       <el-table-column label="联系方式" align="center" prop="contactInfo" />
       <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column
+        label="到期天数"
+        align="center"
+        prop="tenantExpirationTime"
+      />
       <el-table-column
         label="操作"
         align="center"