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 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 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