From a446066c5f3cedc33e035b2bbc9ad36b5aa18512 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 14 十二月 2023 08:25:11 +0800
Subject: [PATCH] 调整提示框字体大小

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java |   81 ++++++++++++++++++++++------------------
 1 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
index 4af6e13..6c3299a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -80,7 +80,7 @@
 
             // System.out.println(stt);
             //瀛樼墖鏍�  鍑虹墖鏍艰鍙�
-  List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
+  List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 33);
 //            System.out.println(arraylist);
 //            Short[] 瀛樼墖 = { 1 };
 //            List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
@@ -98,51 +98,58 @@
             jsonObject.append("params", arraylist);
 
 
-            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
+//            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
+//            if (sendwServer != null) {
+//                sendwServer.sendMessage(jsonObject.toString());
+//            }
+
+//            WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
+            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Positioning1");
             if (sendwServer != null) {
-                sendwServer.sendMessage(jsonObject.toString());
-            }
+                for (WebSocketServer webserver : sendwServer) {
+                    webserver.sendMessage(jsonObject.toString());
 
-            WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
-            if (webSocketServer != null) {
-                List<String> messages = webSocketServer.getMessages();
-                //瀛樼墖鏍�  鍑虹墖鏍煎湴鍧�
-                String addressList3 = "DB100.42";
+                    if (webserver != null) {
+                        List<String> messages = webserver.getMessages();
+                        //瀛樼墖鏍�  鍑虹墖鏍煎湴鍧�
+                        String addressList3 = "DB100.42";
 
-                if (!messages.isEmpty()) {
-                    // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-                    String lastMessage = messages.get(messages.size() - 1);
+                        if (!messages.isEmpty()) {
+                            // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+                            String lastMessage = messages.get(messages.size() - 1);
 //        System.out.println("lastMessage锛�" + lastMessage);
-                    JSONArray messageArray = new JSONArray(lastMessage);
+                            JSONArray messageArray = new JSONArray(lastMessage);
 
-                    // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
-                    List<Short> mergedList = new ArrayList<>();
-                    for (int i = 0; i < 5; i++) {
-                        JSONArray sublist = messageArray.getJSONArray(i);
-                        for (int j = 0; j < sublist.size(); j++) {
-                            Object value = sublist.get(j);
-                            if (value != null && !value.toString().equals("null")) {
-                                try {
-                                    String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-                                    short sValue = Short.parseShort(cleanedValue.trim());
-                                    mergedList.add(sValue);
-                                } catch (NumberFormatException e) {
-                                    // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-                                    System.err.println("Could not parse value: " + value);
+                            // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+                            List<Short> mergedList = new ArrayList<>();
+                            for (int i = 0; i < 7; i++) {
+                                JSONArray sublist = messageArray.getJSONArray(i);
+                                for (int j = 0; j < sublist.size(); j++) {
+                                    Object value = sublist.get(j);
+                                    if (value != null && !value.toString().equals("null")) {
+                                        try {
+                                            String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+                                            short sValue = Short.parseShort(cleanedValue.trim());
+                                            mergedList.add(sValue);
+                                        } catch (NumberFormatException e) {
+                                            // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+                                            System.err.println("Could not parse value: " + value);
+                                        }
+                                    }
                                 }
                             }
+
+
+                            // 鍐欏叆瀛樼墖鏍�  鍑虹墖鏍间綅缃瀹氭暟鎹�
+                            if (!mergedList.isEmpty()) {
+                                S7control.getinstance().WriteWord(addressList3, mergedList);
+                                System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+                            }
+
+                            // 娓呯┖娑堟伅鍒楄〃
+                            webserver.clearMessages();
                         }
                     }
-
-
-                    // 鍐欏叆瀛樼墖鏍�  鍑虹墖鏍间綅缃瀹氭暟鎹�
-                    if (!mergedList.isEmpty()) {
-          S7control.getinstance().WriteWord(addressList3, mergedList);
-                        System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
-                    }
-
-                    // 娓呯┖娑堟伅鍒楄〃
-                    webSocketServer.clearMessages();
                 }
 
 

--
Gitblit v1.8.0