FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

译文原文问题（返回文件有名称重复）

Browse Source
This commit is contained in:
gaojiabao
2023-03-13 10:52:18 +08:00
parent e13d97769d
commit 99eb785b9d
1 changed files with 113 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+43 -1
View File
@@ -2762,6 +2762,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//数据组合
List<OldSystem> oldArr = new ArrayList();
List<OldSystem> oldArr1 = new ArrayList();
//记录同一数据下文件名重复的
List<AttFileEO> fileEOArrayList= new ArrayList<>();
//海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文
for (OldSystem SarStandardsInfo: SarStandardsInfoList){
@@ -2773,6 +2775,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String[] fileIdArr = SarStandardsInfo.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if(asList.size()>0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if(attFileEOS.isEmpty()) {
String yi = "";
String yuan = "";
OldSystem old = new OldSystem();
@@ -2811,6 +2816,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
old.setStandId(SarStandardsInfo.getStandId());
oldArr.add(old);
}
}else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO:attFileEOS) {
fileEO.setResId("h-"+SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
}
}
@@ -2828,6 +2840,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String[] fileIdArr = sarBussionessStand.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if(asList.size()>0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if(attFileEOS.isEmpty()) {
String yi = "";
String yuan = "";
OldSystem old = new OldSystem();
@@ -2866,6 +2881,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
old.setStandId(sarBussionessStand.getStandId());
oldArr1.add(old);
}
}else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO:attFileEOS) {
//记录重复 此id企业或者海外的id
fileEO.setResId("q-"+sarBussionessStand.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
}
}
@@ -2897,7 +2921,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarStandAttrInfoEODao.updateById(sarStandAttrInfo);
logger.info("海外国内修改成功");
}
return Result.success();
return Result.success(fileEOArrayList);
}
public String isTheSame (String oldFileName,String buildId){
@@ -2953,4 +2977,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
return Result.success(null,"数量="+set.size()+"====",set);
}
public List<AttFileEO> newFileNameRepetition(List<String> asList){
List<AttFileEO> attFileEOS = new ArrayList<>();
List<AttFileEO> attFileEOArrayList = new ArrayList<>();
for (String fileId : asList){
AttFileEO byId = attFileEOService.getFileInfo(fileId);
attFileEOS.add(byId);
}
for (AttFileEO data:attFileEOS) {
for (AttFileEO file:attFileEOS){
if(!data.getId().equals(file.getId())){
if(data.getOldFileName().equals(file.getOldFileName())){
attFileEOArrayList.add(data);
}
}
}
}
return attFileEOArrayList;
}
}