bug

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

@@ -1150,6 +1150,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     redisTemplate.opsForHash().put("currentContingency", "alarmType", null);
 //					redisTemplate.opsForValue().set("equipmentId", null);
                 } else {
+                    if ("alarm_type_trouble".equals(fireEquipmentPointType) {
+                        notifyAlarm(fireEquipmentPoint, deviceData);
+                    }
                     String alarmType = (String) redisTemplate.opsForHash().get("currentContingency", "alarmType");
                     if (!ObjectUtils.isEmpty(alarmType) && dict.getDictValue().equals(alarmType)) {
                         ContingencyDeviceStatus contingencyDeviceStatus = (ContingencyDeviceStatus) redisTemplate.opsForHash().get("currentContingency", "contingencyPlan");
@@ -1222,23 +1225,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     updateFirePointValue(fireEquipmentPoint.getId(), param.getState());
                     Equipment equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(Long.valueOf(data.getFireEquipmentId()));
                     if (!ObjectUtils.isEmpty(equipment)) {
-                        if (dict != null && dict.getDictCode().equals("alarm_type_trouble")) {
-                            List<FmeaEquipmentPoint> fmeaEquipmentPoints = fmeaEquipmentPointMapper.listByEquipmentPointId(fireEquipmentPoint.getId());
-                            Set<Long> fmeaIds = Sets.newHashSet();
-                            List<Long> ids = Lists.newArrayList();
-                            fmeaEquipmentPoints.forEach(fmeaEquipmentPoint -> {
-                                ids.add(fmeaEquipmentPoint.getId());
-                                fmeaIds.add(fmeaEquipmentPoint.getFmeaId());
-                            });
-                            if (param.getState().equals("true")) {
-                                fmeaEquipmentPointMapper.updateStateByIds(1, ids);
-                                RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-                                fmeaIds.forEach(fmeaId -> rsDataQueue.addAbnormalMessage(fmeaId));
-                            } else if (param.getState().equals("false")) {
-                                fmeaEquipmentPointMapper.updateStateByIds(0, ids);
-                                RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-                                fmeaIds.forEach(fmeaId -> rsDataQueue.addAbnormalMessage(fmeaId));
-                            }
+                        if (dict != null && dict.getDictValue().equals("alarm_type_trouble")) {
+                            notifyAlarm(fireEquipmentPoint, param);
                         }
                         String batchNo = UUID.randomUUID().toString();
                         FireEquimentDataRo ruleData = new FireEquimentDataRo();
@@ -1269,6 +1257,26 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         equipCommunicationDao.save(list);
     }
 
+    private void notifyAlarm(FireEquipmentPoint fireEquipmentPoint, AlarmParam param) {
+        List<FmeaEquipmentPoint> fmeaEquipmentPoints = fmeaEquipmentPointMapper.listByEquipmentPointId(fireEquipmentPoint.getId());
+        Set<Long> fmeaIds = Sets.newHashSet();
+        List<Long> ids = Lists.newArrayList();
+        fmeaEquipmentPoints.forEach(fmeaEquipmentPoint -> {
+            ids.add(fmeaEquipmentPoint.getId());
+            fmeaIds.add(fmeaEquipmentPoint.getFmeaId());
+        });
+        if (param.getState().equals("true")) {
+            fmeaEquipmentPointMapper.updateStateByIds(1, ids);
+            RsDataQueue rsDataQueue = RsDataQueue.getInstance();
+            fmeaIds.forEach(fmeaId -> rsDataQueue.addAbnormalMessage(fmeaId));
+        } else if (param.getState().equals("false")) {
+            fmeaEquipmentPointMapper.updateStateByIds(0, ids);
+            RsDataQueue rsDataQueue = RsDataQueue.getInstance();
+            fmeaIds.forEach(fmeaId -> rsDataQueue.addAbnormalMessage(fmeaId));
+        }
+
+    }
+
     @Async
     public void sendAnalogue(EquipCommunicationData data) {
         try {