From 09fe50d59e2f1e2261d376eb49ad6c40301f25b4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 10 五月 2024 16:08:59 +0800
Subject: [PATCH] 修改IP与数据库连接
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index 6247785..1047d50 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -2,13 +2,15 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.io.FileUtils;
import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
+@Slf4j
public class PlcManualonePosition extends Thread {
private Configuration config;
@@ -54,11 +56,7 @@
while (this != null) {
try {
Thread.sleep(500);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // this.readValue();
+ // this.readValue();
// String PlcAddress = this.name;
// Integer Plccount = this.count;
@@ -107,6 +105,20 @@
List<String> B01start = Arrays.asList(config.getProperty("mlp.B01start"));
List<String> B02start = Arrays.asList(config.getProperty("mlp.B02start"));
+
+ // 鏁呴殰鍦板潃
+ List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));
+
+
+ // 澶嶄綅鍦板潃
+ List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
+ List<Boolean> readreast = S7control.getinstance().readBits(waddresses6);
+ short[] reast6 = PLCBooleanConverter.convertListsToBinaryShortArray(readreast);
+
+ // 鍥為浂鍦板潃
+ List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
+ List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses7);
+ short[] huiling7 = PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);
List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
@@ -163,6 +175,8 @@
jsonObject.append("guzhang", params2);
jsonObject.append("weihuiling", params3);
jsonObject.append("qidong", combinedBinaryShortArray);
+ jsonObject.append("fuwei", reast6);
+ jsonObject.append("huiling", huiling7);
// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
// if (sendwServer != null) {
@@ -172,23 +186,14 @@
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
+
// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
- if (webserver != null) {
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject.toString());
List<String> messages = webserver.getMessages();
- // 鏁呴殰鍦板潃
- List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));
-
-
- // 澶嶄綅鍦板潃
- List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
-
-
- // 鍥為浂鍦板潃
- List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
@@ -236,9 +241,16 @@
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
+ }else{
+ log.info("ManualonePosition is closed");
}
}
}
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
}
}
}
--
Gitblit v1.8.0