合格和不告警

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FmeaPointInputitem.java

@@ -4,6 +4,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 
 /**
@@ -24,6 +25,8 @@ public class FmeaPointInputitem extends BasicEntity {
     @Column(name = "state")
     private Integer state;
 
+    private Long inputItemId;
+
     public Long getPointInputitemId() {
         return PointInputitemId;
     }
@@ -47,4 +50,13 @@ public class FmeaPointInputitem extends BasicEntity {
     public void setState(Integer state) {
         this.state = state;
     }
+
+    public void setInputItemId(Long inputItemId) {
+        this.inputItemId = inputItemId;
+    }
+
+    @Transient
+    public Long getInputItemId() {
+        return inputItemId;
+    }
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
@@ -835,18 +836,21 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         if (!CollectionUtils.isEmpty(protalData.getItems())) {
             Long pointId = protalData.getId();
             List<Long> inputIds = Lists.newArrayList();
+            Map<Long, CheckInputItemRo> map = Maps.newHashMap();
             for (CheckInputItemRo checkInputItemRo : protalData.getItems()) {
                 inputIds.add(checkInputItemRo.getPointInputitemId());
+                map.put(checkInputItemRo.getPointInputitemId(), checkInputItemRo);
             }
             List<FmeaPointInputitem> fmeaPointInputitems = fmeaPointInputitemMapper.listByPointIdAndInputItemIds(pointId, inputIds);
             Set<Long> fmeaIds = Sets.newHashSet();
             List<Long> failIds = Lists.newArrayList();
             List<Long> successIds = Lists.newArrayList();
             fmeaPointInputitems.forEach(fmeaPointInputitem -> {
-                if (fmeaPointInputitem.getState().equals(2)) {
+                CheckInputItemRo checkInputItemRo = map.get(fmeaPointInputitem.getInputItemId());
+                if (checkInputItemRo.getStatus().equals(2)) {
                     failIds.add(fmeaPointInputitem.getId());
                     fmeaIds.add(fmeaPointInputitem.getFmeaId());
-                } else {
+                } else if (checkInputItemRo.getStatus().equals(1)) {
                     successIds.add(fmeaPointInputitem.getId());
                     fmeaIds.add(fmeaPointInputitem.getFmeaId());
                 }
@@ -1221,22 +1225,21 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                         if (dict != null && dict.getDictCode().equals("alarm_type_trouble")) {
                             List<FmeaEquipmentPoint> fmeaEquipmentPoints = fmeaEquipmentPointMapper.listByEquipmentPointId(fireEquipmentPoint.getId());
                             Set<Long> fmeaIds = Sets.newHashSet();
-                            List<Long> failIds = Lists.newArrayList();
-                            List<Long> successIds = Lists.newArrayList();
+                            List<Long> ids = Lists.newArrayList();
                             fmeaEquipmentPoints.forEach(fmeaEquipmentPoint -> {
-                                if (fmeaEquipmentPoint.getState().equals(2)) {
-                                    failIds.add(fmeaEquipmentPoint.getId());
-                                    fmeaIds.add(fmeaEquipmentPoint.getFmeaId());
-                                } else {
-                                    successIds.add(fmeaEquipmentPoint.getId());
+                                ids.add(fmeaEquipmentPoint.getId());
                                 fmeaIds.add(fmeaEquipmentPoint.getFmeaId());
-                                }
                             });
-                            fmeaEquipmentPointMapper.updateStateByIds(1, failIds);
-                            fmeaEquipmentPointMapper.updateStateByIds(0, successIds);
+                            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));
                             }
+                        }
                         String batchNo = UUID.randomUUID().toString();
                         FireEquimentDataRo ruleData = new FireEquimentDataRo();
                         ruleData.setBatchNo(batchNo);

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fmea_point_inputitem.xml

@@ -98,27 +98,22 @@
 
     <select id="listByPointIdAndInputItemIds" resultType="com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem">
         select
-            id,
-            fmea_id as fmeaId,
-            point_inputitem_id as pointInputitemId,
-            state
-        from
-            f_fmea_point_inputitem
-        where
-            point_inputitem_id in
-            (
-                select
-                    id
+            a.id,
+            a.fmea_id as fmeaId,
+            a.point_inputitem_id as pointInputitemId,
+            a.state,
+            b.input_item_id as inputItemId
         from
-                    p_point_inputitem
+            f_fmea_point_inputitem as a
+        left join
+            p_point_inputitem as b on a.point_inputitem_id = b.id
         where
-                    point_id = #{pointId}
+            b.point_id = #{pointId}
         and
-                    input_item_id in
+            b.input_item_id in
             <foreach collection="inputIds" item="item" index="index" separator="," open="(" close=")">
                 #{item}
             </foreach>
-            )
     </select>
 
     <select id="listFmeaByFmeaId" resultType="com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem">