1、预案代码修改

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

@@ -90,10 +90,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     private static final String DATETYPE_YYYY = "yyyy";//年
 
-    private static final String TOKE = "TOKE";
-
-    private static CacheMap cacheMap = CacheFactory.newChacheMap();
-
     @Autowired
     private IRiskSourceDao iRiskSourceDao;
 
@@ -177,9 +173,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     private IRiskFactorDao iRiskFactorDao;
 
     @Autowired
-    private IEquipManageFeign equipManageFeign;
-
-    @Autowired
     protected HttpServletRequest request;
 
     @Autowired
@@ -1053,10 +1046,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             if (equipment != null) {
                 deviceData.setMonitor(equipment.getName());
                 deviceData.setEquimentId(String.valueOf(equipment.getId()));
-
                 List<RiskSource> riskSources = this.riskSourceMapper.queryByFireEqument(deviceData.getFireEquimentId());
                 //asymbleWithParent(batchNo, riskSources, FireEquimentDataRo.class.getSimpleName(), deviceData.getFireEquimentId(), deviceData.getNodeState(), null, null);
-
                 try {
                     alermContingency(deviceData.getBatchNo(), fireEquipment, equipment);
                 } catch (Exception e) {
@@ -1072,7 +1063,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
      */
     @Async
     void fireEquipRuleMessagePush(AlarmParam deviceData, Toke toke) {
+        ruleMsgSend(deviceData, toke, log, ruleTrigger);
+    }
 
+    static void ruleMsgSend(AlarmParam deviceData, Toke toke, Logger log, RuleTrigger ruleTrigger) {
         String bacthNo = UUID.randomUUID().toString();
         FireEquimentDataRo fireEquimentDataRo = new FireEquimentDataRo();
         deviceData.setBatchNo(bacthNo);