wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

校验改动

java8
wenkuan.shi 2 years ago
parent
b2f839b838
commit
273b62d4e8
2 changed files with 19 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
  2. 4
      src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java

33
src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
View File

@ -378,7 +378,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue0("不合格"); equipmentDataDetail.setValue0("不合格");
} }
} }
@ -398,7 +398,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue1("不合格"); equipmentDataDetail.setValue1("不合格");
} }
} }
@ -419,7 +419,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue2("不合格"); equipmentDataDetail.setValue2("不合格");
} }
} }
@ -439,7 +439,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue3("不合格"); equipmentDataDetail.setValue3("不合格");
} }
} }
@ -460,7 +460,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue4("不合格"); equipmentDataDetail.setValue4("不合格");
} }
} }
@ -480,7 +480,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue5("不合格"); equipmentDataDetail.setValue5("不合格");
} }
} }
@ -500,7 +500,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue6("不合格"); equipmentDataDetail.setValue6("不合格");
} }
} }
@ -521,7 +521,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue7("不合格"); equipmentDataDetail.setValue7("不合格");
} }
} }
@ -542,7 +542,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue8("不合格"); equipmentDataDetail.setValue8("不合格");
} }
} }
@ -563,7 +563,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue9("不合格"); equipmentDataDetail.setValue9("不合格");
} }
} }
@ -585,7 +585,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//对excel(csv)文件进行操作 //对excel(csv)文件进行操作
public List<EquipmentDataDetail> saveExcel(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) { public List<EquipmentDataDetail> saveExcel(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
List<EquipmentDataDetail> equipmentDataDetails = new ArrayList<>(); List<EquipmentDataDetail> equipmentDataDetails = new ArrayList<>();
List<EquipmentDataDetail> equipmentDataDetails1 = new ArrayList<>();
//查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@ -651,7 +650,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue0("不合格"); equipmentDataDetail.setValue0("不合格");
} }
} }
@ -668,7 +667,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue1("不合格"); equipmentDataDetail.setValue1("不合格");
} }
} }
@ -753,7 +752,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue0("不合格"); equipmentDataDetail.setValue0("不合格");
} }
} }
@ -770,7 +769,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue1("不合格"); equipmentDataDetail.setValue1("不合格");
} }
} }
@ -788,7 +787,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue2("不合格"); equipmentDataDetail.setValue2("不合格");
} }
} }
@ -805,7 +804,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//获取表的最大值和最小值 //获取表的最大值和最小值
double max = Double.parseDouble(one.getMaxValue()); double max = Double.parseDouble(one.getMaxValue());
double min = Double.parseDouble(one.getMinValue()); double min = Double.parseDouble(one.getMinValue());
if (max < value || value < min) {
if (max <= value || value <= min) {
equipmentDataDetail.setValue3("不合格"); equipmentDataDetail.setValue3("不合格");
} }
} }

4
src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
View File

@ -37,7 +37,8 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateM
int registerAddress = one.getRegisterAddress(); int registerAddress = one.getRegisterAddress();
int registerNum = one.getRegisterNum(); int registerNum = one.getRegisterNum();
int unitId = one.getUnitId(); int unitId = one.getUnitId();
log.info("获取modbus设备ip:"+modbusIp,"端口:"+modbusPort,"地址值"+registerAddress,"数量:"+unitId);
log.info("获取modbus设备ip-端口-地址值-数量:"+modbusIp+"-"+modbusPort+"-"+registerAddress+"-"+unitId);
try { try {
InetAddress ipAddress = InetAddress.getByName(modbusIp); InetAddress ipAddress = InetAddress.getByName(modbusIp);
// 连接到Modbus设备 // 连接到Modbus设备
@ -72,6 +73,7 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl<ModbusCommunicateM
// 关闭连接 // 关闭连接
connection.close(); connection.close();
} catch (Exception e) { } catch (Exception e) {
log.error("连接Modbus设备时出现异常: {}", e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
} }
Write Preview
Loading…
Cancel
Save