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 14:49:40 +08:00
parent 99eb785b9d
commit 4872a5a24a
5 changed files with 154 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+2 -2
View File
@@ -428,8 +428,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@ApiOperation(value = "|SarBussionessStand|判断原文译文") @ApiOperation(value = "|SarBussionessStand|判断原文译文")
@GetMapping("/emptyFileAnewStorage") @GetMapping("/emptyFileAnewStorage")
public ResponseMessage emptyFileAnewStorage (){ public ResponseMessage emptyFileAnewStorage (String type){
return sarBussionessStandEOService.emptyFileAnewStorage(); return sarBussionessStandEOService.emptyFileAnewStorage(type);
} }
@ApiOperation(value = "|SarBussionessStand|老系统附件重复问题") @ApiOperation(value = "|SarBussionessStand|老系统附件重复问题")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+1 -1
View File
@@ -56,7 +56,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
void checkFileByEncrypt(); void checkFileByEncrypt();
ResponseMessage emptyFileAnewStorage(); ResponseMessage emptyFileAnewStorage(String type);
ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file); ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+30 -27
View File
@@ -2753,31 +2753,31 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//att_file_01——att_file_10表，记录附件对应存储位置 //att_file_01——att_file_10表，记录附件对应存储位置
// //
@Override @Override
public ResponseMessage emptyFileAnewStorage() { public ResponseMessage emptyFileAnewStorage(String type) {
List<OldSystem> SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); //List<OldSystem> SarBussionessStandList = sarBussionessStandEODao.selectListInfo();
List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); // List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo();
// 获取 kmpro_addon34 表的 lore_doc_id // 获取 kmpro_addon34 表的 lore_doc_id
List<OldSystem> oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); List<OldSystem> oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo();
//数据组合 //数据组合
List<OldSystem> oldArr = new ArrayList(); List<OldSystem> oldArr = new ArrayList();
List<OldSystem> oldArr1 = new ArrayList(); List<OldSystem> oldArr1 = new ArrayList();
//记录同一数据下文件名重复的 //记录同一数据下文件名重复的
List<AttFileEO> fileEOArrayList= new ArrayList<>(); List<AttFileEO> fileEOArrayList= new ArrayList<>();
//海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文
for (OldSystem SarStandardsInfo: SarStandardsInfoList){ if(type.equals("海外")) {
List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo();
for (OldSystem SarStandardsInfo : SarStandardsInfoList) {
for (OldSystem oldSystem : oldSystemInfoList) { for (OldSystem oldSystem : oldSystemInfoList) {
if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) {
if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) {
//通过,号分割文件，通过id去查询文件 获取文件名称 //通过,号分割文件，通过id去查询文件 获取文件名称
if(StringUtils.isNotBlank(SarStandardsInfo.getFileId())){ if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) {
String[] fileIdArr = SarStandardsInfo.getFileId().split(","); String[] fileIdArr = SarStandardsInfo.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr); List<String> asList = Arrays.asList(fileIdArr);
if(asList.size()>0) { if (asList.size() > 0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList); List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if(attFileEOS.isEmpty()) { if (attFileEOS.isEmpty()) {
String yi = ""; String yi = "";
String yuan = ""; String yuan = "";
OldSystem old = new OldSystem(); OldSystem old = new OldSystem();
@@ -2812,14 +2812,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (StringUtils.isNotBlank(yuan)) { if (StringUtils.isNotBlank(yuan)) {
old.setOriginal(yuan); old.setOriginal(yuan);
} }
if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){ if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) {
old.setStandId(SarStandardsInfo.getStandId()); old.setStandId(SarStandardsInfo.getStandId());
oldArr.add(old); oldArr.add(old);
} }
}else { } else {
//记录 同一条数据名称一样的 //记录 同一条数据名称一样的
for (AttFileEO fileEO:attFileEOS) { for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId("h-"+SarStandardsInfo.getStandId()); fileEO.setResId("h-" + SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO); fileEOArrayList.add(fileEO);
} }
} }
@@ -2829,7 +2829,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
} }
} }
//海外 国内
for(OldSystem data : oldArr) {
SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo();
String id = sarStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId());
if(StringUtils.isNotBlank(id)) {
sarStandAttrInfo.setId(id);
sarStandAttrInfo.setFbgbjbd(data.getOriginal());
sarStandAttrInfo.setTranslation(data.getTranslation());
}
sarStandAttrInfoEODao.updateById(sarStandAttrInfo);
logger.info("海外国内修改成功");
}
}
if(type.equals("企业")){
List<OldSystem> SarBussionessStandList = sarBussionessStandEODao.selectListInfo();
//企业的文件数据处理 //企业的文件数据处理
for (OldSystem sarBussionessStand : SarBussionessStandList){ for (OldSystem sarBussionessStand : SarBussionessStandList){
for (OldSystem oldSystem : oldSystemInfoList) { for (OldSystem oldSystem : oldSystemInfoList) {
@@ -2896,7 +2911,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
} }
} }
// 企业 // 企业
for(OldSystem data : oldArr1) { for(OldSystem data : oldArr1) {
SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo();
@@ -2909,17 +2923,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo); sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo);
logger.info("企业修改成功"); logger.info("企业修改成功");
} }
//海外 国内
for(OldSystem data : oldArr) {
SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo();
String id = sarStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId());
if(StringUtils.isNotBlank(id)) {
sarStandAttrInfo.setId(id);
sarStandAttrInfo.setFbgbjbd(data.getOriginal());
sarStandAttrInfo.setTranslation(data.getTranslation());
}
sarStandAttrInfoEODao.updateById(sarStandAttrInfo);
logger.info("海外国内修改成功");
} }
return Result.success(fileEOArrayList); return Result.success(fileEOArrayList);
} }
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+2
View File
@@ -1233,5 +1233,7 @@
att.FBGBUSS as 'fileId' att.FBGBUSS as 'fileId'
from sar_bussioness_stand std from sar_bussioness_stand std
left JOIN sar_buss_stand_attr_info att on std.id = att.STAND_ID left JOIN sar_buss_stand_attr_info att on std.id = att.STAND_ID
where std.BUILD_ID is not null
and att.FBGBUSS is not null
</select> </select>
</mapper> </mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+2
View File
@@ -1903,6 +1903,8 @@
att.FBGBJBD as 'fileId' att.FBGBJBD as 'fileId'
from sar_standards_info std from sar_standards_info std
left JOIN sar_stand_attr_info att on std.id = att.STAND_ID left JOIN sar_stand_attr_info att on std.id = att.STAND_ID
where std.BUILD_ID is not null
and att.FBGBJBD is not null
</select> </select>
<select id="OldSystemFile" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem"> <select id="OldSystemFile" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">