规则服务修改

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

@@ -21,6 +21,15 @@ public class JpushMsgContentBo {
      * 巡检状态
      */
     private String checkStatus;
+
+    public String getCheckStatus() {
+        return checkStatus;
+    }
+
+    public void setCheckStatus(String checkStatus) {
+        this.checkStatus = checkStatus;
+    }
+
     /**
      * 执行日期
      */

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

@@ -19,6 +19,15 @@ public class MsgParamBo {
     private BigDecimal rpn;
     private String level;
     private String relationName;
+    private String checkStatus;
+
+    public String getCheckStatus() {
+        return checkStatus;
+    }
+
+    public void setCheckStatus(String checkStatus) {
+        this.checkStatus = checkStatus;
+    }
 
     public String getToke() {
         return toke;

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

@@ -564,7 +564,7 @@ public class RiskSourceController extends BaseController {
     }
 
 
-    //@Authorization(ingore = true)
+//  @Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "上传巡检数据", notes = "上传巡检数据")
     @RequestMapping(value = "/data/patroldata", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse postPatrolData(@RequestBody ProtalDataRo protalData) throws Exception {

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

@@ -76,4 +76,6 @@ public interface FireEquipMapper extends BaseMapper {
     Long queryEquimentRelationCount(
             @Param("equipmentId") String equipmentId,
             @Param("fname") String fname);
+
+    FireEquipmentEntity findById(@Param("id") Long id);
 }

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

@@ -555,17 +555,30 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             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));
+//            Map<String, String> userMap = users.stream().collect(Collectors.toMap(AgencyUserModel::getUserId,AgencyUserModel::getRealName));
+            Map<String, String> userMap = new HashMap<>();
+            if(users!=null){
+                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")));
-            });
+//            Map<Long, String > deptMap = depts.stream().collect(Collectors.toMap(DepartmentModel::getSequenceNbr,DepartmentModel::getDepartmentName));
+            Map<Long, String> deptMap = new HashMap<>();
+            if(depts!=null){
+                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")));
+//            });
+            for(int i=0;i<content.size();i++){
+                content.get(i).put("userName",userMap.get(content.get(i).get("userId")));
+                content.get(i).put("deptName",deptMap.get(content.get(i).get("deptId")));
+                content.get(i).put("tel",userMap.get(String.valueOf(content.get(i).get("deptId")+"tel")));
+            }
         }
         return new PageImpl<>(content, pageable, total);
     }
@@ -589,11 +602,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     @Async
     public void processProtalData(String toke, String product, String appKey, ProtalDataRo protalData) {
-        if (!CollectionUtils.isEmpty(protalData.getItems())) {
+        if (!CollectionUtils.isEmpty(protalData.getPointInputitems())) {
             Long pointId = protalData.getId();
             List<Long> inputIds = Lists.newArrayList();
             Map<Long, CheckInputItemRo> map = Maps.newHashMap();
-            for (CheckInputItemRo checkInputItemRo : protalData.getItems()) {
+            for (CheckInputItemRo checkInputItemRo : protalData.getPointInputitems()) {
                 inputIds.add(checkInputItemRo.getPointInputitemId());
                 map.put(checkInputItemRo.getPointInputitemId(), checkInputItemRo);
             }
@@ -936,12 +949,15 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         } else if (param.getState().equals("false")) {
             state = 0;
         }
+
         if (state != null) {
             if (ids.size() > 0) {
                 fmeaEquipmentPointMapper.updateStateByIds(state, ids);
             }
+            final Integer st=state;
+            String monitor=fireEquipMapper.findById(fireEquipPointMapper.getByCode(param.getPointCode()).getFireEquipmentId()).getName();
             RsDataQueue rsDataQueue = RsDataQueue.getInstance();
-            fmeaIds.forEach(fmeaId -> rsDataQueue.addEquipmentMessage(fmeaId,param.getMonitor()));
+            fmeaIds.forEach(fmeaId -> rsDataQueue.addEquipmentMessage(fmeaId,monitor,st));
         }
     }
 
@@ -1144,6 +1160,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             jpushMsgContentBo.setLevel(msgParam.getLevel());
             jpushMsgContentBo.setRelationName(msgParam.getRelationName());
             jpushMsgContentBo.setRpn(msgParam.getRpn());
+            jpushMsgContentBo.setCheckStatus(msgParam.getCheckStatus());
             msgBo.setTarget(this.getJpushTarget(msgParam));
             msgBo.setMsg(jpushMsgContentBo);
         }
@@ -1190,7 +1207,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     public void notifyFmeaFromAbnormal(
             String toke, String product, String appKey,
-            Long fmeaId, String notifyType,String userName, String relationName) {
+            Long fmeaId, String notifyType,String userName, String relationName, String checkStatus) {
         Fmea fmea = fmeaMapper.getById(fmeaId);
         if (fmea == null) {
             return;
@@ -1226,7 +1243,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                         msgParamBo.setLevel(newLevel.getName());
                         msgParamBo.setUserName(userName);
                         msgParamBo.setNotifyType(notifyType);
+                        msgParamBo.setCheckStatus(checkStatus);
                         msgParamBo.setRelationName(relationName);
+                        msgParamBo.setRpn(rpn);
                         jpushMsgBo = this.getJushMessageInfo(msgParamBo);
                     }
                     //1.3.更新fmea的rpn、风险等级及newOid
@@ -1294,6 +1313,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             if (rpnValueBo.isEmpty()) {
                 return;
             }
+            Fmea caluFmea=fmeaMapper.getById(fmeaId);
+            Integer rpnDiffer=caluFmea.getRpn().intValue()-caluFmea.getRpni().intValue();
+            String checkStatus=jpushMsgBo.getMsg().getCheckStatus();
             BigDecimal rpn = rpnValueBo.getRpn();
             BigDecimal rpni = rpnValueBo.getRpni();
             List<RiskLevel> levels = riskLevelDao.findAll();
@@ -1313,9 +1335,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 //3.更新父节点rpn、rpni、风险等级
                 this.updateParentRpn(riskSource.getParentId());
                 //4.极光推送给手机客户端
+                if(notifyType=="recovery"||notifyType=="fmeaUpdate"||(notifyType=="alarm"&&rpnDiffer>0)||(notifyType=="patrol"&&rpnDiffer>0&&checkStatus.equals("不合格")))
                 jpushRiskSourceMessage(jpushMsgBo);
                 //5.规则告警（消息）TODO
-                notifyRule(riskSourceId, rpn, rpni, notifyType,changeType, jpushMsgBo.getMsg());
+                if(notifyType=="recovery"||notifyType=="fmeaUpdate"||(notifyType=="alarm"&&rpnDiffer>0)||(notifyType=="patrol"&&rpnDiffer>0&&checkStatus.equals("不合格")))
+                    notifyRule(riskSourceId, rpn, rpni, notifyType,changeType, jpushMsgBo.getMsg());
                 //6.通知全景监控屏幕数据刷新
                 iDataRefreshService.refreshViewData(DataRefreshTypeEum.rpn.getCode());
             }

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

@@ -109,7 +109,7 @@ public interface IRiskSourceService {
 
     Integer getChildTypeByPid(Long riskSourceId);
 
-    void notifyFmeaFromAbnormal(String toke,String product,String appKey,Long fmeaId, String notifyType,String userName, String relationName);
+    void notifyFmeaFromAbnormal(String toke,String product,String appKey,Long fmeaId, String notifyType,String userName, String relationName,String checkStatus);
 
     void notifyFmeaFromUpdate(String toke,String product,String appKey,Long fmeaId, String nofityType,String userName);
 

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

@@ -49,6 +49,16 @@ public class ProtalDataRo extends BasicsRo {
 
     private List<CheckInputItemRo> items;
 
+    private List<CheckInputItemRo> pointInputitems;
+
+    public List<CheckInputItemRo> getPointInputitems() {
+        return pointInputitems;
+    }
+
+    public void setPointInputitems(List<CheckInputItemRo> pointInputitems) {
+        this.pointInputitems = pointInputitems;
+    }
+
     public List<CheckInputItemRo> getItems() {
         return items;
     }

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

@@ -78,6 +78,15 @@ public class RsDataQueue {
         blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.alarm.getCode(),"",equipmentName,""));
     }
 
+    public void addEquipmentMessage(Long fmeaId,String equipmentName,Integer state) {
+        if(state==0){
+            blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.alarmRecovery.getCode(),"",equipmentName,""));
+
+        }else{
+            blockingQueue.add(new FmeaMessage(fmeaId, TriggerRpnChangeTypeEum.alarm.getCode(),"",equipmentName,""));
+        }
+    }
+
     public void addDeleteMessage(Long riskSourceId) {
         blockingQueue.add(new FmeaMessage(riskSourceId, TriggerRpnChangeTypeEum.fmeaDelete.getCode()));
     }
