初始脚本更新

pom.xml

@@ -43,7 +43,7 @@
         <activiti-modeler.version>5.22.0</activiti-modeler.version>
         <zip4j.version>1.3.3</zip4j.version>
         <nanoid.version>2.0.0</nanoid.version>
-        <jasypt.version>3.0.3</jasypt.version>
+<!--        <jasypt.version>3.0.3</jasypt.version>-->
         <httpmime.version>4.5.13</httpmime.version>
         <dom4j.version>2.1.4</dom4j.version>
         <easyexcel.version>3.0.5</easyexcel.version>
@@ -294,11 +294,11 @@
                 <artifactId>jnanoid</artifactId>
                 <version>${nanoid.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.github.ulisesbocchio</groupId>
-                <artifactId>jasypt-spring-boot-starter</artifactId>
-                <version>${jasypt.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.github.ulisesbocchio</groupId>-->
+<!--                <artifactId>jasypt-spring-boot-starter</artifactId>-->
+<!--                <version>${jasypt.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpmime</artifactId>

sop-api/install/mysql/init/init.sql

@@ -1141,6 +1141,23 @@ CREATE TABLE `t_b_sop_info_detail` (
                                        PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='sop明细表';
 
+-- ----------------------------
+-- Table structure for t_b_sop_log
+-- ----------------------------
+DROP TABLE IF EXISTS `t_b_sop_log`;
+CREATE TABLE `t_b_sop_log` (
+                               `id` bigint(20) NOT NULL COMMENT '主键',
+                               `sop_id` bigint(20) NOT NULL COMMENT 'sop主键',
+                               `type` varchar(30) DEFAULT NULL COMMENT '类型，APPROVE：sop审核，EDIT：sop编辑，CHANGE_EFFECT_ENGINEER：更改实施工程师，CHANGE_ASSISTANT_ENGINEER：更改助理工程师，ADD_EFFECT_ENGINEER：新增实施工程师，ADD_ASSISTANT_ENGINEER：新增助理工程师，REMOVE_EFFECT_ENGINEER：删除实施工程师，REMOVE_ASSISTANT_ENGINEER：删除助理工程师',
+                               `status` varchar(50) NOT NULL COMMENT '状态，START：已开始，AUDITING：审核中，REJECT：已驳回，END：已终止，FINISH：已结束',
+                               `setup` tinyint(4) NOT NULL COMMENT '计划步骤',
+                               `update_before_obj` mediumtext COMMENT '更改前内容',
+                               `update_after_obj` mediumtext COMMENT '更改后内容',
+                               `create_id` bigint(20) NOT NULL COMMENT '创建人id',
+                               `create_time` bigint(20) NOT NULL COMMENT '创建时间',
+                               PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='sop日志';
+
 -- ----------------------------
 -- Table structure for t_b_sop_plan_date_log
 -- ----------------------------

sop-api/src/main/resources/application.properties

@@ -13,8 +13,8 @@ spring.application.name=sop-api
 db.host=localhost
 db.port=3306
 db.name=sop_db
-db.username=ENC(twj/P1SX6jQfK9COMuT7Jw==)
-db.password=ENC(a2J4vh9tlOrY+SlC2XMMpA/pnlAyJMPv)
+db.username=root
+db.password=123456789
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -22,12 +22,6 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-jasypt.encryptor.password=IeHbJicLySV08XWixOFjk
-jasypt.encryptor.algorithm=PBEWithMD5AndDES
-jasypt.encryptor.pool-size=1
-jasypt.encryptor.salt-generator-classname=org.jasypt.salt.RandomSaltGenerator
-jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
-
 #activiti\u914D\u7F6E
 #activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
 #false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002

sop-business/src/main/java/com/qmth/sop/business/service/impl/DeviceMonitorServiceImpl.java

@@ -9,23 +9,23 @@ import com.qmth.sop.business.service.DeviceMonitorService;
 import com.qmth.sop.business.service.SysUserService;
 import com.qmth.sop.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
 
 /**
  * @author dhshu
  * @date:
  */
 @Service
-public class DeviceMonitorServiceImpl extends ServiceImpl<DeviceMonitorMapper, SysDevice> implements DeviceMonitorService {
+public class DeviceMonitorServiceImpl extends ServiceImpl<DeviceMonitorMapper, SysDevice>
+        implements DeviceMonitorService {
 
     @Resource
     private SysUserService sysUserService;
+
     @Override
     public Map<String, Object> count(Long supplierId, String model) {
         return this.baseMapper.count(supplierId, model);
@@ -43,7 +43,9 @@ public class DeviceMonitorServiceImpl extends ServiceImpl<DeviceMonitorMapper, S
         Map<String, Object> map = this.baseMapper.countByServiceUnit(dpr);
 
         Map<String, Object> count = this.count(null, null);
-        count.putAll(map);
+        if (!CollectionUtils.isEmpty(map)) {
+            count.putAll(map);
+        }
         return count;
     }
 

sop-common/pom.xml

@@ -142,10 +142,10 @@
             <groupId>com.aventrix.jnanoid</groupId>
             <artifactId>jnanoid</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.ulisesbocchio</groupId>
-            <artifactId>jasypt-spring-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.ulisesbocchio</groupId>-->
+<!--            <artifactId>jasypt-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>

sop-task/src/main/resources/application.properties

@@ -14,8 +14,8 @@ spring.application.name=sop-task
 db.host=localhost
 db.port=3306
 db.name=sop_db
-db.username=ENC(twj/P1SX6jQfK9COMuT7Jw==)
-db.password=ENC(a2J4vh9tlOrY+SlC2XMMpA/pnlAyJMPv)
+db.username=root
+db.password=123456789
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -23,12 +23,6 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-jasypt.encryptor.password=IeHbJicLySV08XWixOFjk
-jasypt.encryptor.algorithm=PBEWithMD5AndDES
-jasypt.encryptor.pool-size=1
-jasypt.encryptor.salt-generator-classname=org.jasypt.salt.RandomSaltGenerator
-jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
-
 #activiti\u914D\u7F6E
 #activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
 #false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002