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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
SUNJIABIN
2023-03-14 17:56:00 +08:00
parent ef5d5889e1 d481985603
commit f44c8c1774
11 changed files with 631 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java
+3
View File
@@ -47,4 +47,7 @@ public interface SarBussStandAttrInfoDao extends BaseMapper<SarBussStandAttrInfo
void updateFSQR(@Param("id") String id,@Param("time") String time); void updateFSQR(@Param("id") String id,@Param("time") String time);
void updateByIdInfo(@Param("id")String id,@Param("fbgbuss") String fbgbuss,@Param("translation") String translation);
String selectInfoStandId(@Param("standId") String standId);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+2 -2
View File
@@ -424,8 +424,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/entity/OldSystem.java
+2
View File
@@ -15,6 +15,8 @@ public class OldSystem {
private String fileSrc; private String fileSrc;
//lore_depot_sort //lore_depot_sort
private String sortSign; private String sortSign;
//lore_attache
private String ext;
//新系统返回数据所需要的 //新系统返回数据所需要的
private String attfid; private String attfid;
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)throws Exception; ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file)throws Exception;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+564 -126
View File
@@ -2663,179 +2663,605 @@ 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> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo();
// 获取 kmpro_addon34 表的 lore_doc_id
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<>(); Set<AttFileEO> fileEOArrayList= new HashSet<>();
//海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文
for (OldSystem SarStandardsInfo: SarStandardsInfoList){ if(type.equals("海外")) {
for (OldSystem oldSystem : oldSystemInfoList) { List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("FOREIGN");
if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ for (OldSystem SarStandardsInfo : SarStandardsInfoList) {
if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { String yi = "";
//通过,号分割文件，通过id去查询文件 获取文件名称 String yuan = "";
if(StringUtils.isNotBlank(SarStandardsInfo.getFileId())){ OldSystem old = new OldSystem();
String[] fileIdArr = SarStandardsInfo.getFileId().split(","); if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) {
List<String> asList = Arrays.asList(fileIdArr); if(SarStandardsInfo.getBuildId().contains(",")){
if(asList.size()>0) { String[] buildIdArr = SarStandardsInfo.getBuildId().split(",");
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 List<String> buildIdList = Arrays.asList(buildIdArr);
List<AttFileEO> attFileEOS = newFileNameRepetition(asList); if(!buildIdList.isEmpty()){
if(attFileEOS.isEmpty()) { for (String bid: buildIdList){
String yi = ""; List<OldSystem> OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid);
String yuan = ""; OldSystem oldSystem =OldSystem1.get(0);
OldSystem old = new OldSystem(); if (oldSystem.getLoreDocId().equals(bid)) {
for (String fileId : asList) { //通过,号分割文件，通过id去查询文件 获取文件名称
if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) {
if(SarStandardsInfo.getFileId().contains(",")) {
String[] fileIdArr = SarStandardsInfo.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if (asList.size() > 0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if (attFileEOS.isEmpty()) {
for (String fileId : asList) {
//循环调用每一个 文件 获取文件名称
String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(),bid);
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
}
}
}
}
} else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
}else {
String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), bid);
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + SarStandardsInfo.getFileId();
} else {
yuan = SarStandardsInfo.getFileId();
}
}
}
}
}
}
}
}
}
}else {
List<OldSystem> OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId());
OldSystem oldSystem =OldSystem1.get(0);
if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) {
//通过,号分割文件，通过id去查询文件 获取文件名称
if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) {
if(SarStandardsInfo.getFileId().contains(",")) {
String[] fileIdArr = SarStandardsInfo.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if (asList.size() > 0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if (attFileEOS.isEmpty()) {
for (String fileId : asList) {
//循环调用每一个 文件 获取文件名称
String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
}
}
}
}
} else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
}else {
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = fileId; String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
if (theSame.equals("1")) { if (theSame.equals("1")) {
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
yuan = "," + SarStandardsInfo.getFileId();
} else {
yuan = SarStandardsInfo.getFileId();
}
} }
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
} }
} }
} }
if (StringUtils.isNotBlank(yi)) {
old.setTranslation(yi);
}
if (StringUtils.isNotBlank(yuan)) {
old.setOriginal(yuan);
}
if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){
old.setStandId(SarStandardsInfo.getStandId());
oldArr.add(old);
}
}else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO:attFileEOS) {
fileEO.setResId("h-"+SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO);
}
} }
} }
} }
}
} }
if (StringUtils.isNotBlank(yi)) {
old.setTranslation(yi);
}
if (StringUtils.isNotBlank(yuan)) {
old.setOriginal(yuan);
}
if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) {
old.setStandId(SarStandardsInfo.getStandId());
oldArr.add(old);
}
} }
//海外
for(OldSystem data : oldArr) {
SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo();
String id = sarStandAttrInfoEODao.selectInfoStandId(data.getStandId());
if(StringUtils.isNotBlank(id)) {
sarStandAttrInfo.setId(id);
sarStandAttrInfo.setFbgbjbd(data.getOriginal());
sarStandAttrInfo.setTranslation(data.getTranslation());
}
sarStandAttrInfoEODao.updateByIdInfo(id,sarStandAttrInfo.getFbgbjbd(),sarStandAttrInfo.getTranslation());
logger.info("海外修改成功");
}
} }
//企业的文件数据处理 if(type.equals("国内")) {
for (OldSystem sarBussionessStand : SarBussionessStandList){ List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND");
for (OldSystem oldSystem : oldSystemInfoList) { for (OldSystem SarStandardsInfo : SarStandardsInfoList) {
if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ String yi = "";
if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { String yuan = "";
//通过,号分割文件，通过id去查询文件 获取文件名称 OldSystem old = new OldSystem();
if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) {
String[] fileIdArr = sarBussionessStand.getFileId().split(","); if(SarStandardsInfo.getBuildId().contains(",")){
List<String> asList = Arrays.asList(fileIdArr); String[] buildIdArr = SarStandardsInfo.getBuildId().split(",");
if(asList.size()>0) { List<String> buildIdList = Arrays.asList(buildIdArr);
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 if(!buildIdList.isEmpty()){
List<AttFileEO> attFileEOS = newFileNameRepetition(asList); for (String bid: buildIdList){
if(attFileEOS.isEmpty()) { List<OldSystem> OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid);
String yi = ""; OldSystem oldSystem =OldSystem1.get(0);
String yuan = ""; if (oldSystem.getLoreDocId().equals(bid)) {
OldSystem old = new OldSystem(); //通过,号分割文件，通过id去查询文件 获取文件名称
for (String fileId : asList) { if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) {
//循环调用每一个 文件 获取文件名称 if(SarStandardsInfo.getFileId().contains(",")) {
String id = fileId; String[] fileIdArr = SarStandardsInfo.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if (asList.size() > 0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if (attFileEOS.isEmpty()) {
for (String fileId : asList) {
//循环调用每一个 文件 获取文件名称
String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(),bid);
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
}
}
}
}
} else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
}else {
//循环调用每一个 文件 获取文件名称
String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), bid);
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + SarStandardsInfo.getFileId();
} else {
yuan = SarStandardsInfo.getFileId();
}
}
}
}
}
}
}
}
}
}else {
List<OldSystem> OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId());
OldSystem oldSystem =OldSystem1.get(0);
if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) {
//通过,号分割文件，通过id去查询文件 获取文件名称
if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) {
if(SarStandardsInfo.getFileId().contains(",")) {
String[] fileIdArr = SarStandardsInfo.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if (asList.size() > 0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if (attFileEOS.isEmpty()) {
for (String fileId : asList) {
//循环调用每一个 文件 获取文件名称
String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
}
}
}
}
} else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
}else {
//循环调用每一个 文件 获取文件名称
String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + SarStandardsInfo.getFileId();
} else {
yuan = SarStandardsInfo.getFileId();
}
}
}
}
}
}
}
}
}
if (StringUtils.isNotBlank(yi)) {
old.setTranslation(yi);
}
if (StringUtils.isNotBlank(yuan)) {
old.setOriginal(yuan);
}
if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) {
old.setStandId(SarStandardsInfo.getStandId());
oldArr.add(old);
}
}
//海外
for(OldSystem data : oldArr) {
SarStandAttrInfo sarStandAttrInfo = new SarStandAttrInfo();
String id = sarStandAttrInfoEODao.selectInfoStandId(data.getStandId());
if(StringUtils.isNotBlank(id)) {
sarStandAttrInfo.setId(id);
sarStandAttrInfo.setFbgbjbd(data.getOriginal());
sarStandAttrInfo.setTranslation(data.getTranslation());
}
sarStandAttrInfoEODao.updateByIdInfo(id,sarStandAttrInfo.getFbgbjbd(),sarStandAttrInfo.getTranslation());
logger.info("国内修改成功");
}
}
if(type.equals("企业")){
List<OldSystem> SarBussionessStandList = sarBussionessStandEODao.selectListInfo();
//企业的文件数据处理
for (OldSystem sarBussionessStand: SarBussionessStandList){
String yi = "";
String yuan = "";
OldSystem old = new OldSystem();
// 通过 关联id 去查询这条数据 查询到 即当前数据
if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){
if(sarBussionessStand.getBuildId().contains(",")){
String[] buildIdArr = sarBussionessStand.getBuildId().split(",");
List<String> buildIdList = Arrays.asList(buildIdArr);
if(!buildIdList.isEmpty()){
for (String bId: buildIdList){
List<OldSystem> oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bId);
OldSystem oldSystem =oldSystem1.get(0);
if(oldSystem.getLoreDocId().equals(bId)) {
//通过,号分割文件，通过id去查询文件 获取文件名称
if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){
if(sarBussionessStand.getFileId().contains(",")){
String[] fileIdArr = sarBussionessStand.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if(asList.size()>0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if(attFileEOS.isEmpty()) {
for (String fileId : asList) {
//循环调用每一个 文件 获取文件名称
String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(),bId);
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
}
}
}
}
}else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO:attFileEOS) {
//记录重复 此id企业或者海外的id
fileEO.setResId(sarBussionessStand.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
}else {
//循环调用每一个 文件 获取文件名称
String id = sarBussionessStand.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), bId);
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + sarBussionessStand.getFileId();
} else {
yi = sarBussionessStand.getFileId();
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + sarBussionessStand.getFileId();
} else {
yuan = sarBussionessStand.getFileId();
}
}
}
}
}
}
}
}
}
}else {
List<OldSystem> oldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId());
OldSystem oldSystem = oldSystem1.get(0);
if (oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) {
//通过,号分割文件，通过id去查询文件 获取文件名称
if (StringUtils.isNotBlank(sarBussionessStand.getFileId())) {
if (sarBussionessStand.getFileId().contains(",")) {
String[] fileIdArr = sarBussionessStand.getFileId().split(",");
List<String> asList = Arrays.asList(fileIdArr);
if (asList.size() > 0) {
// 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走
List<AttFileEO> attFileEOS = newFileNameRepetition(asList);
if (attFileEOS.isEmpty()) {
for (String fileId : asList) {
//循环调用每一个 文件 获取文件名称
String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
if (theSame.equals("1")) {
//证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断
if(sortSign != null) {
if (sortSign.getSortSign().contains("译")) {
if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
}
}
}
}
} else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) {
//记录重复 此id企业或者海外的id
fileEO.setResId(sarBussionessStand.getStandId());
fileEOArrayList.add(fileEO);
}
}
}
} else {
String id = sarBussionessStand.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
if (theSame.equals("1")) { if (theSame.equals("1")) {
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + sarBussionessStand.getFileId();
} else {
yi = sarBussionessStand.getFileId();
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + sarBussionessStand.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = sarBussionessStand.getFileId();
yuan = "," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
if (StringUtils.isNotBlank(yi)) {
old.setTranslation(yi);
}
if (StringUtils.isNotBlank(yuan)) {
old.setOriginal(yuan);
}
if(StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)){
old.setStandId(sarBussionessStand.getStandId());
oldArr1.add(old);
}
}else {
//记录 同一条数据名称一样的
for (AttFileEO fileEO:attFileEOS) {
//记录重复 此id企业或者海外的id
fileEO.setResId("q-"+sarBussionessStand.getStandId());
fileEOArrayList.add(fileEO);
}
} }
} }
} }
} }
// 添加
if (StringUtils.isNotBlank(yi)) {
old.setTranslation(yi);
}
if (StringUtils.isNotBlank(yuan)) {
old.setOriginal(yuan);
}
if (StringUtils.isNotBlank(yi) || StringUtils.isNotBlank(yuan)) {
old.setStandId(sarBussionessStand.getStandId());
oldArr1.add(old);
} }
} }
} // 企业
for(OldSystem data : oldArr1) {
// 企业 SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo();
for(OldSystem data : oldArr1) { String id = sarBussStandAttrInfoEODao.selectInfoStandId(data.getStandId());
SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); if(StringUtils.isNotBlank(id)) {
String id = sarBussStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); sarBussStandAttrInfo.setId(id);
if(StringUtils.isNotBlank(id)) { sarBussStandAttrInfo.setFbgbuss(data.getOriginal());
sarBussStandAttrInfo.setId(id); sarBussStandAttrInfo.setTranslation(data.getTranslation());
sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); }
sarBussStandAttrInfo.setTranslation(data.getTranslation()); sarBussStandAttrInfoEODao.updateByIdInfo(id,sarBussStandAttrInfo.getFbgbuss(),sarBussStandAttrInfo.getTranslation());
logger.info("企业修改成功");
} }
sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo);
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);
} }
public String isTheSame (String oldFileName,String buildId){ public String isTheSame (String oldFileName,String buildId){
List<OldSystem> loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); /* List<OldSystem> loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId);
if(loreAttacheList.size()>0){ if(loreAttacheList.size()>0){
for (OldSystem src : loreAttacheList) { for (OldSystem src : loreAttacheList) {
if(StringUtils.isNotBlank(src.getFileSrc())){ if(StringUtils.isNotBlank(src.getFileSrc())){
@@ -2851,6 +3277,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
} }
} }
return "-1";*/
List<OldSystem> loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId);
if(loreAttacheList.size()>0){
for (OldSystem src : loreAttacheList) {
if(StringUtils.isNotBlank(src.getFileSign()) && StringUtils.isNotBlank(src.getExt())){
String s = src.getFileSign()+"."+src.getExt();
if (s.equals(oldFileName)){
return "1";
}
}
}
}
return "-1"; return "-1";
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java
+4
View File
@@ -41,4 +41,8 @@ public interface SarStandAttrInfoDao extends BaseMapper<SarStandAttrInfo> {
String selectFieldValByStandId(@Param("field") String field, @Param("standId") String standId); String selectFieldValByStandId(@Param("field") String field, @Param("standId") String standId);
List<SelectionResult> selectFieldValByContainsVal(@Param("field") String field, @Param("value") String value, @Param("standIds") List<String> standIds); List<SelectionResult> selectFieldValByContainsVal(@Param("field") String field, @Param("value") String value, @Param("standIds") List<String> standIds);
void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("translation") String translation);
String selectInfoStandId(@Param("standId")String standId);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+3 -3
View File
@@ -100,9 +100,7 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<DSarStandardDTO> dealWithDS(@Param("type") String standType, @Param("status")List<String> strings); List<DSarStandardDTO> dealWithDS(@Param("type") String standType, @Param("status")List<String> strings);
List<OldSystem> selectOldSystemInfo(); List<OldSystem> selectListInfo(@Param("type") String type);
List<OldSystem> selectListInfo();
List<OldSystem> OldSystemFile(@Param("loreDocId") String loreDocId); List<OldSystem> OldSystemFile(@Param("loreDocId") String loreDocId);
@@ -111,4 +109,6 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<OldSystem> selectOldSystemFileBuildId(@Param("buildId") String buildId); List<OldSystem> selectOldSystemFileBuildId(@Param("buildId") String buildId);
OldSystem loreDepotSort(@Param("sortId") String sortId); OldSystem loreDepotSort(@Param("sortId") String sortId);
List<OldSystem> selectOldSystemInfoByBuidId(@Param("buildId") String buildId);
} }
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml
+11
View File
@@ -241,4 +241,15 @@
</if> </if>
</select> </select>
<update id="updateByIdInfo" >
update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.TRANSLATION = #{translation}
where id = #{id}
</update>
<select id="selectInfoStandId" resultType="java.lang.String" parameterType="java.lang.String">
SELECT id
FROM SAR_STAND_ATTR_INFO
WHERE stand_id = #{standId} and valid_flag=0
</select>
</mapper> </mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml
+10
View File
@@ -167,5 +167,15 @@
where id = #{id} where id = #{id}
</update> </update>
<update id="updateByIdInfo">
update SAR_BUSS_STAND_ATTR_INFO sb set sb.FBGBUSS = #{fbgbuss}, sb.TRANSLATION = #{translation}
where ID = #{id}
</update>
<!-- 查询字段及对应数据-->
<select id="selectInfoStandId" resultType="java.lang.String" parameterType="java.lang.String">
SELECT id
FROM SAR_BUSS_STAND_ATTR_INFO
WHERE valid_flag=0 and stand_id = #{standId}
</select>
</mapper> </mapper>
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
+29 -8
View File
@@ -1888,13 +1888,6 @@
</where> </where>
</select> </select>
<select id="selectOldSystemInfo" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
SELECT
km.lore_doc_id as 'loreDocId',
km.sort_id as 'sortId'
from kmpro_addon34 km
</select>
<select id="selectListInfo" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem"> <select id="selectListInfo" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
SELECT SELECT
std.id as 'standId', std.id as 'standId',
@@ -1903,6 +1896,11 @@
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
<if test="type != null">
and std.STAND_TYPE = #{type}
</if>
</select> </select>
<select id="OldSystemFile" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem"> <select id="OldSystemFile" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
@@ -1926,7 +1924,9 @@
<select id="selectOldSystemFileBuildId" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem"> <select id="selectOldSystemFileBuildId" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
SELECT SELECT
lo.Src as 'fileSrc' lo.Src as 'fileSrc',
lo.Sign as 'fileSign',
lo.Ext as 'ext'
from lore_attache lo from lore_attache lo
where 1=1 where 1=1
<if test="buildId != null"> <if test="buildId != null">
@@ -1944,4 +1944,25 @@
</if> </if>
</select> </select>
<select id="loreDepotSort" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
SELECT
lo.Sign as 'sortSign'
from lore_depot_sort lo
where 1=1
<if test="sortId != null">
and lo.id = #{sortId}
</if>
</select>
<select id="selectOldSystemInfoByBuidId" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
SELECT
km.lore_doc_id as 'loreDocId',
km.sort_id as 'sortId'
from kmpro_addon34 km
where 1=1
<if test="buildId != null">
and km.lore_doc_id = #{buildId}
</if>
</select>
</mapper> </mapper>