@@ -105,12 +114,19 @@ public class RsDataQueue {
                         Long handId = fmeaMessage.getHandId();
                         String userName = fmeaMessage.getUserName();
                         String relationName = fmeaMessage.getRelationName();
+                        String checkStatus =null;
+                        if(fmeaMessage.getCheckStatus()!=null){
+                            checkStatus =(fmeaMessage.getCheckStatus().equals("1"))?"合格":"不合格";
+                        }
                         if (from.equals(TriggerRpnChangeTypeEum.patrol.getCode())) {
                             //巡检不合格通知
-                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName,relationName);
+                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName,relationName,checkStatus);
                         } else if (from.equals(TriggerRpnChangeTypeEum.alarm.getCode())) {
                             //设备告警
-                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName,relationName);
+                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName,relationName,checkStatus);
+                        } else if (from.equals(TriggerRpnChangeTypeEum.alarmRecovery.getCode())) {
+                            //设备告警恢复
+                            riskSourceService.notifyFmeaFromAbnormal(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName,relationName,checkStatus);
                         } else if (from.equals(TriggerRpnChangeTypeEum.fmeaUpdate.getCode())) {
                             //危险因素评价修改通知
                             riskSourceService.notifyFmeaFromUpdate(toke.getToke(), toke.getProduct(), toke.getAppKey(), handId, from, userName);

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

@@ -499,4 +499,8 @@
             AND fe.`name` like '%${fname}%'
         </if>
     </select>
+
+    <select id="findById" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity">
+        select name from f_fire_equipment where id= #{id}
+    </select>
 </mapper>
\ No newline at end of file