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

英译文件修改和无法处理数据进行返回（公众号和文件id）

Browse Source
This commit is contained in:
gaojiabao
2023-03-22 16:12:25 +08:00
parent 19d7befd82
commit 4d9b3c22ca
4 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java
+2
View File
@@ -27,6 +27,8 @@ public class OldSystem {
private String fileId;
private String standNumber;
// 需要组合的数据
private String attFileId;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java
+15
View File
@@ -0,0 +1,15 @@
package com.adc.da.slrs.sarBussionessStand.entity;
import lombok.Data;
@Data
public class OldSystemVo {
private String id;
//标准号
private String standNumber;
//译文件
private String translateFileId;
//原文件
private String originalFileId;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+46 -8
View File
@@ -42,6 +42,7 @@ import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService;
import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao;
import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal;
import com.adc.da.slrs.sarBussionessStand.entity.OldSystem;
import com.adc.da.slrs.sarBussionessStand.entity.OldSystemVo;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
@@ -2623,8 +2624,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
public ResponseMessage emptyFileAnewStorage(String type) {
//数据组合
List<OldSystem> oldArr = new ArrayList();
// 记录无法处理的id
Set<String> fileEOArrayList= new HashSet<>();
//
List<Object> objectList = new ArrayList<>();
// 被修改的标准号和文件
Set<OldSystemVo> UpdateStandNumberFileList = new HashSet<>();
// 无法处理的信息 标准号 和文件id
Set<OldSystemVo> cannotModifyStandNumberFileList = new HashSet<>();
//海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文
if(type.equals("海外")) {
List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("FOREIGN");
@@ -2764,7 +2769,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
}else {
fileEOArrayList.add(SarStandardsInfo.getStandId());
//记录所有疑问的数据
OldSystemVo oldSystemVo = new OldSystemVo();
oldSystemVo.setId(SarStandardsInfo.getStandId());
oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
cannotModifyStandNumberFileList.add(oldSystemVo);
}
}
@@ -2928,7 +2938,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
}else {
fileEOArrayList.add(SarStandardsInfo.getStandId());
//记录所有疑问的数据
OldSystemVo oldSystemVo = new OldSystemVo();
oldSystemVo.setId(SarStandardsInfo.getStandId());
oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
cannotModifyStandNumberFileList.add(oldSystemVo);
}
}
@@ -2977,6 +2992,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (StringUtils.isNotBlank(yi)) {
old.setStandId(SarStandardsInfo.getStandId());
oldArr.add(old);
//记录所有修改的数据
OldSystemVo oldSystemVo = new OldSystemVo();
oldSystemVo.setId(SarStandardsInfo.getStandId());
oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
oldSystemVo.setTranslateFileId(yi);
UpdateStandNumberFileList.add(oldSystemVo);
}
}
//海外
@@ -2987,7 +3008,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
logger.info("海外修改成功=====================================================================================");
}
}
}
if(type.equals("国内")) {
List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND");
@@ -3127,7 +3147,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
}else {
fileEOArrayList.add(SarStandardsInfo.getStandId());
//记录所有疑问的数据
OldSystemVo oldSystemVo = new OldSystemVo();
oldSystemVo.setId(SarStandardsInfo.getStandId());
oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
cannotModifyStandNumberFileList.add(oldSystemVo);
}
}
@@ -3291,7 +3316,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
}else {
fileEOArrayList.add(SarStandardsInfo.getStandId());
//记录所有疑问的数据
OldSystemVo oldSystemVo = new OldSystemVo();
oldSystemVo.setId(SarStandardsInfo.getStandId());
oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
oldSystemVo.setOriginalFileId(SarStandardsInfo.getFileId());
cannotModifyStandNumberFileList.add(oldSystemVo);
}
}
@@ -3340,6 +3370,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (StringUtils.isNotBlank(yi)) {
old.setStandId(SarStandardsInfo.getStandId());
oldArr.add(old);
//记录所有修改的数据
OldSystemVo oldSystemVo = new OldSystemVo();
oldSystemVo.setId(SarStandardsInfo.getStandId());
oldSystemVo.setStandNumber(SarStandardsInfo.getStandNumber());
oldSystemVo.setTranslateFileId(yi);
UpdateStandNumberFileList.add(oldSystemVo);
}
}
//国内
@@ -3717,7 +3753,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
// }
logger.info("企业没有译文件");
}
return Result.success(fileEOArrayList);
objectList.add(UpdateStandNumberFileList);
objectList.add(cannotModifyStandNumberFileList);
return Result.success(objectList);
}
public String isTheSame (String oldFileName,String buildId){
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+2 -1
View File
@@ -1892,10 +1892,11 @@
SELECT
std.id as 'standId',
std.BUILD_ID as 'buildId',
std.STAND_NUMBER as 'standNumber',
att.id as 'attfid',
att.FBGBJBD as 'fileId'
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
<if test="type != null">