预案优化

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

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.component.rule.MethodParam;
 import com.yeejoin.amos.component.rule.RuleActionBean;
 import com.yeejoin.amos.component.rule.RuleMethod;
+import com.yeejoin.amos.component.rule.config.ClazzUtils;
+import com.yeejoin.amos.component.rule.model.FactModel;
 import com.yeejoin.amos.fas.business.action.el.ELEvaluationContext;
 import com.yeejoin.amos.fas.business.action.model.ContingencyEvent;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
@@ -62,6 +64,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
@@ -488,7 +491,6 @@ public class ContingencyAction implements CustomerAction {
                 log.error("optionarea 加入队列失败-->" + e.getMessage());
             }
 
-
         }
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -24,18 +24,15 @@ import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
 import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -47,7 +44,6 @@ import org.typroject.tyboot.component.emq.EmqxListener;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -307,7 +303,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Override
     public ContingencyPlanResponseVo planStartFirst(String batchNo, Toke toke) {
         logger.info("开始查询Step=============");
-        for (int i =0; i < 30 ; i++) {
+        for (int i =0; i < 120 ; i++) {
             ToipResponse planStepByBatchNo = planVisual3dService.getPlanStepByBatchNo(batchNo);
             logger.info("===============1111111,{}", planStepByBatchNo);
             if(null != planStepByBatchNo && null != planStepByBatchNo.getMsgContext()) {
@@ -326,7 +322,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 }
             }
             try {
-                Thread.sleep(2000);
+                Thread.sleep(500);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -42,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;