From 17b583422095aff6bb91bd8ddff5faeb41c8edb2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 02 十二月 2023 09:06:24 +0800
Subject: [PATCH] 更新电气管理通讯逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index fc93c23..6a5dfaa 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -73,30 +73,31 @@
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
-      this.readValue();
-      String PlcAddress = this.name;
-      Integer Plccount = this.count;
+//      this.readValue();
+//      String PlcAddress = this.name;
+//      Integer Plccount = this.count;
 
       // System.out.println(stt);
-      // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
-      // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
-      Short[] values1 = { 1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
-      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+      List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 60);
+     List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
+//      Short[] values1 = { 1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 ,1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
+//      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
 
-      Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-      List<Short> state = new ArrayList<>(Arrays.asList(values2));
+//      Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+//      List<Short> state = new ArrayList<>(Arrays.asList(values2));
 
-      Boolean[] values = { false, true, true, true, true, true, true, true, true,
-          true, true, true, true, true, true, true, true, true, true, true, true, true, true,
-          true, false, true };
-      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+      // Boolean[] values = { false, true, true, true, true, true, true, true, true,
+      // true, true, true, true, true, true, true, true, true, true, true, true, true,
+      // true,
+      // true, false, true };
+      // List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
 
-      short[] sholist = new short[paramlist.size()];
+      // short[] sholist = new short[paramlist.size()];
 
-      for (int i = 0; i < paramlist.size(); i++) {
-        boolean value = paramlist.get(i);
-        sholist[i] = value ? (short) 1 : (short) 0;
-      }
+      // for (int i = 0; i < paramlist.size(); i++) {
+      // boolean value = paramlist.get(i);
+      // sholist[i] = value ? (short) 1 : (short) 0;
+      // }
 
       JSONObject jsonObject = new JSONObject();
       // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -104,7 +105,7 @@
 
       jsonObject.append("params", arraylist);
       jsonObject.append("state", state);
-      jsonObject.append("action", sholist);
+      // jsonObject.append("action", sholist);
       WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
       if (sendwServer != null) {
         sendwServer.sendMessage(jsonObject.toString());
@@ -136,7 +137,7 @@
           }
 
           // 灏嗘秷鎭�煎啓鍏� PLC
-//          S7control.getinstance().WriteWord(addressList, messageValues);
+       S7control.getinstance().WriteWord(addressList, messageValues);
           System.out.println("messageValues锛�" + messageValues);
           System.out.println("addressList锛�" + addressList);
           // 娓呯┖娑堟伅鍒楄〃

--
Gitblit v1.8.0