From b134ac3690e6d31d40ee6def5c65fb778050a556 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 11 九月 2023 17:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index 8f92c3b..3edf6e7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -31,7 +31,7 @@
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
}
-
+ // 灏嗚鍙栧埌鐨刾lclist杞负鏁扮粍
Short[] shuzu1 = plclist.toArray(new Short[0]);
// Short[] shuzu1 = {
// 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
@@ -83,10 +83,14 @@
};
alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
for (short i = 0; i < shuzu1.length; i++) {
+ // 鏌ヨ缁撴潫鏃堕棿涓簄ull鐨勪釜鏁�
short result = alarmMapper.selectnullti(shuzu[i]);
+ // 璇诲彇PLC瀵瑰簲鍦板潃鐨勫�间负1骞朵笖璇ュ湴鍧�娌℃湁缁撴潫鏃堕棿涓簄ull鐨勬暟鎹紝娣诲姞涓�鏉℃柊鐨勬姤璀︿俊鎭�
if (shuzu1[i] == 1 && result == 0) {
- // alarmMapper.Insertalarm(shuzu[i]);
- } else if (shuzu1[i] == 0 && result > 0) {
+ alarmMapper.Insertalarm(shuzu[i]);
+ }
+ // 璇诲彇PLC瀵瑰簲鍦板潃鐨勫�间负0骞朵笖璇ュ湴鍧�鏈夌粨鏉熸椂闂翠负null鐨勬暟鎹紝淇敼璇ユ潯鏁版嵁鐨勭粨鏉熸椂闂�
+ else if (shuzu1[i] == 0 && result > 0) {
alarmMapper.updatealarm(shuzu[i]);
}
}
--
Gitblit v1.8.0