修改冲突

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

@@ -9,7 +9,8 @@ public enum TriggerRpnChangeTypeEum {
      * 触发类型枚举
      */
     patrol("巡检","patrol"),
-    equipment("设备告警","equipment"),
+    alarm("设备告警","alarm"),
+    alarmRecovery("设备告警恢复","recovery"),
     fmeaUpdate("危险因素评价","fmeaUpdate"),
     fmeaDelete("危险因素删除","fmeaDelete"),
     riskDelete("风险点删除","riskDelete");

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

 package com.yeejoin.amos.fas.dao.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -39,7 +42,8 @@ public class FireEquipment extends BasicEntity  {
 	@Column(name="create_by")
 	private String createBy;
 
-	@Temporal(TemporalType.DATE)
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	@Column(name="effective_date")
 	private Date effectiveDate;
 
@@ -66,7 +70,8 @@ public class FireEquipment extends BasicEntity  {
 	@Column(name="production_area")
 	private String productionArea;
 
-	@Temporal(TemporalType.DATE)
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	@Column(name="production_date")
 	private Date productionDate;
 

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

@@ -95,14 +95,6 @@ public class RiskSource extends BasicEntity {
 		return rpni;
 	}
 
-	public Integer getFlickerFrequency() {
-		return flickerFrequency;
-	}
-
-	public void setFlickerFrequency(Integer flickerFrequency) {
-		this.flickerFrequency = flickerFrequency;
-	}
-
 	public void setRpni(BigDecimal rpni) {
 		this.rpni = rpni;
 	}
@@ -111,6 +103,14 @@ public class RiskSource extends BasicEntity {
 		return increment;
 	}
 
+	public Integer getFlickerFrequency() {
+		return flickerFrequency;
+	}
+
+	public void setFlickerFrequency(Integer flickerFrequency) {
+		this.flickerFrequency = flickerFrequency;
+	}
+
 	public void setIncrement(BigDecimal increment) {
 		this.increment = increment;
 	}

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

+package com.yeejoin.amos.fas.business.bo;
+
+import java.util.Set;
+
+/**
+ * 手机消息对象
+ */
+public class JpushMsgBo {
+    /**
+     * 接收人集合
+     */
+    Set<String> target;
+    /**
+     * 消息体
+     */
+    JpushMsgContentBo msg;
+
+    public Set<String> getTarget() {
+        return target;
+    }
+
+    public void setTarget(Set<String> target) {
+        this.target = target;
+    }
+
+    public JpushMsgContentBo getMsg() {
+        return msg;
+    }
+
+    public void setMsg(JpushMsgContentBo msg) {
+        this.msg = msg;
+    }
+}

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

+package com.yeejoin.amos.fas.business.bo;
+
+import com.yeejoin.amos.fas.common.enums.TriggerRpnChangeTypeEum;
+import com.yeejoin.amos.fas.core.util.DateUtil;
+
+import java.math.BigDecimal;
+
+/**
+ * 手机消息推送内容
+ */
+public class JpushMsgContentBo {
+    /**
+     * 危险因素名称
+     */
+    private String fmeaName;
+    /**
+     * 触发类型
+     */
+    private String notifyType;
+    /**
+     * 巡检状态
+     */
+    private String checkStatus;
+    /**
+     * 执行日期
+     */
+    private String executeDate = DateUtil.getLongCurrentDate();
+    /**
+     * 执行人
+     */
+    private String execute;
+    /**
+     * 等级变化范围
+     */
+    private int levelIsChange;
+    /**
+     * 当前rpn
+     */
+    private BigDecimal rpn;
+    /**
+     *风险等级
+     */
+    private String level;
+
+    /**
+     *标题
+     */
+    private String subject;
+
+    /**
+     * 关联名称
+     */
+    private String relationName;
+
+    /**
+     * 是否需要发送
+     */
+    private Boolean isSend;
+
+    public JpushMsgContentBo(String fmeaName, String notifyType){
+        this.fmeaName = fmeaName;
+        this.notifyType = notifyType;
+        this.setSubject(notifyType);
+    }
+
+    public Boolean getSend() {
+        return isSend;
+    }
+
+    private void setSubject(String notifyType){
+        if(notifyType.equals(TriggerRpnChangeTypeEum.patrol.getCode())){
+            //巡检
+            this.subject = "风险预警";
+            this.isSend = true;
+        } else if(notifyType.equals(TriggerRpnChangeTypeEum.alarm.getCode())){
+            //设备告警
+            this.subject = "风险预警";
+            this.isSend = true;
+        } else if(notifyType.equals(TriggerRpnChangeTypeEum.alarmRecovery.getCode())){
+            //告警恢复
+            this.subject = "告警恢复";
+            this.isSend = true;
+        } else if(notifyType.equals(TriggerRpnChangeTypeEum.fmeaUpdate.getCode())){
+            //风险评价
+            this.subject = "风险评价";
+            this.isSend = true;
+        }
+    }
+
+    public String genMessage(){
+        StringBuilder message = new StringBuilder();
+        if(notifyType.equals(TriggerRpnChangeTypeEum.patrol.getCode())){
+            //巡检
+            message.append("执行人：").append(execute).append("\n");
+            message.append("执行时间：").append(executeDate).append("\n");
+            message.append("危险因素名称：").append(fmeaName).append("\n");
+            message.append("描述：").append("当前风险值上升到").append(rpn).append("，风险等级").append(getLevelChangeType()).append(level).append("\n");
+            message.append("触发原因：").append("关联巡检点").append(relationName).append("检查").append(checkStatus);
+        } else if(notifyType.equals(TriggerRpnChangeTypeEum.alarm.getCode())){
+            //设备告警
+            message.append("执行时间：").append(executeDate).append("\n");
+            message.append("危险因素名称：").append(fmeaName).append("\n");
+            message.append("描述：").append("当前风险值上升到").append(rpn).append("，风险等级").append(getLevelChangeType()).append(level).append("\n");
+            message.append("触发原因：").append("关联设备").append(relationName).append("指标项报警");
+        } else if(notifyType.equals(TriggerRpnChangeTypeEum.alarmRecovery.getCode())){
+            //告警恢复
+            message.append(relationName).append("设备告警解除");
+        } else if(notifyType.equals(TriggerRpnChangeTypeEum.fmeaUpdate.getCode())){
+            //风险评价
+            message.append("评价人：").append(execute).append("\n");;
+            message.append("评价时间：").append(executeDate).append("\n");
+            message.append("评价内容：").append(fmeaName).append("\n");
+            message.append("评价等级：").append(level);
+        }
+        return message.toString();
+    }
+
+    private String getLevelChangeType(){
+        String changeType = "";
+        if(levelIsChange > 0){
+            changeType = "上升到";
+        }else if(levelIsChange == 0){
+            changeType = "不变";
+        } else {
+            changeType = "下降到";
+        }
+        return changeType;
+    }
+
+    public String getExecute() {
+        return execute;
+    }
+
+    public void setExecute(String execute) {
+        this.execute = execute;
+    }
+
+    public int getLevelIsChange() {
+        return levelIsChange;
+    }
+
+    public void setLevelIsChange(int levelIsChange) {
+        this.levelIsChange = levelIsChange;
+    }
+
+    public BigDecimal getRpn() {
+        return rpn;
+    }
+
+    public void setRpn(BigDecimal rpn) {
+        this.rpn = rpn;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getRelationName() {
+        return relationName;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setRelationName(String relationName) {
+        this.relationName = relationName;
+    }
+}

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

+package com.yeejoin.amos.fas.business.bo;
+
+import com.yeejoin.amos.fas.dao.entity.Fmea;
+
+import java.math.BigDecimal;
+
+/**
+ * 参数对象
+ */
+public class MsgParamBo {
+    private String toke;
+    private String product;
+    private String appKey;
+    private Fmea fmea;
+    private Integer managerLevel;
+    private String notifyType;
+    private String userName;
+    private int levelIsChange;
+    private BigDecimal rpn;
+    private String level;
+    private String relationName;
+
+    public String getToke() {
+        return toke;
+    }
+
+    public void setToke(String toke) {
+        this.toke = toke;
+    }
+
+    public String getProduct() {
+        return product;
+    }
+
+    public void setProduct(String product) {
+        this.product = product;
+    }
+
+    public String getAppKey() {
+        return appKey;
+    }
+
+    public void setAppKey(String appKey) {
+        this.appKey = appKey;
+    }
+
+    public Fmea getFmea() {
+        return fmea;
+    }
+
+    public void setFmea(Fmea fmea) {
+        this.fmea = fmea;
+    }
+
+    public Integer getManagerLevel() {
+        return managerLevel;
+    }
+
+    public void setManagerLevel(Integer managerLevel) {
+        this.managerLevel = managerLevel;
+    }
+
+    public String getNotifyType() {
+        return notifyType;
+    }
+
+    public void setNotifyType(String notifyType) {
+        this.notifyType = notifyType;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public int getLevelIsChange() {
+        return levelIsChange;
+    }
+
+    public void setLevelIsChange(int levelIsChange) {
+        this.levelIsChange = levelIsChange;
+    }
+
+    public BigDecimal getRpn() {
+        return rpn;
+    }
+
+    public void setRpn(BigDecimal rpn) {
+        this.rpn = rpn;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getRelationName() {
+        return relationName;
+    }
+
+    public void setRelationName(String relationName) {
+        this.relationName = relationName;
+    }
+}

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

@@ -153,7 +153,6 @@ public class BaseController {
 	    	RequestContext.setToken(getToken());
 	    	RequestContext.setProduct(getProduct());
 	    	RequestContext.setAppKey(getAppKey());
-	    	
 	    	FeignClientResult feignClientResult;
 			try {
 				feignClientResult = Privilege.agencyUserClient.getme();

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

@@ -169,8 +169,8 @@ public class CommonController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取公司下人员列表", notes = "获取公司下人员列表")
     @GetMapping(value = "/user/list", produces = "application/json;charset=UTF-8")
     public  CommonResponse getAllUser() {
-    	ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
+    	ReginParams reginParams = getSelectedOrgInfo();
+		String compCode = getOrgCode(reginParams);
         List<AgencyUserModel> users = commonService.getAllUser(getToken(),getProduct(),getAppKey(), compCode);
         return CommonResponseUtil.success(users);
     }

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

@@ -90,7 +90,6 @@ public class FireSourceController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "查询消防车", notes = "查询消防车")
 	@RequestMapping(value = "/fire-car/det/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse queryFireCar(@ApiParam(value = "查询条件", required = true) @PathVariable Long id) {
-
 		FireCarDetailVo car = fireCarService.findFireCarById(getToken(),getProduct(),getAppKey(),id);
 		return CommonResponseUtil.success(car);
 	}

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

@@ -125,7 +125,7 @@ public class RiskModelController extends BaseController {
             RsDataQueue rs = RsDataQueue.getInstance();
             params.forEach(param -> {
                 if (!ObjectUtils.isEmpty(param.getId())) {
-                    rs.addUpdateMessage(param.getId());
+                    rs.addUpdateMessage(param.getId(),user.getRealName());
                 }
             });
             return CommonResponseUtil.success();
@@ -163,7 +163,7 @@ public class RiskModelController extends BaseController {
     public CommonResponse queryFmeaByPage(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
                                           @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
-        Page<HashMap<String, Object>> fmeaList = fmeaService.queryFmeaList(param);
+        Page<HashMap<String, Object>> fmeaList = fmeaService.queryFmeaList(param,getToken(),getProduct(),getAppKey());
         return CommonResponseUtil.success(fmeaList);
     }
 

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

 package com.yeejoin.amos.fas.business.controller;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.fas.business.bo.BindPointBo;
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
 import com.yeejoin.amos.fas.business.service.intfc.IView3dService;
-import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.business.vo.ExceptionRegionVo;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.common.enums.ResourceTypeDefEnum;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @RequestMapping("/api/view3d")
@@ -49,8 +38,6 @@ public class View3dController extends BaseController {
     public CommonResponse getRegionTree() {
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1*2";
 		String channelType = this.getChannelType();
         return CommonResponseUtil.success(riskSourceService.findRegionTree(channelType,orgCode));
     }
@@ -60,8 +47,6 @@ public class View3dController extends BaseController {
     public CommonResponse getRegionDetail(@PathVariable("riskSourceId") Long riskSourceId) {
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1";
 		String channelType = this.getChannelType();
         return CommonResponseUtil.success(riskSourceService.findRegionById(riskSourceId,orgCode,channelType));
     }
@@ -89,8 +74,6 @@ public class View3dController extends BaseController {
 		if(ResourceTypeDefEnum.containsTypeCode(type)) {		
 			ReginParams reginParams =getSelectedOrgInfo();
 			String orgCode = this.getOrgCode(reginParams);
-			//TODO:待删除
-			orgCode = "1*2";
 			String channelType = this.getChannelType();
 			return CommonResponseUtil.success(view3dService.getPointTreeByType(type,orgCode,channelType));
 		}
@@ -102,8 +85,6 @@ public class View3dController extends BaseController {
     public CommonResponse getPointDetail(String type,Long pointId) {
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1";
 		return CommonResponseUtil.success(view3dService.getPointDetailByTypeAndId(type,pointId,orgCode));
     }
 	
@@ -112,8 +93,6 @@ public class View3dController extends BaseController {
     public CommonResponse safetyIndexWeek(String type,Long pointId) {
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyIndexWeek(orgCode));
     }
 
@@ -122,8 +101,6 @@ public class View3dController extends BaseController {
 	public CommonResponse getSafetyIndexInfoByDate(@RequestParam(name = "date",required = false) String date){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyIndexInfoByDate(orgCode,date));
 	}
 
@@ -132,7 +109,6 @@ public class View3dController extends BaseController {
 	public CommonResponse getSafetyIndexDetail(@ApiParam(value = "risk-风险异常,check-巡检异常,equip-设备故障") @PathVariable String type){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		orgCode = "1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyIndexDetail(type,orgCode));
 	}
 
@@ -150,8 +126,6 @@ public class View3dController extends BaseController {
 	public CommonResponse getStatisticsCheck(){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1*2";
 		return CommonResponseUtil.success(view3dService.getStatisticsCheck(orgCode));
 	}
 	
@@ -160,8 +134,6 @@ public class View3dController extends BaseController {
 	public CommonResponse getSafetyExecuteListTop5(@PathVariable("type")String type){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyExecuteListTop5(type,orgCode));
 	}
 	
@@ -170,8 +142,8 @@ public class View3dController extends BaseController {
 	public CommonResponse getStatisticsDuty(){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		orgCode = "1*2";
-		return view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode);
+		CommonResponse statisticsDuty = view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode);
+		return statisticsDuty;
 	}
 
 	@ApiOperation(value = "异常区域信息查询",notes = "异常区域信息查询")
@@ -179,7 +151,6 @@ public class View3dController extends BaseController {
 	public CommonResponse getExceptionRegion(){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		orgCode = "1*2";
 		List<ExceptionRegionVo> exceptionRegionVoList = view3dService.getExceptionRegion(orgCode);
 		return CommonResponseUtil.success(exceptionRegionVoList);
 	}
@@ -197,8 +168,6 @@ public class View3dController extends BaseController {
 	public CommonResponse initViewNode(String type,Long riskSourceId){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1*2";
 		return CommonResponseUtil.success(view3dService.initViewErrorNode(type,riskSourceId,orgCode));
 	}
 
@@ -207,7 +176,6 @@ public class View3dController extends BaseController {
 	public CommonResponse get3dPointsByType(@RequestParam(required = false,defaultValue = "grain") String model){
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		orgCode = "1*2";
 		return CommonResponseUtil.success(view3dService.get3dPointsByModel(orgCode,model));
 	}
 	
@@ -236,8 +204,6 @@ public class View3dController extends BaseController {
             @ApiParam(value = "区域ID", required = false) @RequestParam(required = false) Long riskSourceId) {
     	ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		//TODO:待删除
-		orgCode = "1*2";
         return CommonResponseUtil.success(view3dService.find3dViewDataByType(type,riskSourceId,orgCode));
     }
     
@@ -251,7 +217,6 @@ public class View3dController extends BaseController {
 			) {
     	ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
-		orgCode = "1*2";
     	return view3dService.retrieveAll(type,inputText,current,pageSize,orgCode);
     }
     

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteSecurityService.java

@@ -4,25 +4,19 @@ package com.yeejoin.amos.fas.business.feign;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.model.PermissionModel;
+import com.yeejoin.amos.feign.privilege.model.*;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import java.util.LinkedHashMap;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -219,42 +213,44 @@ public class RemoteSecurityService {
 		}
         return agencyUserModel;
     }
-    //根据orgCode查询机构用户
+
+	/**
+	 * 根据orgCode查询机构用户
+	 * @param toke toke
+	 * @param product product
+	 * @param appKey appKey
+	 * @param orgCode orgCode
+	 * @return List<AgencyUserModel>
+	 */
     public List<AgencyUserModel> listUserByOrgCode(String toke,String product,String appKey,String orgCode) {
         if (orgCode == null || orgCode.equals("")) {
             return null;
         }
-        
         RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
     	List<AgencyUserModel> agencyUserModel=null;
-    	FeignClientResult feignClientResult;
+    	FeignClientResult feignClientResult = new FeignClientResult();
 		try {
 			feignClientResult = Privilege.agencyUserClient.queryByOrgCode(orgCode);
-			agencyUserModel = (List<AgencyUserModel>)feignClientResult.getResult();
-
 		} catch (InnerInvokException e) {
 			e.printStackTrace();
 		}
-        return agencyUserModel;
-        
-        
-        
-       // CommonResponse commonResponse = iAmosSecurityServer.listUserByOrgCode(orgCode);
-       // return handleArray(commonResponse, UserModel.class);
+        return handleArray(feignClientResult,AgencyUserModel.class);
     }
-   
-    
-    
-    
-    
-    //根据orgCode查询机构
+
+	/**
+	 *  根据orgCode查询机构
+	 * @param toke  toke
+	 * @param product product
+	 * @param appKey appKey
+	 * @param orgCode orgCode
+	 * @return Map<String, Object>
+	 */
     public Map<String, Object>  listByOrgCode(String toke,String product,String appKey,String orgCode) {
         if (orgCode == null || orgCode.equals("")) {
             return null;
         }
-        
         RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
@@ -268,11 +264,6 @@ public class RemoteSecurityService {
 			e.printStackTrace();
 		}
         return agencyUserModel;
-        
-        
-        
-       // CommonResponse commonResponse = iAmosSecurityServer.listUserByOrgCode(orgCode);
-       // return handleArray(commonResponse, UserModel.class);
     }
    
     
@@ -363,37 +354,35 @@ public class RemoteSecurityService {
        // CommonResponse commonResponse = iAmosSecurityServer.getDepartmentTreeByCompanyId(companyId);
        // return handleArray(commonResponse, DepartmentBo.class);
     }
-   //根据id批量获取部门信息
-    public List<LinkedHashMap> listDepartmentByDeptIds(String toke,String product,String appKey,String departmentIds) {
-        
+
+	/**
+	 * 根据id批量获取部门信息
+	 * @param toke token
+	 * @param product  product
+	 * @param appKey appKey
+	 * @param "200".equals(feignClientResult.getStatus())departmentIds 部门ids
+	 * @return List<DepartmentModel>
+	 */
+    public List<DepartmentModel> listDepartmentByDeptIds(String toke,String product,String appKey,String departmentIds) {
     	RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
-    	List<LinkedHashMap> departmentModel=null;
-    	FeignClientResult feignClientResult;
+    	FeignClientResult feignClientResult = new FeignClientResult();
 		try {
 			feignClientResult = Privilege.departmentClient.queryDeptByIds(departmentIds);
-			departmentModel = (List<LinkedHashMap>)feignClientResult.getResult();
-
 		} catch (InnerInvokException e) {
 			e.printStackTrace();
 		}
-        return departmentModel;
-    	
-    	
-    	
-    	
-    	
-    	//CommonResponse commonResponse = iAmosSecurityServer.listDepartmentByDeptIds(departmentIds);
-        //return handleArray(commonResponse, DepartmentBo.class);
+        return handleArray(feignClientResult,DepartmentModel.class);
     }
 
-    private <T> List<T> handleArray(CommonResponse commonResponse, Class<T> t) {
-        if (commonResponse != null && commonResponse.isSuccess()) {
-            String jsonStr = JSON.toJSONString(commonResponse.getDataList());
-            return JSONArray.parseArray(jsonStr, t);
+    private <T> List<T> handleArray(FeignClientResult feignClientResult, Class<T> t) {
+        List<T> list = new ArrayList<>();
+    	if (feignClientResult != null && feignClientResult.getStatus() == 200) {
+            String jsonStr = JSON.toJSONString(feignClientResult.getResult());
+			list = JSONArray.parseArray(jsonStr, t);
         }
-        return null;
+        return list;
     }
 
     private <T> T handleObj(CommonResponse commonResponse, Class<T> t) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/jpush/AppMessagePushService.java

@@ -72,18 +72,11 @@ public class AppMessagePushService {
     }
 
     public void sendMessage(PushMsgParam response) {
-    	CommonResponse  commonResponse = PushFeign.sendMessageone(response);
-//        try {
-//            if (null != response && "true".equals(isPush)) {
-//                PushPayload payload = PushPayload.newBuilder().setPlatform(Platform.android())
-//                        .setAudience(Audience.all())
-//                        .setNotification(Notification.android(response.getContent(), response.getSubject(), response.getExtras()))
-//                        .build();
-//                jpushClient.sendPush(payload);
-//            }
-//        } catch (Exception e) {
-//            log.error("极光推送异常", e);
-//        }
+        try {
+            CommonResponse commonResponse = PushFeign.sendMessageone(response);
+        } catch (Exception e) {
+            log.error("极光推送异常", e);
+        }
     }
 
 }

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

-
+
 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -24,6 +21,7 @@ import com.yeejoin.amos.fas.dao.entity.AccidentType;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.util.CollectionUtils;
 
 @Service("accidentTypeService")
 public class AccidentTypeServiceImpl implements IAccidentTypeService {
@@ -71,8 +69,7 @@ public class AccidentTypeServiceImpl implements IAccidentTypeService {
 	}
 
 	@Override
-	public List<HashMap<String,Object>> queryAccidentType(String orgCode) {	
-		
+	public List<HashMap<String,Object>> queryAccidentType(String orgCode) {
 		return accidentTypeMapper.findAccidentTypeListByOrgCode(orgCode);
 	}
 
@@ -80,35 +77,35 @@ public class AccidentTypeServiceImpl implements IAccidentTypeService {
 	public Page<HashMap<String, Object>> queryAccidentTypePage(String toke,String product,String appKey,CommonPageInfoParam param) {
 		long total = accidentTypeMapper.countPageData(param);
 		List<HashMap<String, Object>> content  = accidentTypeMapper.findAccidentTypePage(param);
-		List<String> userIdList = new ArrayList<String>();
-		List<String> deptIdList = new ArrayList<String>();
-		for(HashMap<String, Object> map : content)
-		{
-			String userId = String.valueOf(map.get("createBy"));
-			String deptId = String.valueOf(map.get("deptId"));
-			if(userId!=null&&!userIdList.contains(userId))
+		if(!CollectionUtils.isEmpty(content)){
+			Set<String> userIds = new HashSet<>();
+			Set<String> deptIds = new HashSet<>();
+			for(HashMap<String, Object> map : content)
 			{
-				userIdList.add(userId);
+				String userId = String.valueOf(map.get("createBy"));
+				String deptId = String.valueOf(map.get("deptId"));
+				userIds.add(userId);
+				deptIds.add(deptId);
 			}
-			if(deptId!=null&&!deptIdList.contains(deptId))
-			{
-				deptIdList.add(deptId);
+			userIds.remove(null);
+			userIds.remove("");
+			deptIds.remove(null);
+			deptIds.remove("");
+			List<AgencyUserModel> users = new ArrayList<>();
+			if(!CollectionUtils.isEmpty(userIds)){
+				users = remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIds));
 			}
+			Map<String, String> userMap = users.stream().collect(Collectors.toMap(AgencyUserModel::getUserId,AgencyUserModel::getRealName));
+			List<DepartmentModel> depts = new ArrayList<>();
+			if(!CollectionUtils.isEmpty(deptIds)){
+				depts = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIds));
+			}
+			Map<String, String > deptMap = depts.stream().collect(Collectors.toMap(e-> e.getSequenceNbr().toString(),DepartmentModel::getDepartmentName));
+			content.forEach(e -> {
+				e.put("userName",userMap.get(e.get("createBy")));
+				e.put("deptName",deptMap.get(e.get("deptId")));
+			});
 		}
-		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
-		Map<String, String> userMap =  new HashMap<String,String>();
-        for (int i = 0; i < users.size(); i++) {
-        	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
-		}
-	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-	    Map<String, String> deptMap =  new HashMap<String,String>();
-        for (int i = 0; i < depts.size(); i++) {
-        	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
-		}
-        content.forEach(e -> {
-            e.put("userName",userMap.get(e.get("createBy")));
-            e.put("deptName",deptMap.get(e.get("deptId")));
-        });
 		Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
 		return result;
 	}

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

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.assertj.core.util.Sets;
@@ -100,17 +101,13 @@ public class FireCarServiceImpl implements IFireCarService {
             Set<String> deptIds =  Sets.newHashSet(Lists.transform(content, Map->Map.get("dept_id")+""));
             deptIds.remove("");
             deptIds.remove(null);
-            Map<String, String> deptMap =  new HashMap<String,String>();
             if(!CollectionUtils.isEmpty(deptIds)){
-                List<LinkedHashMap> deptList = remoteSecurityService.listDepartmentByDeptIds( toke, product, appKey,Joiner.on(",").join(deptIds));
-                for (int i = 0; i < deptList.size(); i++) {
-                	deptMap.put(deptList.get(i).get("sequenceNbr").toString(), deptList.get(i).get("departmentName").toString());
-    			}
+				List<DepartmentModel> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIds));
+				Map<Long, String>  deptMap = depts.stream().collect(Collectors.toMap(DepartmentModel::getSequenceNbr,DepartmentModel::getDepartmentName));
+				content.forEach(e -> {
+					e.put("departmentName",deptMap.get(e.get("dept_id")));
+				});
             }
-            Map<String, String> deptMapNew= deptMap;
-            content.forEach(e -> {
-                e.put("departmentName",deptMapNew.get(e.get("dept_id")));
-            });
         }
 		Page<HashMap<String, Object>> result = new PageImpl<HashMap<String, Object>>(content, param, total);
 		return result;
@@ -120,7 +117,7 @@ public class FireCarServiceImpl implements IFireCarService {
 	public FireCarDetailVo findFireCarById(String toke,String product,String appKey,Long truckId) {
 		FireCarDetailVo carVo = fireCarMapper.getFireCarDetailById(truckId);
 		DepartmentModel departmentModel= remoteSecurityService.getDepartmentByDeptId(toke, product, appKey, carVo.getDeptId());
-		carVo.setDepartmentName(departmentModel.getDepartmentName());
+		carVo.setDepartmentName(departmentModel != null ? departmentModel.getDepartmentName() : "");
 		return carVo;
 	}
 

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

@@ -53,6 +53,7 @@ public class FireEquipPointServiceImpl implements IFireEquipPontService {
 		return fireCar;
     }
 
+    @Override
     public String[] deletePoint(String[] idArray) throws Exception {
         for (String id : idArray) {
             Optional<FireEquipmentPoint> fireEquipmentPoint1 = fireEquipmentPointDao.findById(Long.parseLong(id));
@@ -95,8 +96,11 @@ public class FireEquipPointServiceImpl implements IFireEquipPontService {
         if (total.equals(0L)) {
             return CommonResponseUtil.success(new PageImpl<>(Lists.newArrayList(), null, total));
         }
+        int pageNumber = map.get("pageNumber") != null ? Integer.parseInt(map.get("pageNumber").toString()) : 0;
+        int pageSize = map.get("pageSize") != null ? Integer.parseInt(map.get("pageSize").toString()) : 0;
+        CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
         List<FireEquipmentPointEntity> list = fireEquipPointMapper.listByMap(map);
-        return CommonResponseUtil.success(new PageImpl<>(list, null, total));
+        return CommonResponseUtil.success(new PageImpl<>(list, commonPageable, total));
     }
 
     @Override

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

 package com.yeejoin.amos.fas.business.service.impl;
 
+import com.google.common.base.Joiner;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FmeaMapper;
@@ -10,6 +11,7 @@ import com.yeejoin.amos.fas.business.dao.repository.IRiskFactorDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
 import com.yeejoin.amos.fas.business.feign.RemoteRuleServer;
+import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IFmeaService;
 import com.yeejoin.amos.fas.business.service.model.RiskSourceRo;
@@ -28,12 +30,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("fmeaService")
 public class FmeaServiceImpl implements IFmeaService {
@@ -58,7 +56,7 @@ public class FmeaServiceImpl implements IFmeaService {
     IRiskFactorDao iRiskFactorDao;
 
     @Autowired
-    private RemoteRuleServer remoteRuleServer;
+    private RemoteSecurityService remoteSecurityService;
 
     @Autowired
     private FmeaEquipmentPointMapper fmeaEquipmentPointMapper;
@@ -84,76 +82,37 @@ public class FmeaServiceImpl implements IFmeaService {
     }
 
     @Override
-    public Page<HashMap<String, Object>> queryFmeaList(CommonPageInfoParam param) {
+    public Page<HashMap<String, Object>> queryFmeaList(CommonPageInfoParam param,String toke,String product,String appKey) {
         long total = fmeaMapper.countPageData(param);
         List<HashMap<String, Object>> content = fmeaMapper.queryFmeaPage(param);
-		StringBuffer sb = new StringBuffer();
-		for(HashMap<String, Object> map : content)
-		{
-			
-			//String[] ids = sb.toString().split(",");
-
-			//String companyLeaderId = String.valueOf(map.get("companyLeaderId"));
-			sb.append(map.get("companyLeaderId"));
-			sb.append(map.get(","));
-
-			//String departmentLeaderId = String.valueOf(map.get("departmentLeaderId"));
-
-			sb.append(map.get("departmentLeaderId"));
-			sb.append(map.get(","));
-
-			//String groupLeaderId = String.valueOf(map.get("groupLeaderId"));
-
-			sb.append(map.get("groupLeaderId"));
-			sb.append(map.get(","));
-
-			//String personLeaderId = String.valueOf(map.get("personLeaderId"));
-
-			sb.append(map.get("personLeaderId"));
-			sb.append(map.get(","));
-
-			//String identifyUserId = String.valueOf(map.get("identifyUserId"));
-
-			sb.append(map.get("identifyUserId"));
-			sb.append(map.get(","));
-
-		}
-		sb.deleteCharAt(sb.length()-1);
-		FeignClientResult<List<AgencyUserModel>> resultSec = Privilege.agencyUserClient.queryByIds(sb.toString());
-		for(HashMap<String, Object> map : content)
-		{
-			String companyLeaderId = String.valueOf(map.get("companyLeaderId"));
-			String departmentLeaderId = String.valueOf(map.get("departmentLeaderId"));
-			String groupLeaderId = String.valueOf(map.get("groupLeaderId"));
-			String personLeaderId = String.valueOf(map.get("personLeaderId"));
-			String identifyUserId = String.valueOf(map.get("identifyUserId"));
-			for(AgencyUserModel user : resultSec.getResult())
-			{
-				if(companyLeaderId!=null&& companyLeaderId.equals(user.getUserId()))
-				{
-					map.put("companyLeaderName", user.getRealName());
-				}
-				if(departmentLeaderId!=null&& departmentLeaderId.equals(user.getUserId()))
-				{
-					map.put("departmentLeaderName", user.getRealName());
-				}
-				if(groupLeaderId!=null&& groupLeaderId.equals(user.getUserId()))
-				{
-					map.put("groupLeaderName", user.getRealName());
-				}
-				if(personLeaderId!=null&& personLeaderId.equals(user.getUserId()))
-				{
-					map.put("personLeaderName", user.getRealName());
-				}
-				if(identifyUserId!=null&& identifyUserId.equals(user.getUserId()))
-				{
-					map.put("identifyUserName", user.getRealName());
-				}
-			}
-		}
-		
-        Page<HashMap<String, Object>> result = new PageImpl<HashMap<String, Object>>(content, param, total);
-        return result;
+		if(!CollectionUtils.isEmpty(content)) {
+            Set<String> userIds = new HashSet<>();
+            for (HashMap<String, Object> map : content) {
+                userIds.add(String.valueOf(map.get("companyLeaderId")));
+                userIds.add(String.valueOf(map.get("departmentLeaderId")));
+                userIds.add(String.valueOf(map.get("groupLeaderId")));
+                userIds.add(String.valueOf(map.get("personLeaderId")));
+                userIds.add(String.valueOf(map.get("identifyUserId")));
+            }
+            userIds.remove(null);
+            userIds.remove("");
+            if(!CollectionUtils.isEmpty(userIds)){
+                List<AgencyUserModel> users = new ArrayList<>();
+                if(!CollectionUtils.isEmpty(userIds)){
+                    users = remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIds));
+                }
+                Map<String, String> userMap = users.stream().collect(Collectors.toMap(AgencyUserModel::getUserId,AgencyUserModel::getRealName));
+                for (HashMap<String, Object> map : content) {
+                    map.put("companyLeaderName", userMap.get(map.get("companyLeaderId")));
+                    map.put("departmentLeaderName", userMap.get(map.get("departmentLeaderId")));
+                    map.put("groupLeaderName", userMap.get(map.get("groupLeaderId")));
+                    map.put("personLeaderName", userMap.get(map.get("personLeaderId")));
+                    map.put("identifyUserName", userMap.get(map.get("identifyUserId")));
+                }
+            }
+
+        }
+        return new PageImpl<HashMap<String, Object>>(content, param, total);
     }
 
 

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.stereotype.Service;
-
 import com.google.common.base.Joiner;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskFactorMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskSourceMapper;
@@ -25,6 +13,15 @@ import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("riskFactorService")
 public class RiskFactorServiceImpl implements IRiskFactorService {
@@ -46,35 +43,35 @@ public class RiskFactorServiceImpl implements IRiskFactorService {
     public Page<HashMap<String, Object>> queryRiskFactorPage(String toke,String product,String appKey,CommonPageInfoParam param) {
         long total = riskFactorMapper.countPageData(param);
         List<HashMap<String, Object>> content = riskFactorMapper.queryRiskFactorPage(param);
-		List<String> userIdList = new ArrayList<String>();
-		List<String> deptIdList = new ArrayList<String>();
-		for(HashMap<String, Object> map : content)
-		{
-			String userId = String.valueOf(map.get("createBy"));
-			String deptId = String.valueOf(map.get("deptId"));
-			if(userId!=null&&!userIdList.contains(userId))
-			{
-				userIdList.add(userId);
-			}
-			if(deptId!=null&&!deptIdList.contains(deptId))
-			{
-				deptIdList.add(deptId);
-			}
-		}
-		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
-		Map<String, String> userMap =  new HashMap<String,String>();
-        for (int i = 0; i < users.size(); i++) {
-        	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
-		}
-	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-	    Map<String, String> deptMap =  new HashMap<String,String>();
-        for (int i = 0; i < depts.size(); i++) {
-        	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
-		}
-        content.forEach(e -> {
-            e.put("userName",userMap.get(e.get("createBy")));
-            e.put("deptName",deptMap.get(e.get("deptId")));
-        });
+        if(!CollectionUtils.isEmpty(content)){
+            Set<String> userIds = new HashSet<>();
+            Set<String> deptIds = new HashSet<>();
+            for(HashMap<String, Object> map : content)
+            {
+                String userId = String.valueOf(map.get("createBy"));
+                String deptId = String.valueOf(map.get("deptId"));
+                userIds.add(userId);
+                deptIds.add(deptId);
+            }
+            userIds.remove(null);
+            userIds.remove("");
+            deptIds.remove(null);
+            deptIds.remove("");
+            List<AgencyUserModel> users = new ArrayList<>();
+            if(!CollectionUtils.isEmpty(userIds)){
+                users = remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIds));
+            }
+            Map<String, String> userMap = users.stream().collect(Collectors.toMap(AgencyUserModel::getUserId,AgencyUserModel::getRealName));
+            List<DepartmentModel> depts = new ArrayList<>();
+            if(!CollectionUtils.isEmpty(deptIds)){
+                depts = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIds));
+            }
+            Map<String, String > deptMap = depts.stream().collect(Collectors.toMap(e-> e.getSequenceNbr().toString(),DepartmentModel::getDepartmentName));
+            content.forEach(e -> {
+                e.put("userName",userMap.get(e.get("createBy")));
+                e.put("deptName",deptMap.get(e.get("deptId")));
+            });
+        }
         Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
         return result;
     }

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

@@ -31,6 +31,8 @@ import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.util.CollectionUtils;
+
 @Service("riskLevelService")
 public class RiskLevelServiceImpl implements IRiskLevelService {
 	@Autowired 
@@ -46,25 +48,26 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
 	public Page<HashMap<String, Object>> queryRiskLevelPage(String toke,String product,String appKey,CommonPageInfoParam param) {
 		long total = riskLevelMapper.countPageData(param);
 		List<HashMap<String, Object>> content = riskLevelMapper.queryRiskLevelPage(param);
-		Set<String> userIdList = new HashSet<String>();
-		for(HashMap<String, Object> map : content)
-		{
-			userIdList.add(String.valueOf(map.get("createBy")));
-		}
-		Map<String, String> userMap =  new HashMap<String,String>();
-		if(userIdList.size()>0)
-		{
-    		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
-            for (int i = 0; i < users.size(); i++) {
-            	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
-    		}
+		if(!CollectionUtils.isEmpty(content)){
+			Set<String> userIds = new HashSet<String>();
+			for(HashMap<String, Object> map : content)
+			{
+				String userId = String.valueOf(map.get("createBy"));
+				userIds.add(userId);
+			}
+			userIds.remove(null);
+			userIds.remove("");
+			List<AgencyUserModel> users = new ArrayList<>();
+			if(!CollectionUtils.isEmpty(userIds)){
+				users = remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIds));
+			}
+			Map<String, String> userMap = users.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, AgencyUserModel::getRealName));
+			content.forEach(e -> {
+				e.put("userName", userMap.get(String.valueOf(e.get("createBy"))));
+				e.put("manageLevelName",
+						StringUtil.isNotEmpty(e.get("manageLevel")) ? ManageLevelEum.getNameByManageLevel(Integer.parseInt(e.get("manageLevel").toString())) : "");
+			});
 		}
-
-        content.forEach(e -> {
-            e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
-            e.put("manageLevelName",
-					StringUtil.isNotEmpty(e.get("manageLevel"))  ? ManageLevelEum.getNameByManageLevel(Integer.parseInt(e.get("manageLevel").toString())) : "");
-        });
 		return new PageImpl<>(content, param, total);
 	}
 

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

@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -45,8 +44,10 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
+import com.yeejoin.amos.fas.business.bo.JpushMsgBo;
+import com.yeejoin.amos.fas.business.bo.JpushMsgContentBo;
+import com.yeejoin.amos.fas.business.bo.MsgParamBo;
 import com.yeejoin.amos.fas.business.bo.RpnCalculationBo;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
@@ -67,6 +68,7 @@ import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentPointDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFmeaDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPPointDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
+import com.yeejoin.amos.fas.business.dao.repository.IRiskFactorDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
@@ -109,14 +111,14 @@ import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
 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.PPoint;
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
+import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
 import com.yeejoin.amos.fas.exception.YeeException;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 
 
 @Service("riskSourceService")
@@ -205,7 +207,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     @Autowired
     private IDictDao dictDao;
-
     @Autowired
     private RedisTemplate redisTemplate;
 
@@ -221,6 +222,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Autowired 
     private IAlarmDao iAlarmDao;
 
+    @Autowired
+    private IRiskFactorDao iRiskFactorDao;
+
     public static String cacheKeyForCanBeRunning() {
         return Redis.genKey(CacheType.ERASABLE.name(), "CONTINGENCYRUNING");
     }
@@ -409,10 +413,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             fmeaEquipmentPoint.setEquipmentPointId(equipmentPointId);
             returnList.add(fmeaEquipmentPoint);
         }
-        if (!CollectionUtils.isEmpty(returnList)) {
+        Equipment equipment = equipmentService.queryOne(importantEquipId);
+        if (!CollectionUtils.isEmpty(returnList) && equipment != null) {
             fmeaEquipmentPointMapper.saveBatch(returnList);
             RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-            rsDataQueue.addEquipmentMessage(fmeaId);
+            rsDataQueue.addEquipmentMessage(fmeaId,equipment.getName());
         }
         return returnList;
     }
@@ -587,44 +592,34 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             return new PageImpl<>(content, null, total);
         }
         content = fmeaPointInputitemMapper.listByFmeaId(fmeaId, pageNumber, pageSize);
-        List<String> userIdList = new ArrayList<String>();
-		List<String> deptIdList = new ArrayList<String>();
-		for(Map<String, Object> map : content)
-		{
-			String userId = String.valueOf(map.get("userId"));
-			String deptId = String.valueOf(map.get("deptId"));
-			if(userId!=null&&!userIdList.contains(userId))
-			{
-				userIdList.add(userId);
-			}
-			if(deptId!=null&&!deptIdList.contains(deptId))
-			{
-				deptIdList.add(deptId);
-			}
-		}
-		Map<String, String> userMap =  new HashMap<String,String>();
-		Map<String, String> deptMap =  new HashMap<String,String>();
-		
-        if(userIdList.size()>0)
-        {
-    		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
-            for (int i = 0; i < users.size(); i++) {
-            	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
-    		}
-        }		
-        if(deptIdList.size()>0)
-        {
-    	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-    		  
-            for (int i = 0; i < depts.size(); i++) {
-            	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
-    		}
+        if(!CollectionUtils.isEmpty(content)){
+            Set<String> userIds = new HashSet<>();
+            Set<String> deptIds = new HashSet<>();
+            for(Map<String, Object> map : content)
+            {
+                String userId = String.valueOf(map.get("userId"));
+                String deptId = String.valueOf(map.get("deptId"));
+                userIds.add(userId);
+                deptIds.add(deptId);
+            }
+            userIds.remove(null);
+            deptIds.remove(null);
+            List<AgencyUserModel> users = new ArrayList<>();
+            if(!CollectionUtils.isEmpty(userIds)){
+                users = remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIds));
+            }
+            Map<String, String> userMap = users.stream().collect(Collectors.toMap(AgencyUserModel::getUserId,AgencyUserModel::getRealName));
+            List<DepartmentModel> depts = new ArrayList<>();
+            if(!CollectionUtils.isEmpty(deptIds)){
+                depts = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIds));
+            }
+            Map<Long, String > deptMap = depts.stream().collect(Collectors.toMap(DepartmentModel::getSequenceNbr,DepartmentModel::getDepartmentName));
+            content.forEach(e -> {
+                e.put("userName",userMap.get(e.get("userId")));
+                e.put("deptName",deptMap.get(e.get("deptId")));
+                e.put("tel",userMap.get(String.valueOf(e.get("deptId")+"tel")));
+            });
         }
-        content.forEach(e -> {
-            e.put("username",userMap.get(String.valueOf(e.get("userId"))));
-            e.put("depName",deptMap.get(String.valueOf(e.get("deptId"))));
-            e.put("tel",userMap.get(String.valueOf(e.get("deptId")+"tel")));
-        });
         return new PageImpl<>(content, null, total);
     }
 
@@ -647,25 +642,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     @Async
     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();
-        }
-        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());
-            if (sUser != null) {
-                protalData.setUserName(sUser.getUserName());
-            } else {
-                protalData.setUserName("");
-            }
-        }
         if (!CollectionUtils.isEmpty(protalData.getItems())) {
             Long pointId = protalData.getId();
             List<Long> inputIds = Lists.newArrayList();
@@ -695,7 +671,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 fmeaPointInputitemMapper.updateStateByIds(0, successIds);
             }
             RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-            fmeaIds.forEach(fmeaId -> rsDataQueue.addPatrolMessage(fmeaId));
+            fmeaIds.forEach(fmeaId ->
+               rsDataQueue.addPatrolMessage(fmeaId,protalData.getCheckUser(),protalData.getName(),protalData.getNodeState()));
         }
         iDataRefreshService.refreshViewData(DataRefreshTypeEum.check.getCode());
     }
@@ -775,7 +752,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     private void processFireData(AlarmParam deviceData) throws Exception {
         //处理设备和巡检数据
         deviceData.setNodeState(deviceData.getState());
-
         FireEquipmentPoint fireEquipmentPoint = iFireEquipmentPointDao.findOneByCode(deviceData.getPointCode());
         fireEquipmentPoint.setValue(deviceData.getState());
         updateFirePointValue(fireEquipmentPoint.getId(), deviceData.getState());
@@ -822,7 +798,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     return;
                 }
                 deviceData.setBatchNo(batchNo);
-
                 deviceData.setMonitor(equipment.getName());
                 deviceData.setEquimentId(String.valueOf(equipment.getId()));
                 if ("alarm_type_fire".equals(fireEquipmentPointType)) {
@@ -992,7 +967,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 fmeaEquipmentPointMapper.updateStateByIds(state, ids);
             }
             RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-            fmeaIds.forEach(fmeaId -> rsDataQueue.addEquipmentMessage(fmeaId));
+            fmeaIds.forEach(fmeaId -> rsDataQueue.addEquipmentMessage(fmeaId,param.getMonitor()));
         }
     }
 
@@ -1137,12 +1112,13 @@ 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,String userName) {
         Fmea fmea = fmeaMapper.getById(fmeaId);
         if (fmea == null) {
             return;
         }
         if (fmea.getEvaluationOid() != null && fmea.getEvaluationSid() != null && fmea.getEvaluationDid() != null) {
+            MsgParamBo msgParamBo = new MsgParamBo();
             BigDecimal oidValue = new BigDecimal(fmea.getOidValue());
             BigDecimal sidValue = new BigDecimal(fmea.getSidValue());
             BigDecimal didValue = new BigDecimal(fmea.getDidValue());
@@ -1156,29 +1132,52 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             } else {
                 BigDecimal newOidValue = new BigDecimal(fmea.getNewOidValue());
                 rpn = newOidValue.multiply(sidValue).multiply(didValue).setScale(2, BigDecimal.ROUND_HALF_UP);
-                ;
             }
             List<RiskLevel> levels = riskLevelDao.findAll();
             RiskLevel newLevel = RpnUtils.getBetweenLevel(rpn, levels);
-            Set<String> jpushTargets = new LinkedHashSet<>();
+            JpushMsgBo jpushMsgBo = new JpushMsgBo();
             fmea.setRpni(rpni);
             fmea.setRpn(rpn);
             if (newLevel != null) {
                 fmea.setRiskLevelId(newLevel.getId());
-                getJpushTarget(toke, product, appKey, fmea, newLevel.getManageLevel());
+                msgParamBo.setAppKey(appKey);
+                msgParamBo.setToke(toke);
+                msgParamBo.setProduct(product);
+                msgParamBo.setFmea(fmea);
+                msgParamBo.setManagerLevel(newLevel.getManageLevel());
+                msgParamBo.setLevel(newLevel.getName());
+                msgParamBo.setUserName(userName);
+                msgParamBo.setNotifyType(nofityType);
+                jpushMsgBo = this.getJushMessageInfo(msgParamBo);
             }
             //1.3更新fmea
             fmeaMapper.updateRpn(fmea);
             //2.计算上级风险值（风险点及父节点）
-            this.notifyRiskSource(fmeaId, fmea.getRiskSourceId(), nofityType, jpushTargets);
+            this.notifyRiskSource(fmeaId, fmea.getRiskSourceId(), nofityType, jpushMsgBo);
         }
     }
 
-    private Set<String> getJpushTarget(String toke, String product, String appKey, Fmea fmea, Integer managerLevel) {
+    private JpushMsgBo getJushMessageInfo(MsgParamBo msgParam){
+        JpushMsgBo msgBo = new JpushMsgBo();
+        Optional<RiskFactor>  optional = iRiskFactorDao.findById(msgParam.getFmea().getRiskFactorsId());
+        if(optional.isPresent()){
+            JpushMsgContentBo  jpushMsgContentBo = new JpushMsgContentBo(optional.get().getName(),msgParam.getNotifyType());
+            jpushMsgContentBo.setExecute(msgParam.getUserName());
+            jpushMsgContentBo.setLevelIsChange(msgParam.getLevelIsChange());
+            jpushMsgContentBo.setLevel(msgParam.getLevel());
+            jpushMsgContentBo.setRelationName(msgParam.getRelationName());
+            jpushMsgContentBo.setRpn(msgParam.getRpn());
+            msgBo.setTarget(this.getJpushTarget(msgParam));
+            msgBo.setMsg(jpushMsgContentBo);
+        }
+        return msgBo;
+    }
+
+    private Set<String> getJpushTarget(MsgParamBo msgParam) {
         Set<String> targets = new LinkedHashSet<>();
-        Set<String> userIds = this.getUsersByLevel(managerLevel, fmea);
+        Set<String> userIds = this.getUsersByLevel(msgParam.getManagerLevel(), msgParam.getFmea());
         userIds.forEach(userId -> {
-            AgencyUserModel user = remoteSecurityService.getUserById(toke, product, appKey, userId);
+            AgencyUserModel user = remoteSecurityService.getUserById(msgParam.getToke(), msgParam.getProduct(), msgParam.getAppKey(), userId);
             if (user != null) {
                 String target = user.getMobile();
                 targets.add(target);
@@ -1212,7 +1211,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
      * 告警或者不合格项导致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,String userName, String relationName) {
         Fmea fmea = fmeaMapper.getById(fmeaId);
         if (fmea == null) {
             return;
@@ -1235,16 +1236,26 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     RiskLevel newLevel = RpnUtils.getBetweenLevel(rpn, levels);
                     fmea.setRpn(rpn);
                     fmea.setNewEvaluationOid(oEvaluationModel.getId());
-                    Set<String> jpushTargets = new LinkedHashSet<>();
+                    JpushMsgBo jpushMsgBo = new JpushMsgBo();
+                    MsgParamBo msgParamBo = new MsgParamBo();
                     if (newLevel != null) {
                         //1.2根据风险等级对应的责任等级获取责任人
-                        jpushTargets = getJpushTarget(toke, product, appKey, fmea, newLevel.getManageLevel());
                         fmea.setRiskLevelId(newLevel.getId());
+                        msgParamBo.setAppKey(appKey);
+                        msgParamBo.setToke(toke);
+                        msgParamBo.setProduct(product);
+                        msgParamBo.setFmea(fmea);
+                        msgParamBo.setManagerLevel(newLevel.getManageLevel());
+                        msgParamBo.setLevel(newLevel.getName());
+                        msgParamBo.setUserName(userName);
+                        msgParamBo.setNotifyType(notifyType);
+                        msgParamBo.setRelationName(relationName);
+                        jpushMsgBo = this.getJushMessageInfo(msgParamBo);
                     }
                     //1.3.更新fmea的rpn、风险等级及newOid
                     fmeaMapper.updateRpn(fmea);
                     //2.计算风险点rpn、rpni、riskLevelId
-                    this.notifyRiskSource(fmeaId, fmea.getRiskSourceId(), notifyType, jpushTargets);
+                    this.notifyRiskSource(fmeaId, fmea.getRiskSourceId(), notifyType, jpushMsgBo);
                 }
             }
         }
@@ -1276,7 +1287,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
      * fmea的更新导致rpn、rpni的值改变
      */
     @Override
-    public void notifyRiskSource(Long fmeaId, Long riskSourceId, String notifyType, Set<String> jpushTargets) {
+    public void notifyRiskSource(Long fmeaId, Long riskSourceId, String notifyType, JpushMsgBo jpushMsgBo) {
         Optional<RiskSource> riskSource1 = iRiskSourceDao.findById(riskSourceId);
         RiskSource riskSource = null;
         if (riskSource1.isPresent()) {
@@ -1297,7 +1308,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             this.saveRpnLog(riskSource.getId(), fmeaId, resetValue, resetValue, notifyType);
             //3.更新父节点rpn、rpni、风险等级
             this.updateParentRpn(riskSource.getParentId());
-            //4.知全景监控屏幕数据刷新
+            //4.通知全景监控屏幕数据刷新
             iDataRefreshService.refreshViewData(DataRefreshTypeEum.rpn.getCode());
         } else {//fmea评价、巡检、告警
             RpnCalculationBo rpnValueBo = RpnUtils.calRpnAndRpni(fmeas);
@@ -1322,7 +1333,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 //3.更新父节点rpn、rpni、风险等级
                 this.updateParentRpn(riskSource.getParentId());
                 //4.极光推送给手机客户端
-                jpushRiskSourceMessage("风险预警", jpushTargets);
+                jpushRiskSourceMessage(jpushMsgBo);
                 //5.规则告警（消息）TODO
                 notifyRule(riskSourceId, rpn, rpni, notifyType,changeType);
                 //6.通知全景监控屏幕数据刷新
@@ -1405,16 +1416,20 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     /**
      * 极光推送
      */
-    private void jpushRiskSourceMessage(String content, Set<String> jpushTarget) {
-        if (CollectionUtils.isEmpty(jpushTarget)) {
+    private void jpushRiskSourceMessage(JpushMsgBo jpushMsgBo) {
+        if (jpushMsgBo == null) {
             return;
         }
-        PushMsgParam pushMsgParam = new PushMsgParam();
-        pushMsgParam.setRecivers(Lists.newArrayList(jpushTarget));
-        pushMsgParam.setContent(content);
-        pushMsgParam.setSubject("风险点RPN值改变");
-        pushMsgParam.setType(JPushTypeEnum.ALIAS.getCode());
-        appMessagePushService.sendMessage(pushMsgParam);
+        JpushMsgContentBo jpushMsgContentBo = jpushMsgBo.getMsg();
+        Set<String> target = jpushMsgBo.getTarget();
+        if(jpushMsgContentBo.getSend()){
+            PushMsgParam pushMsgParam = new PushMsgParam();
+            pushMsgParam.setRecivers(Lists.newArrayList(target));
+            pushMsgParam.setContent(jpushMsgContentBo.genMessage());
+            pushMsgParam.setSubject(jpushMsgContentBo.getSubject());
+            pushMsgParam.setType(JPushTypeEnum.ALIAS.getCode());
+            appMessagePushService.sendMessage(pushMsgParam);
+        }
     }
 
     /**

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

@@ -462,7 +462,7 @@ public class View3dServiceImpl implements IView3dService {
 			return view3dMapper.getRiskErrorTop5(orgCode);
 		case "check"://巡检异常
 			return view3dMapper.getCheckErrorTop5(orgCode);
-		case "equip":
+		case "fire":
 			return JSON.parseArray(" [\r\n" + 
 					"        {\r\n" + 
 					"            \"id\": 35781,\r\n" + 

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

@@ -20,7 +20,7 @@ public interface IFmeaService {
     /**
      * 分页查询Fmea
      */
-    Page<HashMap<String, Object>> queryFmeaList(CommonPageInfoParam param);
+    Page<HashMap<String, Object>> queryFmeaList(CommonPageInfoParam param,String toke,String product,String appKey);
 
 //
 //	 void updateRpniInfo(Long riskSourceId);

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
+import com.yeejoin.amos.fas.business.bo.JpushMsgBo;
 import com.yeejoin.amos.fas.business.param.AlarmParam;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.param.FmeaBindParam;
@@ -108,9 +109,9 @@ public interface IRiskSourceService {
 
     Integer getChildTypeByPid(Long riskSourceId);
 
-    void notifyFmeaFromAbnormal(String toke,String product,String appKey,Long fmeaId, String notifyType);
+    void notifyFmeaFromAbnormal(String toke,String product,String appKey,Long fmeaId, String notifyType,String userName, String relationName);
 
-    void notifyFmeaFromUpdate(String toke,String product,String appKey,Long fmeaId, String nofityType);
+    void notifyFmeaFromUpdate(String toke,String product,String appKey,Long fmeaId, String nofityType,String userName);
 
     /**
      * 按照机构重新区域树
@@ -133,7 +134,7 @@ public interface IRiskSourceService {
      */
 	void batchSaveRegionUe4(List<BindRegionBo> regionBoList);
 
-    void notifyRiskSource(Long fmeaId, Long riskSourceId, String notifyType, Set<String> jpushTargets);
+    void notifyRiskSource(Long fmeaId, Long riskSourceId, String notifyType, JpushMsgBo jpushMsgBo);
 
     void notifyFmeaFromDelete(Long handId, String from);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ProtalDataRo.java

@@ -21,6 +21,11 @@ public class ProtalDataRo extends BasicsRo {
     private String userName;
 
     /**
+     * 巡检人员
+     */
+    private String checkUser;
+
+    /**
      * 任务编号，如果无任务，则填充0
      */
     private long taskId = 0;
@@ -92,6 +97,14 @@ public class ProtalDataRo extends BasicsRo {
         this.originalTaskState = originalTaskState;
     }
 
+    public String getCheckUser() {
+        return checkUser;
+    }
+
+    public void setCheckUser(String checkUser) {
+        this.checkUser = checkUser;
+    }
+
     public String getTaskName() {
         return taskName;
     }

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

@@ -6,11 +6,39 @@ public class FmeaMessage {
 
     private String norifyFrom;
 
+    private String userName;
+
+    /**
+     * 设备名称或者巡检点名称
+     */
+    private String relationName;
+
+    private String checkStatus;
+
+
+
+
+    public FmeaMessage(Long handId, String norifyFrom,String userName) {
+        this.handId = handId;
+        this.norifyFrom = norifyFrom;
+        this.userName = userName;
+    }
+
     public FmeaMessage(Long handId, String norifyFrom) {
         this.handId = handId;
         this.norifyFrom = norifyFrom;
     }
 
+
+    public FmeaMessage(Long handId, String norifyFrom,String userName, String relationName, String checkStatus) {
+        this.handId = handId;
+        this.norifyFrom = norifyFrom;
+        this.userName = userName;
+        this.relationName = relationName;
+        this.checkStatus = checkStatus;
+    }
+
+
     public Long getHandId() {
         return handId;
     }
@@ -26,4 +54,28 @@ public class FmeaMessage {
     public void setNorifyFrom(String norifyFrom) {
         this.norifyFrom = norifyFrom;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getRelationName() {
+        return relationName;
+    }
+
+    public void setRelationName(String relationName) {
+        this.relationName = relationName;
+    }
+
+    public String getCheckStatus() {
+        return checkStatus;
+    }
+
+    public void setCheckStatus(String checkStatus) {
+        this.checkStatus = checkStatus;
+    }
 }

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

@@ -26,12 +26,11 @@ 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);
+        remoteSecurityService = (RemoteSecurityService)IotContext.getInstance().getBean(RemoteSecurityService.class);
     }
 
     /**
@@ -62,16 +61,21 @@ public class RsDataQueue {
         service_apdu.execute(task_runnable);
     }
 
-    public void addUpdateMessage(Long fmeaId) {
-        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.fmeaUpdate.getCode()));
+    public void addUpdateMessage(Long fmeaId,String userName) {
+        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.fmeaUpdate.getCode(),userName));
     }
 
     public void addPatrolMessage(Long fmeaId) {
         blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.patrol.getCode()));
     }
 
-    public void addEquipmentMessage(Long fmeaId) {
-        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.equipment.getCode()));
+    public void addPatrolMessage(Long fmeaId, String userName, String pointName, String checkStatus) {
+        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.patrol.getCode(),userName,pointName,checkStatus));
+    }
+
+
+    public void addEquipmentMessage(Long fmeaId,String equipmentName) {
+        blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.alarm.getCode(),"",equipmentName,""));
     }
 
     public void addDeleteMessage(Long riskSourceId) {
@@ -99,15 +103,17 @@ public class RsDataQueue {
                         }
                         String from = fmeaMessage.getNorifyFrom();
                         Long handId = fmeaMessage.getHandId();
+                        String userName = fmeaMessage.getUserName();
+                        String relationName = fmeaMessage.getRelationName();
                         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, userName,relationName);
+                        } else if (from.equals(TriggerRpnChangeTypeEum.alarm.getCode())) {
                             //设备告警
-                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from);
+                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName,relationName);
                         } else if (from.equals(TriggerRpnChangeTypeEum.fmeaUpdate.getCode())) {
                             //危险因素评价修改通知
-                            riskSourceService.notifyFmeaFromUpdate(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from);
+                            riskSourceService.notifyFmeaFromUpdate(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName);
                         } else if (from.equals(TriggerRpnChangeTypeEum.fmeaDelete.getCode())) {
                             //危险因素删除通知
                             riskSourceService.notifyFmeaFromDelete(handId, from);
@@ -117,7 +123,7 @@ public class RsDataQueue {
                         }
                     }
                 } catch (Exception e) {
-                    LoggerFactory.getLogger(this.getClass()).error(e.getMessage());
+                    LoggerFactory.getLogger(this.getClass()).error(e.getMessage(),e);
                 }
         }
     }

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -12,9 +12,9 @@ eureka.client.healthcheck.enabled = true
 eureka.client.fetchRegistry = true
 
 #DB properties:
-spring.datasource.url=jdbc:mysql://47.103.14.66:3306/91-safety-business?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.11.33:3306/safety-business-2.0?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=root_123
+spring.datasource.password=admin_1234
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver
 spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
@@ -30,7 +30,7 @@ spring.data.mongodb.uri = mongodb://172.16.11.33:27017/iecmonitor
 params.remoteRuleUrl=http://magintursh.xicp.net:18080/
 params.remoteWebsocketUrl=http://172.16.10.91:10600/
 
-spring.redis.database=5
+spring.redis.database=1
 spring.redis.host=172.16.11.33
 spring.redis.port=6379
 spring.redis.password=1234560
@@ -45,3 +45,6 @@ file.uploadUrl=D:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.3.89:8083/file/getFile?in=
 params.isPush=true
+
+Push.fegin.name=PPMESSAGEPUSHSERVICE15
+dutyMode.fegin.name=AMOS-DUTY
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

@@ -30,7 +30,7 @@ spring.data.mongodb.uri = mongodb://amos-mongo:27017/iecmonitor
 params.remoteRuleUrl=http://station-rule:8080/
 params.remoteWebsocketUrl=http://station-websocket:10600/
 
-spring.redis.database=5
+spring.redis.database=1
 spring.redis.host=amos-redis
 spring.redis.port=6379
 spring.redis.password=redis2020
@@ -45,3 +45,5 @@ file.uploadUrl=D:\\upload\\files\\
 #picture read
 file.readUrl=http://station-fireautosys:8083/file/getFile?in=
 params.isPush=true
+Push.fegin.name=AMOS-PUSH
+dutyMode.fegin.name=AMOS-DUTY
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application-test.properties

@@ -30,7 +30,7 @@ spring.data.mongodb.uri = mongodb://172.16.11.33:27017/iecmonitor
 params.remoteRuleUrl=http://magintursh.xicp.net:18080/
 params.remoteWebsocketUrl=http://172.16.10.91:10600/
 
-spring.redis.database=5
+spring.redis.database=1
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.password=
@@ -45,3 +45,6 @@ file.uploadUrl=D:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.3.89:8083/file/getFile?in=
 params.isPush=true
+
+Push.fegin.name=PPMESSAGEPUSHSERVICE15
+dutyMode.fegin.name=AMOS-DUTY
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = AMOS-AUTOSYS-XKQ1
+spring.application.name = AMOS-AUTOSYS
  
 server.port = 8083
 

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

@@ -265,6 +265,18 @@
 			  PRIMARY KEY (`id`),
 			  UNIQUE KEY `type_index` (`type`) USING HASH
 			) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='报警信息表';
+       </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1589769364577-1">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="f_risk_level " columnName="manage_level"/>
+        </preConditions>
+        <comment>f_risk_level 增加管控级别 初始化数据</comment>
+        <sql>
+            update f_risk_level set manage_level = 1 where level = '1';
+            update f_risk_level set manage_level = 2 where level = '2';
+            update f_risk_level set manage_level = 3 where level = '3';
+            update f_risk_level set manage_level = 4 where level = '4';
         </sql>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/init/fas-init-data.sql

@@ -40,4 +40,184 @@ INSERT INTO `f_dict` VALUES ('40', '名称', 'hydrant', '0', '\0', 'name', '0',
 INSERT INTO `f_dict` VALUES ('41', '编号', 'hydrant', '0', '\0', 'code', '1', null, null);
 INSERT INTO `f_dict` VALUES ('42', '名称', 'pool', '0', '\0', 'name', '0', null, null);
 INSERT INTO `f_dict` VALUES ('43', '编号', 'pool', '0', '\0', 'code', '1', null, null);
+INSERT INTO `f_risk_source` (`id`, `org_code`, `code`, `name`, `position3d`, `floor3d`, `is_indoor`, `parent_id`, `risk_level_id`, `rpn`, `remark`, `create_by`, `create_date`, `is_region`, `status`, `increment`, `rpni`, `sort_num`) VALUES ('1', '1', '100101', '伊克昭换流站', NULL, NULL, b'1', '0', '0', '0.00', NULL, '0', '2019-09-21 23:09:07', 'TRUE', 'NORMAL', '0.00', '0', '99');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('22', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '10', '无警告的危害', '在没有任何预兆的情况下发生，影响人员或设备安全，或违反有关法律法规的及严重的故障模式。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('23', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '9', '有警告的危害', '在有故障预兆的情况下发生，影响人员或设备安全，或违反有关法律法规的及严重的故障模式。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('24', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '8', '很大', '对生产造成较大的破坏，设备全部或主要功能无法正常运行，但设备是安全的。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('25', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '7', '大', '设备性能受到影响，但仍可实现功能并是安全的。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('26', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '6', '中等', '设备性能退化，但仍可以工作并是安全的。局部故障，但仍可以工作。不重要零件不能工作。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('27', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '5', '小', '对设备性能有中等程度的影响，不重要零件故障需要维修', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('28', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '4', '很小', '队产品性能有较小影响。故障不需要维修', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('29', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '3', '轻微', '对设备性能有轻微影响。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('30', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '2', '很轻微', '对设备性能有非常轻微的影响。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('31', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '1', '无', '无影响。', 'S');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('32', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '10', '几乎不可能', '不可能探测或没有检查', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('33', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '9', '很微小', '只能再失效发生后才能检测出', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('34', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '8', '微小', '只能通过相关设备来进行探测', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('35', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '7', '很小', '已全部纳管进安全执行系统或进行自动信号采集', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('36', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '6', '小', '只能通过目测或手触来进行探测', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('37', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '5', '中等', '只通过目测即可进行探测', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('38', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '4', '中等偏上', '可通过仪表读数进行探测', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('39', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '3', '高', '可通过中控仪表盘进行探测', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('40', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '2', '很高', '有相应报警提示，出现故障后可在中控仪表盘中不断闪红', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('41', '1', NULL, NULL, '2019-05-28 00:36:56', '0', NULL, '1', '几乎肯定能', '有相应报警装置一旦出现故障可报警提示', 'D');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('42', '1', NULL, NULL, '2020-02-14 14:35:53', '0', NULL, '10', '很高：故障几乎不可避免', '0.9<O&&O<=1', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('43', '1', NULL, NULL, '2020-02-14 14:35:53', '0', NULL, '9', '很高：故障几乎不可避免', '0.8<O&&O<=0.9', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('44', '1', NULL, NULL, '2020-02-14 14:35:53', '0', NULL, '8', '高：反复发生的故障', '0.7<O&&O<=0.8', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('45', '1', NULL, NULL, '2020-02-14 14:35:53', '0', NULL, '7', '高：反复发生的故障', '0.6<O&&O<=0.7', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('46', '1', NULL, NULL, '2020-02-14 14:35:53', '0', NULL, '6', '中等：偶尔发生的故障', '0.5<O&&O<=0.6', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('47', '1', NULL, NULL, '2020-02-14 14:35:54', '0', NULL, '5', '中等：偶尔发生的故障', '0.4<O&&O<=0.5', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('48', '1', NULL, NULL, '2020-02-14 14:35:54', '0', NULL, '4', '中等：偶尔发生的故障', '0.3<O&&O<=0.4', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('49', '1', NULL, NULL, '2020-02-14 14:35:54', '0', NULL, '3', '低：相对很少发生', '0.2<O&&O<=0.3', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('50', '1', NULL, NULL, '2020-02-14 14:35:54', '0', NULL, '2', '低：相对很少发生', '0.1<O&&O<=0.2', 'O');
+INSERT INTO `f_evaluation_model` (`id`, `org_code`, `name`, `standard`, `create_date`, `create_by`, `remark`, `coefficient`, `influence`, `describe`, `type`) VALUES ('51', '1', NULL, NULL, '2020-02-14 14:35:54', '0', NULL, '1', '极低：几乎不可能发生', '0<=O&&O<=0.1', 'O');
+INSERT INTO `f_risk_level` (`id`, `org_code`, `level`, `evaluation_model_id`, `severity`, `name`, `color`, `create_by`, `create_date`, `remark`, `top_limit`, `down_limit`) VALUES ('1', '10', '1', NULL, '大', '1级', '红色', '1666891', '2020-05-14 10:38:54', NULL, '1000.00', '501.00');
+INSERT INTO `f_risk_level` (`id`, `org_code`, `level`, `evaluation_model_id`, `severity`, `name`, `color`, `create_by`, `create_date`, `remark`, `top_limit`, `down_limit`) VALUES ('2', '10', '2', NULL, '较大', '2级', '橙色', '1666891', '2020-05-14 10:39:04', NULL, '500.00', '101.00');
+INSERT INTO `f_risk_level` (`id`, `org_code`, `level`, `evaluation_model_id`, `severity`, `name`, `color`, `create_by`, `create_date`, `remark`, `top_limit`, `down_limit`) VALUES ('3', '10', '3', NULL, '中等', '3级', '黄色', '1666891', '2020-05-14 10:39:09', NULL, '100.00', '51.00');
+INSERT INTO `f_risk_level` (`id`, `org_code`, `level`, `evaluation_model_id`, `severity`, `name`, `color`, `create_by`, `create_date`, `remark`, `top_limit`, `down_limit`) VALUES ('4', '10', '4', NULL, '小', '4级', '蓝色', '1666891', '2020-05-14 10:39:14', NULL, '50.00', '1.00');
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('1', '1*2', '设备故障', '26', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:19', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('2', '1*2', '断电设备突然停运', '27', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:19', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('3', '1*2', '其他', '30', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:19', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('4', '1*2', '电源短路', '25', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:19', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('5', '1*2', '火灾', '23', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:20', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('6', '1*2', '其他伤害', '29', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:20', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('7', '1*2', '触电事故', '25', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:21', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('11', '1*2', '人身触电', '25', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:21', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('12', '1*2', 'SF6气体防护', '25', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:21', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('13', '1*2', '高空坠落', '26', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:21', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('14', '1*2', '设备故障', '24', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:21', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('16', '1*2', '高空落物', '26', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:21', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('17', '1*2', '雷击事故', '22', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:21', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('18', '1*2', '静电及放射线事故', '26', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:22', NULL);
+INSERT INTO `f_accident_type` (`id`, `org_code`, `name`, `evaluation_sid`, `influence`, `severity`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('19', '1*2', '小的事故类型', '22', NULL, NULL, '1245230062576365570', '1530151', '2020-05-15 13:44:22', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('1', '1*2', '设备老化产生故障', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('2', '1*2', '可能电源短路', '5', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('3', '1*2', '设备运行故障，不能及时感知火灾', '6', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('4', '1*2', '电线老化', '7', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('5', '1*2', '电线接地', '7', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('7', '1*2', '误碰、误动、误登运行设备，\n误入带电间隔。', '11', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('8', '1*2', '误碰、误动、误登运行设备，\n误入带电间隔。', '11', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('9', '1*2', '设备有接地故障时，巡视人员误入产生跨步电压。\n', '11', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('12', '1*2', '登高检查设备，如登上开关机构平台检查设备时，感应电造成人员失去平衡，造成人员碰伤、摔伤。\n', '13', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('13', '1*2', '高空落物伤人。\n', '16', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('14', '1*2', '使用无线通讯设备，造成保护误动。\n', '14', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:54', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('15', '1*2', '小动物进入，造成事故。\n', '14', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:55', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('16', '1*2', 'OWS上报出换流阀故障告警信号', '14', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:55', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('17', '1*2', '阀塔设备冒烟、着火', '5', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:55', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('18', '1*2', '阀塔设备、阀塔下方地面有水迹或阀塔水管喷水', '3', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:55', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('19', '1*2', '阀塔设备、阀塔下方地面有水迹或阀塔水管喷水', '3', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:55', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('20', '1*2', '换流阀运行声音有异常变化', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:55', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('21', '1*2', '换流变压器喷油、漏油、冒烟', '14', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:55', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('22', '1*2', '换流变压器冒烟着火', '5', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('23', '1*2', '换流变压器冒烟着火', '5', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('24', '1*2', '换流变压器声音与正常运行时对比有明显增大且伴有各种噪音', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('25', '1*2', '换流变压器套管炸裂、严重漏油', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('26', '1*2', '套管SF6压力低', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('27', '1*2', '绕组温度/油温异常升高', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('28', '1*2', '空调机组停止运行', '1', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('29', '1*2', '空调控制系统发压差传感器报警', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('30', '1*2', '空调控制系统发压差传感器报警', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('31', '1*2', '风挡卡住', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('32', '1*2', '风挡卡住', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('33', '1*2', '除湿机不工作', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('34', '1*2', '站间通讯中断', '14', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('35', '1*2', '站间通讯中断', '14', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('36', '1*2', '服务器死机', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:56', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('37', '1*2', '控制保护屏柜、板卡电源显示异常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('38', '1*2', 'UPS装置面板异常故障报警', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('39', '1*2', '空调外机异响、通风口异物、柜门密封差', '3', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('41', '1*2', '实际位置与电气、机械位置指示不相符', '3', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('42', '1*2', '压力管道渗漏', '1', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('43', '1*2', '氮气动力源铅封破损，气体压力指示不是0MPa；氮气启动源源铅封破损，气体压力压力小于4MPa', '3', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('44', '1*2', '电磁控制阀有碰撞变形及其它机械性损伤，表盘非“SHUT”状态；减压阀有碰撞变形及其它机械性损伤', '3', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('45', '1*2', '水雾喷头异物堵塞', '3', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('46', '1*2', '冬季检查泡沫消防间温度低于0℃', '3', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('47', '1*2', '装置运行不正常、液晶显示不正确、有异常声音及气味', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('48', '1*2', '运行指示不正常，电源开关位置不正常，装置告警信号', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('49', '1*2', '主水回路管道及法兰连接处、仪表及传感器安装处、管道阀门及主水过滤器有渗漏', '3', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('50', '1*2', '表计（压力表、压差表、氮气瓶压力等）指示不在正常范围内', '3', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('51', '1*2', '各回路阀门位置未在指定正确方向', '3', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('52', '1*2', '火灾报警控制器各指示灯显示异常，异常报警', '1', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('53', '1*2', '控制柜各指示灯显示异常，有异常及告警信号，工作状态不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:57', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('54', '1*2', '蓄电池有变形、凸出、漏液爆炸裂开、烧焦、螺丝连接处氧化物渗出', '1', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('55', '1*2', '消防砂池开裂、漏砂', '3', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('56', '1*2', '消防室杂乱有渗、漏雨；门窗有破损', '3', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('57', '1*2', '消防箱、消防桶、消防铲、消防斧损旧、锈蚀、破损', '3', '1', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('58', '1*2', '进入户内SF6设备室或SF6设备发生故障气体外逸，巡视人员窒息或中毒。', '12', '3', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('59', '1*2', '机构箱、端子箱内加热器故障、防火封堵未到位', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('60', '1*2', '母线存在变形，异物，跨接线过大弧垂和摆动\n', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('61', '1*2', '母线终端、连接金具破损，接头松动，软连接有断片。\n', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('62', '1*2', '母线均压环外观不正常、母线有异常声音。', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('63', '1*2', '断路器分合状态指示正常，蝶（弹）簧在压缩位置，液压机构油位未在1/2处。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('64', '1*2', '断路器压力指示指针未在绿色区域，SF6压力不正常。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('65', '1*2', '断路器套管和液压机构观察孔污秽现象，断路器套管破损、裂纹。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('66', '1*2', '基础有破损或开裂，基础有无下沉，支架是否锈蚀或变形。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('67', '1*2', '汇控柜、端子箱、机构箱、动力箱温湿度控制器显示不正常、加热器运行不正常。（冬季）', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:58', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('68', '1*2', '实际位置与电气、机械位置指示不相符。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('69', '1*2', '瓷柱无裂纹和破损，无污秽现象、无放电和闪络的痕迹。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('70', '1*2', '连杆无弯曲、无松动、无锈蚀，开口销齐全。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('71', '1*2', '引线连接部分无过热现象，引线弧度适中。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('72', '1*2', '无影响设备安全运行的障碍物、附着物。\n', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('73', '1*2', '操作机构箱柜门密封良好，箱门锁紧，基础构架无变形。\n热器运行正常。（冬季）', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('74', '1*2', '构架及机构上无鸟巢、蜂巢。\n', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('75', '1*2', '机构箱温湿度控制器显示正常、加热器运行正常。（冬季）', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('76', '1*2', '电流互感器伞群、法兰等无破损、裂纹及放电闪络痕迹', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('77', '1*2', '电流互感器伞群污秽、不完整、存在裂纹、老化迹象。', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('78', '1*2', '电流互感器油位不正常，有渗、漏油现象', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('79', '1*2', '电流互感器引线异物，接头连接不牢固', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('80', '1*2', '电流互感器套管运行声音不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('81', '1*2', '本体存在破损、污秽、有锈蚀、裂纹', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('82', '1*2', '电流互感器接线板发热松动，放电声不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('83', '1*2', '平波电抗器顶部油温、绕组温度不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('84', '1*2', '平波电抗器本体、阀门、冷却器有渗、漏油现象，有异物挂落,套管油位不在正常区域，油枕油位不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('85', '1*2', '平波电抗器呼吸器外壳破裂现象，硅胶变色部分超过3/4', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('86', '1*2', '平波电抗器呼吸器外壳破裂现象，硅胶变色部分超过3/4', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:41:59', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('87', '1*2', '平波电抗器冷却器运行不正常, 散热片严重污秽现象,油流指示器指示不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('88', '1*2', '电抗器冷却器控制柜内冷却器切换把手位置不正确', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('89', '1*2', '主变压器顶部油温、绕组温度正常。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('90', '1*2', '主变压器本体、阀门、冷却器有渗、漏油现象，异物挂落,套管油位在非正常区域，本体油枕油位不正常；\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('91', '1*2', '主变压器呼吸器外壳存在破裂现象，硅胶变色部分超过2/3；', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('92', '1*2', '主变压器套管污秽现象, 闪络放电痕迹；\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('93', '1*2', '变压器冷却器运行不正常, 散热片严重污秽现象。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('94', '1*2', '主变压器本体、冷却器运行声音不正常。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('95', '1*2', '主变压器冷却器控制柜内冷却器操作把手位置不正确；\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('96', '1*2', '电容器存在渗漏油、生锈、鼓肚变形。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('97', '1*2', '运行声音异常及其它异常现象。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('98', '1*2', '各引线和接头有无松动、变色、过热现象。', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('99', '1*2', '电抗器本体存在破损、污秽、锈蚀、开裂。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('100', '1*2', '电抗器接地良好。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('101', '1*2', '电抗器接地良好。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:00', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('102', '1*2', '电抗器各引线和接头有松动、变色、过热现象', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('103', '1*2', '避雷器引流线松股、断股和弛度过紧及过松现象；接头松动、发热或变色等现象。', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('104', '1*2', '\n避雷器均压环存在位移、变形、锈蚀现象，有放电痕迹。', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('105', '1*2', '避雷器瓷套部分裂纹、破损、放电现象，防污闪涂层有破裂、起皱、鼓泡、脱落；硅橡胶复合绝缘外套伞裙破损、变形。\n密封结构金属件和法兰盘裂纹、锈蚀。\n压力释放装置封闭破损异物。', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('106', '1*2', '避雷器设备基础有塌陷；底座固定牢固、整体倾斜；绝缘底座表面破损、积污。', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('107', '1*2', '避雷器接地引下线连接不可靠，锈蚀、断裂。\n引下线支持小套管碎裂，螺栓松动情况', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('108', '1*2', '避雷器运行时异常声响。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('109', '1*2', '避雷器监测装置外观不完整、密封较差、连接不紧固，表计指示不正常，数值超标；放电计数器而问题，内部无受潮、进水。\n接地标识、设备铭牌、设备标示牌不齐全、模糊。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('110', '1*2', '电阻器箱体破损变形，接头引线放电现象，运行声音不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('111', '1*2', '电阻器箱体破损变形，接头引线放电现象，运行声音不正常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('112', '1*2', '联络变油色谱在线监测柜灯状态异常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('113', '1*2', '联络变风冷控制柜状态显示异常', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('114', '1*2', '呼吸器油杯油位、套管油位、开关油位、油枕油位调补变端子箱油温油位未在规定范围内', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('115', '1*2', '故障录波指示灯指示运行状态异常，打印机异常常，打印纸缺失', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('116', '1*2', '很大的危险因素', '19', '1', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('117', '1*2', 'SCADA-系统\n1.中央报警系统故障告警。\n2.OWS上各界面显示异常。\n3.站控制监视系统屏柜内设备运行声音异常\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('118', '1*2', '消防系统-火灾检测：火灾报警后台上有报警。\n', '1', '1', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('119', '1*2', '\"图像监控系统：\n1.视频监控显示器显示、切换异常，摄像机控制不灵活。\n2.视频主机屏上指示灯异常，网络连接断开，交换机（网桥）指示灯异常。\n3.视频主机屏内设备存在发热、死机等现象。\n\n\"\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:01', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('120', '1*2', '直流控制保护系统面板、板卡等指示灯异常告警。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('121', '1*2', '直流控制保护系统屏柜内有杂物，凝结水现象\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('122', '1*2', '\"直流控制保护系统电源开关异常，电源指示异常，接点抖动，异常声响，焦糊味，防火封堵有损。\n\"\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('123', '1*2', '直流控制保护系统压板、转换开关、按钮有损坏，位置偏移。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('124', '1*2', '直流控制保护系统屏柜端子排存在放电现象。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('125', '1*2', '直流控制保护系统OWS中央发出告警信号。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('126', '1*2', '母线变形，有异物，跨接线存在过大弧垂和摆动。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('127', '1*2', '母线终端、连接金具有破损、生锈，接头松动，软连接存在断片。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('128', '1*2', '母线均压环外观正常。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('129', '1*2', '瓷裙放电现象。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('130', '1*2', '瓷裙、法兰裂纹、破损现象。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:02', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('131', '1*2', '高压瓷柱绝缘支柱倾斜。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:03', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('132', '1*2', '设备法兰及铁件等部分出现裂纹、裂缝现象。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:03', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('133', '1*2', '互感器本体有异常声响、震动和气味有渗漏油现象。\n', '1', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:03', NULL);
+INSERT INTO `f_risk_factor` (`id`, `org_code`, `name`, `accident_type_id`, `type`, `dept_id`, `create_by`, `create_date`, `remark`) VALUES ('134', '1*2', '互感器本体有异物悬挂\n', '3', '2', '1245230062576365570', '1530151', '2020-05-15 13:42:03', NULL);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file

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

@@ -429,8 +429,6 @@
 			<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-		and
-			fire_equipment_id  = 0
 	</delete>
 
 </mapper>
\ No newline at end of file

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

@@ -669,8 +669,8 @@
 			<if test="riskLevelId != null">
 				risk_level_id = #{riskLevelId},
 			</if>
-			<if test="flicker_frequency != null">
-				flicker_frequency = #{flicker_frequency}
+			<if test="flickerFrequency != null">
+				flicker_frequency = #{flickerFrequency}
 			</if>
 		</set>
 		where id = #{id}

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

@@ -390,7 +390,7 @@
 	
 	<select id="getSafetyIndexWeek" resultType="java.util.HashMap">
 		<![CDATA[
-			SELECT temp1.*,IFNULL(S.safety_index,0) as value
+			SELECT distinct temp1.*,IFNULL(S.safety_index,0) as value
 			FROM (
 				SELECT @s :=@s + 1 as `index`, DATE(DATE_SUB(CURRENT_DATE, INTERVAL @s DAY)) AS date
 				FROM mysql.help_topic,(SELECT @s := 0) temp
@@ -491,7 +491,9 @@
 	</select>
 	
 	<select id="getCheckErrorTop5" resultType="com.yeejoin.amos.fas.business.bo.SafetyExecuteBo">
-		SELECT p.id,I.point_no as code,I.name as label,p.point_id,'check' as type,p.check_time as changeDate
+		SELECT p.id,I.point_no as code,
+			IF(p.is_ok = '2', CONCAT(I.name,' 不合格') ,CONCAT(I.name,' 漏检') ) as label,
+			p.point_id,'check' as type,p.check_time as changeDate
 		FROM p_check p
 		left join p_point I ON I.id = p.point_id
 		where p.is_ok IN ('2', '3')