From db0b4745458fd22b6552912b0572a89b2af09564 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 07 九月 2023 17:12:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index c6e197c..faa9362 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -3,7 +3,9 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+
public class Plcaction extends Thread {
private static final long SEND_INTERVAL = 2000; // 鍙戦�佹秷鎭殑鏃堕棿闂撮殧
@@ -73,6 +75,29 @@
e.printStackTrace();
}
}
+<<<<<<< HEAD
+ }
+
+
+ private void sendMessages() {
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("action");
+ if (sendwServer != null) {
+
+ List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);
+ List<Boolean> paramlist2 = new ArrayList<>(Arrays.asList(true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false));
+
+
+ List<Integer> binaryList = new ArrayList<>();
+
+ for (Boolean value : paramlist2) {
+ int binaryValue = value ? 1 : 0;
+ binaryList.add(binaryValue);
+ }
+ // new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("params", binaryList);
+=======
+>>>>>>> 36acd690614dd276428530a59f448c543bac52d4
// 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
List<Boolean> messageBooleans = new ArrayList<>();
--
Gitblit v1.8.0