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

添加比较值

java8
wenkuan.shi 2 years ago
parent
a22e1ec394
commit
b81a2eef71
5 changed files with 432 additions and 42 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. 9
      src/main/java/com/xujie/sys/modules/reader/dao/EquipmentFolderDetailMapper.java
  2. 18
      src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderDetailEntity.java
  3. 7
      src/main/java/com/xujie/sys/modules/reader/service/EquipmentFolderDetailService.java
  4. 11
      src/main/java/com/xujie/sys/modules/reader/service/impl/EquipmentFolderDetailServiceImpl.java
  5. 353
      src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java

9
src/main/java/com/xujie/sys/modules/reader/dao/EquipmentFolderDetailMapper.java
View File

@ -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<EquipmentFolderDetailEntity> {
}

18
src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderDetailEntity.java
View File

@ -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;
}

7
src/main/java/com/xujie/sys/modules/reader/service/EquipmentFolderDetailService.java
View File

@ -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<EquipmentFolderDetailEntity> {
}

11
src/main/java/com/xujie/sys/modules/reader/service/impl/EquipmentFolderDetailServiceImpl.java
View File

@ -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<EquipmentFolderDetailMapper, EquipmentFolderDetailEntity> implements EquipmentFolderDetailService {
}

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

@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xujie.sys.modules.reader.dao.GetInformationForExcelMapper; import com.xujie.sys.modules.reader.dao.GetInformationForExcelMapper;
import com.xujie.sys.modules.reader.entity.EquipmentDataDetail; 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.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.EquipmentFolderLocationService;
import com.xujie.sys.modules.reader.service.GetInformationForExcelService; import com.xujie.sys.modules.reader.service.GetInformationForExcelService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -38,6 +40,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
@Autowired @Autowired
private GetInformationForExcelMapper getInformationForExcelMapper; private GetInformationForExcelMapper getInformationForExcelMapper;
@Autowired
private EquipmentFolderDetailService equipmentFolderDetailService;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveByExcel() { public void saveByExcel() {
@ -224,9 +229,11 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
} }
} }
//新增完之后把原路径的文件复制到另一个文件并删除原路径的下的文件 //新增完之后把原路径的文件复制到另一个文件并删除原路径的下的文件
//endPath本地文件名 suffixName复制到文件夹路径 //endPath本地文件名 suffixName复制到文件夹路径
private static void deleteBypath(String endPath, String suffixName, String newFileName) throws Exception {
private static void deleteBypath(String endPath, String suffixName, String newFileName) {
// 创建源文件对象和目标文件夹对象 // 创建源文件对象和目标文件夹对象
File sourceFile = new File(endPath); File sourceFile = new File(endPath);
@ -260,7 +267,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
} }
//对tff文件进行操作 //对tff文件进行操作
private static List<EquipmentDataDetail> saveTxt(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
private List<EquipmentDataDetail> saveTxt(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
List<EquipmentDataDetail> equipmentDataDetails = new ArrayList<>(); List<EquipmentDataDetail> equipmentDataDetails = new ArrayList<>();
int index = 1; int index = 1;
for (String s : fileName) { for (String s : fileName) {
@ -302,6 +309,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
line = bufferedReader.readLine(); line = bufferedReader.readLine();
} }
} }
//查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
LambdaQueryWrapper<EquipmentFolderDetailEntity> 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) { for (String info : list) {
String[] data = info.split("\t"); String[] data = info.split("\t");
@ -313,6 +327,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
equipmentDataDetail.setItemNo(excel.getItemNo()); equipmentDataDetail.setItemNo(excel.getItemNo());
equipmentDataDetail.setFileNo(excel.getFileNo()); equipmentDataDetail.setFileNo(excel.getFileNo());
equipmentDataDetail.setCreateDate(new Date()); equipmentDataDetail.setCreateDate(new Date());
if (one==null){
equipmentDataDetail.setValue0(data[0]); equipmentDataDetail.setValue0(data[0]);
if (data.length>1){ if (data.length>1){
equipmentDataDetail.setValue1(data[1]); equipmentDataDetail.setValue1(data[1]);
@ -341,6 +356,200 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
if (data.length>9){ if (data.length>9){
equipmentDataDetail.setValue9(data[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); equipmentDataDetail.setNum(index);
equipmentDataDetails.add(equipmentDataDetail); equipmentDataDetails.add(equipmentDataDetail);
index++; index++;
@ -354,7 +563,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
} }
//对excel(csv)文件进行操作 //对excel(csv)文件进行操作
private static 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<>();
//获取每个excel下的所有关于Test的两个值并保存 //获取每个excel下的所有关于Test的两个值并保存
int index=1; int index=1;
@ -380,6 +589,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
if (list.get(i).get(0) == null) { if (list.get(i).get(0) == null) {
continue; continue;
} }
//查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
LambdaQueryWrapper<EquipmentFolderDetailEntity> 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")) { if (list.get(i).get(0).equals("TEST")) {
EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo()); equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo());
@ -389,8 +605,51 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
equipmentDataDetail.setItemNo(excel.getItemNo()); equipmentDataDetail.setItemNo(excel.getItemNo());
equipmentDataDetail.setFileNo(excel.getFileNo()); equipmentDataDetail.setFileNo(excel.getFileNo());
equipmentDataDetail.setCreateDate(new Date()); equipmentDataDetail.setCreateDate(new Date());
if (one==null){
equipmentDataDetail.setValue0(list.get(i).get(1)); equipmentDataDetail.setValue0(list.get(i).get(1));
equipmentDataDetail.setValue1(list.get(i).get(3)); equipmentDataDetail.setValue1(list.get(i).get(3));
}else {
if (StringUtils.equals(one.getCollectionSource(),"value0")){
//获取表的值
int value = Integer.parseInt(list.get(i).get(1));
if (one.getDefaultValue()!=null){
//规定参数
int defaultValue = Integer.parseInt(one.getDefaultValue());
if (defaultValue == value){
equipmentDataDetail.setValue0(list.get(i).get(1));
}
}else {
//获取表的最大值和最小值
int max = Integer.parseInt(one.getMaxValue());
int min = Integer.parseInt(one.getMinValue());
if (max >= 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); equipmentDataDetail.setNum(index);
equipmentDataDetails.add(equipmentDataDetail); equipmentDataDetails.add(equipmentDataDetail);
index++; index++;
@ -401,7 +660,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
} }
//对txt文件进行操作 //对txt文件进行操作
private static List<EquipmentDataDetail> saveTxtFile(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
public List<EquipmentDataDetail> saveTxtFile(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
int index=1; int index=1;
List<EquipmentDataDetail> detailList = new ArrayList<>(); List<EquipmentDataDetail> detailList = new ArrayList<>();
for (String name : fileName) { for (String name : fileName) {
@ -419,6 +678,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
list.add(line); list.add(line);
} }
} }
//查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
LambdaQueryWrapper<EquipmentFolderDetailEntity> 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) { for (String s : list) {
EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
String[] data = s.split("\t"); String[] data = s.split("\t");
@ -429,6 +695,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
equipmentDataDetail.setItemNo(excel.getItemNo()); equipmentDataDetail.setItemNo(excel.getItemNo());
equipmentDataDetail.setFileNo(excel.getFileNo()); equipmentDataDetail.setFileNo(excel.getFileNo());
equipmentDataDetail.setCreateDate(new Date()); equipmentDataDetail.setCreateDate(new Date());
if (one==null){
equipmentDataDetail.setValue0(data[0]); equipmentDataDetail.setValue0(data[0]);
if (data.length>1){ if (data.length>1){
equipmentDataDetail.setValue1(data[1]); equipmentDataDetail.setValue1(data[1]);
@ -439,6 +706,84 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
if (data.length>3){ if (data.length>3){
equipmentDataDetail.setValue3(data[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); equipmentDataDetail.setNum(index);
detailList.add(equipmentDataDetail); detailList.add(equipmentDataDetail);
index++; index++;

Write Preview
Loading…
Cancel
Save