From b81a2eef717efeb7eb4f3b9a3e19bce6566699a2 Mon Sep 17 00:00:00 2001 From: "wenkuan.shi" Date: Mon, 24 Jun 2024 15:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=94=E8=BE=83=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/EquipmentFolderDetailMapper.java | 9 + .../entity/EquipmentFolderDetailEntity.java | 18 + .../service/EquipmentFolderDetailService.java | 7 + .../EquipmentFolderDetailServiceImpl.java | 11 + .../GetInformationForExcelServiceImpl.java | 429 ++++++++++++++++-- 5 files changed, 432 insertions(+), 42 deletions(-) create mode 100644 src/main/java/com/xujie/sys/modules/reader/dao/EquipmentFolderDetailMapper.java create mode 100644 src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderDetailEntity.java create mode 100644 src/main/java/com/xujie/sys/modules/reader/service/EquipmentFolderDetailService.java create mode 100644 src/main/java/com/xujie/sys/modules/reader/service/impl/EquipmentFolderDetailServiceImpl.java diff --git a/src/main/java/com/xujie/sys/modules/reader/dao/EquipmentFolderDetailMapper.java b/src/main/java/com/xujie/sys/modules/reader/dao/EquipmentFolderDetailMapper.java new file mode 100644 index 00000000..c13df18b --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/reader/dao/EquipmentFolderDetailMapper.java @@ -0,0 +1,9 @@ +package com.xujie.sys.modules.reader.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xujie.sys.modules.reader.entity.EquipmentFolderDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface EquipmentFolderDetailMapper extends BaseMapper { +} diff --git a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderDetailEntity.java b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderDetailEntity.java new file mode 100644 index 00000000..542c94d3 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderDetailEntity.java @@ -0,0 +1,18 @@ +package com.xujie.sys.modules.reader.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("Equipment_folder_detail") +public class EquipmentFolderDetailEntity { + private String site; + private String buNo; + private String equipmentNo; + private String ip; + private String suffix; + private String defaultValue; + private String maxValue; + private String minValue; + private String collectionSource; +} diff --git a/src/main/java/com/xujie/sys/modules/reader/service/EquipmentFolderDetailService.java b/src/main/java/com/xujie/sys/modules/reader/service/EquipmentFolderDetailService.java new file mode 100644 index 00000000..eca116c8 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/reader/service/EquipmentFolderDetailService.java @@ -0,0 +1,7 @@ +package com.xujie.sys.modules.reader.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xujie.sys.modules.reader.entity.EquipmentFolderDetailEntity; + +public interface EquipmentFolderDetailService extends IService { +} diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/EquipmentFolderDetailServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/EquipmentFolderDetailServiceImpl.java new file mode 100644 index 00000000..919cd247 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/EquipmentFolderDetailServiceImpl.java @@ -0,0 +1,11 @@ +package com.xujie.sys.modules.reader.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.xujie.sys.modules.reader.dao.EquipmentFolderDetailMapper; +import com.xujie.sys.modules.reader.entity.EquipmentFolderDetailEntity; +import com.xujie.sys.modules.reader.service.EquipmentFolderDetailService; +import org.springframework.stereotype.Service; + +@Service +public class EquipmentFolderDetailServiceImpl extends ServiceImpl implements EquipmentFolderDetailService { +} 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 621aff91..f2497b73 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 @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xujie.sys.modules.reader.dao.GetInformationForExcelMapper; import com.xujie.sys.modules.reader.entity.EquipmentDataDetail; +import com.xujie.sys.modules.reader.entity.EquipmentFolderDetailEntity; import com.xujie.sys.modules.reader.entity.EquipmentFolderLocation; +import com.xujie.sys.modules.reader.service.EquipmentFolderDetailService; import com.xujie.sys.modules.reader.service.EquipmentFolderLocationService; import com.xujie.sys.modules.reader.service.GetInformationForExcelService; import lombok.extern.slf4j.Slf4j; @@ -38,6 +40,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveTxt(List fileName, EquipmentFolderLocation excel, Integer batchNo) { + private List saveTxt(List fileName, EquipmentFolderLocation excel, Integer batchNo) { List equipmentDataDetails = new ArrayList<>(); int index = 1; for (String s : fileName) { @@ -302,6 +309,13 @@ 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) { String[] data = info.split("\t"); @@ -313,34 +327,229 @@ 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]); + if (one==null){ + 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]); + } + }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]); + } + } + } + + 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(),"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(),"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(),"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(),"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(),"value6")){ + //获取表的值 + int value = Integer.parseInt(data[6]); + if (one.getDefaultValue()!=null){ + //规定参数 + int defaultValue = Integer.parseInt(one.getDefaultValue()); + if (defaultValue == value){ + equipmentDataDetail.setValue0(data[6]); + } + }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(),"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(),"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(),"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]); + } + } + } + + } + equipmentDataDetail.setNum(index); equipmentDataDetails.add(equipmentDataDetail); index++; @@ -354,7 +563,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveExcel(List fileName, EquipmentFolderLocation excel, Integer batchNo) { + public List saveExcel(List fileName, EquipmentFolderLocation excel, Integer batchNo) { List equipmentDataDetails = new ArrayList<>(); //获取每个excel下的所有关于Test的两个值并保存 int index=1; @@ -380,6 +589,13 @@ 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(); equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo()); @@ -389,8 +605,51 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl= value && value>= min){ + equipmentDataDetail.setValue0(list.get(i).get(1)); + } + } + } + + 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)); + } + } + } + + } + equipmentDataDetail.setNum(index); equipmentDataDetails.add(equipmentDataDetail); index++; @@ -401,7 +660,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveTxtFile(List fileName, EquipmentFolderLocation excel, Integer batchNo) { + public List saveTxtFile(List fileName, EquipmentFolderLocation excel, Integer batchNo) { int index=1; List detailList = new ArrayList<>(); for (String name : fileName) { @@ -419,6 +678,13 @@ 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"); @@ -429,16 +695,95 @@ 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 (one==null){ + 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]); + } + }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]); + } + } + } + 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(),"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(),"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]); + } + } + } + } + equipmentDataDetail.setNum(index); detailList.add(equipmentDataDetail); index++;