From a8d31b3d7b6e0d60b8045ace9be49cdfb590696f Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期四, 09 十一月 2023 15:46:37 +0800
Subject: [PATCH] 拉取后对应翻译没了，部分代码报错，修改后提交
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 f45650a..ca035a8 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
@@ -15,12 +15,12 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
-
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.DBx0.0", 40);
+ // 鏍规嵁鍦板潃璇诲彇PCL鏁版嵁
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.0.0", 40);
// Boolean[] values = { true, false, true, false, true, false, true, false,
// true, false, true, false, true, false,
// true, false, true, false, true, false, true, false, true, false, true, false,
@@ -31,7 +31,6 @@
if (plclist != null) {
JSONObject jsonObject = new JSONObject();
-
jsonObject.append("params", plclist);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("alarm");
if (sendwServer != null) {
@@ -44,9 +43,11 @@
Intlist.add(value == true ? 1 : 0);
}
+
// 灏咺ntlist杞崲涓烘暟缁�
Integer[] shuzu1 = Intlist.toArray(new Integer[0]);
+ // 瀹氫箟鐨勬姤璀﹀唴瀹规暟缁�
String[] shuzu = {
"D01 VFD error",
"D02 VFD error",
@@ -91,10 +92,14 @@
};
alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
for (short i = 0; i < shuzu.length; i++) {
+ // 鏌ヨ瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁�
short result = alarmMapper.selectnullti(shuzu[i]);
+ // 璇诲彇鍒癙LC鐨勫�间负1骞朵笖瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁扮殑鏉℃暟涓�0
if (shuzu1[i] == 1 && result == 0) {
+ // 濉姞涓�鏉℃姤璀︿俊鎭�,鏈夊紑濮嬫椂闂�
alarmMapper.Insertalarm(shuzu[i]);
} else if (shuzu1[i] == 0 && result > 0) {
+ // 淇敼璇ユ潯鎶ヨ淇℃伅鐨勭粨鏉熸椂闂�
alarmMapper.updatealarm(shuzu[i]);
}
}
--
Gitblit v1.8.0