diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java index 9afeac88..b0970f41 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java @@ -47,4 +47,7 @@ public interface SarBussStandAttrInfoDao extends BaseMapper void checkFileByEncrypt(); - ResponseMessage emptyFileAnewStorage(); + ResponseMessage emptyFileAnewStorage(String type); ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index a998a415..8c744feb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2663,179 +2663,605 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); - // 获取 kmpro_addon34 表的 lore_doc_id - List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); - + public ResponseMessage emptyFileAnewStorage(String type) { //数据组合 List oldArr = new ArrayList(); List oldArr1 = new ArrayList(); //记录同一数据下文件名重复的 - List fileEOArrayList= new ArrayList<>(); - + Set fileEOArrayList= new HashSet<>(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 - for (OldSystem SarStandardsInfo: SarStandardsInfoList){ - for (OldSystem oldSystem : oldSystemInfoList) { - if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ - if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if(StringUtils.isNotBlank(SarStandardsInfo.getFileId())){ - String[] fileIdArr = SarStandardsInfo.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if(asList.size()>0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if(attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { + if(type.equals("海外")) { + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("FOREIGN"); + for (OldSystem SarStandardsInfo : SarStandardsInfoList) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { + if(SarStandardsInfo.getBuildId().contains(",")){ + String[] buildIdArr = SarStandardsInfo.getBuildId().split(","); + List buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bid: buildIdList){ + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(bid)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List 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 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 asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List 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); String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); if (theSame.equals("1")) { //证明找到文件名称一致的了 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } } 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("海外修改成功"); + } + } - //企业的文件数据处理 - for (OldSystem sarBussionessStand : SarBussionessStandList){ - for (OldSystem oldSystem : oldSystemInfoList) { - if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ - if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { - //通过,号分割文件，通过id去查询文件 获取文件名称 - if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ - String[] fileIdArr = sarBussionessStand.getFileId().split(","); - List asList = Arrays.asList(fileIdArr); - if(asList.size()>0) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - List attFileEOS = newFileNameRepetition(asList); - if(attFileEOS.isEmpty()) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - for (String fileId : asList) { - //循环调用每一个 文件 获取文件名称 - String id = fileId; + if(type.equals("国内")) { + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND"); + for (OldSystem SarStandardsInfo : SarStandardsInfoList) { + String yi = ""; + String yuan = ""; + OldSystem old = new OldSystem(); + if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { + if(SarStandardsInfo.getBuildId().contains(",")){ + String[] buildIdArr = SarStandardsInfo.getBuildId().split(","); + List buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bid: buildIdList){ + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + OldSystem oldSystem =OldSystem1.get(0); + if (oldSystem.getLoreDocId().equals(bid)) { + //通过,号分割文件，通过id去查询文件 获取文件名称 + if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { + if(SarStandardsInfo.getFileId().contains(",")) { + String[] fileIdArr = SarStandardsInfo.getFileId().split(","); + List asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List 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 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 asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List 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 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 buildIdList = Arrays.asList(buildIdArr); + if(!buildIdList.isEmpty()){ + for (String bId: buildIdList){ + List 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 asList = Arrays.asList(fileIdArr); + if(asList.size()>0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List 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 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 asList = Arrays.asList(fileIdArr); + if (asList.size() > 0) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + List 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); String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); if (theSame.equals("1")) { //证明找到文件名称一致的了 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //原文译文 进行判断 - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + sarBussionessStand.getFileId(); + } else { + yi = sarBussionessStand.getFileId(); + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + if (StringUtils.isNotBlank(yuan)) { + yuan = "," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); + } + } } } } - 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(); - String id = sarBussStandAttrInfoEODao.selectFieldValByStandId("id", data.getStandId()); - if(StringUtils.isNotBlank(id)) { - sarBussStandAttrInfo.setId(id); - sarBussStandAttrInfo.setFbgbuss(data.getOriginal()); - sarBussStandAttrInfo.setTranslation(data.getTranslation()); + // 企业 + for(OldSystem data : oldArr1) { + SarBussStandAttrInfo sarBussStandAttrInfo = new SarBussStandAttrInfo(); + String id = sarBussStandAttrInfoEODao.selectInfoStandId(data.getStandId()); + if(StringUtils.isNotBlank(id)) { + sarBussStandAttrInfo.setId(id); + 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); } public String isTheSame (String oldFileName,String buildId){ - List loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); + /* List loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); if(loreAttacheList.size()>0){ for (OldSystem src : loreAttacheList) { if(StringUtils.isNotBlank(src.getFileSrc())){ @@ -2851,6 +3277,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 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"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java index 5eb588a9..13266ef0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java @@ -41,4 +41,8 @@ public interface SarStandAttrInfoDao extends BaseMapper { String selectFieldValByStandId(@Param("field") String field, @Param("standId") String standId); List selectFieldValByContainsVal(@Param("field") String field, @Param("value") String value, @Param("standIds") List standIds); + + void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("translation") String translation); + + String selectInfoStandId(@Param("standId")String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 786e3629..009c9ee9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -100,9 +100,7 @@ public interface SarStandardsInfoDao extends BaseMapper { List dealWithDS(@Param("type") String standType, @Param("status")List strings); - List selectOldSystemInfo(); - - List selectListInfo(); + List selectListInfo(@Param("type") String type); List OldSystemFile(@Param("loreDocId") String loreDocId); @@ -111,4 +109,6 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectOldSystemFileBuildId(@Param("buildId") String buildId); OldSystem loreDepotSort(@Param("sortId") String sortId); + + List selectOldSystemInfoByBuidId(@Param("buildId") String buildId); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml index 17105f6a..6994a345 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml @@ -241,4 +241,15 @@ + + update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.TRANSLATION = #{translation} + where id = #{id} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml index a7b74a5c..9f5e4db4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml @@ -167,5 +167,15 @@ where id = #{id} + + update SAR_BUSS_STAND_ATTR_INFO sb set sb.FBGBUSS = #{fbgbuss}, sb.TRANSLATION = #{translation} + where ID = #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index c3717d55..c165c4a2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1233,5 +1233,7 @@ att.FBGBUSS as 'fileId' from sar_bussioness_stand std 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 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 1b0f4d38..5f96b8b2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1888,13 +1888,6 @@ - - SELECT - lo.Src as 'fileSrc' + lo.Src as 'fileSrc', + lo.Sign as 'fileSign', + lo.Ext as 'ext' from lore_attache lo where 1=1 @@ -1944,4 +1944,25 @@ + + + +