From bf3d6101a58cdec0e81f369d94b8191648813c41 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 10 四月 2024 09:08:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 8329678..e1120ea 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -14,6 +14,9 @@
import java.util.Arrays;
public class Plcsign extends Thread {
+
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
String name = "";
Integer count = 0;
@@ -71,8 +74,11 @@
// System.out.println(PlcAddress);
// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 112);
-
+ // List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 112);
+ List<String> addressList21 = Arrays.asList(config.getProperty("PlcIO.State").split(","));
+ List<Boolean> plclist = S7control.getinstance().readBits(addressList21);
+ List<String> addressListName = Arrays.asList(config.getProperty("PlcIO.Name").split(","));
+
// Boolean[] values = { true, true, true, true, true, false, true, false,
// true, false, true, false, true, false,
// true, false, true, false, true, false, true, false, true, false, true, false,
@@ -95,6 +101,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.append("sig", Intlist);
+ jsonObject.append("addressListName", addressListName);
// WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
// if (sendwServer3 != null) {
// sendwServer3.sendMessage(jsonObject.toString());
--
Gitblit v1.8.0