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