From 45d7fbba5d02e1f65cab0c328d5deafa3094b2cb Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 五月 2025 11:14:08 +0800
Subject: [PATCH] #

---
 src/main/resources/application-prod.yml           |   11 +++++++++--
 src/main/java/com/zy/core/thread/ScaleThread.java |   14 ++++++++------
 src/main/java/com/zy/core/ServerBootstrap.java    |   22 +++++++++++-----------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 2f2a2f4..415e931 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -68,10 +68,10 @@
 //        for (Slave led : slaveProperties.getLed()) {
 //            MessageQueue.init(SlaveType.Led, led);
 //        }
-//        // 鍒濆鍖栫绉癿q
-//        for (Slave scale : slaveProperties.getScale()) {
-//            MessageQueue.init(SlaveType.Scale, scale);
-//        }
+        // 鍒濆鍖栫绉癿q
+        for (Slave scale : slaveProperties.getScale()) {
+            MessageQueue.init(SlaveType.Scale, scale);
+        }
 //        // 鍒濆鍖栧彴杞q
 //        for (Slave car : slaveProperties.getCar()) {
 //            MessageQueue.init(SlaveType.Car, car);
@@ -114,13 +114,13 @@
 //            new Thread(ledThread).start();
 //            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
 //        }
-//        // 鍒濆鍖栫绉ょ嚎绋�
-//        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-//        for (Slave scale : slaveProperties.getScale()) {
-//            ScaleThread scaleThread = new ScaleThread(scale);
-//            new Thread(scaleThread).start();
-//            SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
-//        }
+        // 鍒濆鍖栫绉ょ嚎绋�
+        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+        for (Slave scale : slaveProperties.getScale()) {
+            ScaleThread scaleThread = new ScaleThread(scale);
+            new Thread(scaleThread).start();
+            SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
+        }
     }
 
 
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 2b7e65d..ed52d03 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -53,9 +53,11 @@
                 byte[] read = read(8, 100);
                 if (null != read) {
                     String s = new String(read);
-                    if (!Cools.isEmpty(s) && s.startsWith("=")) {
-                        scale = Double.parseDouble(s.substring(1));
+                    if (!Cools.isEmpty(s) && s.startsWith("\u0002+")) {
+//                    if (!Cools.isEmpty(s) && s.startsWith("=")) {
+                        scale = Double.parseDouble(s.substring(1))/100;
 
+                        System.out.println("scale:"+scale+"ip:"+slave.getIp());
 //                        String substring = s.substring(1);
 //                        String s1 = new StringBuilder(substring).reverse().toString();//閫嗗簭
 //                        scale = Double.parseDouble(s1);
@@ -120,13 +122,13 @@
             dataOutputStream = new DataOutputStream(socket.getOutputStream());
             dataInputStream = new DataInputStream(socket.getInputStream());
 //            log.info("鏉$爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-            deviceErrorService.deleteDeviceError("scale", slave.getId());
+//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+//            deviceErrorService.deleteDeviceError("scale", slave.getId());
         } catch (Exception e) {
             socket = null;
             log.error("纾呯Г杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-            deviceErrorService.addDeviceError("scale", slave.getId(), "纾呯Г杩炴帴澶辫触");
+//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+//            deviceErrorService.addDeviceError("scale", slave.getId(), "纾呯Г杩炴帴澶辫触");
             return false;
         }
         return true;
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index de8c456..1ceeb1e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -243,9 +243,16 @@
     # 纾呯Г
   scale[0]:
     id: 1
-    ip: 10.10.10.207
+    ip: 10.10.10.202
     port: 5005
-    staNo: 281
+    staNo: 1004
+    devpPlcId: 1
+    # 纾呯Г
+  scale[1]:
+    id: 2
+    ip: 10.10.10.203
+    port: 5005
+    staNo: 1022
     devpPlcId: 1
   crn[0]: #鍫嗗灈鏈�1
     ip: 10.10.10.10

--
Gitblit v1.9.1