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

---
 src/main/java/com/zy/core/thread/ScaleThread.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

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;

--
Gitblit v1.9.1