diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 8f2f6dfb..cad4f1b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -428,8 +428,8 @@ public class SarBussionessStandController extends BaseController void checkFileByEncrypt(); - ResponseMessage emptyFileAnewStorage(); + ResponseMessage emptyFileAnewStorage(String type); ResponseMessage importSarBussionessStandFile(MultipartFile file); 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 1277e504..2225ecaf 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 @@ -2753,173 +2753,176 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); + public ResponseMessage emptyFileAnewStorage(String type) { + //List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); + // List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); // 获取 kmpro_addon34 表的 lore_doc_id List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); - //数据组合 List oldArr = new ArrayList(); List oldArr1 = new ArrayList(); //记录同一数据下文件名重复的 List fileEOArrayList= new ArrayList<>(); - //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 - 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) { - //循环调用每一个 文件 获取文件名称 - 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.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = "," + fileId; + if(type.equals("海外")) { + List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); + 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) { + //循环调用每一个 文件 获取文件名称 + 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.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = "," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = "," + fileId; - } else { - yuan = fileId; - } + 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); - } - } - } - } - } - } - } - } - - //企业的文件数据处理 - 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; - 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; - } else { - yi = fileId; - } - } 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(sarBussionessStand.getStandId()); - oldArr1.add(old); - } - }else { - //记录 同一条数据名称一样的 - for (AttFileEO fileEO:attFileEOS) { - //记录重复 此id企业或者海外的id - fileEO.setResId("q-"+sarBussionessStand.getStandId()); - fileEOArrayList.add(fileEO); - } } - } } } } } - } + //海外 国内 + 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("海外国内修改成功"); + } - // 企业 - 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()); - } - 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()); + if(type.equals("企业")){ + List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); + //企业的文件数据处理 + 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; + 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; + } else { + yi = fileId; + } + } 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(sarBussionessStand.getStandId()); + oldArr1.add(old); + } + }else { + //记录 同一条数据名称一样的 + for (AttFileEO fileEO:attFileEOS) { + //记录重复 此id企业或者海外的id + fileEO.setResId("q-"+sarBussionessStand.getStandId()); + fileEOArrayList.add(fileEO); + } + } + + } + } + } + } + } + } + // 企业 + 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()); + } + sarBussStandAttrInfoEODao.updateById(sarBussStandAttrInfo); + logger.info("企业修改成功"); } - sarStandAttrInfoEODao.updateById(sarStandAttrInfo); - logger.info("海外国内修改成功"); } return Result.success(fileEOArrayList); } 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..9900c0cc 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 @@ -1903,6 +1903,8 @@ att.FBGBJBD as 'fileId' from sar_standards_info std 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