修改配置

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -855,6 +855,7 @@ public class ContingencyAction implements CustomerAction {
     public void autoExecuteActionV2(@MethodParam(paramLabel = "步骤编码") String stepCode, @MethodParam(paramLabel = "按钮编码") String buttonCode, @MethodParam(paramLabel = "按钮状态") String confirm, @MethodParam(paramLabel = "步骤状态") String stepState, @MethodParam(paramLabel = "动作名称") String actionName, @MethodParam(paramLabel = "图标") String icon, @MethodParam(paramLabel = "提示信息") String tips, @MethodParam(paramLabel = "按钮json字符串") String buttonJson, @MethodParam(paramLabel = "预案对象") Object paramObj) {
         ContingencyRo contingencyRo = (ContingencyRo) paramObj;
         String batchNo = contingencyRo.getBatchNo();
+        long startTime = System.currentTimeMillis();
         if (!findByBatchNoAndStatus(batchNo)) {
             ContingencyPlanInstance contingencyPlanInstance = getContingencyPlan(contingencyRo.getBatchNo(), actionName, icon, tips, buttonJson);
             String contingencyPlanId = contingencyPlanInstance.getId();
@@ -866,6 +867,8 @@ public class ContingencyAction implements CustomerAction {
                 e.printStackTrace();
             }
         }
+        long endTime = System.currentTimeMillis();
+        log.warn("自动执行动作V2耗时+++++++++++++++++++++++++++++++++" + (endTime - startTime) / 1000 + "秒" + ", 当前步骤编号: " + stepCode);
     }
 
     public void sendcmd(String msgType, SafteyPlanResult result) {

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business_v3.0.1.3_pyh?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
@@ -22,6 +22,7 @@ eureka.client.fetch-registry = true
 eureka.client.healthcheck.enabled = false
 eureka.client.fetchRegistry = true
 eureka.instance.prefer-ip-address=true
+#eureka.instance.ip-address = 172.16.11.201
 
 #redis
 spring.redis.database=1
@@ -76,7 +77,7 @@ rocketmq.producer.groupName2=groupName2
 rocketmq.producer.namesrvAddr2=172.16.3.135:9876
 
 #\u89C4\u5219ip\u914D\u7F6E\uFF0C\u7528\u4E8E\u591A\u7F51\u5361\u53CAdocker\u955C\u50CF\u542F\u52A8\u65F6\u6DFB\u52A0
-#rule.definition.local-ip=172.16.11.201
+rule.definition.local-ip=172.16.11.201
 
 rocket-plan-topic=topic_fire_emergency_plan
 rocket-equip-alarm-topic=topic_fire_equip_alarm