1.计算rpn

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/RpnChangeLogTypeEum.java

+package com.yeejoin.amos.fas.common.enums;
+
+/**
+ * rpn变化类型枚举
+ */
+public enum RpnChangeLogTypeEum {
+    /**
+     * 类型枚举
+     */
+    upper("上升",0),
+    down("下降",1),
+    unChange("未发生变化",2);
+
+    private String name;
+    private int code;
+    RpnChangeLogTypeEum(String name,int code){
+        this.name = name;
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/TriggerRpnChangeTypeEum.java

+package com.yeejoin.amos.fas.common.enums;
+
+/**
+ * @author DELL
+ */
+
+public enum TriggerRpnChangeTypeEum {
+    /**
+     * 触发类型枚举
+     */
+    patrol("巡检","patrol"),
+    equipment("设备告警","equipment"),
+    fmeaUpdate("危险因素评价","fmeaUpdate"),
+    fmeaDelete("危险因素删除","fmeaDelete"),
+    riskDelete("风险点删除","riskDelete");
+
+    private String name;
+    private String code;
+
+    TriggerRpnChangeTypeEum(String name,String code){
+        this.name = name;
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

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

@@ -47,6 +47,8 @@ public class RiskLevel extends BasicEntity {
     @Column(name = "down_limit")
     private BigDecimal downLimit;
 
+    private Integer manageLevel;
+
     private String remark;
 
     private String severity;
@@ -125,4 +127,12 @@ public class RiskLevel extends BasicEntity {
     public void setDownLimit(BigDecimal downLimit) {
         this.downLimit = downLimit;
     }
+
+    public Integer getManageLevel() {
+        return manageLevel;
+    }
+
+    public void setManageLevel(Integer manageLevel) {
+        this.manageLevel = manageLevel;
+    }
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/RpnCalculationBo.java

+package com.yeejoin.amos.fas.business.bo;
+
+import java.math.BigDecimal;
+
+/**
+ * @author DELL
+ */
+public class RpnCalculationBo {
+    /**
+     * rpn
+     */
+    BigDecimal rpn;
+    /**
+     * rpni
+     */
+    BigDecimal rpni;
+    /**
+     * 长度
+     */
+    long size;
+
+    public long getSize() {
+        return size;
+    }
+
+    public void setSize(long size) {
+        this.size = size;
+    }
+
+    public BigDecimal getRpn() {
+        return rpn;
+    }
+
+    public void setRpn(BigDecimal rpn) {
+        this.rpn = rpn;
+    }
+
+    public BigDecimal getRpni() {
+        return rpni;
+    }
+
+    public void setRpni(BigDecimal rpni) {
+        this.rpni = rpni;
+    }
+
+    public boolean isEmpty(){
+        return size <= 0;
+    }
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FmeaMapper.java

@@ -36,5 +36,7 @@ public interface FmeaMapper extends BaseMapper {
 
     List<Fmea> listByRiskSourceId(Long riskSourceId);
 
+    List<Fmea> listByRiskSourceIds(@Param("ids") List<Long> ids);
+
     void updateRpn(Fmea fmea);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFmeaDao.java

@@ -29,7 +29,7 @@ public interface IFmeaDao extends BaseDao<Fmea, Long> {
 	/**
 	 * 根据ID删除fmea对象
 	 * 
-	 * @param riskSourceId
+	 * @param fmeaIds
 	 */
 	@Modifying
 	@Transactional
@@ -44,4 +44,7 @@ public interface IFmeaDao extends BaseDao<Fmea, Long> {
 
 	@Query(value = "SELECT count(1) FROM `f_fmea_equipment_point` WHERE fmea_id in ?1", nativeQuery = true)
 	int countAssociatedEquipPointByIds(String[] ids);
+
+	@Query(value = "select * from `f_fmea` where id in ?1",nativeQuery = true)
+    List<Fmea> findAllByRiskSourceIds(List<Long> ids);
 }

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

@@ -66,10 +66,7 @@ public class FmeaServiceImpl implements IFmeaService {
         fmeas.forEach(fmea -> {
             String userId = paramMap.get("user_id") == null ? "0" : paramMap.get("user_id").toString();
             fmea.setCreateBy(Integer.parseInt(userId));
-//            RiskSource riskSource = iRiskSourceDao.findById(fmea.getRiskSourceId());
-//            fmea.setRiskSource(riskSource);
             iFmeaDao.save(fmea);
-            //updateRpniInfo(fmea.getRiskSourceId());
         });
     }
 
@@ -255,7 +252,7 @@ public class FmeaServiceImpl implements IFmeaService {
         Map map = (Map) result;
 
 
-        RPNi = new BigDecimal(Double.parseDouble(String.valueOf(map.get("RPNi"))));
+        RPNi = new BigDecimal(String.valueOf(map.get("RPNi")));
         if (RPNi != null) {
             riskSource.setRpni(RPNi);
             this.iRiskSourceDao.save(riskSource);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java

@@ -16,6 +16,7 @@ import org.springframework.data.domain.Page;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface IRiskSourceService {
 
@@ -111,5 +112,9 @@ public interface IRiskSourceService {
 
     void notifyFmeaFromUpdate(Long fmeaId, String nofityType);
 
-    void notifyRiskSource(Long riskSourceId, String notifyType, String jpushTarget);
+    void notifyRiskSource(Long fmeaId, Long riskSourceId, String notifyType, Set<String> jpushTargets);
+
+    void notifyFmeaFromDelete(Long handId, String from);
+
+    void notifyRiskSourceDelete(Long handId);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/RpnUtils.java

+package com.yeejoin.amos.fas.business.util;
+
+import com.yeejoin.amos.fas.business.bo.RpnCalculationBo;
+import com.yeejoin.amos.fas.common.enums.RpnChangeLogTypeEum;
+import com.yeejoin.amos.fas.dao.entity.Fmea;
+import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
+import com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem;
+import com.yeejoin.amos.fas.dao.entity.RiskLevel;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author DELL
+ */
+public class RpnUtils {
+    /**
+     * 计算风险值
+     * @param fmeas
+     * @return RpnCalculationBo
+     */
+    public static RpnCalculationBo calRpnAndRpni(List<Fmea> fmeas){
+        BigDecimal maxSidValue = new BigDecimal("0");
+        BigDecimal maxDidValue = new BigDecimal("0");
+        BigDecimal totalOidValue = new BigDecimal("0");
+        BigDecimal totalNewOidValue = new BigDecimal("0");
+        long count = 0L;
+        for (Fmea fmea : fmeas) {
+            if (fmea.getEvaluationDid() != null && fmea.getEvaluationSid() != null && fmea.getEvaluationOid() != null && fmea.getNewEvaluationOid() != null) {
+                BigDecimal didValue = new BigDecimal(fmea.getDidValue());
+                BigDecimal sidValue = new BigDecimal(fmea.getSidValue());
+                BigDecimal oidValue = new BigDecimal(fmea.getOidValue());
+                BigDecimal newOidValue = new BigDecimal(fmea.getNewOidValue());
+                if (didValue.compareTo(maxDidValue) == 1) {
+                    maxDidValue = didValue;
+                }
+                if (sidValue.compareTo(maxSidValue) == 1) {
+                    maxSidValue = sidValue;
+                }
+                totalOidValue = totalOidValue.add(oidValue);
+                totalNewOidValue = totalNewOidValue.add(newOidValue);
+                count++;
+            }
+        }
+        RpnCalculationBo rpnValue = new RpnCalculationBo();
+        rpnValue.setSize(count);
+        if (count == 0) {
+            return rpnValue;
+        }
+        BigDecimal averageOidValue = totalOidValue.divide(BigDecimal.valueOf(count),2,BigDecimal.ROUND_HALF_UP);
+        BigDecimal averageNewOidValue = totalNewOidValue.divide(BigDecimal.valueOf(count),2,BigDecimal.ROUND_HALF_UP);
+        BigDecimal rpn = maxDidValue.multiply(maxSidValue).multiply(averageNewOidValue).setScale(2,BigDecimal.ROUND_HALF_UP);
+        BigDecimal rpni = maxDidValue.multiply(maxSidValue).multiply(averageOidValue).setScale(2,BigDecimal.ROUND_HALF_UP);
+        rpnValue.setRpn(rpn);
+        rpnValue.setRpni(rpni);
+        return rpnValue;
+    }
+
+    /**
+     * 计算最大故障率
+     * @param equipmentPoints
+     * @param pointInputitems
+     * @return
+     */
+    public static Double getMaxRate(List<FmeaEquipmentPoint> equipmentPoints, List<FmeaPointInputitem> pointInputitems) {
+        Double pointInputitemRate = null;
+        if (!CollectionUtils.isEmpty(pointInputitems)) {
+            int totalPointInputitem = pointInputitems.size();
+            int pointInputitemUnNormal = 0;
+            for (FmeaPointInputitem pointInputitem : pointInputitems) {
+                if (pointInputitem.getState() == 1) {
+                    pointInputitemUnNormal++;
+                }
+            }
+            pointInputitemRate = pointInputitemUnNormal * 1.0 / totalPointInputitem;
+        }
+        Double equipmentPointRate = null;
+        if (!CollectionUtils.isEmpty(equipmentPoints)) {
+            int totalEquipmentPoint = equipmentPoints.size();
+            int equipmentPointUnNormal = 0;
+            for (FmeaEquipmentPoint equipmentPoint : equipmentPoints) {
+                if (equipmentPoint.getState() == 1) {
+                    equipmentPointUnNormal++;
+                }
+            }
+            equipmentPointRate = equipmentPointUnNormal * 1.0 / totalEquipmentPoint;
+        }
+        if (equipmentPointRate == null) {
+            if (pointInputitemRate == null) {
+                return null;
+            } else {
+                return pointInputitemRate;
+            }
+        } else {
+            if (pointInputitemRate == null) {
+                return equipmentPointRate;
+            } else {
+                if (pointInputitemRate < equipmentPointRate) {
+                    return equipmentPointRate;
+                } else {
+                    return pointInputitemRate;
+                }
+            }
+        }
+    }
+
+    /**
+     * 获得风险等级
+     * @param rpni
+     * @param levels
+     * @return
+     */
+    public static RiskLevel getBetweenLevel(BigDecimal rpni, List<RiskLevel> levels) {
+        if (CollectionUtils.isEmpty(levels)) {
+            return null;
+        }
+        for (RiskLevel level : levels) {
+            int downResult = level.getDownLimit().compareTo(rpni);
+            int topResult = level.getTopLimit().compareTo(rpni);
+            if (downResult == -1 && topResult != -1) {
+                return level;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取风险变化类型
+     * @param rpn
+     * @param rpni
+     * @return
+     */
+    public static int getChangeType(BigDecimal rpn, BigDecimal rpni) {
+        if(rpn.subtract(rpni).doubleValue() > 0){
+            return RpnChangeLogTypeEum.upper.getCode();
+        } else if(rpn.subtract(rpni).doubleValue() < 0){
+            return RpnChangeLogTypeEum.down.getCode();
+        } else {
+            return RpnChangeLogTypeEum.unChange.getCode();
+        }
+
+    }
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/client/invoke/RsDataQueue.java

 package com.yeejoin.amos.fas.client.invoke;
 
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
+import com.yeejoin.amos.fas.common.enums.TriggerRpnChangeTypeEum;
 import com.yeejoin.amos.fas.context.IotContext;
 import org.apache.log4j.Logger;
-
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -24,7 +24,10 @@ public class RsDataQueue {
         riskSourceService = (IRiskSourceService) IotContext.getInstance().getBean(IRiskSourceService.class);
     }
 
-    //获取RsDataQueue 的实例
+    /**
+     *  获取RsDataQueue 的实例
+     * @return 获RsDataQueue
+     */
     public static RsDataQueue getInstance() {
         //先检查实例是否存在，如果不存在才进入下面的同步块
         if (instance == null) {
@@ -49,22 +52,27 @@ public class RsDataQueue {
     }
 
     public void addUpdateMessage(Long fmeaId) {
-        blockingQueue.add(new FmeaMessage(fmeaId, "update"));
+        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.fmeaUpdate.getCode()));
     }
 
     public void addPatrolMessage(Long fmeaId) {
-        blockingQueue.add(new FmeaMessage(fmeaId, "patrol"));
+        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.patrol.getCode()));
     }
 
     public void addEquipmentMessage(Long fmeaId) {
-        blockingQueue.add(new FmeaMessage(fmeaId, "equipment"));
+        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.equipment.getCode()));
     }
 
     public void addDeleteMessage(Long riskSourceId) {
-        blockingQueue.add(new FmeaMessage(riskSourceId, "delete"));
+        blockingQueue.add(new FmeaMessage(riskSourceId, TriggerRpnChangeTypeEum.fmeaDelete.getCode()));
+    }
+
+    public void addRiskSourcePointDeleteMessage(Long parentId){
+        blockingQueue.add(new FmeaMessage(parentId,TriggerRpnChangeTypeEum.riskDelete.getCode()));
     }
 
-    Runnable task_runnable = new Runnable() {
+    private Runnable task_runnable = new Runnable() {
+        @Override
         public void run() {
             while (true) {
                 try {
@@ -72,23 +80,25 @@ public class RsDataQueue {
                     if (riskSourceService != null) {
                         String from = fmeaMessage.getNorifyFrom();
                         Long handId = fmeaMessage.getHandId();
-                        if (from.equals("patrol")) {
+                        if (from.equals(TriggerRpnChangeTypeEum.patrol.getCode())) {
                             //巡检不合格通知
                             riskSourceService.notifyFmeaFromAbnormal(handId, from);
-                        } else if (from.equals("equipment")) {
+                        } else if (from.equals(TriggerRpnChangeTypeEum.equipment.getCode())) {
                             //设备告警
                             riskSourceService.notifyFmeaFromAbnormal(handId, from);
-                        } else if (from.equals("update")) {
-                            //修改通知
+                        } else if (from.equals(TriggerRpnChangeTypeEum.fmeaUpdate.getCode())) {
+                            //危险因素评价修改通知
                             riskSourceService.notifyFmeaFromUpdate(handId, from);
-                        } else if (from.equals("delete")) {
-                            //删除通知
-                            riskSourceService.notifyRiskSource(handId, from, null);
+                        } else if (from.equals(TriggerRpnChangeTypeEum.fmeaDelete.getCode())) {
+                            //危险因素删除通知
+                            riskSourceService.notifyFmeaFromDelete(handId, from);
+                        } else if(from.equals(TriggerRpnChangeTypeEum.riskDelete.getCode())){
+                            //风险点删除通知
+                            riskSourceService.notifyRiskSourceDelete(handId);
                         }
                     }
                 } catch (Exception e) {
                     Logger.getLogger(this.getClass()).error(e.getMessage());
-                    e.printStackTrace();
                 }
             }
         }

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-1.0.2.xml

@@ -368,5 +368,15 @@
 			MODIFY COLUMN `nodeid`  varchar(36) DEFAULT NULL;
 		  </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1588990926789-1">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="f_risk_level " columnName="manage_level"/>
+        </preConditions>
+        <comment>f_risk_level add column manage_level 管控级别</comment>
+        <sql>
+            ALTER TABLE `f_risk_level`
+            add COLUMN `manage_level` tinyint(4) DEFAULT NULL COMMENT '管控级别';
+        </sql>
+    </changeSet>
 
 </databaseChangeLog>
\ No newline at end of file

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

@@ -154,4 +154,27 @@
 		</set>
 		where id = #{id}
 	</update>
+	<select id="listByRiskSourceIds" resultType="com.yeejoin.amos.fas.dao.entity.Fmea">
+		select
+			a.id,
+			a.risk_source_id as riskSourceId,
+			a.risk_factors_id as riskFactorsId,
+			a.evaluation_sid as evaluationSid,
+			a.evaluation_oid as evaluationOid,
+			a.evaluation_did as evaluationDid,
+			a.new_evaluation_oid as newEvaluationOid,
+			a.rpni,
+			a.rpn,
+			(select coefficient from f_evaluation_model where id = a.evaluation_sid) as sidValue,
+			(select coefficient from f_evaluation_model where id = a.evaluation_oid) as oidValue,
+			(select coefficient from f_evaluation_model where id = a.evaluation_did) as didValue,
+			(select coefficient from f_evaluation_model where id = a.new_evaluation_oid) as newOidValue
+		from
+			f_fmea as a
+		where
+			a.risk_source_id in
+		<foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</select>
 </mapper>
\ No newline at end of file

pom.xml

@@ -251,7 +251,16 @@
       <name>maven-public</name>
       <url>http://172.16.1.6:8081/nexus/content/repositories/maven-public/</url>
     </repository>
-    
+	<repository>
+		<id>maven-public</id>
+		<name>maven-public</name>
+		<url>http://repo.typroject.org:8081/repository/maven-public/</url>
+	</repository>
+	<repository>
+		<id>maven-snapshot</id>
+		<name>maven-snapshot</name>
+		<url>http://repo.typroject.org:8081/repository/maven-snapshots/</url>
+	</repository>
   </repositories>
 
   <pluginRepositories>