From 5bd9fb1f893191d02774a5ff36bbbcb58c0b75fd Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Sat, 10 Aug 2024 14:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AEPLC=20bahch=5Fno=20=E5=92=8Ct?=
 =?UTF-8?q?xt=E5=88=87=E5=89=B2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GetInformationForExcelServiceImpl.java  | 16 ++++++++++++----
 .../impl/ModbusCommunicateServiceImpl.java       |  9 +++++++--
 2 files changed, 19 insertions(+), 6 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 6556cbe8..3f259aa8 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
@@ -463,7 +463,12 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                 }
                 for (String s : list) {
                     EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
-                    String[] data = s.split(equipmentFolderLocation.getCuttingSymbol());
+                    if (StringUtils.isNotEmpty(equipmentFolderLocation.getCuttingSymbol())){
+                        String[] data = s.split(equipmentFolderLocation.getCuttingSymbol());
+                        insertByEntity(equipmentDataDetail, new HashMap<>(), data);
+                    }else {
+                        equipmentDataDetail.setValue0(s);
+                    }
                     equipmentDataDetail.setEquipmentNo(equipmentFolderLocation.getEquipmentNo());
                     equipmentDataDetail.setBuNo(equipmentFolderLocation.getBuNo());
                     equipmentDataDetail.setSite(equipmentFolderLocation.getSite());
@@ -471,7 +476,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setItemNo(equipmentFolderLocation.getItemNo());
                     equipmentDataDetail.setFileNo(equipmentFolderLocation.getFileNo());
                     equipmentDataDetail.setCreateDate(new Date());
-                    insertByEntity(equipmentDataDetail, new HashMap<>(), data);
                     equipmentDataDetail.setNum(index);
                     detailList.add(equipmentDataDetail);
                     index++;
@@ -522,8 +526,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     }
                     //对数据进行切割封装
                     for (String info : list) {
-                        String[] data = info.split(equipmentFolderLocation.getCuttingSymbol());
                         EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
+                        if (StringUtils.isNotEmpty(equipmentFolderLocation.getCuttingSymbol())){
+                            String[] data = info.split(equipmentFolderLocation.getCuttingSymbol());
+                            insertByEntity(equipmentDataDetail, new HashMap<>(), data);
+                        }else {
+                            equipmentDataDetail.setValue0(info);
+                        }
                         equipmentDataDetail.setEquipmentNo(equipmentFolderLocation.getEquipmentNo());
                         equipmentDataDetail.setBuNo(equipmentFolderLocation.getBuNo());
                         equipmentDataDetail.setSite(equipmentFolderLocation.getSite());
@@ -531,7 +540,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                         equipmentDataDetail.setItemNo(equipmentFolderLocation.getItemNo());
                         equipmentDataDetail.setFileNo(equipmentFolderLocation.getFileNo());
                         equipmentDataDetail.setCreateDate(new Date());
-                        insertByEntity(equipmentDataDetail, new HashMap<>(), data);
                         equipmentDataDetail.setGroupValue(group);
                         if (groupValue == firstReadLines) {
                             group++;
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 d0d9d54e..23a2841e 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
@@ -131,6 +131,7 @@ public class ModbusCommunicateServiceImpl implements ModbusCommunicateService {
                 equipmentDataDetail.setSite(folderLocation.getSite());
                 equipmentDataDetail.setEquipmentNo(folderLocation.getEquipmentNo());
                 equipmentDataDetail.setBuNo(folderLocation.getBuNo());
+                equipmentDataDetail.setBatchNo(1);
                 equipmentDataDetail.setNum(num);
                 detailList.add(equipmentDataDetail);
                 num++;
@@ -351,12 +352,16 @@ public class ModbusCommunicateServiceImpl implements ModbusCommunicateService {
                     short value = register.toShort();
                     int hexValue = value & 0xFFFF;
                     log.info("获取的值是: {},value: {}", hexValue, value);
-                    hex.add(hexValue);
+                    if (hexValue!=0){
+                        hex.add(hexValue);
+                    }
                 }
                 for (int i = 0; i < hex.size(); i += 2) {
                     int hexI = (hex.get(i) << 16) | (hex.get(i + 1) & 0xFFFF);
                     float floatValue = Float.intBitsToFloat(hexI);
-                    floats.add(floatValue);
+                    if (floatValue!=0){
+                        floats.add(floatValue);
+                    }
                     log.info("最终值是: {}", floatValue);
                 }
             } else {