Browse Source

增加代码注释

hanzhiwei 3 years ago
parent
commit
6b676228a2

+ 2 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanController.java

@@ -177,6 +177,7 @@ public class LabRiskPlanController extends BaseController {
     public AjaxResult triggerRiskPlan(@RequestBody SubFunction <SensorFunctionStatus> subFunction) {
         try {
             int flag=1;
+            //如果实验室ID为空 通过设备ID查询绑定实验室ID
             if(StringUtils.isNull(subFunction.getSubId())){
                 if(subFunction.getFunctionStatuses().size()>0){
                     Long subId = labHardwareService.querySubIdByNum(subFunction.getFunctionStatuses().get(0).getHardwareNum());
@@ -189,6 +190,7 @@ public class LabRiskPlanController extends BaseController {
                             .stream()
                             .filter(a->"huoyan".equals(a.getFunNum()))
                             .forEach(a->{
+                                //没有火焰预警的缓存信息,则执行智能预警方法,否则不执行, 需要手动关闭火焰预警
                                 if(redisService.getCacheObject("subjectByHuoyan"+subFunction.getSubId())==null){
 //                                    redisService.setCacheObject("subjectByHuoyan"+subFunction.getSubId(), subFunction.getSubId());
                                     labRiskPlanService.triggerRiskPlan(subFunction);

+ 4 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineServiceImpl.java

@@ -97,6 +97,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         List<LabExitLineJoinVO> labExitLineJoinVOList = labExitLineJoinMapper.selectLabExitLineIntelligentGuidance(labExitLineJoin);
         //todo 这里临时调用一下处理LightId的办法,以后如果变动,需要重新设计调整,这个方法就不用了。
         changeLightId(labExitLineJoinVOList);
+        //验证是否在双向疏散时,都有配置双向线路 如没有 则置空
         if(dire==0){
             boolean leftLight=false,rightLight=false;
             for(LabExitLineJoinVO labExitLineJoinVO:labExitLineJoinVOList){
@@ -396,7 +397,9 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         if(redisService.hasKey(CacheConstants.EVACUATION + subId)){
             EvacuationLine evacuationLine = redisService.getCacheObject(CacheConstants.EVACUATION + subId);
             if(type.equals(evacuationLine.getType())){
+                //如果相等 取redis的值,不相等就要后续取查
                 return evacuationLine.getLineJoins();
+                // -1 直接取redis的值
             }else if(type==-1){
                 return evacuationLine.getLineJoins();
             }
@@ -508,6 +511,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
             try{
                 LabAudioSynthesis audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisById(5L);
                 if(com.zd.common.core.utils.StringUtils.isNotNull(audioSyntheses)){
+                    //获取喇叭列表
                     R deviceList = remoteSpeakService.getDeviceList(1,10, 5L);
                     if(deviceList.getCode()==200){
                         List<Map<String,Object>> mapList = (List <Map <String, Object>>) deviceList.getData();

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

@@ -1038,6 +1038,7 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
         LabRiskPlanVO riskPlanVo = new LabRiskPlanVO();
         //这里需要接收对应的实验室id
         riskPlanVo.setSubjectId(subFunction.getSubId());
+        //通过实验室ID查询到对应的预案列表
         List<LabRiskPlan> riskPlanList = labRiskPlanMapper.selectLabRiskPlanBySubjectList(riskPlanVo);
         LabRiskPlan newRiskPlan = matchingRiskPlan(riskPlanList,subFunction);
 
@@ -1045,10 +1046,12 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
         List<LabNoticeconfig> noticeconfigList = labNoticeconfigMapper.selectLabNoticeconfigList(new LabNoticeconfig());
         StringBuffer radioStr = new StringBuffer();
         if(noticeconfigList.size()>0 && newRiskPlan!=null){
+            //语音播报 短信 电话内容
             LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
             newRiskPlan.setVoicebroadcast(labNoticeconfig.getRiskVoice());
             newRiskPlan.setMessage(labNoticeconfig.getRiskMessage());
             newRiskPlan.setInformation(labNoticeconfig.getRiskPhone());
+            //预案广播通知
             radioStr.append(labNoticeconfig.getRiskRadio());
         }
 
@@ -1056,6 +1059,7 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
         LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = new LabRiskPlanAbnormalGroup();
         labRiskPlanAbnormalGroup.setSubjectId(subFunction.getSubId());
         labRiskPlanAbnormalGroup.setStatus(1L);
+        //查询风险异常组级列表
         List <LabRiskPlanAbnormalGroupVO> groupList = labRiskPlanAbnormalGroupMapper.selectLabRiskPlanAbnormalGroupList(labRiskPlanAbnormalGroup);
 
         //如果预案里面配置传感器都达标,需要执行预案对应的硬件操作
@@ -1224,7 +1228,7 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
                 }
 
 
-
+                //查询风险日志下,根据预案ID查询风险日志
                 LabRiskPlanAbnormalLog labRiskPlanAbnormalLogByGroupId = new LabRiskPlanAbnormalLog();
                 labRiskPlanAbnormalLogByGroupId.setGroupId(groupVo.getId());
                 List<LabRiskPlanAbnormalLog> newPlanAbnormalLogList = labRiskPlanAbnormalLogMapper.selectLabRiskPlanAbnormalLogOrderByList(labRiskPlanAbnormalLogByGroupId);
@@ -1681,6 +1685,7 @@ public class LabRiskPlanServiceImpl implements ILabRiskPlanService {
                            } catch (NumberFormatException e) {
                                return;
                            }
+                           //判断值范围  在范围内存储预案ID和类型名称 (火焰,温度,湿度)
                            if((senseVal>=c.getMinMonitor().floatValue()) && (senseVal<=c.getMaxMonitor().floatValue())){
                                if(riskMap.get(a.getId())!=null){
                                    riskMap.get(a.getId()).add(t.getFunNum());