From 74a84c4c625efe3c0c728266ff6d3df32f108cf6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 15 九月 2023 16:30:53 +0800
Subject: [PATCH] 增加进片请求字段的拼接，出片任务判定逻辑更改。
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 b641602..cd0375b 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
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Arrays;
public class Plcsign extends Thread {
@Override
@@ -15,20 +16,31 @@
e.printStackTrace();
}
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.DBX0.0", 58);
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 58);
+ // 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,
+ // 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, };
+ // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+ if (plclist != null) {
+ // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
+ List<Integer> Intlist = new ArrayList<>();
+ for (Boolean value : plclist) {
+ Intlist.add(value == true ? 0 : 1);
- JSONObject jsonObject = new JSONObject();
- // jsonObject3.append("sig",
- // new short[] { 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
- // 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
- // 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
- // });
- jsonObject.append("sig", plclist);
- WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
- if (sendwServer3 != null) {
- sendwServer3.sendMessage(jsonObject.toString());
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sig", Intlist);
+ WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
+ if (sendwServer3 != null) {
+ sendwServer3.sendMessage(jsonObject.toString());
+ }
+
}
-
}
}
}
--
Gitblit v1.8.0