From 79f33da4df32fc139c3855a8ecca6545723e0815 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 九月 2023 08:08:17 +0800
Subject: [PATCH] 删除不需要的代码,玻璃信息放入其他数据库 方便测试显示数据库连接的信息

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java |   90 +++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 60 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 7c9c446..f91920e 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,81 +4,51 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Arrays;
 
 public class Plcsign extends Thread {
   @Override
   public void run() {
     while (this != null) {
       try {
-        Thread.sleep(10000);
+        Thread.sleep(1000);
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
 
-      List<Short> paramlist = S7control.getinstance().ReadWord("DB100.DBW", 12);
+      List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
+      List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
 
-      // JSONObject jsonObject = new JSONObject();
-      // // jsonObject.append("params", paramlist);
-      // jsonObject.append("params", new short[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-      // 11, });
-      // WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
-      // if (sendwServer != null) {
-      // sendwServer.sendMessage(jsonObject.toString());
-      // }
+      // 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, };
+      // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
 
-      JSONObject jsonObject3 = 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, });
-      WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
-      if (sendwServer3 != null) {
-        sendwServer3.sendMessage(jsonObject3.toString());
-      }
+      // Boolean[] values2 = { true, false,
+      // true, false, true, false, true, false,
+      // true, false, true, false, true, };
+      // List<Boolean> plclist2 = new ArrayList<>(Arrays.asList(values2));
 
-      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Sign");
-      if (webSocketServer != null) {
-        List<String> messages = webSocketServer.getMessages();
+      // 灏唒lclist2鐨勫厓绱犳坊鍔犲埌plclist涓�
+      plclist.addAll(plclist2);
+      // System.out.println(plclist);
+      if (plclist != null) {
+        // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
+        List<Integer> Intlist = new ArrayList<>();
+        for (Boolean value : plclist) {
+          Intlist.add(value == true ? 0 : 1);
 
-        String addressList = "DB100.DBW0";
-        // addressList.add("DB100.DBW0");
-        // addressList.add("DB100.DBW2");
-        // addressList.add("DB100.DBW4");
-        // addressList.add("DB100.DBW6");
-        // addressList.add("DB100.DBW8");
-        // addressList.add("DB100.DBW10");
-        // addressList.add("DB100.DBW12");
-        // addressList.add("DB100.DBW14");
-        // addressList.add("DB100.DBW16");
-        // addressList.add("DB100.DBW18");
-        // addressList.add("DB100.DBW20");
-        // addressList.add("DB100.DBW22");
-
-        if (!messages.isEmpty()) {
-          // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-          String lastMessage = messages.get(messages.size() - 1);
-          System.out.println("messages锛�" + messages);
-          String[] parts = lastMessage.split(",");
-          List<Short> messageValues = new ArrayList<>();
-          for (String part : parts) {
-            try {
-              // 浣跨敤姝e垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
-              String cleanedPart = part.replaceAll("[^0-9-]", "");
-              short value = Short.parseShort(cleanedPart.trim());
-              messageValues.add(value);
-            } catch (NumberFormatException e) {
-              // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-
-              e.printStackTrace();
-            }
-          }
-
-          // 灏嗘秷鎭�煎啓鍏� PLC
-          // S7control.getinstance().WriteWord(addressList, messageValues);
-          System.out.println("messageValues锛�" + messageValues);
-          System.out.println("addressList锛�" + addressList);
-          // 娓呯┖娑堟伅鍒楄〃
-          webSocketServer.clearMessages();
         }
+        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