From 7a44f04919481e3254653ef971ff3207ede13406 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Fri, 28 Jun 2024 17:54:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetInformationForExcelServiceImpl.java    | 34 ++++++++++---------
 .../impl/ModbusCommunicateServiceImpl.java    | 15 ++++----
 2 files changed, 27 insertions(+), 22 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 f133d082..db796286 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
@@ -332,34 +332,34 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setItemNo(excel.getItemNo());
                     equipmentDataDetail.setFileNo(excel.getFileNo());
                     equipmentDataDetail.setCreateDate(new Date());
-                    equipmentDataDetail.setValue0(data[0]);
+                    equipmentDataDetail.setValue0(data[0].trim());
 
                     if (data.length > 1) {
-                        equipmentDataDetail.setValue1(data[1]);
+                        equipmentDataDetail.setValue1(data[1].trim());
                     }
                     if (data.length > 2) {
-                        equipmentDataDetail.setValue2(data[2]);
+                        equipmentDataDetail.setValue2(data[2].trim());
                     }
                     if (data.length > 3) {
-                        equipmentDataDetail.setValue3(data[3]);
+                        equipmentDataDetail.setValue3(data[3].trim());
                     }
                     if (data.length > 4) {
-                        equipmentDataDetail.setValue4(data[4]);
+                        equipmentDataDetail.setValue4(data[4].trim());
                     }
                     if (data.length > 5) {
-                        equipmentDataDetail.setValue5(data[5]);
+                        equipmentDataDetail.setValue5(data[5].trim());
                     }
                     if (data.length > 6) {
-                        equipmentDataDetail.setValue6(data[6]);
+                        equipmentDataDetail.setValue6(data[6].trim());
                     }
                     if (data.length > 7) {
-                        equipmentDataDetail.setValue7(data[7]);
+                        equipmentDataDetail.setValue7(data[7].trim());
                     }
                     if (data.length > 8) {
-                        equipmentDataDetail.setValue8(data[8]);
+                        equipmentDataDetail.setValue8(data[8].trim());
                     }
                     if (data.length > 9) {
-                        equipmentDataDetail.setValue9(data[9]);
+                        equipmentDataDetail.setValue9(data[9].trim());
                     }
                     equipmentDataDetail.setGroupValue(group);
 
@@ -424,8 +424,8 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setItemNo(excel.getItemNo());
                     equipmentDataDetail.setFileNo(excel.getFileNo());
                     equipmentDataDetail.setCreateDate(new Date());
-                    equipmentDataDetail.setValue0(list.get(i).get(1));
-                    equipmentDataDetail.setValue1(list.get(i).get(3));
+                    equipmentDataDetail.setValue0(list.get(i).get(1).trim());
+                    equipmentDataDetail.setValue1(list.get(i).get(3).trim());
                     equipmentDataDetail.setNum(index);
                     equipmentDataDetails.add(equipmentDataDetail);
                     index++;
@@ -470,15 +470,17 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setItemNo(excel.getItemNo());
                     equipmentDataDetail.setFileNo(excel.getFileNo());
                     equipmentDataDetail.setCreateDate(new Date());
-                    equipmentDataDetail.setValue0(data[0]);
+
+                    equipmentDataDetail.setValue0(data[0].trim());
                     if (data.length > 1) {
-                        equipmentDataDetail.setValue1(data[1]);
+
+                        equipmentDataDetail.setValue1(data[1].trim());
                     }
                     if (data.length > 2) {
-                        equipmentDataDetail.setValue2(data[2]);
+                        equipmentDataDetail.setValue2(data[2].trim());
                     }
                     if (data.length > 3) {
-                        equipmentDataDetail.setValue3(data[3]);
+                        equipmentDataDetail.setValue3(data[3].trim());
                     }
                     equipmentDataDetail.setNum(index);
                     detailList.add(equipmentDataDetail);
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 6dd53ef2..209a3f19 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
@@ -6,7 +6,6 @@ import com.ghgande.j2mod.modbus.io.ModbusTCPTransaction;
 import com.ghgande.j2mod.modbus.msg.ReadInputRegistersRequest;
 import com.ghgande.j2mod.modbus.msg.ReadInputRegistersResponse;
 import com.ghgande.j2mod.modbus.net.TCPMasterConnection;
-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;
@@ -61,11 +60,15 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateM
             // 获取响应
             ReadInputRegistersResponse response = (ReadInputRegistersResponse) transaction.getResponse();
             if (response != null) {
-                // 处理响应数据
-                InputRegister[] registers1 = response.getRegisters();
-                for (InputRegister inputRegister : registers1) {
-                    int value = inputRegister.getValue();
-                    log.info("获取到的modbus数据为: {}",value);
+//                // 处理响应数据
+//                InputRegister[] registers1 = response.getRegisters();
+//                for (InputRegister inputRegister : registers1) {
+//                    int value = inputRegister.getValue();
+//                    log.info("获取到的modbus数据为: {}",value);
+//                }
+                byte[] message = response.getMessage();
+                for (byte b : message) {
+                    log.info("获取到的modbus数据为: {}", b);
                 }
             } else {
                 log.info("处理数据出现异常");