From 0b6ddf2bf0d6c70867611b730ac445a242a89931 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 08 九月 2023 08:13:12 +0800
Subject: [PATCH] 合并
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 22 ----------------------
1 files changed, 0 insertions(+), 22 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 faa9362..bcd2cf9 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
@@ -75,29 +75,7 @@
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