Merge branch 'develop' into dev_upgrade

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

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

@@ -67,6 +67,12 @@ public class TopographyLine extends BusinessEntity{
     @Column(name = "to_port", columnDefinition = "varchar(32) COMMENT '终点'")
     private String toPort;
     
+    @Column(name = "type", columnDefinition = "varchar(32) COMMENT '1 领导架构 | 2 任务流程'")
+    private String type;
+    
+    @Column(name = "category", columnDefinition = "varchar(32) COMMENT '类别'")
+    private String category;
+    
 	public String getId() {
 		return id;
 	}
@@ -127,6 +133,18 @@ public class TopographyLine extends BusinessEntity{
 	public void setToPort(String toPort) {
 		this.toPort = toPort;
 	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getCategory() {
+		return category;
+	}
+	public void setCategory(String category) {
+		this.category = category;
+	}
     
 	
 }

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

@@ -74,6 +74,9 @@ public class TopographyNode extends BusinessEntity{
     @Column(name = "source_id", columnDefinition = "varchar(32) COMMENT '资源id'")
     private String sourceId;
     
+    @Column(name = "type", columnDefinition = "varchar(32) COMMENT '1 领导架构 | 2 任务流程'")
+    private String type;
+    
 	public String getId() {
 		return id;
 	}
@@ -140,4 +143,10 @@ public class TopographyNode extends BusinessEntity{
 	public void setSourceId(String sourceId) {
 		this.sourceId = sourceId;
 	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
 }

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/controller/FileController.java

@@ -210,7 +210,7 @@ public class FileController extends BaseController {
             return new CommonResponse(SUCCESS, "访问的文件不存在!", "查询成功");
         }
         if (fileName.endsWith(".doc") || fileName.endsWith(".docx")) {
-            String htmlFileName = fileName.substring(0, fileName.indexOf(".")) + ".html";
+            String htmlFileName = fileName.substring(0, fileName.lastIndexOf(".")) + ".html";
             File htmlFile = new File(htmlFileName);
             String data = WordConverterUtils.wordToHtmlString(fileName, readUrl);
             Map<String, Object> processData = null;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

@@ -7,28 +7,15 @@ import com.yeejoin.amos.fas.dao.entity.TextPlan;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
 import java.util.List;
 import java.util.Map;
 
@@ -38,14 +25,14 @@ import java.util.Map;
 public class PlanVisual3dController extends BaseController {
 
     private final Logger log = LoggerFactory.getLogger(PlanVisual3dController.class);
-    
+
     // 上传路径
     @Value("${file.uploadUrl}")
     private String fileUploadDir;
 
     @Autowired
     private IPlanVisual3dService planVisual3dService;
-    
+
     @Autowired
     HttpServletResponse response;
     @Autowired
@@ -62,50 +49,50 @@ public class PlanVisual3dController extends BaseController {
     public CommonResponse getTextPlanById(@PathVariable(value = "id") Long id) {
         return CommonResponseUtil.success(planVisual3dService.getTextPlanInfoById(id));
     }
-    
+
     //@Authorization(ingore = true)
     @RequestMapping(value = "/plan/text/downloadFile/{id}", method = RequestMethod.GET)
     public HttpServletResponse download(@PathVariable("id") Long id) {
-    	TextPlan testPlan = planVisual3dService.getTextPlanInfoById(id);
-    	if(testPlan != null) {
-    		String path = testPlan.getFilePath();
-    		if( path != null && !"".equals(path)) {
-    			try {
-    				// path是指欲下载的文件的路径。
-    				File file = new File(fileUploadDir + path);
-    				if(file.exists()) {
-    					// 取得文件名。
-    					String filename = file.getName();
-    					// 取得文件的后缀名。
-    					String ext = filename.substring(filename.lastIndexOf(".") + 1).toUpperCase();
-    					
-    					// 以流的形式下载文件。
-    					InputStream fis = new BufferedInputStream(new FileInputStream(fileUploadDir + path));
-    					byte[] buffer = new byte[fis.available()];
-    					fis.read(buffer);
-    					fis.close();
-    					// 清空response
+        TextPlan testPlan = planVisual3dService.getTextPlanInfoById(id);
+        if (testPlan != null) {
+            String path = testPlan.getFilePath();
+            if (path != null && !"".equals(path)) {
+                try {
+                    // path是指欲下载的文件的路径。
+                    File file = new File(fileUploadDir + path);
+                    if (file.exists()) {
+                        // 取得文件名。
+                        String filename = file.getName();
+                        // 取得文件的后缀名。
+                        String ext = filename.substring(filename.lastIndexOf(".") + 1).toUpperCase();
+
+                        // 以流的形式下载文件。
+                        InputStream fis = new BufferedInputStream(new FileInputStream(fileUploadDir + path));
+                        byte[] buffer = new byte[fis.available()];
+                        fis.read(buffer);
+                        fis.close();
+                        // 清空response
 //    				response.reset();
-    					// 设置response的Header
-    					response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));
-    					response.addHeader("Content-Length", "" + file.length());
-    					response.setContentType("application/x-download");
-    					OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
-    					response.setContentType("application/octet-stream");
-    					toClient.write(buffer);
-    					toClient.flush();
-    					toClient.close();
-    				}else {
-    					response.setStatus(404);
-    				}
-    			} catch (IOException ex) {
-    				ex.printStackTrace();
-    			}
-    		}
-    	}else {
-    		response.setStatus(404);
-    	}
-    	return response;
+                        // 设置response的Header
+                        response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));
+                        response.addHeader("Content-Length", "" + file.length());
+                        response.setContentType("application/x-download");
+                        OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
+                        response.setContentType("application/octet-stream");
+                        toClient.write(buffer);
+                        toClient.flush();
+                        toClient.close();
+                    } else {
+                        response.setStatus(404);
+                    }
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        } else {
+            response.setStatus(404);
+        }
+        return response;
     }
 
     /**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/TopographyController.java

@@ -42,11 +42,22 @@ public class TopographyController {
 	@Autowired
 	private ITopographyLineService lineService;
 	
-	@ApiOperation(value = "根据appID查询节点及线", notes = "根据appID查询节点及线")
-    @GetMapping(value = "/{appId}")
-    public CommonResponse getTextPlanById(@PathVariable(value = "appId") String appId) {
-		List<TopographyNode> nodes = nodeService.getNodesByAppId(appId);
-    	List<TopographyLine> links = lineService.getLinksByAppId(appId);
+	@ApiOperation(value = "根据appId查询节点及线", notes = "根据appID查询节点及线")
+    @GetMapping(value = "/query/{type}/{appId}")
+    public CommonResponse getTextPlanByIdAndType(@PathVariable(value = "appId") String appId,@PathVariable(value = "type") String type) {
+		List<TopographyNode> nodes = nodeService.getNodesByAppIdAndType(appId,type);
+    	List<TopographyLine> links = lineService.getLinesByAppIdAndType(appId,type);
+    	Map<String,Object> results = new HashMap<>();
+    	results.put("nodeData", nodes);
+    	results.put("linkData", links);
+    	return CommonResponseUtil.success(results);
+    }
+	
+	@ApiOperation(value = "根据type查询节点及线", notes = "根据type查询节点及线")
+    @GetMapping(value = "/query/{type}")
+    public CommonResponse getTextPlanByType(@PathVariable(value = "type") String type) {
+		List<TopographyNode> nodes = nodeService.getNodesByType(type);
+    	List<TopographyLine> links = lineService.getLinesByType(type);
     	Map<String,Object> results = new HashMap<>();
     	results.put("nodeData", nodes);
     	results.put("linkData", links);
@@ -61,58 +72,73 @@ public class TopographyController {
     @PostMapping(value = "/updateTopo", produces = "application/json;charset=UTF-8")
     @ApiOperation(value = "保存拓扑图", notes = "保存拓扑图")
     public CommonResponse savedonghuanNodes(@ApiParam(value = "", required = false) @RequestBody JSONObject topographyParam) {
-    	String appId = topographyParam.getString("appId");
-    	//节点
-    	JSONArray nodes = topographyParam.getJSONArray("nodeData");
-    	List<TopographyNode> nodeData = JSON.parseArray(JSON.toJSONString(nodes), TopographyNode.class);
-    	HashMap<String, String> convertKeyMap = new HashMap<>();
-    	int curSize = nodeService.queryMaxKeyByAppId(appId);
-    	for(TopographyNode e:nodeData){
-    		if(Integer.valueOf(e.getKey()) < 0) {
-    			curSize = curSize + 1 ;
-    			String newKey = String.format("%05d", curSize);
-    			convertKeyMap.put(e.getKey(), newKey);
-    			e.setKey(newKey);
-    			e.setAppId(appId);
-    			e.setGroup("");
-    		}
-    	};
-    	//线
-    	JSONArray links = topographyParam.getJSONArray("linkData");
-    	List<TopographyLine> lineData = JSON.parseArray(JSON.toJSONString(links), TopographyLine.class);
-    	lineData.forEach(l -> {
-    		if(Integer.parseInt(l.getFrom()) < 0) {
-    			l.setFrom(convertKeyMap.get(l.getFrom()));
-    		}
-    		if(Integer.parseInt(l.getTo()) < 0) {
-    			l.setTo(convertKeyMap.get(l.getTo()));
-    		}
-    		if(l.getAppId() == null) {
-    			l.setAppId(appId);
-    		}
-    	});
-    	
-    	nodeService.saveNodes(nodeData);
-    	lineService.saveLines(lineData);
-    	
-    	//节点详情
-    	JSONObject nodeDetailJson = topographyParam.getJSONObject("nodeDetail");
-    	if(nodeDetailJson != null) {
-    		TopographyNodeDetail nodeDetail = JSON.parseObject(JSON.toJSONString(nodeDetailJson), TopographyNodeDetail.class);
-    		String nodekey = nodeDetail.getNodekey();
-    		if(nodekey != null && Integer.parseInt(nodekey) < 0) {
-    			TopographyNode node = nodeService.queryByKeyAndAppId(convertKeyMap.get(nodekey),appId);
-    			nodeDetail.setNodeid(node.getId());
-    		}
-    		nodeService.saveNodeDetail(nodeDetail);
+    	synchronized (TopographyController.class) {
+    		
+	    	String appId = topographyParam.getString("appId") != null ? topographyParam.getString("appId") : null;
+	    	String type = topographyParam.getString("type");
+	    	//节点
+	    	JSONArray nodes = topographyParam.getJSONArray("nodeData");
+	    	List<TopographyNode> nodeData = JSON.parseArray(JSON.toJSONString(nodes), TopographyNode.class);
+	    	HashMap<String, String> convertKeyMap = new HashMap<>();
+	    	int curSize = nodeService.queryMaxKeyByAppIdAndType(appId,type);
+	    	for(TopographyNode e:nodeData){
+	    		if(Integer.valueOf(e.getKey()) < 0) {
+	    			curSize = curSize + 1 ;
+	    			String newKey = String.format("%05d", curSize);
+	    			convertKeyMap.put(e.getKey(), newKey);
+	    			e.setKey(newKey);
+	    			e.setType(type);
+	    			e.setAppId(appId);
+	    			if(e.getGroup() == null) {
+	    				e.setGroup("");
+	    			}else if(Integer.valueOf(e.getGroup()) < 0){//修改新节点组
+	    				e.setGroup(convertKeyMap.get(e.getGroup()));
+	    			}
+	    		}
+	    	};
+	    	//线
+	    	JSONArray links = topographyParam.getJSONArray("linkData");
+	    	List<TopographyLine> lineData = JSON.parseArray(JSON.toJSONString(links), TopographyLine.class);
+	    	lineData.forEach(l -> {//修改新增节点之间线的连接
+	    		if(Integer.parseInt(l.getFrom()) < 0) {
+	    			l.setFrom(convertKeyMap.get(l.getFrom()));
+	    		}
+	    		if(Integer.parseInt(l.getTo()) < 0) {
+	    			l.setTo(convertKeyMap.get(l.getTo()));
+	    		}
+	    		if(l.getCategory() == null) {
+					l.setCategory("");
+				}
+	    		if(l.getAppId() == null) {
+	    			l.setAppId(appId);
+	    			l.setType(type);
+	    		}
+	    	});
+	    	
+	    	nodeService.saveNodes(nodeData);
+	    	lineService.saveLines(lineData);
+	    	
+	    	//节点详情
+	    	
+    		JSONObject nodeDetailJson = topographyParam.getJSONObject("nodeDetail");
+        	if(nodeDetailJson != null) {
+        		TopographyNodeDetail nodeDetail = JSON.parseObject(JSON.toJSONString(nodeDetailJson), TopographyNodeDetail.class);
+        		String nodekey = nodeDetail.getNodekey();
+        		if(nodekey != null && Integer.parseInt(nodekey) < 0) {
+        			TopographyNode node = nodeService.queryByKeyAndAppIdAndType(convertKeyMap.get(nodekey),appId,type);
+        			nodeDetail.setNodeid(node.getId());
+        		}
+        		nodeService.saveNodeDetail(nodeDetail);
+        	}
+	    	//返回保存后的数据
+	    	List<TopographyNode> newNodes = nodeService.getNodesByAppIdAndType(appId,type);
+	    	List<TopographyLine> newLinks = lineService.getLinesByAppIdAndType(appId,type);
+	    	
+	    	Map<String,Object> results = new HashMap<>();
+	    	results.put("nodeData", newNodes);
+	    	results.put("linkData", newLinks);
+	    	return CommonResponseUtil.success(results);
     	}
-
-    	List<TopographyNode> newNodes = nodeService.getNodesByAppId(appId);
-    	List<TopographyLine> newLinks = lineService.getLinksByAppId(appId);
-    	Map<String,Object> results = new HashMap<>();
-    	results.put("nodeData", newNodes);
-    	results.put("linkData", newLinks);
-    	return CommonResponseUtil.success(results);
     }
 
 	@ApiOperation(value = "根据nodeid查询节点详情", notes = "根据nodeid查询节点详情")
@@ -143,7 +169,8 @@ public class TopographyController {
     	if("Link".equals(type)) {
     		lineService.deleteLine(id);
     	}else {
-    		nodeService.deleteNode(id);
+    		TopographyNode node = nodeService.queryById(id);
+    		nodeService.deleteNode(node);
     	}
 		return CommonResponseUtil.success();
     }

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/mapper/PlanVisual3dMapper.java

@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface PlanVisual3dMapper extends BaseMapper {
-    List<HashMap<String,String>> getResourceListByType(@Param("type") String type);
+    List<HashMap<String,Object>> getResourceListByType(@Param("type") String type);
 
     Map<String, Object> queryOneByTypeAndId(@Param("type") String type, @Param("id") Long id);
 }

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

@@ -12,5 +12,7 @@ public interface IFireEquipmentPointDao extends BaseDao<FireEquipmentPoint, Long
 	Optional<FireEquipmentPoint> findById(Long id);
 
 	FireEquipmentPoint findOneByCode(String pointCode);
+	
+	int countByCode(String code);
 
 }

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

@@ -30,7 +30,7 @@ public interface IFmeaDao extends BaseDao<Fmea, Long> {
 	/**
 	 * 根据ID删除fmea对象
 	 * 
-	 * @param riskSourceId
+	 * @param fmeaIds
 	 */
 	@Modifying
 	@Transactional
@@ -45,4 +45,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/dao/repository/ITopographyLineDao.java

@@ -10,11 +10,13 @@ import com.yeejoin.amos.fas.dao.entity.TopographyLine;
 @Repository("iTopographyLineDao")
 public interface ITopographyLineDao  extends BaseDao<TopographyLine, Long> {
 
-	List<TopographyLine> findByAppId(String appId);
+	List<TopographyLine> findByAppIdAndType(String appId,String type);
 
 	TopographyLine findById(String id);
 
 	@Query(value = "select * from f_topography_line " + " where `from` = (?1) or `to` = (?1)",nativeQuery = true)
 	List<TopographyLine> findByKey(String key);
 
+	List<TopographyLine> findByType(String type);
+
 }

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

@@ -11,16 +11,23 @@ import com.yeejoin.amos.fas.dao.entity.TopographyNode;
 @Repository("iTopographyNodeDao")
 public interface ITopographyNodeDao extends BaseDao<TopographyNode, Long> {
 
-	List<TopographyNode> findByAppId(String appId);
+	List<TopographyNode> findByAppIdAndType(String appId,String type);
 	
 	@Query(value = "select * from f_topography_node " + " where id in (?1)",nativeQuery = true)
 	List<TopographyNode> findAllByIds(@Param("ids") List<String> ids);
 
 	TopographyNode findById(String id);
 
-	TopographyNode findByKeyAndAppId(String nodekey, String appId);
+	TopographyNode findByKeyAndAppIdAndType(String nodekey, String appId,String type);
 
-	@Query(value = "select max(`key`) from f_topography_node where app_id = (?1)",nativeQuery = true)
-	Integer queryMaxKeyByAppId(String appId);
+	@Query(value = "select max(`key`) from f_topography_node where app_id = (?1) and type = (?2)",nativeQuery = true)
+	Integer queryMaxKeyByAppIdAndType(String appId,String type);
+
+	List<TopographyNode> findByGroupAndAppIdAndType(String key, String appId, String type);
+
+	List<TopographyNode> findByType(String type);
+
+	@Query(value = "select max(`key`) from f_topography_node where type = (?1)",nativeQuery = true)
+	Integer queryMaxKeyByType(String type);
 	
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/entity/mybatis/FireEquipmentPointEntity.java

@@ -29,6 +29,8 @@ public class FireEquipmentPointEntity extends FireEquipmentPointExtend {
     private String orgCode;
 
     private Long alarmType;
+    
+    private String alarmTypeName;
 
     private String fireEquipmentCode;
 
@@ -135,4 +137,12 @@ public class FireEquipmentPointEntity extends FireEquipmentPointExtend {
     public void setFireEquipmentCode(String fireEquipmentCode) {
         this.fireEquipmentCode = fireEquipmentCode;
     }
+
+	public String getAlarmTypeName() {
+		return alarmTypeName;
+	}
+
+	public void setAlarmTypeName(String alarmTypeName) {
+		this.alarmTypeName = alarmTypeName;
+	}
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/param/FireEquipmentPointParam.java

@@ -29,7 +29,7 @@ public class FireEquipmentPointParam {
     @Excel(name = "单位", orderNum = "7", width = 12)
     private String unit;
 
-    @Excel(name = "告警类型", replace = {"火灾告警_1", "电源开关_2", "换流变_6", "液位_3", "流量_4", "容量_5"}, orderNum = "8")
+    @Excel(name = "告警类型", replace = {"火灾告警_1", "电源开关_2", "换流变_6", "液位_3", "流量_4", "容量_5", "故障告警_7"}, orderNum = "8")
     private Long alarmType;
 
     public Long getId() {

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

@@ -67,10 +67,7 @@ public class FmeaServiceImpl implements IFmeaService {
         fmeas.forEach(fmea -> {
             String userId = paramMap.get("user_id") == null ? "0" : paramMap.get("user_id").toString();
             fmea.setCreateBy(userId);
-//            RiskSource riskSource = iRiskSourceDao.findById(fmea.getRiskSourceId());
-//            fmea.setRiskSource(riskSource);
             iFmeaDao.save(fmea);
-            //updateRpniInfo(fmea.getRiskSourceId());
         });
     }
 
@@ -235,8 +232,9 @@ public class FmeaServiceImpl implements IFmeaService {
             if(anomalyLevel1.isPresent()){
             	 anomalyLevel =anomalyLevel1.get();
             }
-            if (anomalyLevel != null && anomalyLevel.getLevel() > maxLevel)
+            if (anomalyLevel != null && anomalyLevel.getLevel() > maxLevel){
                 maxLevel = anomalyLevel.getLevel();
+            }
         }
         return maxLevel;
     }
@@ -245,36 +243,14 @@ public class FmeaServiceImpl implements IFmeaService {
     private List<RiskSource> findAnomalyRiskSource(Long riskSourceId) {
         List<RiskSource> returnList = new ArrayList<>();
         List<RiskSource> childs = iRiskSourceDao.findByParentId(riskSourceId);
-
-        if (CollectionUtils.isEmpty(childs))
+        if (CollectionUtils.isEmpty(childs)){
             return returnList;
-
+        }
         for (RiskSource child : childs) {
-			/*if("ANOMALY".equals(child.getStatus()))
-			{
-				returnList.add(child);
-			}*/
             returnList.add(child);
             returnList.addAll(this.findAnomalyRiskSource(child.getId()));
         }
         return returnList;
     }
 
-
-    private BigDecimal updateRpn(Object result, RiskSource riskSource, BigDecimal RPNi) {
-
-			/*"RPNr": 16,
-			"RPNi": -14*/
-        Map map = (Map) result;
-
-
-        RPNi = new BigDecimal(Double.parseDouble(String.valueOf(map.get("RPNi"))));
-        if (RPNi != null) {
-            riskSource.setRpni(RPNi);
-            this.iRiskSourceDao.save(riskSource);
-        }
-        return RPNi;
-    }
-
-
 }

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

@@ -16,8 +16,11 @@ public class ITopographyLineServiceImpl implements ITopographyLineService{
 	private ITopographyLineDao topographyLineDao;
 
 	@Override
-	public List<TopographyLine> getLinksByAppId(String appId) {
-		return topographyLineDao.findByAppId(appId);
+	public List<TopographyLine> getLinesByAppIdAndType(String appId,String type) {
+		if(appId == null) {
+			return topographyLineDao.findByType(type);
+		}
+		return topographyLineDao.findByAppIdAndType(appId,type);
 	}
 
 	@Override
@@ -32,6 +35,11 @@ public class ITopographyLineServiceImpl implements ITopographyLineService{
 			topographyLineDao.delete(line);
 		}
 	}
+
+	@Override
+	public List<TopographyLine> getLinesByType(String type) {
+		return topographyLineDao.findByType(type);
+	}
 	
 	
 }

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

@@ -26,8 +26,11 @@ public class ITopographyNodeServiceImpl implements ITopographyNodeService{
 	private ITopographyLineDao lineDao;
 
 	@Override
-	public List<TopographyNode> getNodesByAppId(String appId) {
-		return nodeDao.findByAppId(appId);
+	public List<TopographyNode> getNodesByAppIdAndType(String appId,String type) {
+		if(appId == null) {
+			return nodeDao.findByType(type);
+		}
+		return nodeDao.findByAppIdAndType(appId,type);
 	}
 
 	@Override
@@ -53,8 +56,8 @@ public class ITopographyNodeServiceImpl implements ITopographyNodeService{
 	}
 
 	@Override
-	public void deleteNode(String id) {
-		TopographyNode node = nodeDao.findById(id);
+	public void deleteNode(TopographyNode node) {
+//		TopographyNode node = nodeDao.findById(id);
 		if(node != null) {
 			String key = node.getKey();
 			nodeDao.delete(node);
@@ -62,17 +65,41 @@ public class ITopographyNodeServiceImpl implements ITopographyNodeService{
 			if(lines != null && lines.size() > 0) {
 				lineDao.deleteAll(lines);
 			}
+			if(node.getIsGroup() != null && node.getIsGroup()) {
+				List<TopographyNode> childNodes = nodeDao.findByGroupAndAppIdAndType(node.getKey(),node.getAppId(),node.getType());
+				childNodes.forEach(c -> deleteNode(c));
+			}
+			return;
+		}
+	}
+
+	@Override
+	public TopographyNode queryByKeyAndAppIdAndType(String nodekey, String appId,String type) {
+		return nodeDao.findByKeyAndAppIdAndType(nodekey,appId,type);
+	}
+
+	@Override
+	public int queryMaxKeyByAppIdAndType(String appId,String type) {
+		Integer maxKey;
+		if(null == appId) {
+			maxKey = nodeDao.queryMaxKeyByType(type);		
+		}else {
+			maxKey = nodeDao.queryMaxKeyByAppIdAndType(appId,type);			
+		}
+		if(maxKey == null) {
+			maxKey = 0;
 		}
+		return maxKey;
 	}
 
 	@Override
-	public TopographyNode queryByKeyAndAppId(String nodekey, String appId) {
-		return nodeDao.findByKeyAndAppId(nodekey,appId);
+	public TopographyNode queryById(String id) {
+		return nodeDao.findById(id);
 	}
 
 	@Override
-	public int queryMaxKeyByAppId(String appId) {
-		return nodeDao.queryMaxKeyByAppId(appId);
+	public List<TopographyNode> getNodesByType(String type) {
+		return nodeDao.findByType(type);
 	}
 
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
+import com.yeejoin.amos.fas.business.dao.mapper.DictMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanVisual3dMapper;
 import com.yeejoin.amos.fas.business.dao.repository.ITextPlanDao;
 import com.yeejoin.amos.fas.business.feign.IMaasVisualServer;
@@ -34,6 +35,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     @Autowired
     IDictService dictService;
 
+    @Autowired
+    private DictMapper dictMapper;
+
     @Override
     public List<TreeSubjectVo> getPlanTree() {
 
@@ -75,9 +79,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         for (Object obj : list) {
             TreeSubjectVo treeItem = new TreeSubjectVo();
             LinkedHashMap<String, Object> map = (LinkedHashMap<String, Object>) obj;
-            treeItem.setId((Integer) map.get("id"));
+            treeItem.setId((String) map.get("id"));
             treeItem.setTreeName((String) map.get("treeName"));
-            treeItem.setParentId((Integer) map.get("parentId"));
+            treeItem.setParentId((String) map.get("parentId"));
             treeItem.setMaxSubjectNumber((Integer) map.get("maxSubjectNumber"));
             treeItem.setType("treeNode");
 
@@ -92,30 +96,34 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
                 List<TreeSubjectVo> childrenVos = Lists.newArrayList();
                 List<Object> res = (List<Object>) response.getDataList();
                 res.forEach(r -> {
+                	LinkedHashMap<String, Object> map1 = (LinkedHashMap<String, Object>) r;
+                	Integer state = (Integer) map1.get("publishState");
+                	if(state == 0) {//过滤 未发布状态
+                		return;
+                	}
                     TreeSubjectVo subjectVo = new TreeSubjectVo();
-                    LinkedHashMap<String, Object> map1 = (LinkedHashMap<String, Object>) r;
                     subjectVo.setType("listNode");
-                    subjectVo.setParentId((Integer) map.get("id"));
-                    subjectVo.setId((Integer) map1.get("id"));
-                    subjectVo.setDelete(map1.get("isDelete") == null ? false : (Boolean) map1.get("isDelete"));
-                    subjectVo.setCreateTime((Long) map1.get("createTime"));
+                    subjectVo.setParentId((String) map.get("id"));
+                    subjectVo.setId((String) map1.get("id"));
+                    subjectVo.setDelete(map1.get("isDelete") == null || (Integer) map1.get("isDelete") == 0 ? false : true);
+                    subjectVo.setCreateTime((String) map1.get("createTime"));
                     subjectVo.setCreator(map1.get("creator") == null ? 0 : (Integer) map1.get("creator"));
                     subjectVo.setSubjectName((String) map1.get("subjectName"));
                     subjectVo.setTreeName((String) map1.get("subjectName"));
                     subjectVo.setSubjectDetail((String) map1.get("subjectDetail"));
                     subjectVo.setSubjectType((String) map1.get("subjectType"));
                     subjectVo.setSubjectTypeName((String) map1.get("subjectTypeName"));
-                    subjectVo.setPublishState((Integer) map1.get("publishState"));
-                    subjectVo.setBelongTreeId((Integer) map1.get("belongTreeId"));
+                    subjectVo.setPublishState(state);
+                    subjectVo.setBelongTreeId((String) map1.get("belongTreeId"));
                     subjectVo.setScenes(map1.get("scenes") == null ? "" : (String) map1.get("scenes"));
 
                     //关联文字预案
                     List<TextPlan> textPlans = iTextPlanDao.findByAppId(String.valueOf(subjectVo.getId()));
                     textPlans.forEach(t -> {
                         TreeSubjectVo textTreeSubjectVo = new TreeSubjectVo();
-                        textTreeSubjectVo.setParentId(Integer.valueOf(t.getAppId()));
+                        textTreeSubjectVo.setParentId(String.valueOf(t.getAppId()));
                         textTreeSubjectVo.setTreeName(t.getTextName());
-                        textTreeSubjectVo.setId((int) t.getId());
+                        textTreeSubjectVo.setId(String.valueOf(t.getId()));
                         textTreeSubjectVo.setType("textNode");
                         subjectVo.getChildren().add(textTreeSubjectVo);
                     });
@@ -178,5 +186,44 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         return list;
     }
 
+    @Override
+    public List<Map<String, Object>> getResourceTypeList() {
+        Dict dict = new Dict();
+        dict.setDictCode(FasConstant.PLAN_SOURCE_TYPE);
+        List<Dict> dictList = dictMapper.getDictList(dict);
+        List<Map<String, Object>> list = new ArrayList<>();
+        list = dictList.stream().map(e->{
+            Map<String, Object> newMap = new HashMap<String, Object>();
+            newMap.put("key",e.getDictValue());
+            newMap.put("value",e.getDictValue());//前端级联Cascader使用
+            newMap.put("isLeaf",false);////前端级联Cascader使用
+            newMap.put("dataType","type");
+            newMap.put("label",e.getDictName());
+            return newMap;
+        }).collect(Collectors.toList());
+        return list;
+    }
+
+	@Override
+	public List<TreeSubjectVo> getTextPlanBySubjectId(String appId) {
+		//关联文字预案
+		List<TreeSubjectVo> subjectVos = new ArrayList<>();
+        List<TextPlan> textPlans = iTextPlanDao.findByAppId(appId);
+        textPlans.forEach(t -> {
+            TreeSubjectVo textTreeSubjectVo = new TreeSubjectVo();
+            textTreeSubjectVo.setParentId(String.valueOf(t.getAppId()));
+            textTreeSubjectVo.setTreeName(t.getTextName());
+            textTreeSubjectVo.setId(String.valueOf(t.getId()));
+            textTreeSubjectVo.setType("textNode");
+            subjectVos.add(textTreeSubjectVo);
+        });
+		return subjectVos;
+	}
+
+	@Override
+	public void deleteTextPlanFile(Long id) {
+		iTextPlanDao.deleteById(id);
+	}
+
 
 }

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

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
+import com.yeejoin.amos.fas.business.bo.RpnCalculationBo;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.mongo.EquipCommunicationDao;
@@ -23,6 +24,7 @@ import com.yeejoin.amos.fas.business.service.intfc.*;
 import com.yeejoin.amos.fas.business.service.model.*;
 import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JexlUtil;
+import com.yeejoin.amos.fas.business.util.RpnUtils;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
@@ -42,16 +44,13 @@ import org.springframework.data.redis.core.HashOperations;
 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.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.component.cache.enumeration.CacheType;
 
 import javax.annotation.PostConstruct;
-
-import static org.hamcrest.CoreMatchers.nullValue;
-
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -74,11 +73,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     private static final String DATETYPE_YYYY = "yyyy";//年
 
-    private static final String PACKAGE_ID = "风险管控/risk";
-
-    //计算风险点rpni对应规则packageid
-    private static final String PACKAGE_ID_COUNT_RPNI = "风险管控/countRPNi";
-
     @Autowired
     private IRiskSourceDao iRiskSourceDao;
 
@@ -98,9 +92,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     private FmeaMapper fmeaMapper;
 
     @Autowired
-    private IRiskFactorDao iRiskFactorDao;
-
-    @Autowired
     private RiskSourceMapper riskSourceMapper;
 
     @Autowired
@@ -179,16 +170,15 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     public RiskSource editRiskSource(HashMap<String, Object> map) throws Exception {
         RiskSource riskSource = (RiskSource) map.get("param");
-//		String id = String.valueOf(map.get("id"));
         Long id = riskSource.getId();
         String orgCode = map.get("org_code") == null ? "" : map.get("org_code").toString();
         String userId = map.get("user_id") == null ? "0" : map.get("user_id").toString();
         riskSource.setOrgCode(orgCode);
         riskSource.setCreateBy(Integer.parseInt(userId));
         Optional<RiskSource> oldRiskSource1 = iRiskSourceDao.findById(id);
-        RiskSource oldRiskSource=null;
-        if(oldRiskSource1.isPresent()){
-        	oldRiskSource=oldRiskSource1.get();
+        RiskSource oldRiskSource = null;
+        if (oldRiskSource1.isPresent()) {
+            oldRiskSource = oldRiskSource1.get();
         }
         if (id == 0) {//新增
             riskSource.setStatus(FasConstant.RISK_SOURCE_STATUS_NORMAL);
@@ -197,52 +187,47 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             riskSource.setCreateDate(oldRiskSource.getCreateDate());
             riskSource.setFmeaList(oldRiskSource.getFmeaList());
             riskSource.setIncrement(oldRiskSource.getIncrement());
-//            riskSource.setRiskSourceEquipment(oldRiskSource.getRiskSourceEquipment());
-//            riskSource.setRiskSourcePointInputitem(oldRiskSource.getRiskSourcePointInputitem());
             riskSource.setRpn(oldRiskSource.getRpn());
             riskSource.setRpnChangeLogList(oldRiskSource.getRpnChangeLogList());
             riskSource.setRpni(oldRiskSource.getRpni());
             riskSource.setStatus(oldRiskSource.getStatus());
         }
-
         iRiskSourceDao.saveAndFlush(riskSource);
 
-
         //同步数据
-        if (id == null || id == 0)
+        if (id == 0) {
             node3dVoService.syncData(() -> node3dVoService.incrementalCreate(Node3dVoService.DATATYPE_RISKSOURCE));
-        else
+        } else {
             node3dVoService.syncData(() -> node3dVoService.incrementalUpdate(Node3dVoService.DATATYPE_RISKSOURCE));
-        iDataRefreshService.refreshViewData(DataRefreshTypeEum.rpn.getCode());
+            iDataRefreshService.refreshViewData(DataRefreshTypeEum.rpn.getCode());
+        }
+
         return riskSource;
     }
 
     @Override
     public void deleteRiskSource(Long[] riskSourceId) throws Exception {
-        Long id = Collections.min(Arrays.asList(riskSourceId));
-        Long parentId = 0L;
-        if (null != id) {
-            Optional<RiskSource> rs1 = iRiskSourceDao.findById(id);
-            RiskSource rs =null;
-            if(rs1.isPresent()){
-            	rs=rs1.get();
-            }
-            parentId = rs.getParentId();
-        }
+        Set<Long> parentIds = new LinkedHashSet<>();
         for (Long rId : riskSourceId) {
             int count = iRiskSourceDao.countByParentId(rId);
+            Optional<RiskSource> rs = iRiskSourceDao.findById(rId);
+            rs.ifPresent(riskSource -> parentIds.add(riskSource.getParentId()));
             if (count > 0) {
                 throw new YeeException("该数据有关联子项，请先删除子项数据");
             }
             iRiskSourceDao.deleteById(rId);
         }
-//        if (null != parentId) {
-////            updateRiskSourceRpni(parentId);
-////        }
 
-        //同步数据
+        //1.同步数据
         node3dVoService.syncData(() -> node3dVoService.incrementalRemove(Node3dVoService.DATATYPE_RISKSOURCE));
+        //2.3d屏数据刷新
         iDataRefreshService.refreshViewData(DataRefreshTypeEum.rpn.getCode());
+        //3.重新计算rpn
+        List<Long> existIds = parentIds.stream().filter(e ->
+                iRiskSourceDao.findById(e).isPresent()
+        ).collect(Collectors.toList());
+        RsDataQueue rs = RsDataQueue.getInstance();
+        existIds.forEach(rs::addRiskSourcePointDeleteMessage);
     }
 
     @Override
@@ -253,6 +238,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
+    @Override
     public List<Map> queryForRegion() {
         List<Map> result = riskSourceMapper.queryForRegion();
         if (!CollectionUtils.isEmpty(result)) {
@@ -265,6 +251,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
+    @Override
     public Map queryFor3DStatistics() {
         Map<String, List> result = riskSourceMapper.statistics3dCount();
         result.put("equipClassify", riskSourceMapper.statisticsEquipClassify());
@@ -274,11 +261,13 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
+    @Override
     public List<Map> queryRPNReport() {
         return riskSourceMapper.queryRPNReport();
     }
 
 
+    @Override
     public Map queryForRiseUp() throws Exception {
         Map<String, Map> result = new HashMap<>();
 
@@ -312,6 +301,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return result;
     }
 
+    @Override
     public List<Map> queryForMatrix() {
         return this.riskSourceMapper.queryForMatrix();
     }
@@ -356,14 +346,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return riskSourceMapper.getRiskSources();
     }
 
-//    @Override
-//    public Page<HashMap<String, Object>> getRiskSourcePoints(RiskSourceParam param) {
-//        long total = riskSourceMapper.getRiskSourcePointCount(param);
-//        List<HashMap<String, Object>> content = riskSourceMapper.getRiskSourcePoints(param);
-//        Page<HashMap<String, Object>> result = new PageImpl<HashMap<String, Object>>(content, param, total);
-//        return result;
-//    }
-
     @Override
     public List<FmeaEquipmentPoint> bindFireEquiment(FmeaBindParam fmeaBindParam) {
         Long fmeaId = fmeaBindParam.getFmeaId();
@@ -410,21 +392,17 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return returnList;
     }
 
-//    public String[] removeBoundRelation(String[] idArray) {
-//        for (String id : idArray)
-//            this.iRiskSourceEquipmentDao.delete(Long.parseLong(id));
-//        return idArray;
-//    }
-
     /**
      * 查询指定风险点和设备之间的关系，包含绑定和未绑定
      */
+    @Override
     public Page<Map> queryEquimentRelation(CommonPageable commonPageable, String equipmentId, String fname) {
         Long total = fireEquipMapper.queryEquimentRelationCount(equipmentId, fname);
         List<Map> list = fireEquipMapper.queryEquimentRelation(commonPageable.getOffset(), commonPageable.getPageSize(), equipmentId, fname);
         return new PageImpl<>(list, commonPageable, total);
     }
 
+    @Override
     public List<Map<String, Object>> listEquipmentPointById(Long fmeaId, Long importantEquipId, Long equipmentId, String equipmentPointName) {
         List<Map<String, Object>> list = fmeaEquipmentPointMapper.listEquipmentPoint(fmeaId, importantEquipId, equipmentId, equipmentPointName);
         if (CollectionUtils.isEmpty(list)) {
@@ -434,6 +412,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     }
 
+    @Override
     @Async
     public String processFireEqumtData(FireEquimentDataRo deviceData) throws Exception {
         //处理设备和巡检数据
@@ -441,10 +420,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         String batchNo = UUID.randomUUID().toString();
         deviceData.setBatchNo(batchNo);
         Optional<FireEquipment> fireEquipment1 = this.iFireEquipmentDao.findById(deviceData.getFireEquimentId());
-        FireEquipment fireEquipment =null;
-        
-        if(fireEquipment1.isPresent()){
-        	fireEquipment =fireEquipment1.get();
+        FireEquipment fireEquipment = null;
+
+        if (fireEquipment1.isPresent()) {
+            fireEquipment = fireEquipment1.get();
         }
         Equipment equipment = null;
         if (fireEquipment != null) {
@@ -475,8 +454,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     public void alermContingency(String batchNo, FireEquipment fireEquipment, Equipment equipment) throws Exception {
         ContingencyRo contingencyRo = new ContingencyRo();
-
-
         contingencyRo.setBatchNo(batchNo);
         contingencyRo.setEquipmentId(String.valueOf(equipment.getId()));
         contingencyRo.setEquipmentName(equipment.getName());
@@ -499,225 +476,45 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         contingencyRo.setAdminName("admin");
         contingencyRo.setFireEquipmentPosition(fireEquipment.getPosition3d());
 
-
         List<PreplanPicture> pictures = iPreplanPictureDao.findByEquipmentId(Long.valueOf(equipment.getId()));
         if (!CollectionUtils.isEmpty(pictures)) {
             for (PreplanPicture picture : pictures) {
-                if (1 == picture.getType())
+                if (1 == picture.getType()) {
                     contingencyRo.setPicture1(picture.getPicture());
-                if (2 == picture.getType())
+                }
+                if (2 == picture.getType()) {
                     contingencyRo.setPicture2(picture.getPicture());
-                if (3 == picture.getType())
+                }
+                if (3 == picture.getType()) {
                     contingencyRo.setPicture3(picture.getPicture());
-                if (4 == picture.getType())
+                }
+                if (4 == picture.getType()) {
                     contingencyRo.setPicture4(picture.getPicture());
+                }
             }
         }
-
-
         Object result = remoteRuleServer.fireRuleFlow(contingencyRo, equipment.getReservePlan(), equipment.getName());
-
-
         ContingencyOriginalData contingencyOriginalData = new ContingencyOriginalData();
         BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);
         iContingencyOriginalDataDao.save(contingencyOriginalData);
     }
 
 
-//    public boolean asymbleWithParent(String bacthNo, List<RiskSource> riskSourceList, String from, Long fromId, String nodeState, String originalNodeState, List<FmeaPointInputitem> pointInputitems) throws Exception {
-//        if (!CollectionUtils.isEmpty(riskSourceList)) {
-//            for (RiskSource riskSource : riskSourceList) {
-//                //当前规则
-//                RiskSourceRo riskSourceRo = this.transfer(bacthNo, riskSource, from, nodeState, originalNodeState, new BigDecimal(0), pointInputitems);
-//
-//                Object result = remoteRuleServer.fireRule(riskSourceRo, PACKAGE_ID);
-//                //BigDecimal RPNi = updateRpn(result,riskSource,null,fromId);
-//                //处理返回结果
-//
-//                //反查 父级风险点，取得处于第二级的父级风险点
-//                findParent(bacthNo, riskSource, nodeState, originalNodeState, new BigDecimal(0), fromId);
-//            }
-//        }
-//        return true;
-//    }
-
-//    /**
-//     * 查询父节点风险点
-//     *
-//     * @param riskSource
-//     * @param nodeState
-//     * @param originalNodeState
-//     * @param RPNi
-//     * @return
-//     */
-//    private BigDecimal findParent(String bacthNo, RiskSource riskSource, String nodeState, String originalNodeState,
-//                                  BigDecimal RPNi, Long fromId) throws Exception {
-//        if (riskSource != null && riskSource.getId() != 0 && RPNi.doubleValue() != 0) {
-//            RiskSource parent = this.iRiskSourceDao.findById(riskSource.getParentId());
-//            if (null != parent) {
-//                RiskSourceRo parentRiskResource = this.transfer(bacthNo, parent, "child", nodeState, originalNodeState,
-//                        RPNi, null);
-//                Object result = remoteRuleServer.fireRule(parentRiskResource, "风险管控/parentRisk");
-//                //updateRpn(result, parent, RPNi, fromId);
-//
-//                if (parent.getParentId() != 0)
-//                    this.findParent(bacthNo, parent, nodeState, originalNodeState, RPNi, fromId);
-//            }
-//        }
-//
-//        return RPNi;
-//    }
-
-
-    private RiskSourceRo transfer(String bacthNo, RiskSource riskSource, String from, String nodeState, String originalNodeState, BigDecimal rpni, List<FmeaPointInputitem> pointInputitems) {
-        RiskSourceRo riskSourceRo = new RiskSourceRo();
-        riskSourceRo.setBatchNo(bacthNo);
-        riskSourceRo.setId(String.valueOf(riskSource.getId()));
-        riskSourceRo.setCode(riskSource.getCode());
-        riskSourceRo.setFrom(from);
-        riskSourceRo.setName(riskSource.getName());
-        riskSourceRo.setNodeState(nodeState);
-        riskSourceRo.setOriginalNodeState(originalNodeState);
-        riskSourceRo.setIsRegion(riskSource.getIsRegion());
-        riskSourceRo.setRiskFactor(null);
-        riskSourceRo.setRpn(riskSource.getRpn());
-        riskSourceRo.setRiskState(riskSource.getStatus());
-
-        riskSourceRo.setRpni(rpni);
-        Optional<RiskLevel> riskLevel1 = iRiskLevelDao.findById(riskSource.getRiskLevelId());
-        RiskLevel riskLevel =null;
-        if(riskLevel1.isPresent()){
-        	riskLevel=riskLevel1.get();
-        }
-        if (riskLevel != null) {
-            riskSourceRo.setRiskLevel(riskLevel.getLevel());
-        }
-
-
-        List<BigDecimal> RPNiSum = new ArrayList<>();
-        List<Fmea> fmeaList = iFmeaDao.findByRiskSourceId(riskSource.getId());
-        String riskFactor = "";
-
-        if (!CollectionUtils.isEmpty(fmeaList)) {
-            for (Fmea fmea : fmeaList) {
-                RPNiSum.add(fmea.getRpni());
-                Optional<RiskFactor> factor1 = iRiskFactorDao.findById(fmea.getRiskFactorsId());
-                RiskFactor factor =null;
-                if(factor1.isPresent()){
-                	factor=factor1.get();
-                }
-                if (factor != null)
-                    riskFactor += factor.getName() + "\n";
-            }
-        }
-
-
-        //获取所有子节点的rpni值
-        List<Map<String, BigDecimal>> rpniList = riskSourceMapper.queryForRiskSourceRpni(riskSource.getId());
-        if (!CollectionUtils.isEmpty(rpniList)) {
-            for (Map<String, BigDecimal> map : rpniList) {
-                RPNiSum.addAll(map.values());
-            }
-        }
-
-
-
-       /* for(Fmea fmea:fmeaList)
-        {
-            Map<String,BigDecimal> map = new HashMap<>();
-            map.put("rpni",fmea.getRpni());
-            RPNiSum.add(map);
-        }*/
-
-
-        //巡检
-        if (ProtalDataRo.class.getSimpleName().equals(from)) {
-
-            if (!CollectionUtils.isEmpty(pointInputitems)) {
-//                for (RiskSourcePointInputitem pointInputitem : pointInputitems) {
-//                    RiskSourcePointInputitem riskSourcePointInputitem = iRiskSourcePointInputitemDao.findAllByRiskSourceIdAndPointIdAndPointInputitemId(riskSource.getId(), pointInputitem.getPointId(), pointInputitem.getPointInputitemId());
-//
-//                    if (riskSourcePointInputitem != null) {
-//                        riskSourcePointInputitem.setCheckInputitemId(pointInputitem.getCheckInputitemId());
-//						/*//正常1，异常2    正常变异常  负的，异常变正常  正的
-//						String status = pointInputitem.getStatus();
-//						String oldStatus = riskSourcePointInputitem.getStatus();
-//
-//						*//*if(StringUtils.isEmpty(oldStatus))
-//							oldStatus =  "1";
-//
-//						if("1".equals(oldStatus) && "2".equals(status))
-//						{
-//							if(!CollectionUtils.isEmpty(fmeaList))
-//							{
-//								for(Fmea fmea:fmeaList)
-//								{
-//									Map<String,BigDecimal> map = new HashMap<>();
-//
-//									//正常变异常  累加负的
-//									map.put("rpni",fmea.getRpni().multiply(new BigDecimal(-1)));
-//									RPNiSum.add(map);
-//								}
-//							}
-//							riskSourcePointInputitem.setStatus(status);
-//						}
-//
-//						if("2".equals(oldStatus) && "1".equals(status))
-//						{
-//							if(!CollectionUtils.isEmpty(fmeaList))
-//							{
-//								for(Fmea fmea:fmeaList)
-//								{
-//									Map<String,BigDecimal> map = new HashMap<>();
-//									map.put("rpni",fmea.getRpni());
-//									RPNiSum.add(map);
-//								}
-//							}
-//							riskSourcePointInputitem.setStatus(status);
-//						}*//*
-//
-//
-//                        for(Fmea fmea:fmeaList)
-//                        {
-//                            Map<String,BigDecimal> map = new HashMap<>();
-//                            map.put("rpni",fmea.getRpni());
-//                            RPNiSum.add(map);
-//                        }
-//                       // riskSourcePointInputitem.setStatus(status);*/
-//                        riskSourcePointInputitem.setStatus(pointInputitem.getStatus());
-//                        iRiskSourcePointInputitemDao.save(riskSourcePointInputitem);
-//                    }
-//                }
-            }
-        }
-
-
-        riskSourceRo.setRiskFactor(riskFactor);
-        riskSourceRo.setRPNiSum(RPNiSum);
-
-
-        //是否是区域节点
-        if ("TRUE".equals(riskSource.getIsRegion())) {
-
-            riskSourceRo.setRegionMaxLevel(findRegionMaxLevel(riskSource.getId()));
-        }
-        return riskSourceRo;
-    }
-
-
     private Integer findRegionMaxLevel(Long regionRiskSourceId) {
         Integer maxLevel = 0;
         List<RiskSource> anomalyRiskSource = findAnomalyRiskSource(regionRiskSourceId);
         for (RiskSource anomaly : anomalyRiskSource) {
             Optional<RiskLevel> anomalyLevel1 = this.iRiskLevelDao.findById(anomaly.getRiskLevelId());
             RiskLevel anomalyLevel = null;
-            if(anomalyLevel1.isPresent()){
-            	anomalyLevel=anomalyLevel1.get();
+            if (anomalyLevel1.isPresent()) {
+                anomalyLevel = anomalyLevel1.get();
             }
-            if (anomalyLevel != null && anomalyLevel.getLevel() > maxLevel)
+            if (anomalyLevel != null && anomalyLevel.getLevel() > maxLevel) {
                 maxLevel = anomalyLevel.getLevel();
+            }
         }
         return maxLevel;
+
     }
 
 
@@ -725,63 +522,16 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         List<RiskSource> returnList = new ArrayList<>();
         List<RiskSource> childs = iRiskSourceDao.findByParentId(riskSourceId);
 
-        if (CollectionUtils.isEmpty(childs))
+        if (CollectionUtils.isEmpty(childs)) {
             return returnList;
-
+        }
         for (RiskSource child : childs) {
-			/*if("ANOMALY".equals(child.getStatus()))
-			{
-				returnList.add(child);
-			}*/
             returnList.add(child);
             returnList.addAll(this.findAnomalyRiskSource(child.getId()));
         }
         return returnList;
     }
 
-
-	/*private BigDecimal updateRpn(Object result,RiskSource riskSource,BigDecimal RPNi,Long fromId)
-	{
-
-			*//*"RPNr": 16,
-			"RPNi": -14*//*
-		Map map = (Map) result;
-
-
-
-			RPNi = new BigDecimal(Double.parseDouble(String.valueOf(map.get("RPNi"))));
-			if(RPNi != null)
-            {
-                riskSource.setRpni(RPNi);
-                this.iRiskSourceDao.save(riskSource);
-            }
-
-			*//*if(RPNr.doubleValue() != 0 && !"ANOMALY".equals(riskSource.getStatus()))
-			{
-				riskSource.setStatus("ANOMALY");
-				this.iRiskSourceDao.save(riskSource);
-			}
-
-			if(RPNr.doubleValue() == 0 && !"NORMAL".equals(riskSource.getStatus()))
-			{
-				riskSource.setStatus("NORMAL");
-				this.iRiskSourceDao.save(riskSource);
-			}*//*
-		return RPNi;
-	}*/
-
-
-    private void createRpnChangeLog(BigDecimal rpni, BigDecimal rpnr, Long riskSourceId, Long fromId) {
-        RpnChangeLog rpnChangeLog = new RpnChangeLog();
-        rpnChangeLog.setCreateDate(new Date());
-        rpnChangeLog.setRiskSourceId(Long.valueOf(riskSourceId));
-        rpnChangeLog.setRpn(rpnr);
-        rpnChangeLog.setRpni(rpni);
-        rpnChangeLog.setTriggerBy(Long.valueOf(fromId));
-        rpnChangeLog.setType(rpni.doubleValue() > 0 ? 0 : 1);
-        iRpnChangeLogDao.save(rpnChangeLog);
-    }
-
     @Override
     public Page<Map<String, Object>> listFmeaPointInputitem(Long fmeaId, Integer pageNumber, Integer pageSize) {
         List<Map<String, Object>> content = Lists.newArrayList();
@@ -801,6 +551,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
+    @Override
     public boolean processTaskData(ProtalDataRo taskData) throws Exception {
         taskData.setBatchNo(UUID.randomUUID().toString());
         //Object result = remoteRuleServer.fireRule(taskData, "风险管控/patrol");
@@ -808,25 +559,22 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
+    @Override
     @Async
-    public void processProtalData(String toke,String product,String appKey,ProtalDataRo protalData) {
+    public void processProtalData(String toke, String product, String appKey, ProtalDataRo protalData) {
         String bacthNo = UUID.randomUUID().toString();
         protalData.setBatchNo(bacthNo);
         Optional<PPoint> pPoint1 = iPPointDao.findById(protalData.getId());
-        PPoint pPoint =null;
-        if(pPoint1.isPresent()){
-        	pPoint=pPoint1.get();
+        PPoint pPoint = null;
+        if (pPoint1.isPresent()) {
+            pPoint = pPoint1.get();
         }
         if (pPoint != null) {
             protalData.setOriginalNodeState(pPoint.getStatus());
             protalData.setLevel(pPoint.getLevel());
             protalData.setPointNo(pPoint.getPointNo());
             protalData.setPointName(pPoint.getName());
-
-            AgencyUserModel sUser = remoteSecurityService.getUserById( toke, product, appKey, pPoint.getChargePersonId());
-            
-           
-            
+            AgencyUserModel sUser = remoteSecurityService.getUserById(toke, product, appKey, pPoint.getChargePersonId());
             if (sUser != null) {
                 protalData.setUserName(sUser.getUserName());
             } else {
@@ -865,22 +613,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             fmeaIds.forEach(fmeaId -> rsDataQueue.addPatrolMessage(fmeaId));
         }
         iDataRefreshService.refreshViewData(DataRefreshTypeEum.check.getCode());
-        //asymbleWithParent(bacthNo,riskSources, ProtalDataRo.class.getSimpleName(),protalData.getId(),protalData.getNodeState(),protalData.getOriginalNodeState(),protalData.getPointInputitems());
     }
 
-//    @Override
-//    @Transactional
-//    public void removeByRSIdAndPId(List<HashMap<String, String>> list) {
-//        // TODO Auto-generated method stub
-//        if (list.size() > 0) {
-//            for (HashMap<String, String> hashMap : list) {
-//                iRiskSourcePointInputitemDao.removeByRSIdAndPId(hashMap.get("riskId"), hashMap.get("pointId"));
-//            }
-//
-//        }
-//
-//    }
-
     @Override
     public RiskSourceTreeResponse queryRiskSourceDetailById(Long id) {
         RiskSourceTreeResponse det = riskSourceMapper.findRiskSourceDetatil(id);
@@ -888,13 +622,13 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
+    @Override
     public Map earlyWarning(Long riskSourceId) {
         Map returnMap = new HashMap();
         Map riskSourceInfo = this.riskSourceMapper.queryForRiskSourceLevel(riskSourceId);
         List<Map> fmeaList = this.fmeaMapper.queryForFmeaList(riskSourceId);
         List<Map> inputitemContent = this.riskSourceMapper.queryForUnqualified(riskSourceId);
         List<Map> fireEquipmentPointMap = fireEquipPointMapper.queryForEqueAndPointName(riskSourceId);
-
         returnMap.put("riskSourceInfo", riskSourceInfo);
         returnMap.put("fmeaList", fmeaList);
         returnMap.put("inputitemContent", inputitemContent);
@@ -902,113 +636,19 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return returnMap;
     }
 
-//    @Override
-//    public BigDecimal updateRiskSourceRpni(Long riskSourceId) throws Exception {
-//        BigDecimal newRpni = new BigDecimal(0);
-//        //风险点添加或删除风险因素时
-//        RiskSource riskSource = iRiskSourceDao.findById(riskSourceId);
-//        if (null != riskSource) {
-//            List<BigDecimal> childRpniList = new ArrayList<>();
-//            List<RiskSource> children = iRiskSourceDao.findByParentId(riskSource.getId());
-//            for (RiskSource child : children) {
-//                childRpniList.add(child.getRpni());
-//            }
-//            RiskSourceRo riskSourceRo = fillRiskSourceRo(riskSource, childRpniList);
-//            //Object result = remoteRuleServer.fireRule(riskSourceRo, PACKAGE_ID_COUNT_RPNI);
-//            //BigDecimal RPNi = updateRpni(result, riskSource);
-//            //findParent(riskSource, RPNi);
-//            //newRpni = RPNi;
-//        }
-//        return newRpni;
-//    }
-
-    private RiskSourceRo fillRiskSourceRo(RiskSource riskSource, List<BigDecimal> rpniList) {
-        RiskSourceRo riskSourceRo = new RiskSourceRo();
-        String batchNo = UUID.randomUUID().toString();
-        riskSourceRo.setId(String.valueOf(riskSource.getId()));
-        riskSourceRo.setBatchNo(batchNo);
-        riskSourceRo.setIsRegion(riskSource.getIsRegion());
-        riskSourceRo.setRiskState(riskSource.getStatus());
-        List<BigDecimal> RPNiSum = new ArrayList<>();
-        List<Fmea> fmeaList = iFmeaDao.findByRiskSourceId(riskSource.getId());
-        if (!CollectionUtils.isEmpty(fmeaList)) {// 风险点自身危险因素的rpni值
-            for (Fmea fmea : fmeaList) {
-                RPNiSum.add(fmea.getRpni());
-            }
-        }
-        if (null != rpniList) {// 若风险点为父节点，则将所有子节点的rpni值加入RPNiSum列表中
-            for (BigDecimal rpni : rpniList) {
-                RPNiSum.add(rpni);
-            }
-        }
-        riskSourceRo.setRPNiSum(RPNiSum);
-        return riskSourceRo;
-    }
-
-    private BigDecimal updateRpni(Object result, RiskSource riskSource) {
-
-        /*
-         * "RPNr": 16, "RPNi": -14
-         */
-        BigDecimal RPNi = null;
-        Map map = (Map) result;
-        if (null != map.get("RPNi")) {
-            RPNi = new BigDecimal(Double.parseDouble(String.valueOf(map.get("RPNi"))));
-            if (RPNi != null) {
-                riskSource.setRpni(RPNi);
-                this.iRiskSourceDao.save(riskSource);
-            }
-        }
-        return RPNi;
-    }
-
-    /**
-     * 查询父节点风险点
-     *
-     * @param riskSource
-     * @param RPNi
-     * @return
-     */
-    private BigDecimal findParent(RiskSource riskSource, BigDecimal RPNi) throws Exception {
-        if (null != riskSource && riskSource.getId() != 0 && riskSource.getParentId() != 0 && null != RPNi && RPNi.doubleValue() != 0) {
-//			RiskSource parent = iRiskSourceDao.getOne(0L);
-            Optional<RiskSource> parent1 = iRiskSourceDao.findById(riskSource.getParentId());
-            RiskSource parent=null;
-            if(parent1.isPresent()){
-            	parent=parent1.get();
-            }
-            if (null != parent) {
-                List<BigDecimal> childRpniList = new ArrayList<>();
-                List<RiskSource> children = iRiskSourceDao.findByParentId(parent.getId());
-                for (RiskSource child : children) {
-                    childRpniList.add(child.getRpni());
-                }
-
-                RiskSourceRo parentRiskResourceRo = fillRiskSourceRo(parent, childRpniList);
-                //Object result = remoteRuleServer.fireRule(parentRiskResourceRo, PACKAGE_ID_COUNT_RPNI);
-                //updateRpni(result, parent);
-                if (parent.getParentId() != 0)
-                    this.findParent(parent, RPNi);
-            }
-        }
-
-        return RPNi;
-    }
 
     @Override
     public List<HashMap<String, Object>> queryRiskAreaRpn() {
         return riskSourceMapper.queryRiskAreaRpn();
     }
 
-    @javax.transaction.Transactional
+    @Transactional
     public void updateFirePointValue(Long id, String state) {
         fireEquipPointMapper.updateValue(id, state);
     }
 
-
     private static final BlockingQueue<AlarmParam> blockingQueue = new LinkedBlockingQueue<AlarmParam>();
     private static ExecutorService executorService = Executors.newSingleThreadExecutor();
-    private static boolean isRunning = true;
 
     @PostConstruct
     public void start() {
@@ -1022,6 +662,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
          */
         @Override
         public void run() {
+            boolean isRunning = true;
             while (isRunning) {
                 AlarmParam alarmParam = null;
                 try {
@@ -1059,9 +700,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             fireEquipmentPointType = dict.getDictValue();
         }
         Optional<FireEquipment> fireEquipment1 = this.iFireEquipmentDao.findById(fireEquipmentPoint.getFireEquipmentId());
-        FireEquipment fireEquipment =null;
-        if(fireEquipment1.isPresent()){
-        	fireEquipment=fireEquipment1.get();
+        FireEquipment fireEquipment = null;
+        if (fireEquipment1.isPresent()) {
+            fireEquipment = fireEquipment1.get();
         }
         Equipment equipment = null;
         if (fireEquipment != null) {
@@ -1073,7 +714,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             list.add(deviceData);
             //保存到mongo
             saveData(list, "soe");
-
             if (equipment != null) {
                 String batchNo = null;
                 Object batch = null;
@@ -1096,38 +736,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 if (ObjectUtils.isEmpty(batchNo)) {
                     return;
                 }
-//				if (batch == null) {
-//					batchNo = UUID.randomUUID().toString();
                 deviceData.setBatchNo(batchNo);
 
                 deviceData.setMonitor(equipment.getName());
                 deviceData.setEquimentId(String.valueOf(equipment.getId()));
-
-//                FireEquimentDataRo ruleData = new FireEquimentDataRo();
-//                ruleData.setBatchNo(batchNo);
-//                ruleData.setEquimentId(String.valueOf(equipment.getId()));
-//                ruleData.setMonitor(equipment.getName());
-//                ruleData.setCode(deviceData.getCode());
-//                ruleData.setFireEquimentId(fireEquipment.getId());
-//                ruleData.setName(fireEquipmentPoint.getName());
-//                ruleData.setNodeState("true".equals(deviceData.getState()) ? "1" : "0");
-//                ruleData.setUnit(fireEquipmentPoint.getUnit());
-//                ruleData.setValue(deviceData.getState());
-//                ruleData.setFireEqumentName(fireEquipment.getName());
-//                Object result = remoteRuleServer.fireRule(ruleData, "风险管控/fireEquiment");
-                //处理返回结果
-//				} else {
-//					if (batch == null) {
-//					batchNo = batch.toString();
-//				}
-
-                //List<RiskSource> riskSources = this.riskSourceMapper.queryByFireEqument(fireEquipmentPoint.getFireEquipmentId());
-                //asymbleWithParent(batchNo, riskSources, FireEquimentDataRo.class.getSimpleName(), fireEquipmentPoint.getFireEquipmentId(), deviceData.getNodeState(), null, null);
-//                if (ObjectUtils.isEmpty(fireEquipmentPointType) || "false".equals(deviceData.getState())) {
-//                    return;
-//                }
-
-
                 if ("alarm_type_fire".equals(fireEquipmentPointType)) {
                     if (deviceData.getIsMock()) {
                         redisTemplate.delete(RiskSourceServiceImpl.cacheKeyForCanBeRunning());
@@ -1146,7 +758,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     redisTemplate.opsForHash().put("currentContingency", "batchNo", batchNo);
                     redisTemplate.opsForHash().put("currentContingency", "contingencyPlan", null);
                     redisTemplate.opsForHash().put("currentContingency", "alarmType", null);
-//					redisTemplate.opsForValue().set("equipmentId", null);
                     //通知刷新3d页面告警数据
                     iDataRefreshService.refreshViewData(DataRefreshTypeEum.alarm.getCode());
                 } else {
@@ -1185,22 +796,22 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         fireEquipmentData.setEqPointUnit(fireEquipmentPoint.getUnit());
         fireEquipmentData.setFireEquipmentPointId(fireEquipmentPoint.getId());
         fireEquipmentData.setFireEquipmentId(fireEquipmentPoint.getFireEquipmentId());
-        if (fireEquipmentPointType == null || !"alarm_type_fire".equals(fireEquipmentPointType)) {
+        if (!"alarm_type_fire".equals(fireEquipmentPointType)) {
             fireEquipmentData.setType("monitor");
         }
         iFireEquipmentDataDao.save(fireEquipmentData);
         if (!"alarm_type_fire".equals(fireEquipmentPointType)) {
-            Map<String,Object> content = new HashMap<>();
-            content.put("id",fireEquipmentData.getId());
-            content.put("label",fireEquipmentData.getEqPointName());
-            content.put("changeDate",fireEquipmentData.getCreateDate());
+            Map<String, Object> content = new HashMap<>();
+            content.put("id", fireEquipmentData.getId());
+            content.put("label", fireEquipmentData.getEqPointName());
+            content.put("changeDate", fireEquipmentData.getCreateDate());
             Optional<FireEquipment> fireEquipment = iFireEquipmentDao.findById(fireEquipmentPoint.getFireEquipmentId());
-            if(fireEquipment.isPresent()) {
-            	content.put("orgCode",fireEquipment.get().getOrgCode());
-            }else {
-            	log.info(fireEquipmentPoint.getFireEquipmentId() + "设备不存在！！！");
+            if (fireEquipment.isPresent()) {
+                content.put("orgCode", fireEquipment.get().getOrgCode());
+            } else {
+                log.info(fireEquipmentPoint.getFireEquipmentId() + "设备不存在！！！");
             }
-            iDataRefreshService.sendRefreshDataWithArea(DataRefreshTypeEum.monitor.getCode(),content);
+            iDataRefreshService.sendRefreshDataWithArea(DataRefreshTypeEum.monitor.getCode(), content);
         }
 
     }
@@ -1234,10 +845,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 FireEquipmentPoint fireEquipmentPoint = iFireEquipmentPointDao.findOneByCode(param.getPointCode());
                 Dict dict = null;
                 if (fireEquipmentPoint.getAlarmType() != null) {
-                	Optional<Dict> dict1 = dictDao.findById(fireEquipmentPoint.getAlarmType());
-                	if(dict1.isPresent()){
-                		dict=dict1.get();
-                	}
+                    Optional<Dict> dict1 = dictDao.findById(fireEquipmentPoint.getAlarmType());
+                    if (dict1.isPresent()) {
+                        dict = dict1.get();
+                    }
                 }
                 if (!param.getState().equals(fireEquipmentPoint.getValue())) {
                     fireEquipmentPoint.setValue(param.getState());
@@ -1247,23 +858,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                         if (dict != null && dict.getDictValue().equals("alarm_type_trouble")) {
                             notifyAlarm(fireEquipmentPoint, param);
                         }
-//                        String batchNo = UUID.randomUUID().toString();
-//                        FireEquimentDataRo ruleData = new FireEquimentDataRo();
-//                        ruleData.setBatchNo(batchNo);
-//                        ruleData.setEquimentId(String.valueOf(equipment.getId()));
-//                        ruleData.setMonitor(equipment.getName());
-//                        ruleData.setCode(data.getFireEquipmentCode());
-//                        ruleData.setFireEquimentId(Long.valueOf(data.getFireEquipmentId()));
-//                        ruleData.setName(data.getPointName());
-//                        ruleData.setNodeState("true".equals(data.getState()) ? "1" : "0");
-//                        ruleData.setUnit(data.getUnit());
-//                        ruleData.setValue(data.getSoe() + "");
-//                        ruleData.setFireEqumentName(data.getFireEquipmentName());
-//                        try {
-//                            Object result = remoteRuleServer.fireRule(ruleData, "风险管控/fireEquiment");
-//                        } catch (Exception e) {
-//                            e.printStackTrace();
-//                        }
                     }
                 }
             }
@@ -1276,6 +870,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         equipCommunicationDao.saveAll(list);
     }
 
+    /**
+     * 设备告警触发fema的sod值
+     */
     private void notifyAlarm(FireEquipmentPoint fireEquipmentPoint, AlarmParam param) {
         List<FmeaEquipmentPoint> fmeaEquipmentPoints = fmeaEquipmentPointMapper.listByEquipmentPointId(fireEquipmentPoint.getId());
         Set<Long> fmeaIds = Sets.newHashSet();
@@ -1358,9 +955,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 redisTemplate.opsForValue().set("equipmentId", null);
                 break;
             default:
-//			redisTemplate.opsForHash().put("currentContingency", "contingencyPlan", null);
                 redisTemplate.opsForValue().set("equipmentId", contingencyDeviceStatus.getEquipmentId());
-//			redisTemplate.opsForHash().put("currentContingency", "equipmentId", null);
                 break;
         }
         if (alarmType == null) {
@@ -1442,7 +1037,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
      * 修改、添加导致rpn、rpni改变
      */
     @Override
-    public void notifyFmeaFromUpdate(String toke,String product,String appKey,Long fmeaId, String nofityType) {
+    public void notifyFmeaFromUpdate(String toke, String product, String appKey, Long fmeaId, String nofityType) {
         Fmea fmea = fmeaMapper.getById(fmeaId);
         if (fmea == null) {
             return;
@@ -1451,8 +1046,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             BigDecimal oidValue = new BigDecimal(fmea.getOidValue());
             BigDecimal sidValue = new BigDecimal(fmea.getSidValue());
             BigDecimal didValue = new BigDecimal(fmea.getDidValue());
+            //1.1计算rpni
             BigDecimal rpni = oidValue.multiply(sidValue).multiply(didValue);
             BigDecimal rpn;
+            //1.2计算rpn：为空则rpni = rpn;不为空则重新计算s*d*newo
             if (fmea.getNewEvaluationOid() == null) {
                 fmea.setNewEvaluationOid(fmea.getEvaluationOid());
                 rpn = rpni;
@@ -1461,47 +1058,60 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 rpn = newOidValue.multiply(sidValue).multiply(didValue);
             }
             List<RiskLevel> levels = riskLevelDao.findAll();
-            RiskLevel newLevel = getBetweenLevel(rpn, levels);
-            String jpushTarget = null;
+            RiskLevel newLevel = RpnUtils.getBetweenLevel(rpn, levels);
+            Set<String> jpushTargets = new LinkedHashSet<>();
             fmea.setRpni(rpni);
             fmea.setRpn(rpn);
             if (newLevel != null) {
                 fmea.setRiskLevelId(newLevel.getId());
-                jpushTarget = getJpushTarget( toke, product, appKey,fmea, newLevel.getLevel());
+                getJpushTarget(toke, product, appKey, fmea, newLevel.getManageLevel());
             }
+            //1.3更新fmea
             fmeaMapper.updateRpn(fmea);
-            saveRpnLog(fmea.getRiskSourceId(), fmeaId, rpn, rpni);
-            this.notifyRiskSource(fmea.getRiskSourceId(), nofityType, jpushTarget);
+            //2.计算上级风险值（风险点及父节点）
+            this.notifyRiskSource(fmeaId, fmea.getRiskSourceId(), nofityType, jpushTargets);
         }
     }
 
-    private String getJpushTarget(String toke,String product,String appKey,Fmea fmea, Integer level) {
-        String jpushTarget = null;
-        String userId = null;
+    private Set<String> getJpushTarget(String toke, String product, String appKey, Fmea fmea, Integer managerLevel) {
+        Set<String> targets = new LinkedHashSet<>();
+        Set<String> userIds = this.getUsersByLevel(managerLevel, fmea);
+        userIds.forEach(userId -> {
+            AgencyUserModel user = remoteSecurityService.getUserById(toke, product, appKey, userId);
+            if (user != null) {
+                String target = user.getMobile();
+                targets.add(target);
+            }
+        });
+        return targets;
+    }
+
+    private Set<String> getUsersByLevel(Integer level, Fmea fmea) {
+        Set<String> userIds = new HashSet<>();
         if (level.equals(1)) {
-            userId = fmea.getCompanyLeader();
+            userIds.add(fmea.getCompanyLeader());
+            userIds.add(fmea.getDepartmentLeader());
+            userIds.add(fmea.getGroupLeader());
+            userIds.add(fmea.getPersonLeader());
         } else if (level.equals(2)) {
-            userId = fmea.getDepartmentLeader();
+            userIds.add(fmea.getDepartmentLeader());
+            userIds.add(fmea.getGroupLeader());
+            userIds.add(fmea.getPersonLeader());
         } else if (level.equals(3)) {
-            userId = fmea.getGroupLeader();
+            userIds.add(fmea.getGroupLeader());
+            userIds.add(fmea.getPersonLeader());
         } else if (level.equals(4)) {
-            userId = fmea.getPersonLeader();
+            userIds.add(fmea.getPersonLeader());
         }
-        if (userId != null) {
-            AgencyUserModel user = remoteSecurityService.getUserById( toke, product, appKey, userId);
-
-            if (user != null) {
-                jpushTarget = user.getMobile();
-            }
-        }
-        return jpushTarget;
+        userIds.remove(null);
+        return userIds;
     }
 
     /**
      * 告警或者不合格项导致fmea的rpn、new_evaluation_oid改变
      */
     @Override
-    public void notifyFmeaFromAbnormal(String toke,String product,String appKey,Long fmeaId, String notifyType) {
+    public void notifyFmeaFromAbnormal(String toke, String product, String appKey, Long fmeaId, String notifyType) {
         Fmea fmea = fmeaMapper.getById(fmeaId);
         if (fmea == null) {
             return;
@@ -1509,8 +1119,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         if (fmea.getEvaluationOid() != null && fmea.getEvaluationSid() != null && fmea.getEvaluationDid() != null) {
             List<FmeaEquipmentPoint> equipmentPoints = fmeaEquipmentPointMapper.listFmeaByFmeaId(fmeaId);
             List<FmeaPointInputitem> pointInputitems = fmeaPointInputitemMapper.listFmeaByFmeaId(fmeaId);
-            Double maxRate = getMaxRate(equipmentPoints, pointInputitems);
+            //1.准备更新数据
+            Double maxRate = RpnUtils.getMaxRate(equipmentPoints, pointInputitems);
             if (maxRate != null) {
+                //1.1根据设备和巡检数据获取高的故障率
                 List<EvaluationModel> oModels = iEvaluationModelDao.findAllByType("O");
                 EvaluationModel oEvaluationModel = getBetweenModel(maxRate, oModels);
                 if (oEvaluationModel != null) {
@@ -1519,17 +1131,19 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     BigDecimal didValue = new BigDecimal(fmea.getDidValue());
                     BigDecimal rpn = newOidValue.multiply(sidValue).multiply(didValue);
                     List<RiskLevel> levels = riskLevelDao.findAll();
-                    RiskLevel newLevel = getBetweenLevel(rpn, levels);
+                    RiskLevel newLevel = RpnUtils.getBetweenLevel(rpn, levels);
                     fmea.setRpn(rpn);
                     fmea.setNewEvaluationOid(oEvaluationModel.getId());
-                    String jpushTarget = null;
+                    Set<String> jpushTargets = new LinkedHashSet<>();
                     if (newLevel != null) {
-                        jpushTarget = getJpushTarget( toke, product, appKey,fmea, newLevel.getLevel());
+                        //1.2根据风险等级对应的责任等级获取责任人
+                        jpushTargets = getJpushTarget(toke, product, appKey, fmea, newLevel.getManageLevel());
                         fmea.setRiskLevelId(newLevel.getId());
                     }
+                    //1.3.更新fmea的rpn、风险等级及newOid
                     fmeaMapper.updateRpn(fmea);
-                    saveRpnLog(fmea.getRiskSourceId(), fmeaId, rpn, fmea.getRpni());
-                    this.notifyRiskSource(fmea.getRiskSourceId(), notifyType, jpushTarget);
+                    //2.计算风险点rpn、rpni、riskLevelId
+                    this.notifyRiskSource(fmeaId, fmea.getRiskSourceId(), notifyType, jpushTargets);
                 }
             }
         }
@@ -1538,9 +1152,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     private void saveRpnLog(Long riskSourceId, Long fmeaId, BigDecimal rpn, BigDecimal rpni) {
         RpnChangeLog rpnChangeLog = new RpnChangeLog();
         rpnChangeLog.setRiskSourceId(riskSourceId);
-        rpnChangeLog.setFmeaId(fmeaId);
         rpnChangeLog.setRpn(rpn);
         rpnChangeLog.setRpni(rpni);
+        rpnChangeLog.setType(RpnUtils.getChangeType(rpn, rpni));
+        rpnChangeLog.setTriggerBy(fmeaId);
+        rpnChangeLog.setFmeaId(fmeaId);
         iRpnChangeLogDao.save(rpnChangeLog);
     }
 
@@ -1554,114 +1170,133 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return null;
     }
 
-    private 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;
-                }
-            }
-        }
-    }
-
     /**
      * fmea的更新导致rpn、rpni的值改变
      */
     @Override
-    public void notifyRiskSource(Long riskSourceId, String notifyType, String jpushTarget) {
+    public void notifyRiskSource(Long fmeaId, Long riskSourceId, String notifyType, Set<String> jpushTargets) {
         Optional<RiskSource> riskSource1 = iRiskSourceDao.findById(riskSourceId);
-        RiskSource riskSource =null;
-        if(riskSource1.isPresent()){
-        	  riskSource =riskSource1.get();
-        }
-        if (riskSource == null) {
+        RiskSource riskSource = null;
+        if (riskSource1.isPresent()) {
+            riskSource = riskSource1.get();
+        } else {
             return;
         }
         List<Fmea> fmeas = fmeaMapper.listByRiskSourceId(riskSourceId);
-        if (CollectionUtils.isEmpty(fmeas)) {
+        if (CollectionUtils.isEmpty(fmeas)) {//fema删除
             BigDecimal resetValue = new BigDecimal("0");
-            riskSource.setRpn(resetValue);
-            riskSource.setRpni(resetValue);
-            riskSource.setRiskLevelId(0L);
+            riskSource.setRpn(null);
+            riskSource.setRpni(null);
+            riskSource.setRiskLevelId(null);
+            //1.更新fmea对应风险点rpn、rpni、level
             riskSourceMapper.updateRpn(riskSource);
+            //2.记录风险点rpn变化流水
+            this.saveRpnLog(riskSource.getId(), fmeaId, resetValue, resetValue);
+            //3.更新父节点rpn、rpni、风险等级
+            this.updateParentRpn(riskSource.getParentId());
+        } else {//fmea评价、巡检、告警
+            RpnCalculationBo rpnValueBo = RpnUtils.calRpnAndRpni(fmeas);
+            if (rpnValueBo.isEmpty()) {
+                return;
+            }
+            BigDecimal rpn = rpnValueBo.getRpn();
+            BigDecimal rpni = rpnValueBo.getRpni();
+            List<RiskLevel> levels = riskLevelDao.findAll();
+            RiskLevel newRiskLevel = RpnUtils.getBetweenLevel(rpn, levels);
+            RiskLevel oldRiskLevel = RpnUtils.getBetweenLevel(rpni, levels);
+            if (newRiskLevel != null && oldRiskLevel != null) {
+                riskSource.setRpn(rpn);
+                riskSource.setRpni(rpni);
+                riskSource.setRiskLevelId(newRiskLevel.getId());
+                //1.更新fmea对应风险点rpn、rpni、level
+                riskSourceMapper.updateRpn(riskSource);
+                //2.记录风险点rpn变化流水
+                this.saveRpnLog(riskSource.getId(), fmeaId, rpn, rpni);
+                //3.更新父节点rpn、rpni、风险等级
+                this.updateParentRpn(riskSource.getParentId());
+                //4.极光推送给手机客户端
+                jpushRiskSourceMessage("风险预警", jpushTargets);
+                //5.规则告警（消息）TODO
+                notifyRule(riskSourceId, rpn, rpni, oldRiskLevel.getLevel(), newRiskLevel.getLevel(), notifyType);
+            }
         }
-        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;
+    }
+
+    @Override
+    public void notifyFmeaFromDelete(Long riskSourceId, String from) {
+        //1.计算风险点风险值信息
+        this.notifyRiskSource(0L, riskSourceId, from, null);
+    }
+
+    @Override
+    public void notifyRiskSourceDelete(Long parentId) {
+        //1.风险点删除触发更新父节点rpn、rpni、风险等级
+        this.updateParentRpn(parentId);
+    }
+
+    private void updateParentRpn(long parentId) {
+        Optional<RiskSource> riskSource1 = iRiskSourceDao.findById(parentId);
+        RiskSource riskSource = null;
+        if (riskSource1.isPresent()) {
+            riskSource = riskSource1.get();
+        }
+        if (riskSource != null) {
+            List<RiskSource> riskSourceList = new ArrayList<>();
+            List<Long> ids = new ArrayList<>();
+            riskSourceList = iRiskSourceDao.findByParentId(riskSource.getId());
+            //递归获取区域(含子区域)所有点
+            this.getAllRiskPoint(ids, riskSourceList);
+            if (CollectionUtils.isEmpty(ids)) {//没有风险点，则赋初始值null
+                riskSource.setRpn(null);
+                riskSource.setRpni(null);
+                riskSource.setRiskLevelId(null);
+            } else {
+                List<Fmea> fmeas = fmeaMapper.listByRiskSourceIds(ids);
+                RpnCalculationBo rpnValueBo = RpnUtils.calRpnAndRpni(fmeas);
+                if (rpnValueBo.isEmpty()) {
+                    return;
                 }
-                if (sidValue.compareTo(maxSidValue) == 1) {
-                    maxSidValue = sidValue;
+                BigDecimal rpn = rpnValueBo.getRpn();
+                BigDecimal rpni = rpnValueBo.getRpni();
+                List<RiskLevel> levels = riskLevelDao.findAll();
+                RiskLevel newRiskLevel = RpnUtils.getBetweenLevel(rpn, levels);
+                if (newRiskLevel != null) {
+                    riskSource.setRpn(rpn);
+                    riskSource.setRpni(rpni);
+                    riskSource.setRiskLevelId(newRiskLevel.getId());
                 }
-                totalOidValue = totalOidValue.add(oidValue);
-                totalNewOidValue = totalNewOidValue.add(newOidValue);
-                count++;
             }
+            iRiskSourceDao.save(riskSource);
+            this.updateParentRpn(riskSource.getParentId());
         }
-        if (count == 0) {
-            return;
-        }
-        BigDecimal averageOidValue = totalOidValue.divide(BigDecimal.valueOf(count));
-        BigDecimal averageNewOidValue = totalNewOidValue.divide(BigDecimal.valueOf(count));
-        BigDecimal rpn = maxDidValue.multiply(maxSidValue).multiply(averageNewOidValue);
-        BigDecimal rpni = maxDidValue.multiply(maxSidValue).multiply(averageOidValue);
-        List<RiskLevel> levels = riskLevelDao.findAll();
-        RiskLevel newRiskLevel = getBetweenLevel(rpn, levels);
-        RiskLevel oldRiskLevel = getBetweenLevel(rpni, levels);
-        if (newRiskLevel != null) {
-            riskSource.setRpn(rpn);
-            riskSource.setRpni(rpni);
-            riskSource.setRiskLevelId(newRiskLevel.getId());
-            riskSourceMapper.updateRpn(riskSource);
-            jpushRiskSourceMessage("风险点告警", jpushTarget);
-            notifyRule(riskSourceId, rpn, rpni, oldRiskLevel.getLevel(), newRiskLevel.getLevel(), notifyType);
+    }
+
+    /**
+     * 获得子节点：巡检点
+     *
+     * @param ids            返回
+     * @param riskSourceList 风险点区域列表
+     */
+    private void getAllRiskPoint(List<Long> ids, List<RiskSource> riskSourceList) {
+        //TODO 递归
+        for (RiskSource riskSource : riskSourceList) {
+            if (riskSource.getIsRegion().equalsIgnoreCase("TRUE")) {
+                List<RiskSource> list = iRiskSourceDao.findByParentId(riskSource.getId());
+                if (list != null) {
+                    this.getAllRiskPoint(ids, list);
+                }
+            } else {
+                ids.add(riskSource.getId());
+            }
         }
         iDataRefreshService.refreshViewData(DataRefreshTypeEum.rpn.getCode());
     }
 
-    private void jpushRiskSourceMessage(String content, String jpushTarget) {
-        if (StringUtils.isEmpty(jpushTarget)) {
+    /**
+     * 极光推送
+     */
+    private void jpushRiskSourceMessage(String content, Set<String> jpushTarget) {
+        if (CollectionUtils.isEmpty(jpushTarget)) {
             return;
         }
         PushMsgParam pushMsgParam = new PushMsgParam();
@@ -1672,7 +1307,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         appMessagePushService.sendMessage(pushMsgParam);
     }
 
-    private void notifyRule(Long id, BigDecimal rpnr, BigDecimal rpni, Integer oldLevel, Integer newLevel, String notifyType) {
+    /**
+     * 规则告警
+     */
+    private void notifyRule(Long id, BigDecimal rpnr, BigDecimal rpni, Integer oldLevel, Integer newLevel, String
+            notifyType) {
         int level = oldLevel - newLevel;
         String changeType;
         if (level > 0) {
@@ -1703,64 +1342,49 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
     }
 
-    private 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;
+    @Override
+    public List<RegionTreeResponse> findRegionTree(String channelType, String orgCode) {
+        List<RegionTreeResponse> regionList = riskSourceMapper.getRegionList(channelType, orgCode);
+        return getRiskRegionTree(regionList);
     }
 
-	@Override
-	public List<RegionTreeResponse> findRegionTree(String channelType,String orgCode) {
-		List<RegionTreeResponse> regionList = riskSourceMapper.getRegionList(channelType,orgCode);
-		return getRiskRegionTree(regionList);
-	}
-	
-	//区域列表转树
-	private static List<RegionTreeResponse> getRiskRegionTree(List<RegionTreeResponse> list) {
-		HashMap<Long, RegionTreeResponse> hashMap = new HashMap<>();
-		list.forEach( e -> hashMap.put(e.getId(), e));
-		List<RegionTreeResponse> treeList = new ArrayList<RegionTreeResponse>();
-        list.forEach( r -> {
-        	Long parentId = r.getParentId();
-        	if(parentId != null) {
-        		RegionTreeResponse pRegion = hashMap.get(parentId);
-        		if(pRegion != null) {
-        			pRegion.getChildren().add(r);
-        		}else {
-        			treeList.add(r);
-        		}
-        	}
+    //区域列表转树
+    private static List<RegionTreeResponse> getRiskRegionTree(List<RegionTreeResponse> list) {
+        HashMap<Long, RegionTreeResponse> hashMap = new HashMap<>();
+        list.forEach(e -> hashMap.put(e.getId(), e));
+        List<RegionTreeResponse> treeList = new ArrayList<RegionTreeResponse>();
+        list.forEach(r -> {
+            Long parentId = r.getParentId();
+            if (parentId != null) {
+                RegionTreeResponse pRegion = hashMap.get(parentId);
+                if (pRegion != null) {
+                    pRegion.getChildren().add(r);
+                } else {
+                    treeList.add(r);
+                }
+            }
         });
         return treeList;
     }
 
-	@Override
-	public HashMap<String, Object> findRegionById(Long id,String orgCode,String channelType) {
-		HashMap<String, Object> regionDetail = riskSourceMapper.findRegionById(id,orgCode,channelType);
-		if(regionDetail != null) {			
-			Long isBind = (Long) regionDetail.get("isBind");
-			regionDetail.put("isBind", isBind == 0 ? false : true);
-			String ue4Location = (String)regionDetail.get("ue4Location");
-			regionDetail.put("ue4Location", ue4Location == null ? new JSONArray() : JSON.parseArray(ue4Location));
-			String ue4Rotation = (String)regionDetail.get("ue4Rotation");
-			regionDetail.put("ue4Rotation", ue4Rotation == null ? new JSONArray() : JSON.parseArray(ue4Rotation));
-			String ue4Extent = (String)regionDetail.get("ue4Extent");
-			regionDetail.put("ue4Extent", ue4Extent == null ? new JSONArray() : JSON.parseArray(ue4Extent));
-		}
-		return regionDetail;
-	}
-
-	@Override
-	public void batchSaveRegionUe4(List<BindRegionBo> regionBoList) {
-		riskSourceMapper.batchSaveRegionUe4(regionBoList);
-	}
-	
+    @Override
+    public HashMap<String, Object> findRegionById(Long id, String orgCode, String channelType) {
+        HashMap<String, Object> regionDetail = riskSourceMapper.findRegionById(id, orgCode, channelType);
+        if (regionDetail != null) {
+            Long isBind = (Long) regionDetail.get("isBind");
+            regionDetail.put("isBind", isBind == 0 ? false : true);
+            String ue4Location = (String) regionDetail.get("ue4Location");
+            regionDetail.put("ue4Location", ue4Location == null ? new JSONArray() : JSON.parseArray(ue4Location));
+            String ue4Rotation = (String) regionDetail.get("ue4Rotation");
+            regionDetail.put("ue4Rotation", ue4Rotation == null ? new JSONArray() : JSON.parseArray(ue4Rotation));
+            String ue4Extent = (String) regionDetail.get("ue4Extent");
+            regionDetail.put("ue4Extent", ue4Extent == null ? new JSONArray() : JSON.parseArray(ue4Extent));
+        }
+        return regionDetail;
+    }
+
+    @Override
+    public void batchSaveRegionUe4(List<BindRegionBo> regionBoList) {
+        riskSourceMapper.batchSaveRegionUe4(regionBoList);
+    }
 }

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

@@ -4,7 +4,6 @@ import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.dao.entity.TextPlan;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -35,4 +34,10 @@ public interface IPlanVisual3dService {
     CommonResponse getResourceListByType(String type);
 
     List<Map<String,Object>> getResourceById(String type,Long id);
+
+    List<Map<String,Object>> getResourceTypeList();
+
+	List<TreeSubjectVo> getTextPlanBySubjectId(String appId);
+
+	void deleteTextPlanFile(Long id);
 }

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
 import com.yeejoin.amos.fas.business.param.AlarmParam;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
@@ -19,6 +13,12 @@ import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
 import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
 import com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
+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 {
 
@@ -86,8 +86,6 @@ public interface IRiskSourceService {
 
     Map earlyWarning(Long riskSourceId);
 
-//    BigDecimal updateRiskSourceRpni(Long riskSourceId) throws Exception;
-
     List<HashMap<String, Object>> queryRiskAreaRpn();
 
     String processFireEqumtData(AlarmParam deviceData) throws Exception;
@@ -114,8 +112,6 @@ public interface IRiskSourceService {
 
     void notifyFmeaFromUpdate(String toke,String product,String appKey,Long fmeaId, String nofityType);
 
-    void notifyRiskSource(Long riskSourceId, String notifyType, String jpushTarget);
-
     /**
      * 按照机构重新区域树
      * @param orgCode 机构
@@ -137,4 +133,9 @@ public interface IRiskSourceService {
      */
 	void batchSaveRegionUe4(List<BindRegionBo> regionBoList);
 
+    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/service/intfc/ITopographyLineService.java

@@ -6,10 +6,12 @@ import com.yeejoin.amos.fas.dao.entity.TopographyLine;
 
 public interface ITopographyLineService {
 
-	public List<TopographyLine>  getLinksByAppId(String appId);
+	public List<TopographyLine>  getLinesByAppIdAndType(String appId,String type);
 
 	public void saveLines(List<TopographyLine> lineData);
 
 	public void deleteLine(String id);
 
+	public List<TopographyLine> getLinesByType(String type);
+
 }

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

@@ -2,13 +2,12 @@ package com.yeejoin.amos.fas.business.service.intfc;
 
 import java.util.List;
 
-import com.yeejoin.amos.fas.dao.entity.TopographyLine;
 import com.yeejoin.amos.fas.dao.entity.TopographyNode;
 import com.yeejoin.amos.fas.dao.entity.TopographyNodeDetail;
 
 public interface ITopographyNodeService {
 
-	public List<TopographyNode> getNodesByAppId(String appId);
+	public List<TopographyNode> getNodesByAppIdAndType(String appId,String type);
 
 	public void saveNodes(List<TopographyNode> nodeData);
 
@@ -16,10 +15,14 @@ public interface ITopographyNodeService {
 
 	public TopographyNodeDetail saveNodeDetail(TopographyNodeDetail nodeDetail);
 
-	public void deleteNode(String id);
+	public void deleteNode(TopographyNode node);
 
-	public TopographyNode queryByKeyAndAppId(String nodekey, String appId);
+	public TopographyNode queryByKeyAndAppIdAndType(String nodekey, String appId,String type);
 
-	public int queryMaxKeyByAppId(String appId);
+	public int queryMaxKeyByAppIdAndType(String appId,String type);
+
+	public TopographyNode queryById(String id);
+
+	public List<TopographyNode> getNodesByType(String type);
 
 }

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/business/vo/TreeSubjectVo.java

@@ -5,11 +5,11 @@ import java.util.List;
 
 public class TreeSubjectVo {
 
-    private Integer id;
+    private String id;
 
     private String treeName;
 
-    private Integer parentId;
+    private String parentId;
 
     private Integer maxSubjectNumber;
 
@@ -17,7 +17,7 @@ public class TreeSubjectVo {
 
     private List<TreeSubjectVo> children = new ArrayList<>();
 
-    private Long createTime;
+    private String createTime;
 
     private Integer creator;
 
@@ -33,17 +33,17 @@ public class TreeSubjectVo {
 
     private int publishState;
 
-    private int belongTreeId;
+    private String belongTreeId;
 
     private String scenes;
 
     List<TreeSubjectVo> subjectChildren = new ArrayList<>();
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 
@@ -55,11 +55,11 @@ public class TreeSubjectVo {
         this.treeName = treeName;
     }
 
-    public Integer getParentId() {
+    public String getParentId() {
         return parentId;
     }
 
-    public void setParentId(Integer parentId) {
+    public void setParentId(String parentId) {
         this.parentId = parentId;
     }
 
@@ -79,11 +79,11 @@ public class TreeSubjectVo {
         this.children = children;
     }
 
-    public Long getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Long createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 
@@ -143,11 +143,11 @@ public class TreeSubjectVo {
         this.publishState = publishState;
     }
 
-    public int getBelongTreeId() {
+    public String getBelongTreeId() {
         return belongTreeId;
     }
 
-    public void setBelongTreeId(int belongTreeId) {
+    public void setBelongTreeId(String belongTreeId) {
         this.belongTreeId = belongTreeId;
     }
 

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

@@ -5,9 +5,8 @@ import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
 import com.yeejoin.amos.fas.business.util.CacheFactory;
 import com.yeejoin.amos.fas.business.util.CacheMap;
 import com.yeejoin.amos.fas.business.vo.Toke;
+import com.yeejoin.amos.fas.common.enums.TriggerRpnChangeTypeEum;
 import com.yeejoin.amos.fas.context.IotContext;
-
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -27,14 +26,19 @@ public class RsDataQueue {
     private IRiskSourceService riskSourceService;
     private volatile static RsDataQueue instance = null;
     private static final String TOKE = "TOKE";
-    
+
     @Autowired
     private RemoteSecurityService remoteSecurityService;
+
     private RsDataQueue() {
         riskSourceService = (IRiskSourceService) IotContext.getInstance().getBean(IRiskSourceService.class);
     }
 
-    //获取RsDataQueue 的实例
+    /**
+     * 获取RsDataQueue 的实例
+     *
+     * @return 获RsDataQueue
+     */
     public static RsDataQueue getInstance() {
         //先检查实例是否存在，如果不存在才进入下面的同步块
         if (instance == null) {
@@ -59,55 +63,65 @@ 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()));
     }
 
-    Runnable task_runnable = new Runnable() {
+    public void addRiskSourcePointDeleteMessage(Long parentId) {
+        blockingQueue.add(new FmeaMessage(parentId, TriggerRpnChangeTypeEum.riskDelete.getCode()));
+    }
+
+    private Runnable task_runnable = new Runnable() {
+        @Override
         public void run() {
             while (true) {
                 try {
                     FmeaMessage fmeaMessage = blockingQueue.take();
-                    
                     if (riskSourceService != null) {
-                    	 //获取缓存
-                        CacheMap cacheMap= CacheFactory.newChacheMap();
-                        Toke  toke=  cacheMap.getValue(TOKE);
-                        if(toke==null){
-                        	toke= remoteSecurityService.come();
-                        	Long times=  (long) (20*24*60*60);
-                        	cacheMap.setex(TOKE, toke, times);
+                        //获取缓存
+                        CacheMap cacheMap = CacheFactory.newChacheMap();
+                        Toke toke = cacheMap.getValue(TOKE);
+                        if (toke == null) {
+                            toke = remoteSecurityService.come();
+                            Long times = (long) (20 * 24 * 60 * 60);
+                            cacheMap.setex(TOKE, toke, times);
                         }
                         String from = fmeaMessage.getNorifyFrom();
                         Long handId = fmeaMessage.getHandId();
-                        if (from.equals("patrol")) {
-                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(),toke.getProduct(),toke.getAppKey(),handId, from);
-                        } else if (from.equals("equipment")) {
-                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(),toke.getProduct(),toke.getAppKey(),handId, from);
-                        } else if (from.equals("update")) {
-                            riskSourceService.notifyFmeaFromUpdate(toke.getToke(),toke.getProduct(),toke.getAppKey(),handId, from);
-                        } else if (from.equals("delete")) {
-                            riskSourceService.notifyRiskSource(handId, from, null);
+                        if (from.equals(TriggerRpnChangeTypeEum.patrol.getCode())) {
+                            //巡检不合格通知
+                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from);
+                        } else if (from.equals(TriggerRpnChangeTypeEum.equipment.getCode())) {
+                            //设备告警
+                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from);
+                        } else if (from.equals(TriggerRpnChangeTypeEum.fmeaUpdate.getCode())) {
+                            //危险因素评价修改通知
+                            riskSourceService.notifyFmeaFromUpdate(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from);
+                        } else if (from.equals(TriggerRpnChangeTypeEum.fmeaDelete.getCode())) {
+                            //危险因素删除通知
+                            riskSourceService.notifyFmeaFromDelete(handId, from);
+                        } else if (from.equals(TriggerRpnChangeTypeEum.riskDelete.getCode())) {
+                            //风险点删除通知
+                            riskSourceService.notifyRiskSourceDelete(handId);
                         }
                     }
                 } catch (Exception e) {
                     LoggerFactory.getLogger(this.getClass()).error(e.getMessage());
-                    e.printStackTrace();
                 }
-            }
         }
-    };
+    }
+};
 
 
 }

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

@@ -182,8 +182,6 @@
             <column name="type"/>
         </createIndex>
     </changeSet>
-
-    
     <changeSet author="shanqiyun" id="1588067351000-1">
         <preConditions onFail="MARK_RAN">
         	<not>
@@ -195,7 +193,6 @@
             alter table f_risk_source add column `route_path` varchar(2000) DEFAULT NULL COMMENT '路径坐标' after `position3d`;
  		</sql>
     </changeSet>
-    
     <changeSet author="suhuiguang" id="1588140925893-1">
         <preConditions onFail="MARK_RAN">
             <not>
@@ -207,4 +204,14 @@
             alter table `f_safety_index_change_log` add column `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间';
         </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_3d_plan_visual.xml

@@ -5,7 +5,11 @@
 	<!--查询-->
 	<select id="getResourceListByType" resultType="java.util.HashMap">
 		SELECT
-		 rs.id,rs.name,rs.code
+		 rs.id as `key` ,
+		 rs.id AS `value`,
+		 rs.name as label,
+		 rs.code ,
+		 'id' as dataType
 		from
 		<choose>
 			<when test="type=='fireCar'">

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

@@ -132,12 +132,14 @@
 			a.unit,
 			a.org_code as orgCode,
 			a.alarm_type as alarmType,
+			fd.dict_name as alarmTypeName,
 			b.name as fireEquipmentName,
 			b.code as fireEquipmentCode
 		from
 			f_fire_equipment_point as a
 		left join
 			f_fire_equipment as b on a.fire_equipment_id = b.id
+		left join f_dict fd on fd.id = a.alarm_type
 		<where>
 			<if test="searchValue!=null and searchValue.trim() != ''">
 				and (a.name like concat('%',#{searchValue},'%') or a.code like concat('%',#{searchValue},'%'))

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

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

@@ -119,7 +119,8 @@
 		 null data_level,
 			fe.`code` data_code,
 			(select GROUP_CONCAT(cast(eq.`name` as char(50)) SEPARATOR ',')  from f_equipment_fire_equipment fre join f_equipment eq on fre.equipment_id = eq.id where fre.fire_equipment_id =  fe.id) protect_obj_name,
-			null route_name
+			null route_name,
+		    0 frequency
 		 from f_fire_equipment fe
 		where
 		<choose>
@@ -249,7 +250,8 @@
 		null data_level,
 			e.`code` data_code,
 			null protect_obj_name,
-			null route_name
+			null route_name,
+		    0 frequency
 		 from f_equipment e
 		where
 		<choose>
@@ -346,7 +348,8 @@
 		null data_level,
 			fc.car_num  data_code,
 			null protect_obj_name,
-			null route_name 
+			null route_name,
+		    0 frequency 
 		 from f_fire_car fc
 		where
 		 
@@ -445,7 +448,8 @@
 		  null data_level,
 			fs.`code` data_code,
 			null protect_obj_name,
-			null route_name 
+			null route_name ,
+		    0 frequency
 		 from f_fire_station fs
 		 where
 		 <choose>
@@ -544,7 +548,8 @@
 		  null data_level,
 			wr.`code` data_code,
 			null protect_obj_name,
-			null route_name 
+			null route_name ,
+		    0 frequency
 		 from f_water_resource wr
 		 where
 		 <choose>

pom.xml

@@ -207,7 +207,7 @@
 	</dependencyManagement>
 
 	
-	<repositories>
+  <repositories>
     <repository>
       <id>public</id>
       <name>Public Repositories</name>
@@ -218,7 +218,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>