diff --git a/ems-quartz/src/main/java/com/xzzn/quartz/task/ProtectionPlanTask.java b/ems-quartz/src/main/java/com/xzzn/quartz/task/ProtectionPlanTask.java index 0d9690c..bba3473 100644 --- a/ems-quartz/src/main/java/com/xzzn/quartz/task/ProtectionPlanTask.java +++ b/ems-quartz/src/main/java/com/xzzn/quartz/task/ProtectionPlanTask.java @@ -89,7 +89,9 @@ public class ProtectionPlanTask { Long planId = 0L; try { // 获取所有方案,轮询 - List planList = iEmsFaultProtectionPlanService.selectEmsFaultProtectionPlanList(null); + EmsFaultProtectionPlan emsFaultProtectionPlan = new EmsFaultProtectionPlan(); + emsFaultProtectionPlan.setSiteId("021_DDS_01"); + List planList = iEmsFaultProtectionPlanService.selectEmsFaultProtectionPlanList(emsFaultProtectionPlan); for (EmsFaultProtectionPlan plan : planList) { planId = plan.getId(); @@ -123,6 +125,7 @@ public class ProtectionPlanTask { // 需要同步云端 @SyncAfterInsert private boolean dealWithProtectionPlan(EmsFaultProtectionPlan plan, List protSettings) { + logger.info("<轮询保护方案> 站点:{},方案ID:{}", plan.getSiteId(), plan.getId()); boolean isHighLevel = false; String siteId = plan.getSiteId(); @@ -130,6 +133,7 @@ public class ProtectionPlanTask { final Long status = plan.getStatus(); // 看方案是否启用,走不同判断 if (Objects.equals(status, ProtPlanStatus.STOP.getCode())) { + logger.info("<方案未启用> 站点:{},方案ID:{}", siteId, plan.getId()); // 未启用,获取方案的故障值与最新数据判断是否需要下发方案 if(checkIsNeedIssuedPlan(protSettings, siteId)){ if("3".equals(plan.getFaultLevel())){ @@ -166,6 +170,7 @@ public class ProtectionPlanTask { }, faultDelay, TimeUnit.SECONDS); } } else { + logger.info("<方案已启用> 站点:{},方案ID:{}", siteId, plan.getId()); // 已启用,则获取方案的释放值与最新数据判断是否需要取消方案 if(checkIsNeedCancelPlan(protSettings, siteId)){ // 延时, @@ -282,6 +287,7 @@ public class ProtectionPlanTask { } // 获取点位最新值 BigDecimal lastPointValue = getPointLastValue(deviceId, point, siteId); + logger.info("checkIsNeedCancelPlan 点位:{},最新值:{},比较方式:{},释放值:{}", point, lastPointValue, vo.getReleaseOperator(), releaseValue); if(lastPointValue == null){ return false; } @@ -293,10 +299,9 @@ public class ProtectionPlanTask { conditionSb.append(" ").append(relation).append(" "); } - // 执行比较语句 - return executeWithParser(conditionSb.toString()); } - return true; + // 执行比较语句 + return executeWithParser(conditionSb.toString()); } // 校验故障值是否需要下发方案 @@ -315,6 +320,7 @@ public class ProtectionPlanTask { } // 获取点位最新值 BigDecimal lastPointValue = getPointLastValue(deviceId, point, siteId); + logger.info("checkIsNeedIssuedPlan 点位:{},最新值:{},比较方式:{},故障值:{}", point, lastPointValue, vo.getFaultOperator(), faultValue); if(lastPointValue == null){ return false; } @@ -326,10 +332,9 @@ public class ProtectionPlanTask { conditionSb.append(" ").append(relation).append(" "); } - // 执行比较语句 - return executeWithParser(conditionSb.toString()); } - return true; + // 执行比较语句 + return executeWithParser(conditionSb.toString()); } private BigDecimal getPointLastValue(String deviceId, String point, String siteId) { @@ -461,7 +466,7 @@ public class ProtectionPlanTask { boolean finalResult = atomicResults.get(0); for (int i = 0; i < logicRelations.size(); i++) { String relation = logicRelations.get(i); - boolean nextResult = atomicResults.get(i + 1); + boolean nextResult = atomicResults.get(i+1); if ("&&".equals(relation)) { finalResult = finalResult && nextResult; } else if ("||".equals(relation)) {