From 53b6fa2d8aa3a415610900fedf1b0e8f429cc2bb Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 25 六月 2025 16:50:20 +0800
Subject: [PATCH] 电力预警增加obj，RunMachineStateTask增加判断
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunMachineStateTask.java | 15 +++++++++++++++
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleElectricityTask.java | 9 +++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunMachineStateTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunMachineStateTask.java
index 42adb10..5ff1b41 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunMachineStateTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunMachineStateTask.java
@@ -90,6 +90,8 @@
logger.info("RunMachineStateTask定时任务正在执行，参数为：{}", params);
try {
List<String> partPointNos = partPoints.values().stream().flatMap(List::stream).collect(Collectors.toList());
+ partPointNos.add("M0000100011");
+ partPointNos.add("M0000100012");
Map<String, Object> partPointsRealValue = dataPointApi.queryPointsRealValue(partPointNos);
logger.info("运行状态点值：{}", partPointsRealValue);
List<String> qhPointNos = qhPoints.values().stream().flatMap(List::stream).collect(Collectors.toList());
@@ -102,21 +104,25 @@
partPointsRealValue.replace("C0000101223", 0);
partPointsRealValue.replace("C0000101210", 0);
partPointsRealValue.replace("C0000101214", 0);
+ partPointsRealValue.replace("M0000100854", 0);
}else if ("F0000100099".equals(pointNo) && value == 0.00) {
partPointsRealValue.replace("F0000100110", 0);
partPointsRealValue.replace("C0000101224", 0);
partPointsRealValue.replace("C0000101211", 0);
partPointsRealValue.replace("C0000101215", 0);
+ partPointsRealValue.replace("M0000100855", 0);
}else if ("F0000100100".equals(pointNo) && value == 0.00) {
partPointsRealValue.replace("F0000100111", 0);
partPointsRealValue.replace("C0000101225", 0);
partPointsRealValue.replace("C0000101212", 0);
partPointsRealValue.replace("C0000101216", 0);
+ partPointsRealValue.replace("M0000100856", 0);
}else if ("F0000100101".equals(pointNo) && value == 0.00) {
partPointsRealValue.replace("F0000100112", 0);
partPointsRealValue.replace("C0000101226", 0);
partPointsRealValue.replace("C0000101213", 0);
partPointsRealValue.replace("C0000101217", 0);
+ partPointsRealValue.replace("M0000100857", 0);
}else if ("F0000100105".equals(pointNo) && value == 0.00) {
partPointsRealValue.replace("F0000100116", 0);
partPointsRealValue.replace("C0000101227", 0);
@@ -134,11 +140,20 @@
partPointsRealValue.replace("C0000101231", 0);
partPointsRealValue.replace("C0000101221", 0);
partPointsRealValue.replace("C0000101218", 0);
+ partPointsRealValue.replace("C0000101114", 0);
+ partPointsRealValue.replace("C0000101116", 0);
+ //若其中一个135MW气耗率为0，则剩下那个135MW机组BFG、LDG取“动力总厂135MW发电机组BFG使用瞬时流量（M0000100011）“，”动力总厂135MW发电机组LDG使用瞬时流量（M0000100012）
+ partPointsRealValue.replace("C0000101115", partPointsRealValue.get("M0000100011"));
+ partPointsRealValue.replace("C0000101117", partPointsRealValue.get("M0000100012"));
}else if ("F0000100103".equals(pointNo) && value == 0.00) {
partPointsRealValue.replace("F0000100114", 0);
partPointsRealValue.replace("C0000101232", 0);
partPointsRealValue.replace("C0000101222", 0);
partPointsRealValue.replace("C0000101219", 0);
+ partPointsRealValue.replace("C0000101115", 0);
+ partPointsRealValue.replace("C0000101117", 0);
+ partPointsRealValue.replace("C0000101114", partPointsRealValue.get("M0000100011"));
+ partPointsRealValue.replace("C0000101116", partPointsRealValue.get("M0000100012"));
}
}
}
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleElectricityTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleElectricityTask.java
index af6a8c3..a8f93a5 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleElectricityTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleElectricityTask.java
@@ -83,6 +83,15 @@
saveAlarmMessage("乐杨变3#主变预警", result.get("periods_ly_three"), "LY3", scheduleTime, result.get("adviceValues_ly_three"), scheme.getWarningAdjustRate());
saveAlarmMessage("乐杨变4#主变预警", result.get("periods_ly_four"), "LY4", scheduleTime, result.get("adviceValues_ly_four"), scheme.getWarningAdjustRate());
+ saveAlarmMessage("东区变1#主变合环", result.get("periods_dq_one_hh"), "DQ1HH", scheduleTime, result.get("adviceValues_dq_one_hh"), scheme.getWarningAdjustRate());
+ saveAlarmMessage("东区变2#主变合环", result.get("periods_dq_two_hh"), "DQ2HH", scheduleTime, result.get("adviceValues_dq_two_hh"), scheme.getWarningAdjustRate());
+ saveAlarmMessage("东区变3#主变合环", result.get("periods_dq_three_hh"), "DQ3HH", scheduleTime, result.get("adviceValues_dq_three_hh"), scheme.getWarningAdjustRate());
+ saveAlarmMessage("海力变1#主变合环", result.get("periods_hl_one_hh"), "HL1HH", scheduleTime, result.get("adviceValues_hl_one_hh"), scheme.getWarningAdjustRate());
+ saveAlarmMessage("海力变2#主变合环", result.get("periods_hl_two_hh"), "HL2HH", scheduleTime, result.get("adviceValues_hl_two_hh"), scheme.getWarningAdjustRate());
+ saveAlarmMessage("海力变3#主变合环", result.get("periods_hl_three_hh"), "HL3HH", scheduleTime, result.get("adviceValues_hl_three_hh"), scheme.getWarningAdjustRate());
+
+
+
logger.info(params + "调度方案执行完成");
} catch (Exception ex) {
logger.error("RunScheduleAirRatioTask运行异常");
--
Gitblit v1.9.3