监控特殊处理

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java

@@ -97,7 +97,9 @@ public class ProcessStep4After implements TaskListener {
                         List<Task> list = taskService.createTaskQuery().processInstanceId(esTechRelation.getPrcId()).active().list();
                         if (list != null && !list.isEmpty()) {
                             // 删除正在运行中的流程根据流程实例ID
-                            runtimeService.deleteProcessInstance(esTechRelation.getPrcId(), "");
+                            if(StringUtils.isNotBlank(esTechRelation.getPrcId())) {
+                                runtimeService.deleteProcessInstance(esTechRelation.getPrcId(), "");
+                            }
                             //删除关联表
                             delList.add(esTechRelation.getId());
                         }
@@ -114,7 +116,9 @@ public class ProcessStep4After implements TaskListener {
                         List<Task> list = taskService.createTaskQuery().processInstanceId(esTechRelation.getPrcTechId()).active().list();
                         if (list != null && !list.isEmpty()) {
                             // 删除正在运行中的流程根据流程实例ID
-                            runtimeService.deleteProcessInstance(esTechRelation.getPrcTechId(), "");
+                            if(StringUtils.isNotBlank(esTechRelation.getPrcTechId())) {
+                                runtimeService.deleteProcessInstance(esTechRelation.getPrcTechId(), "");
+                            }
                             //删除关联表
                             delList.add(esTechRelation.getId());
                         }
@@ -339,7 +343,9 @@ public class ProcessStep4After implements TaskListener {
                         String nowTaskInfo1 = list1.get(0).getName();
                         if ("技术标准起草".equals(nowTaskInfo1)) {
                             // 删除正在运行中的流程根据流程实例ID
-                            runtimeService.deleteProcessInstance(prcIdGk1, "");
+                            if(StringUtils.isNotBlank(prcIdGk1)) {
+                                runtimeService.deleteProcessInstance(prcIdGk1, "");
+                            }
 
                             String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
                             QueryWrapper queryWrapperGk1 = new QueryWrapper();
@@ -355,7 +361,9 @@ public class ProcessStep4After implements TaskListener {
                         List<Task> list = taskService.createTaskQuery().processInstanceId(prcId1).active().list();
                         if (list != null && !list.isEmpty()) {
                             // 删除正在运行中的流程根据流程实例ID
-                            runtimeService.deleteProcessInstance(prcId1, "");
+                            if(StringUtils.isNotBlank(prcId1)) {
+                                runtimeService.deleteProcessInstance(prcId1, "");
+                            }
                         }
                     }
                 }
@@ -368,7 +376,10 @@ public class ProcessStep4After implements TaskListener {
                         String nowTaskInfo2 = list2.get(0).getName();
                         if ("技术标准起草".equals(nowTaskInfo2)) {
                             // 删除正在运行中的流程根据流程实例ID
-                            runtimeService.deleteProcessInstance(prcIdGk2, "");
+                            if(StringUtils.isNotBlank(prcIdGk2)){
+                                runtimeService.deleteProcessInstance(prcIdGk2, "");
+
+                            }
 
                             String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
                             QueryWrapper queryWrapperGk2 = new QueryWrapper();
@@ -384,7 +395,9 @@ public class ProcessStep4After implements TaskListener {
                         List<Task> list = taskService.createTaskQuery().processInstanceId(prcId2).active().list();
                         if (list != null && !list.isEmpty()) {
                             // 删除正在运行中的流程根据流程实例ID
-                            runtimeService.deleteProcessInstance(prcId2, "");
+                            if(StringUtils.isNotBlank(prcId2)){
+                                runtimeService.deleteProcessInstance(prcId2, "");
+                            }
                         }
                     }
                 }

src/main/resources/application.yml

@@ -14,8 +14,11 @@ logging:
     org.hibernate: info
 eureka:
   client:
+    allow-redirects: true
+    register-with-eureka: true
+    fetch-registry: true
     serviceUrl:
-      defaultZone: http://10.100.5.117:4201/eureka/
+      defaultZone: http://127.0.0.1:8123/eureka/
   instance:
     prefer-ip-address: true
 spring:
@@ -33,9 +36,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.100.5.111:3306/foton_bat_wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
+    url: jdbc:mysql://121.36.69.172:3307/foton-bat-wkflow-test?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
-    username: tempuser
+    username: root
-    password: Fting&8g35g#geg2
+    password: hzwlsoft.com
   activiti:
     database-schema-update: true
     # 自动部署验证设置:true-开启（默认）、false-关闭
@@ -44,10 +47,10 @@ spring:
     active: dev
   # 相关服务配置同业务系统
   rabbitmq:
-    host: 10.100.5.119
+    host: 121.36.69.172
     port: 5672
     username: admin
-    password: foton@admin
+    password: hzwlsoft.com
     listener:
       direct:
         # 默认加载 发版 需改为 true
@@ -102,7 +105,7 @@ ribbon:
 
 # 配置 是否 启用 OA
 oa:
-  flag: true
+  flag: false
 
 # 配置前端服务全路径地址 如下 /#/
 webUrl: https://srms.foton.com.cn/#/
@@ -116,5 +119,4 @@ buss:
   down:
     file:
       path: https://srms.foton.com.cn/file/
-#      path: http://foton.natapp1.cc/file/
+#      path: http://foton.natapp1.cc/file/
-