From 8dfb37b10ffb2fcb41c85b3fa266d1ef2874aebc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 30 十一月 2023 08:53:27 +0800
Subject: [PATCH] 修改电气管理PLC通讯逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index d0351de..49566c2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -39,7 +39,7 @@
       JSONObject jsonObject = new JSONObject(str);
 
       // 鑾峰彇json涓殑鍊�
-      JSONArray address = jsonObject.getJSONArray("ServoManualone");
+      JSONArray address = jsonObject.getJSONArray("ManualonePosition");
       for (int i = 0; i < address.size(); i++) {
         JSONObject ress = (JSONObject) address.get(i);
 
@@ -75,7 +75,7 @@
       addresses.add("DB100.20");
       addresses.add("DB103.52");
       List<Short> arraylist = S7control.getinstance().readWords(addresses);
-      // System.out.println(arraylist);
+//       System.out.println(arraylist);
 
       List<String> addresses2 = new ArrayList<>();
       addresses2.add("DB100.110");
@@ -100,13 +100,19 @@
       List<Short> arraylist7 = S7control.getinstance().ReadWord("DB103.48", 1);
       List<Short> arraylist8 = S7control.getinstance().ReadWord("DB103.50", 1);
       List<String> addresses9 = new ArrayList<>();
-      addresses9.add("DB104.24");
-      addresses9.add("DB104.26");
-      addresses9.add("DB104.20");
-      addresses9.add("DB104.22");
-      addresses9.add("DB104.28");
-      addresses9.add("DB104.30");
-      List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
+      addresses9.add("DB104.1.2");
+      addresses9.add("DB104.1.3");
+      addresses9.add("DB104.1.6");
+      addresses9.add("DB104.1.7");
+//      addresses9.add("DB104.28");
+//      addresses9.add("DB104.30");
+      List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
+      short[] params2 = new short[arraylist9.size()];
+      for (int i = 0; i < arraylist9.size(); i++) {
+        boolean value = arraylist9.get(i);
+        params2[i] = value ? (short) 1 : (short) 0;
+      }
+//      List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
       arraylist5.addAll(arraylist6);
       arraylist5.addAll(arraylist7);
       arraylist5.addAll(arraylist8);
@@ -118,7 +124,7 @@
       jsonObject.append("zuhe3", arraylist3);
       jsonObject.append("zuhe4", arraylist4);
       jsonObject.append("shishi1", arraylist5);
-      jsonObject.append("guzhang", arraylist9);
+      jsonObject.append("guzhang", params2);
       // jsonObject.append("weihuiling", arraylist8);
 
       WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");

--
Gitblit v1.8.0