From cfd227d1ef747d0eee85f0253dfcce2e495a3bae Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 13 Aug 2025 17:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DustNoiseDataServiceImpl.java        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
index b4c6543d6..1d4ea0357 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
@@ -264,16 +264,17 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
      */
     private void rzckStartHj212() throws InterruptedException {
         RSServer rsServer = RSServer.Initiate(rengzhicekongHj212Port);// 初始化
+        String rzck = "仁智测控";
         rsServer.addDataListener(new IDataListener() {// 添加监听
             @Override
             public void receiveTimmingAck(TimmingAck data) {// 校时指令应答处理
-                log.info("校时应答->设备编号:" + data.getDeviceId()
+                log.info(rzck + "校时应答->设备编号:" + data.getDeviceId()
                         + "\t执行结果：" + data.getStatus());
             }
 
             @Override
             public void receiveTelecontrolAck(TelecontrolAck data) {// 遥控指令应答处理
-                log.info("遥控应答->设备编号:" + data.getDeviceId()
+                log.info(rzck + "遥控应答->设备编号:" + data.getDeviceId()
                         + "\t继电器编号:" + data.getRelayId() + "\t执行结果:"
                         + data.getStatus());
             }
@@ -285,7 +286,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
                     SimpleDateFormat sdf = new SimpleDateFormat(
                             "yy-MM-dd HH:mm:ss");
                     String str = sdf.format(nd.getRecordTime());
-                    log.info("存储数据->设备地址:" + data.getDeviceId()
+                    log.info(rzck + "存储数据->设备地址:" + data.getDeviceId()
                             + "\t节点:" + nd.getNodeId() + "\t温度:" + nd.getTem()
                             + "\t湿度:" + nd.getHum() + "\t存储时间:" + str);
                 }
@@ -307,7 +308,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
                             + "\t纬度:" + data.getLat() + "\t坐标类型:"
                             + data.getCoordinateType() + "\t继电器状态:"
                             + data.getRelayStatus();
-                    log.info(printData);
+                    log.info(rzck + printData);
                     /*
                     {
                       "deviceId": "",
@@ -402,7 +403,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
 
             @Override
             public void receiveLoginData(LoginData data) {// 登录数据接收处理
-                log.info("登录->设备地址:" + data.getDeviceId());
+                log.info(rzck + "登录->设备地址:" + data.getDeviceId());
 
             }
 
@@ -415,7 +416,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
                 {
                     str += paramId + ",";
                 }
-                log.info(str);
+                log.info(rzck + str);
 
             }
 
@@ -433,7 +434,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
                             .getValue() : pararm.getValueDescription()
                             .get(pararm.getValue())) + "\r\n";
                 }
-                log.info(str);
+                log.info(rzck + str);
 
             }
 
@@ -442,7 +443,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
                 String str = "下载设备参数->设备编号：" + data.getDeviceId() + "\t参数数量："
                         + data.getCount() + "\t"
                         + (data.isSuccess() ? "下载成功" : "下载失败");
-                log.info(str);
+                log.info(rzck + str);
 
             }
 
@@ -450,13 +451,13 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
             public void receiveTransDataAck(TransDataAck data) {
                 String str = "数据透传->设备编号：" + data.getDeviceId() + "\t响应结果："
                         + data.getData() + "\r\n字节数：" + data.getTransDataLen();
-                log.info(str);
+                log.info(rzck + str);
 
             }
 
             @Override
             public void receiveHeartbeatData(HeartbeatData heartbeatData) {
-
+                log.info(rzck + "receiveHeartbeatData");
             }
         });
         rsServer.start();