From 59b47441175f1ba367ef56fe4a4eca94c3c9d850 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 09:04:10 +0800
Subject: [PATCH] 测试合并
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 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..2e74215 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,14 @@
import java.util.Arrays;
public class Plcsign extends Thread {
+
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
+
+ public Plcsign() throws IOException {
+ config = new Configuration("config.properties");
+ }
+
String name = "";
Integer count = 0;
@@ -60,30 +68,16 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(1000);
+ Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
-
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
- // System.out.println(PlcAddress);
-
-// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 112);
-
-// 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,
-// true, false, true, false, true,
-// false, true, false, true, false,
-// true, false, true, false, true, false, true, false, null,
-// true, false,
-// true, false, true, false, true, false,
-// true, false, true, false, true, };
-// List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
-
+ 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(","));
+ // List<String> addressListName1 = Arrays.asList(config.getProperty("PlcIO.Name1").split(","));
+ // System.out.println("鎬ュ仠"+S7control.getinstance().ReadBits("DB10.0.5", 1));
+
if (plclist != null) {
// 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
List<Integer> Intlist = new ArrayList<>();
@@ -95,6 +89,8 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.append("sig", Intlist);
+ // jsonObject.append("addressListName", addressListName);
+ // jsonObject.append("addressListName1", addressListName1);
// WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
// if (sendwServer3 != null) {
// sendwServer3.sendMessage(jsonObject.toString());
--
Gitblit v1.8.0