From 3da3dda8fe9ab520cac2675fb1e1e63a725d44ef Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 23 六月 2025 17:01:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunMachineStateTask.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 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 5df9768..42adb10 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
@@ -29,6 +29,7 @@
put("F0000101185", Arrays.asList("F0000100098", "F0000100099", "F0000100100", "F0000100101"));
put("F0000101186", Arrays.asList("F0000100109", "F0000100110", "F0000100111", "F0000100112"));
put("F0000101187", Arrays.asList("M0000100009", "M0000100023", "M0000100026", "M0000100029"));
+ put("F0000101188", Arrays.asList("M0000100854", "M0000100855", "M0000100856", "M0000100857"));
put("F0000101189", Arrays.asList("M0000100010", "M0000100024", "M0000100027", "M0000100030"));
put("F0000101190", Arrays.asList("C0000101199", "C0000101200", "C0000101201", "C0000101202"));
put("F0000101191", Arrays.asList("M0000100854", "M0000100855", "M0000100856", "M0000100857"));
@@ -74,6 +75,10 @@
put("F0000101228", Arrays.asList("F0000101195", "F0000101206", "F0000101217", "C0000101220"));
}};
+ private static final HashMap<String, List<String>> qhPoints = new HashMap<String, List<String>>() {{
+ put("1", Arrays.asList("F0000100098", "F0000100099", "F0000100100", "F0000100101","F0000100105", "F0000100106", "F0000100107", "F0000100108","F0000100102", "F0000100103"));
+ }};
+
private boolean qhFlag1 = false;
private boolean qhFlag2 = false;
private boolean qhFlag135 = false;
@@ -86,6 +91,58 @@
try {
List<String> partPointNos = partPoints.values().stream().flatMap(List::stream).collect(Collectors.toList());
Map<String, Object> partPointsRealValue = dataPointApi.queryPointsRealValue(partPointNos);
+ logger.info("运行状态点值：{}", partPointsRealValue);
+ List<String> qhPointNos = qhPoints.values().stream().flatMap(List::stream).collect(Collectors.toList());
+ Map<String, Object> qhPointsRealValue = dataPointApi.queryPointsRealValue(qhPointNos);
+ for (Map.Entry<String, List<String>> entry : qhPoints.entrySet()) {
+ for (String pointNo : entry.getValue()) {
+ Double value = Double.valueOf(String.format("%.2f", Double.valueOf(qhPointsRealValue.get(pointNo).toString())));
+ if ("F0000100098".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100109", 0);
+ partPointsRealValue.replace("C0000101223", 0);
+ partPointsRealValue.replace("C0000101210", 0);
+ partPointsRealValue.replace("C0000101214", 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);
+ }else if ("F0000100100".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100111", 0);
+ partPointsRealValue.replace("C0000101225", 0);
+ partPointsRealValue.replace("C0000101212", 0);
+ partPointsRealValue.replace("C0000101216", 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);
+ }else if ("F0000100105".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100116", 0);
+ partPointsRealValue.replace("C0000101227", 0);
+ }else if ("F0000100106".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100117", 0);
+ partPointsRealValue.replace("C0000101228", 0);
+ }else if ("F0000100107".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100118", 0);
+ partPointsRealValue.replace("C0000101229", 0);
+ }else if ("F0000100108".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100119", 0);
+ partPointsRealValue.replace("C0000101230", 0);
+ }else if ("F0000100102".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100113", 0);
+ partPointsRealValue.replace("C0000101231", 0);
+ partPointsRealValue.replace("C0000101221", 0);
+ partPointsRealValue.replace("C0000101218", 0);
+ }else if ("F0000100103".equals(pointNo) && value == 0.00) {
+ partPointsRealValue.replace("F0000100114", 0);
+ partPointsRealValue.replace("C0000101232", 0);
+ partPointsRealValue.replace("C0000101222", 0);
+ partPointsRealValue.replace("C0000101219", 0);
+ }
+ }
+ }
+ logger.info("替换后的点位值：{}", partPointsRealValue);
for (Map.Entry<String, List<String>> entry : partPoints.entrySet()) {
ApiPointValueWriteDTO writeDTO = new ApiPointValueWriteDTO();
double dataValue = 0d;
@@ -203,6 +260,12 @@
dataPointApi.writePointRealValue(apiPointValueWriteDTO);
}
+ qhFlag1 = false;
+ qhFlag2 = false;
+ qhFlag135 = false;
+ qhFlag180 = false;
+ qhFlagTotal = false;
+
} catch (Exception ex) {
logger.error("RunMachineStateTask运行异常", ex);
}
--
Gitblit v1.9.3