From e72f4bde2d285e0f7fdcd4d21c97233998e1ff77 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 17:08:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/ScaleThread.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 95a298b..e630268 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -80,7 +80,7 @@
OutputQueue.SCALE.offer(jsonObject);
}
} catch (Exception e){
- log.error("绉伴噸妯″潡寮傚父"+e.getMessage());
+ log.error("绉伴噸妯″潡寮傚父"+e .getMessage());
}
// BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
// BasDevp basDevp = basDevpService.selectById(slave.getStaNo());
@@ -122,13 +122,23 @@
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());
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.deleteDeviceError("devp", slave.getId());
+ } catch (Exception e){
+ log.error("e:"+e.getMessage());
+ }
} 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(), "纾呯Г杩炴帴澶辫触");
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.deleteDeviceError("devp", slave.getId());
+ } catch (Exception e1){
+ log.error("e:"+e1.getMessage());
+ }
return false;
}
return true;
--
Gitblit v1.9.1