风险日志更新

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabRiskPlanAbnormalDescService.java

@@ -53,12 +53,12 @@ public interface ILabRiskPlanAbnormalDescService {
     /**
      * 添加风险概况
      * @param groupId 分线记录ID
+     * @param subjectId 实验室ID
      * @param riskReason 风险原因
      * @param riskLevel 风险级别
-     * @param internalPerson 实验室内人员
      * @return
      */
-    int addLabRiskPlanAbnormalDesc(long groupId, String riskReason, int riskLevel, String internalPerson);
+    int addLabRiskPlanAbnormalDesc(long groupId, long subjectId, String riskReason, int riskLevel);
 
     /**
      * 更新风险概况

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalDescServiceImpl.java

@@ -3,12 +3,17 @@ package com.zd.laboratory.service.impl;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.domain.LabRiskPlanAbnormalDesc;
+import com.zd.laboratory.mapper.LabHardwareStateMapper;
 import com.zd.laboratory.mapper.LabRiskPlanAbnormalDescMapper;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalDescService;
+import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>类注释说明</p>
@@ -23,6 +28,9 @@ public class LabRiskPlanAbnormalDescServiceImpl implements ILabRiskPlanAbnormalD
     @Autowired
     private LabRiskPlanAbnormalDescMapper labRiskPlanAbnormalDescMapper;
 
+    @Autowired
+    private LabHardwareStateMapper hardwareStateMapper;
+
     @Override
     public int insert(LabRiskPlanAbnormalDesc labRiskPlanAbnormalDesc) {
         if (labRiskPlanAbnormalDesc != null) {
@@ -75,7 +83,15 @@ public class LabRiskPlanAbnormalDescServiceImpl implements ILabRiskPlanAbnormalD
     }
 
     @Override
-    public int addLabRiskPlanAbnormalDesc(long groupId, String riskReason, int riskLevel, String internalPerson) {
+    public int addLabRiskPlanAbnormalDesc(long groupId, long subjectId, String riskReason, int riskLevel) {
+        //获取实验室内人员
+        Map<String, Object> params = new HashMap<>();
+        params.put("subId",subjectId);
+        List<SysUser> users = hardwareStateMapper.querySubOnlineUserByOnepc(params);
+        String internalPerson = "";
+        if (users != null && users.size() > 0) {
+            internalPerson = users.stream().map(SysUser::getUserName).collect(Collectors.joining(","));
+        }
         LabRiskPlanAbnormalDesc desc = new LabRiskPlanAbnormalDesc();
         desc.setGroupId(groupId);
         desc.setRiskReason(riskReason);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalGroupServiceImpl.java

@@ -20,14 +20,12 @@ import com.zd.laboratory.mapper.LabRiskPlanAbnormalLogMapper;
 import com.zd.laboratory.service.ILabExitLineService;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalDescService;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalGroupService;
-import com.zd.model.entity.SysUser;
 import com.zd.model.enums.HardwareTypeEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -45,15 +43,9 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
     private LabRiskPlanAbnormalGroupMapper labRiskPlanAbnormalGroupMapper;
 
     @Autowired
-    private HardwareFunctionStatusConfig hardwareFunctionStatusConfig;
-    @Autowired
     private LabHardwareMapper labHardwareMapper;
     @Autowired
     private LabRiskPlanAbnormalLogMapper labRiskPlanAbnormalLogMapper;
-
-    @Autowired
-    private LabHardwareStateMapper hardwareStateMapper;
-
     @Autowired
     private ILabExitLineService labExitLineService;
 
@@ -152,15 +144,7 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
         Date now = new Date();
         group.setCreateTime(now);
         if(labRiskPlanAbnormalGroupMapper.insertLabRiskPlanAbnormalGroup(group) > 0) {
-            //获取实验室内人员
-            Map<String, Object> params = new HashMap<>();
-            params.put("subId",subjectId);
-            List<SysUser> users = hardwareStateMapper.querySubOnlineUserByOnepc(params);
-            String internalPerson = null;
-            if (users != null && users.size() > 0) {
-                internalPerson = users.stream().map(SysUser::getUserName).collect(Collectors.joining(","));
-            }
-            if(labRiskPlanAbnormalDescService.addLabRiskPlanAbnormalDesc(group.getId(), riskReason, riskLevel, internalPerson) > 0){
+            if(labRiskPlanAbnormalDescService.addLabRiskPlanAbnormalDesc(group.getId(), subjectId, riskReason, riskLevel) > 0){
                 return group.getId();
             }
         }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -129,7 +129,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     private LabBuildFloorLayoutMapper labBuildFloorLayoutMapper;
 
     @Autowired
-    private ILabRiskPlanAbnormalGroupService labRiskPlanAbnormalGroupService;
+    private ILabRiskPlanAbnormalDescService labRiskPlanAbnormalDescService;
 
     @Autowired
     private RemoteCameraService remoteCameraService;
@@ -760,9 +760,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 //                                    Set<String> funSet = newRiskPlan.getRiskPlanSensorList().stream().map(d -> d.getFunNum()).collect(Collectors.toSet());
 //                                    redisService.setCacheSetV2(BaseConstants.WRAN_KEY+subFunction.getSubId(),funSet);
 //                                });
-//
-//
-//
 //                    }
 //                }
 //            }else{
@@ -804,10 +801,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 //            messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_LOG);
 //            //首页预案组通知
 //            messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_GROUP);
-//
-//
-//
-//
 //        }else {
 //            for(LabRiskPlanAbnormalGroup groupVo : groupList){
 //                LabRiskPlanAbnormalLog labRiskPlanAbnormalLogByGroupId = new LabRiskPlanAbnormalLog();
@@ -906,7 +899,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 //        log.error("这里硬件调用结束=======================================================");
 //    }
 //
-//
 //    /**
 //     * 调用执行硬件的接口，交由接口实现具体的设备开启或关闭
 //     *
@@ -1079,7 +1071,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             }
 
             //插入风险日志
-            Long groupId = insertPlanAbnormalLog(labRiskPlanLevel, riskPlanJson, groupList, 1L, subFunction);
+            Long groupId = insertPlanAbnormalLog(labRiskPlanLevel, riskPlanJson, groupList, 1L, subFunction, riskAttribute);
             log.info("####################groupId:" + groupId);
             if (groupId != null) {
                 LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subFunction.getSubId());
@@ -1193,7 +1185,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             if (redisService.getCacheObject("subjectByYa" + subFunction.getSubId()) != null) {
                 return flag;
             }
-
             for (LabRiskPlanAbnormalGroupVO groupVo : groupList) {
                 try {
                     //预案关闭喇叭
@@ -1401,21 +1392,25 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     }
 
 
-    public LabRiskPlanAbnormalGroup insertPlanAbnormalGroup(LabRiskPlanLevel newRiskPlan, Long subjectId) {
+    public LabRiskPlanAbnormalGroup insertPlanAbnormalGroup(LabRiskPlanLevel newRiskPlan, Long subjectId, Integer riskAttribute, Integer riskPlanLevel) {
         //如果找不到组，先插入组数据
         LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = new LabRiskPlanAbnormalGroup();
         labRiskPlanAbnormalGroup.setGroupName(newRiskPlan.getRiskName());
+        labRiskPlanAbnormalGroup.setRiskAttribute(riskAttribute);
         labRiskPlanAbnormalGroup.setStatus(1L);
         labRiskPlanAbnormalGroup.setCreateTime(new Date());
         labRiskPlanAbnormalGroup.setCreateBy("自动");
         labRiskPlanAbnormalGroup.setSubjectId(subjectId);
         labRiskPlanAbnormalGroup.setRiskAttribute(newRiskPlan.getRiskAttribute());
-        labRiskPlanAbnormalGroupMapper.insertLabRiskPlanAbnormalGroup(labRiskPlanAbnormalGroup);
+        if(labRiskPlanAbnormalGroupMapper.insertLabRiskPlanAbnormalGroup(labRiskPlanAbnormalGroup) > 0) {
+            //TODO 添加风险概况
+            labRiskPlanAbnormalDescService.addLabRiskPlanAbnormalDesc(labRiskPlanAbnormalGroup.getId(),subjectId, "", riskPlanLevel);
+        }
         return labRiskPlanAbnormalGroup;
     }
 
 
-    public Long insertPlanAbnormalLog(LabRiskPlanLevel labRiskPlanLevel/*LabRiskPlan newRiskPlan*/, JSONArray riskPlanJson, List<LabRiskPlanAbnormalGroupVO> groupList, Long riskStatus, SubFunction<SensorFunctionStatus> subFunction) {
+    public Long insertPlanAbnormalLog(LabRiskPlanLevel labRiskPlanLevel, JSONArray riskPlanJson, List<LabRiskPlanAbnormalGroupVO> groupList, Long riskStatus, SubFunction<SensorFunctionStatus> subFunction, Integer riskAttribute) {
         LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup;
         Long groupId;
         //将风险预案写入日志表
@@ -1426,7 +1421,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         labRiskPlanAbnormalLog.setSensorJson(riskPlanJson.toString());
         labRiskPlanAbnormalLog.setRiskStatus(riskStatus);
         labRiskPlanAbnormalLog.setSubjectId(subFunction.getSubId());
-
         labRiskPlanAbnormalLog.setRiskAttribute(labRiskPlanLevel.getRiskAttribute());
         labRiskPlanAbnormalLog.setRiskPlanLevelId(labRiskPlanLevel.getId());
         labRiskPlanAbnormalLog.setRiskPlanLevelName(RiskPlanLevelEnum.getValue(labRiskPlanLevel.getRiskPlanLevel()));
@@ -1434,7 +1428,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
         if (groupList == null || groupList.size() == 0) {
             // todo
-            labRiskPlanAbnormalGroup = insertPlanAbnormalGroup(labRiskPlanLevel, subFunction.getSubId());
+            labRiskPlanAbnormalGroup = insertPlanAbnormalGroup(labRiskPlanLevel, subFunction.getSubId(),riskAttribute,labRiskPlanLevel.getRiskPlanLevel());
 //            labRiskPlanAbnormalGroupService.addRiskExeRecord(riskPlanName, subjectId, subjectName, riskAttribute, riskReason, riskLevel);
             groupId = labRiskPlanAbnormalGroup.getId();
             //给风险日志表关联组