From 625d2b6dd9bd4a1c63bf7e1b2701393d908f7a81 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 五月 2024 08:31:12 +0800
Subject: [PATCH] 客户数据库变更，部分铝框没有对应玻璃信息，扫码添加出片队列时，当铝框没有对应玻璃时直接添加到出片队列
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index b01cc8a..8862fa0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -2,6 +2,8 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.io.FileUtils;
import java.io.*;
@@ -9,6 +11,7 @@
import java.util.Arrays;
import java.util.List;
+@Slf4j
public class PLCAutomaticParameterSetting extends Thread {
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
@@ -38,6 +41,8 @@
// 缈昏浆
List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
+
+ // System.out.println("messageValue锛�"+ arraylist );
// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
@@ -70,11 +75,12 @@
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
+
// WebSocketServer webSocketServer =
// WebSocketServer.sessionMap.get("AutomaticParameterSetting");
- if (webserver != null) {
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject.toString());
List<String> messages = webserver.getMessages();
String addressList1 = "DB100.120";
String addressList2 = "DB100.18";
@@ -151,12 +157,17 @@
S7control.getinstance().WriteWord(waddresses1, mergedList2);
System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
}
+ //鍘熺偣璁板繂
+
+
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
}
}
-
+ else{
+ log.info("AutomaticParameterSetting is closed");
+ }
}
}
--
Gitblit v1.8.0