From b51dc14de69c88b144462be9bbac2c1304241951 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Fri, 21 Jun 2024 14:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9txt=E6=96=87=E4=BB=B6=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96,=E8=AF=BB=E5=8F=96modbus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GetInformationForExcelServiceImpl.java        |  1 -
 .../service/impl/ModbusCommunicateServiceImpl.java     | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
index 223792d5..621aff91 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
@@ -506,6 +506,5 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             }
         }
     }
-
 }
 
diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
index 9b07e012..582dd35e 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
@@ -10,12 +10,14 @@ import com.ghgande.j2mod.modbus.procimg.InputRegister;
 import com.xujie.sys.modules.reader.dao.ModbusCommunicateMapper;
 import com.xujie.sys.modules.reader.entity.ModbusCommunicateEntity;
 import com.xujie.sys.modules.reader.service.ModbusCommunicateService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.net.InetAddress;
 
 @Service
+@Slf4j
 public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateMapper,ModbusCommunicateEntity> implements ModbusCommunicateService {
 
     @Autowired
@@ -29,6 +31,7 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateM
         int modbusPort = one.getModbusPort();
         int registerAddress = one.getRegisterAddress();
         int registerNum = one.getRegisterNum();
+        int unitId = one.getUnitId();
         try {
             InetAddress ipAddress = InetAddress.getByName(modbusIp);
             // 连接到Modbus设备
@@ -39,7 +42,7 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateM
             // 创建一个Modbus TCP请求
             //ReadInputRegistersRequest(寄存器起始地址值,寄存器个数)
             ReadInputRegistersRequest request = new ReadInputRegistersRequest(registerAddress, registerNum);
-            request.setUnitID(1); // 设置Modbus设备的Unit ID
+            request.setUnitID(unitId); // 设置Modbus设备的Unit ID
 
             // 创建一个Modbus TCP事务
             ModbusTCPTransaction transaction = new ModbusTCPTransaction(connection);
@@ -55,9 +58,9 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateM
                 InputRegister[] registers1 = response.getRegisters();
                 for (InputRegister inputRegister : registers1) {
                     int value = inputRegister.getValue();
+                    log.info("获取到的modbus数据为: ",value);
                     System.out.println("Register value: " + value);
                 }
-
             } else {
                 System.out.println("No response received.");
             }
@@ -66,6 +69,5 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateM
         } catch (Exception e) {
             e.printStackTrace();
         }
-
     }
-}
+}
\ No newline at end of file