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

添加比较值改动

java8
wenkuan.shi 2 years ago
parent
b81a2eef71
commit
09654ddd1c
2 changed files with 380 additions and 352 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. 8
      src/main/java/com/xujie/sys/common/utils/TaskUtils.java
  2. 724
      src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java

8
src/main/java/com/xujie/sys/common/utils/TaskUtils.java
View File

@ -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();
// }
} }

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

@ -157,7 +157,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
for (String s : imageFiles) { for (String s : imageFiles) {
int index = 1; int index = 1;
// 创建源文件对象和目标文件夹对象 // 创建源文件对象和目标文件夹对象
deleteBypath(excel.getFolderPath()+"\\"+s, excel.getBackupPhotoPath(), index + timestamp + "$" + s);
deleteBypath(excel.getFolderPath() + "\\" + s, excel.getBackupPhotoPath(), index + timestamp + "$" + s);
index++; index++;
} }
} }
@ -230,10 +230,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
} }
//新增完之后把原路径的文件复制到另一个文件并删除原路径的下的文件 //新增完之后把原路径的文件复制到另一个文件并删除原路径的下的文件
//endPath本地文件名 suffixName复制到文件夹路径 //endPath本地文件名 suffixName复制到文件夹路径
private static void deleteBypath(String endPath, String suffixName, String newFileName) {
private static void deleteBypath(String endPath, String suffixName, String newFileName) {
// 创建源文件对象和目标文件夹对象 // 创建源文件对象和目标文件夹对象
File sourceFile = new File(endPath); File sourceFile = new File(endPath);
@ -269,6 +268,14 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
//对tff文件进行操作 //对tff文件进行操作
private 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<>();
List<EquipmentDataDetail> equipmentDataDetails1 = new ArrayList<>();
//查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo())
.eq(EquipmentFolderDetailEntity::getSite, excel.getSite())
.eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo());
List<EquipmentFolderDetailEntity> entityList = equipmentFolderDetailService.list(lambdaQueryWrapper);
int index = 1; int index = 1;
for (String s : fileName) { for (String s : fileName) {
int startLine = 15; // 第一次读取开始的行数 int startLine = 15; // 第一次读取开始的行数
@ -309,12 +316,6 @@ 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) {
@ -327,246 +328,274 @@ 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]);
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]);
}
}
}
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(); bufferedReader.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
return equipmentDataDetails;
return equipmentDataDetails;
} }
//对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
LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo())
.eq(EquipmentFolderDetailEntity::getSite, excel.getSite())
.eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo());
List<EquipmentFolderDetailEntity> entityList = equipmentFolderDetailService.list(lambdaQueryWrapper);
//获取每个excel下的所有关于Test的两个值并保存 //获取每个excel下的所有关于Test的两个值并保存
int index=1;
int index = 1;
for (String s : fileName) { for (String s : fileName) {
File excelFile = new File(s); File excelFile = new File(s);
List<Map<Integer, String>> list = new ArrayList<>(); List<Map<Integer, String>> list = new ArrayList<>();
@ -589,12 +618,7 @@ 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();
@ -605,64 +629,71 @@ 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());
equipmentDataDetail.setValue0(list.get(i).get(1));
equipmentDataDetail.setValue1(list.get(i).get(3));
if (one==null){
equipmentDataDetail.setValue0(list.get(i).get(1));
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));
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文件进行操作 //对txt文件进行操作
public 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<>();
List<EquipmentDataDetail> equipmentDataDetails1 = new ArrayList<>();
//查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo())
.eq(EquipmentFolderDetailEntity::getSite, excel.getSite())
.eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo());
List<EquipmentFolderDetailEntity> entityList = equipmentFolderDetailService.list(lambdaQueryWrapper);
for (String name : fileName) { for (String name : fileName) {
try { try {
@ -679,12 +710,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
} }
} }
//查询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");
@ -695,110 +721,112 @@ 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]);
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]);
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) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
return detailList;
return detailList;
} }
//对图片进行保存 //对图片进行保存
private static List<EquipmentDataDetail> saveImage(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) { private static List<EquipmentDataDetail> saveImage(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
List<EquipmentDataDetail> detailList = new ArrayList<>(); List<EquipmentDataDetail> detailList = new ArrayList<>();
int index= 1;
int index = 1;
for (String s : fileName) { for (String s : fileName) {
EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo()); equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo());

Write Preview
Loading…
Cancel
Save