|
@@ -628,7 +628,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public synchronized int triggerRiskPlan(SubFunction<SensorFunctionStatus> subFunction, Integer riskAttribute) {
|
|
public synchronized int triggerRiskPlan(SubFunction<SensorFunctionStatus> subFunction, Integer riskAttribute) {
|
|
|
- log.info("======进入触发预案======");
|
|
|
|
|
|
|
+ //log.info("======进入触发预案======");
|
|
|
int flag = 200;
|
|
int flag = 200;
|
|
|
//这里判断火焰预案,就不继续往下执行了,锁死火焰预案
|
|
//这里判断火焰预案,就不继续往下执行了,锁死火焰预案
|
|
|
if (redisService.getCacheObject("subjectByHuoyan" + subFunction.getSubId()) != null) {
|
|
if (redisService.getCacheObject("subjectByHuoyan" + subFunction.getSubId()) != null) {
|
|
@@ -637,7 +637,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
|
|
|
}
|
|
}
|
|
|
//实验室传感器是否触发预案
|
|
//实验室传感器是否触发预案
|
|
|
LabRiskPlanLevel labRiskPlanLevel = matchingRiskPlan(subFunction);
|
|
LabRiskPlanLevel labRiskPlanLevel = matchingRiskPlan(subFunction);
|
|
|
- log.info("触发预案具体信息={}", JSON.toJSONString(labRiskPlanLevel));
|
|
|
|
|
|
|
+ //log.info("触发预案具体信息={}", JSON.toJSONString(labRiskPlanLevel));
|
|
|
//获取当前实验室触发预案的风险异常组列表
|
|
//获取当前实验室触发预案的风险异常组列表
|
|
|
List<LabRiskPlanAbnormalGroupVO> groupList = getLabRiskPlanAbnormalGroupVOS(subFunction.getSubId());
|
|
List<LabRiskPlanAbnormalGroupVO> groupList = getLabRiskPlanAbnormalGroupVOS(subFunction.getSubId());
|
|
|
//如果预案里面配置传感器都达标,需要执行预案对应的硬件操作
|
|
//如果预案里面配置传感器都达标,需要执行预案对应的硬件操作
|
|
@@ -673,7 +673,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
|
|
|
log.info("预案缓存冗余时间,请等待...");
|
|
log.info("预案缓存冗余时间,请等待...");
|
|
|
return flag;
|
|
return flag;
|
|
|
}
|
|
}
|
|
|
- log.info("传感器触发关闭预案!实验室id={}", subFunction.getSubId());
|
|
|
|
|
|
|
+ //log.info("传感器触发关闭预案!实验室id={}", subFunction.getSubId());
|
|
|
for (LabRiskPlanAbnormalGroupVO groupVo : groupList) {
|
|
for (LabRiskPlanAbnormalGroupVO groupVo : groupList) {
|
|
|
//更新结束预案日志
|
|
//更新结束预案日志
|
|
|
updateLogs(subFunction, groupVo);
|
|
updateLogs(subFunction, groupVo);
|