1.合并刘林安全追溯逻辑代码代码

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/CommonController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.biz.job.InspectionExpireRemindJob;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.TaskModelServiceImpl;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl2;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 public class CommonController extends BaseController {
 
     @Autowired
-    CommonServiceImpl2 commonserviceImpl;
+    CommonServiceImpl commonserviceImpl;
 
     @Autowired
     TaskModelServiceImpl taskModelService;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionDetectionSaveToDbEventListener.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionDetectionSaveToDbEvent;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.BizEmqPublisher;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl2;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
@@ -37,7 +37,7 @@ public class InspectionDetectionSaveToDbEventListener implements ApplicationList
     private int threadNumber;
 
     @Autowired
-    CommonServiceImpl2 commonService;
+    CommonServiceImpl commonService;
 
     @Autowired
     private Sequence sequence;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/TaskModelServiceImpl.java

@@ -15,7 +15,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.InstanceRuntimeData;
 import com.yeejoin.amos.boot.module.jyjc.api.model.TaskModelDto;
 import com.yeejoin.amos.boot.module.jyjc.api.model.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CmWorkflowServiceImpl;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl2;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonUtils;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -51,7 +51,7 @@ public class TaskModelServiceImpl {
     private RedisUtils redisUtils;
 
     @Autowired
-    CommonServiceImpl2 commonService;
+    CommonServiceImpl commonService;
 
     @Autowired
     IDataDictionaryService iDataDictionaryService;
@@ -475,7 +475,7 @@ public class TaskModelServiceImpl {
         }
         String taskId = map.get("nextTaskId").toString();
         String instanceId = map.get("instanceId").toString();
-        String lockKey = CommonServiceImpl2.buildJcExecuteLockKey(instanceId);
+        String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonServiceImpl2.java → amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.List;
  * @author Administrator
  */
 @Service
-public class CommonServiceImpl2 {
+public class CommonServiceImpl {
 
     @Value("${jyjc.user-post:6615}")
     private String jyjcUserPost;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -98,7 +98,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     WorkflowFeignService workflowFeignService;
     @Autowired
-    CommonServiceImpl2 commonService;
+    CommonServiceImpl commonService;
     @Autowired
     CmWorkflowServiceImpl cmWorkflowService;
     @Value("classpath:/json/bizTypeInfo.json")
@@ -541,7 +541,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     public void doReceive(Map<String, Object> params) {
         String instanceId = params.get("instanceId").toString();
         String nextTaskId = params.get("nextTaskId").toString();
-        String lockKey = CommonServiceImpl2.buildJcExecuteLockKey(instanceId);
+        String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
@@ -689,7 +689,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     public Boolean doReject(Map<String, Object> params) {
         String instanceId = params.get("instanceId").toString();
         String nextTaskId = params.get("nextTaskId").toString();
-        String lockKey = CommonServiceImpl2.buildJcExecuteLockKey(instanceId);
+        String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
@@ -764,7 +764,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
      * 撤回流程办理单
      */
     public Boolean doRollback(String sequenceNbr, String instanceId, String nextTaskId) {
-        String lockKey = CommonServiceImpl2.buildJcExecuteLockKey(instanceId);
+        String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -101,7 +101,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
     @Autowired
-    CommonServiceImpl2 commonService;
+    CommonServiceImpl commonService;
 
     @Autowired
     TzsUserInfoMapper tzsUserInfoMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -116,7 +116,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     private TzsUserInfoMapper userInfoMapper;
 
     @Autowired
-    CommonServiceImpl2 commonService;
+    CommonServiceImpl commonService;
 
     @Autowired
     CmWorkflowServiceImpl cmWorkflowService;
@@ -514,7 +514,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     public JyjcOpeningApplication executeFlow(Map<String, Object> params) {
         String instanceId = params.get("instanceId").toString();
         String nextTaskId = params.get("nextTaskId").toString();
-        String lockKey = CommonServiceImpl2.buildJcExecuteLockKey(instanceId);
+        String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
@@ -606,7 +606,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     private void executeOneStep(JyjcOpeningApplicationModel openingApplication) {
         String instanceId = openingApplication.getWorkflowProstanceId();
         String nextTaskId = openingApplication.getNextTaskId();
-        String lockKey = CommonServiceImpl2.buildJcExecuteLockKey(instanceId);
+        String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
@@ -654,7 +654,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 撤回流程办理单
      */
     public JyjcOpeningApplication stopFlow(String sequenceNbr, String instanceId, String nextTaskId) {
-        String lockKey = CommonServiceImpl2.buildJcExecuteLockKey(instanceId);
+        String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);