From 09654ddd1c18dca1ce9dd529967ab7a33103218b Mon Sep 17 00:00:00 2001 From: "wenkuan.shi" Date: Mon, 24 Jun 2024 21:32:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=94=E8=BE=83=E5=80=BC?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xujie/sys/common/utils/TaskUtils.java | 8 +- .../GetInformationForExcelServiceImpl.java | 724 +++++++++--------- 2 files changed, 380 insertions(+), 352 deletions(-) diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java index b6504da0..c81d1504 100644 --- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java +++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java @@ -37,8 +37,8 @@ public class TaskUtils { } //添加定時任務 - @Scheduled(cron = "${task.data.modbusCommunicate}" ) //每五秒执行 读取文件数据 - public void getModbus(){ - modbusCommunicateService.getInfoByModbus(); - } +// @Scheduled(cron = "${task.data.modbusCommunicate}" ) //每五秒执行 读取文件数据 +// public void getModbus(){ +// modbusCommunicateService.getInfoByModbus(); +// } } 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 f2497b73..0e8261c5 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 @@ -157,7 +157,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveTxt(List fileName, EquipmentFolderLocation excel, Integer batchNo) { List equipmentDataDetails = new ArrayList<>(); + List equipmentDataDetails1 = new ArrayList<>(); + + //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo()) + .eq(EquipmentFolderDetailEntity::getSite, excel.getSite()) + .eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo()); + List entityList = equipmentFolderDetailService.list(lambdaQueryWrapper); int index = 1; for (String s : fileName) { int startLine = 15; // 第一次读取开始的行数 @@ -309,12 +316,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo,excel.getBuNo()) - .eq(EquipmentFolderDetailEntity::getSite,excel.getSite()) - .eq(EquipmentFolderDetailEntity::getEquipmentNo,excel.getEquipmentNo()); - EquipmentFolderDetailEntity one = equipmentFolderDetailService.getOne(lambdaQueryWrapper); //对数据进行切割封装 for (String info : list) { @@ -327,246 +328,274 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl1){ - equipmentDataDetail.setValue1(data[1]); - } - if (data.length>2){ - equipmentDataDetail.setValue2(data[2]); - } - if (data.length>3){ - equipmentDataDetail.setValue3(data[3]); - } - if (data.length>4){ - equipmentDataDetail.setValue4(data[4]); - } - if (data.length>5){ - equipmentDataDetail.setValue5(data[5]); - } - if (data.length>6){ - equipmentDataDetail.setValue6(data[6]); - } - if (data.length>7){ - equipmentDataDetail.setValue7(data[7]); - } - if (data.length>8){ - equipmentDataDetail.setValue8(data[8]); - } - if (data.length>9){ - equipmentDataDetail.setValue9(data[9]); - } - }else { - if (StringUtils.equals(one.getCollectionSource(),"value0")){ - //获取表的值 - int value = Integer.parseInt(data[0]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[0]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[0]); - } - } - } + equipmentDataDetail.setValue0(data[0]); + if (data.length > 1) { + equipmentDataDetail.setValue1(data[1]); + } + if (data.length > 2) { + equipmentDataDetail.setValue2(data[2]); + } + if (data.length > 3) { + equipmentDataDetail.setValue3(data[3]); + } + if (data.length > 4) { + equipmentDataDetail.setValue4(data[4]); + } + if (data.length > 5) { + equipmentDataDetail.setValue5(data[5]); + } + if (data.length > 6) { + equipmentDataDetail.setValue6(data[6]); + } + if (data.length > 7) { + equipmentDataDetail.setValue7(data[7]); + } + if (data.length > 8) { + equipmentDataDetail.setValue8(data[8]); + } + if (data.length > 9) { + equipmentDataDetail.setValue9(data[9]); + } + equipmentDataDetail.setNum(index); + equipmentDataDetails.add(equipmentDataDetail); + index++; + } - if (StringUtils.equals(one.getCollectionSource(),"value1")){ - //获取表的值 - int value = Integer.parseInt(data[1]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[1]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[1]); + if (CollectionUtils.isNotEmpty(entityList)){ + for (EquipmentFolderDetailEntity one : entityList) { + for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) { + if (StringUtils.equals(one.getCollectionSource(), "value0")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue0())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue0()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue0(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue0(null); + } } } - } - - if (StringUtils.equals(one.getCollectionSource(),"value2")){ - //获取表的值 - int value = Integer.parseInt(data[2]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[2]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[2]); + if (StringUtils.equals(one.getCollectionSource(), "value1")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue1())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue1()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue1(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue1(null); + } } } - } - if (StringUtils.equals(one.getCollectionSource(),"value3")){ - //获取表的值 - int value = Integer.parseInt(data[3]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[3]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[3]); + if (StringUtils.equals(one.getCollectionSource(), "value2")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue2())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue2()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue2(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue2(null); + } } } - } - - if (StringUtils.equals(one.getCollectionSource(),"value4")){ - //获取表的值 - int value = Integer.parseInt(data[4]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[4]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[4]); + if (StringUtils.equals(one.getCollectionSource(), "value3")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue3())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue3()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue3(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue3(null); + } } } - } - if (StringUtils.equals(one.getCollectionSource(),"value5")){ - //获取表的值 - int value = Integer.parseInt(data[5]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[5]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[5]); + if (StringUtils.equals(one.getCollectionSource(), "value4")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue4())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue4()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue4(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue4(null); + } } } - } - - if (StringUtils.equals(one.getCollectionSource(),"value6")){ - //获取表的值 - int value = Integer.parseInt(data[6]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[6]); + if (StringUtils.equals(one.getCollectionSource(), "value5")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue5())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue5()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue5(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue5(null); + } } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[6]); + } + if (StringUtils.equals(one.getCollectionSource(), "value6")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue6())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue6()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue6(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue6(null); + } } } - } - if (StringUtils.equals(one.getCollectionSource(),"value7")){ - //获取表的值 - int value = Integer.parseInt(data[7]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[7]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[7]); + if (StringUtils.equals(one.getCollectionSource(), "value7")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue7())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue7()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue7(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue7(null); + } } } - } - if (StringUtils.equals(one.getCollectionSource(),"value8")){ - //获取表的值 - int value = Integer.parseInt(data[8]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[8]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[8]); + if (StringUtils.equals(one.getCollectionSource(), "value8")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue8())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue8()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue8(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue8(null); + } } } - } - if (StringUtils.equals(one.getCollectionSource(),"value9")){ - //获取表的值 - int value = Integer.parseInt(data[9]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[9]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[9]); + if (StringUtils.equals(one.getCollectionSource(), "value9")){ + if (StringUtils.isEmpty(equipmentDataDetail.getValue9())){ + continue; + } + double value = Double.parseDouble(equipmentDataDetail.getValue9()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue9(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue9(null); + } } } - } - + } } - - equipmentDataDetail.setNum(index); - equipmentDataDetails.add(equipmentDataDetail); - index++; } bufferedReader.close(); } catch (IOException e) { e.printStackTrace(); } } - return equipmentDataDetails; + + return equipmentDataDetails; + } //对excel(csv)文件进行操作 public List saveExcel(List fileName, EquipmentFolderLocation excel, Integer batchNo) { List equipmentDataDetails = new ArrayList<>(); + List equipmentDataDetails1 = new ArrayList<>(); + + //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo()) + .eq(EquipmentFolderDetailEntity::getSite, excel.getSite()) + .eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo()); + List entityList = equipmentFolderDetailService.list(lambdaQueryWrapper); //获取每个excel下的所有关于Test的两个值并保存 - int index=1; + int index = 1; for (String s : fileName) { File excelFile = new File(s); List> list = new ArrayList<>(); @@ -589,12 +618,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo,excel.getBuNo()) - .eq(EquipmentFolderDetailEntity::getSite,excel.getSite()) - .eq(EquipmentFolderDetailEntity::getEquipmentNo,excel.getEquipmentNo()); - EquipmentFolderDetailEntity one = equipmentFolderDetailService.getOne(lambdaQueryWrapper); + if (list.get(i).get(0).equals("TEST")) { EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); @@ -605,64 +629,71 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl= value && value>= min){ - equipmentDataDetail.setValue0(list.get(i).get(1)); + equipmentDataDetail.setNum(index); + equipmentDataDetails.add(equipmentDataDetail); + index++; + } + if (CollectionUtils.isNotEmpty(entityList)){ + for (EquipmentFolderDetailEntity one : entityList) { + for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) { + if (StringUtils.equals(one.getCollectionSource(), "value0")){ + + double value = Double.parseDouble(equipmentDataDetail.getValue0()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue0(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue0(null); + } } } - } - - if (StringUtils.equals(one.getCollectionSource(),"value1")){ - //获取表的值 - int value = Integer.parseInt(list.get(i).get(3)); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(list.get(i).get(3)); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(list.get(i).get(3)); + if (StringUtils.equals(one.getCollectionSource(), "value1")){ + double value = Double.parseDouble(equipmentDataDetail.getValue1()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue1(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue1(null); + } } } } - } - - equipmentDataDetail.setNum(index); - equipmentDataDetails.add(equipmentDataDetail); - index++; } } } - return equipmentDataDetails; + return equipmentDataDetails; } //对txt文件进行操作 public List saveTxtFile(List fileName, EquipmentFolderLocation excel, Integer batchNo) { - int index=1; + int index = 1; List detailList = new ArrayList<>(); + List equipmentDataDetails1 = new ArrayList<>(); + //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo()) + .eq(EquipmentFolderDetailEntity::getSite, excel.getSite()) + .eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo()); + List entityList = equipmentFolderDetailService.list(lambdaQueryWrapper); + for (String name : fileName) { try { @@ -679,12 +710,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo,excel.getBuNo()) - .eq(EquipmentFolderDetailEntity::getSite,excel.getSite()) - .eq(EquipmentFolderDetailEntity::getEquipmentNo,excel.getEquipmentNo()); - EquipmentFolderDetailEntity one = equipmentFolderDetailService.getOne(lambdaQueryWrapper); + for (String s : list) { EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); String[] data = s.split("\t"); @@ -695,110 +721,112 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl1){ - equipmentDataDetail.setValue1(data[1]); - } - if (data.length>2){ - equipmentDataDetail.setValue2(data[2]); - } - if (data.length>3){ - equipmentDataDetail.setValue3(data[3]); - } - }else { - if (StringUtils.equals(one.getCollectionSource(),"value0")){ - //获取表的值 - int value = Integer.parseInt(data[0]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[0]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[0]); + equipmentDataDetail.setValue0(data[0]); + if (data.length > 1) { + equipmentDataDetail.setValue1(data[1]); + } + if (data.length > 2) { + equipmentDataDetail.setValue2(data[2]); + } + if (data.length > 3) { + equipmentDataDetail.setValue3(data[3]); + } + + + equipmentDataDetail.setNum(index); + detailList.add(equipmentDataDetail); + index++; + } + + if (CollectionUtils.isNotEmpty(entityList)){ + for (EquipmentFolderDetailEntity one : entityList) { + for (EquipmentDataDetail equipmentDataDetail : detailList) { + if (StringUtils.equals(one.getCollectionSource(), "value0")){ + + double value = Double.parseDouble(equipmentDataDetail.getValue0()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue0(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue0(null); + } } } - } - if (StringUtils.equals(one.getCollectionSource(),"value1")){ - //获取表的值 - int value = Integer.parseInt(data[1]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[1]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[1]); + if (StringUtils.equals(one.getCollectionSource(), "value1")){ + double value = Double.parseDouble(equipmentDataDetail.getValue1()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue1(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue1(null); + } } } - } - if (StringUtils.equals(one.getCollectionSource(),"value2")){ - //获取表的值 - int value = Integer.parseInt(data[2]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[2]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[2]); + if (StringUtils.equals(one.getCollectionSource(), "value2")){ + double value = Double.parseDouble(equipmentDataDetail.getValue2()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue2(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue2(null); + } } } - } - - if (StringUtils.equals(one.getCollectionSource(),"value3")){ - //获取表的值 - int value = Integer.parseInt(data[3]); - if (one.getDefaultValue()!=null){ - //规定参数 - int defaultValue = Integer.parseInt(one.getDefaultValue()); - if (defaultValue == value){ - equipmentDataDetail.setValue0(data[3]); - } - }else { - //获取表的最大值和最小值 - int max = Integer.parseInt(one.getMaxValue()); - int min = Integer.parseInt(one.getMinValue()); - if (max >= value && value>= min){ - equipmentDataDetail.setValue0(data[3]); + if (StringUtils.equals(one.getCollectionSource(), "value3")){ + double value = Double.parseDouble(equipmentDataDetail.getValue3()); + if (StringUtils.isNotEmpty(one.getDefaultValue())) { + //规定参数 + double defaultValue = Double.parseDouble(one.getDefaultValue()); + if (defaultValue != value) { + equipmentDataDetail.setValue3(null); + } + } else { + //获取表的最大值和最小值 + double max = Double.parseDouble(one.getMaxValue()); + double min = Double.parseDouble(one.getMinValue()); + if (max < value || value < min) { + equipmentDataDetail.setValue3(null); + } } } - } + } } - - equipmentDataDetail.setNum(index); - detailList.add(equipmentDataDetail); - index++; } + } catch (Exception e) { e.printStackTrace(); } } - return detailList; + return detailList; } //对图片进行保存 private static List saveImage(List fileName, EquipmentFolderLocation excel, Integer batchNo) { List detailList = new ArrayList<>(); - int index= 1; + int index = 1; for (String s : fileName) { EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo());