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 5228dee2..2bc50570 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 @@ -2681,6 +2681,366 @@ public class SarBussionessStandServiceImpl extends ServiceImpl OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(bid); + if(!OldSystem1.isEmpty()){ + 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) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set 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 = yi+"," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + } + } + + } + } + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + + } + } + }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 = yi+"," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + SarStandardsInfo.getFileId(); + } else { + yuan = SarStandardsInfo.getFileId(); + } + } + } + } + } + } + } + } + } + } + }else { + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + if(!OldSystem1.isEmpty()){ + 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) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set 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 = yi+"," + fileId; + } else { + yi = fileId; + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + + } + } + } + } + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), SarStandardsInfo.getBuildId()); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } + + }else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), SarStandardsInfo.getBuildId()); + if (theSame.equals("1")) { + File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } + + } + } + }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 = yi+"," + SarStandardsInfo.getFileId(); + } else { + yi = SarStandardsInfo.getFileId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + 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 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); + if(!OldSystem1.isEmpty()){ OldSystem oldSystem =OldSystem1.get(0); if (oldSystem.getLoreDocId().equals(bid)) { //通过,号分割文件，通过id去查询文件 获取文件名称 @@ -2721,90 +3081,90 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), bid); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } + } else { + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } + } + } + } + } - } else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); - if (theSame.equals("1")) { - File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(SarStandardsInfo.getStandId()); - } + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } + }else { + fileEOArrayList.add(SarStandardsInfo.getStandId()); + } } } @@ -2837,8 +3197,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + } + }else { + List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); + if(!OldSystem1.isEmpty()){ OldSystem oldSystem =OldSystem1.get(0); if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { //通过,号分割文件，通过id去查询文件 获取文件名称 @@ -2883,8 +3245,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 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) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set 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 = yi+"," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } - } - } - - } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; - } - } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), bid); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } - - } else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); - if (theSame.equals("1")) { - File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(SarStandardsInfo.getStandId()); - } - - } - } - }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 = yi+"," + SarStandardsInfo.getFileId(); - } else { - yi = SarStandardsInfo.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - 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) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set 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 = yi+"," + fileId; - } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } - - } - } - } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; - } - } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), SarStandardsInfo.getBuildId()); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); - } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); - } - } - } - } - } - - }else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), SarStandardsInfo.getBuildId()); - if (theSame.equals("1")) { - File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } - } - }else { - fileEOArrayList.add(SarStandardsInfo.getStandId()); - } - - } - } - }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 = yi+"," + SarStandardsInfo.getFileId(); - } else { - yi = SarStandardsInfo.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + SarStandardsInfo.getFileId(); - } else { - yuan = SarStandardsInfo.getFileId(); - } - } - } - } - } - } - } - } } if (StringUtils.isNotBlank(yi)) { @@ -3389,153 +3399,155 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 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) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set 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 = yi+"," + fileId; + if(OldSystem1.isEmpty()){ + 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) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set 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 = yi+"," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } } } - } - } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; } } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), bid); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } + } + } + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), bid); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } } } } } - } - } else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); - if (theSame.equals("1")) { - File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } + } else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); + String theSame = isTheSame(arrayList.get(0).getOldFileName(), bid); + if (theSame.equals("1")) { + File file1 = new File("E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File("E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } } } } + }else { + fileEOArrayList.add(sarBussionessStand.getStandId()); } - }else { - fileEOArrayList.add(sarBussionessStand.getStandId()); + } - } - } - }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 = yi+"," + sarBussionessStand.getFileId(); + }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 = yi+"," + sarBussionessStand.getFileId(); + } else { + yi = sarBussionessStand.getFileId(); + } } else { - yi = sarBussionessStand.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); + } } } } @@ -3547,154 +3559,156 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 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) { - // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 - Set 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 = yi+"," + fileId; + if(!OldSystem1.isEmpty()){ + 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) { + // 判断 新系统中的文件是否有名称是一样的 如果有 则跳过 进行记录 没有则 往下走 + Set 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 = yi+"," + fileId; + } else { + yi = fileId; + } } else { - yi = fileId; - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + fileId; - } else { - yuan = fileId; - } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + fileId; + } else { + yuan = fileId; + } + } } } } - } - } else { - int numberCount = 0; - //只允许2个文件名称相同 - for (AttFileEO data : attFileEOS) { - numberCount = 0; - for (AttFileEO file : attFileEOS) { - if (data.getOldFileName().equals(file.getOldFileName())) { - numberCount = numberCount+1; + } else { + int numberCount = 0; + //只允许2个文件名称相同 + for (AttFileEO data : attFileEOS) { + numberCount = 0; + for (AttFileEO file : attFileEOS) { + if (data.getOldFileName().equals(file.getOldFileName())) { + numberCount = numberCount+1; + } } } - } - if(numberCount==2){ - //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 - List attFileEOS1 = newFileNameRepetitionInfo(asList); - // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS - List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); - if(!notRepeatedFile.isEmpty()){ - //不重复数据在老库中是否存在 selectOldSystemFileBuildId - for (AttFileEO file: notRepeatedFile){ - String theSame = isTheSame(file.getOldFileName(), sarBussionessStand.getBuildId()); - //1 有相同 -1 无相同 - if(theSame.equals("1")){ - //证明找到文件名称一致的了 - OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); - //原文译文 进行判断 - if(sortSign != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + file.getId(); + if(numberCount==2){ + //1:文件名称重复的情况下 判断文件的大小 大的为中文 小的为英文，一样大则存入 + List attFileEOS1 = newFileNameRepetitionInfo(asList); + // 不相等的数据 notRepeatedFile 重复的文件 attFileEOS + List notRepeatedFile = duplicateFiles(attFileEOS1, attFileEOS); + if(!notRepeatedFile.isEmpty()){ + //不重复数据在老库中是否存在 selectOldSystemFileBuildId + for (AttFileEO file: notRepeatedFile){ + String theSame = isTheSame(file.getOldFileName(), sarBussionessStand.getBuildId()); + //1 有相同 -1 无相同 + if(theSame.equals("1")){ + //证明找到文件名称一致的了 + OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); + //原文译文 进行判断 + if(sortSign != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + file.getId(); + } else { + yi = file.getId(); + } } else { - yi = file.getId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + file.getId(); - } else { - yuan = file.getId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + file.getId(); + } else { + yuan = file.getId(); + } } } } } - } + }else { + //相同文件处理 + List arrayList = new ArrayList<>(); + for (AttFileEO data : attFileEOS) { + arrayList.add(data); + } + String theSame = isTheSame(arrayList.get(0).getOldFileName(), sarBussionessStand.getBuildId()); + if (theSame.equals("1")) { + File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); + File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); + //判断两个文件大小 //相等 则不做处理 + long length1 = file1.length(); + long length2 = file2.length(); + if (length1 > length2) { + //1 中文 2英文 + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(1).getId(); + } else { + yi = arrayList.get(1).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(0).getId(); + } else { + yuan = arrayList.get(0).getId(); + } + } + if (length1 < length2) { + if (StringUtils.isNotBlank(yi)) { + yi = yi + "," + arrayList.get(0).getId(); + } else { + yi = arrayList.get(0).getId(); + } + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan + "," + arrayList.get(1).getId(); + } else { + yuan = arrayList.get(1).getId(); + } + } + } + } }else { - //相同文件处理 - List arrayList = new ArrayList<>(); - for (AttFileEO data : attFileEOS) { - arrayList.add(data); - } - String theSame = isTheSame(arrayList.get(0).getOldFileName(), sarBussionessStand.getBuildId()); - if (theSame.equals("1")) { - File file1 = new File( "E:/data/slrs/file/" + arrayList.get(0).getFilePath() + arrayList.get(0).getFileName()); - File file2 = new File( "E:/data/slrs/file/" + arrayList.get(1).getFilePath() + arrayList.get(1).getFileName()); - //判断两个文件大小 //相等 则不做处理 - long length1 = file1.length(); - long length2 = file2.length(); - if (length1 > length2) { - //1 中文 2英文 - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(1).getId(); - } else { - yi = arrayList.get(1).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(0).getId(); - } else { - yuan = arrayList.get(0).getId(); - } - } - if (length1 < length2) { - if (StringUtils.isNotBlank(yi)) { - yi = yi + "," + arrayList.get(0).getId(); - } else { - yi = arrayList.get(0).getId(); - } - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan + "," + arrayList.get(1).getId(); - } else { - yuan = arrayList.get(1).getId(); - } - } - } + fileEOArrayList.add(sarBussionessStand.getStandId()); } - }else { - fileEOArrayList.add(sarBussionessStand.getStandId()); - } + } } - } - }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 != null) { - if (sortSign.getSortSign().contains("译")) { - if (StringUtils.isNotBlank(yi)) { - yi = yi+"," + sarBussionessStand.getFileId(); + }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 != null) { + if (sortSign.getSortSign().contains("译")) { + if (StringUtils.isNotBlank(yi)) { + yi = yi+"," + sarBussionessStand.getFileId(); + } else { + yi = sarBussionessStand.getFileId(); + } } else { - yi = sarBussionessStand.getFileId(); - } - } else { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); + if (StringUtils.isNotBlank(yuan)) { + yuan = yuan+"," + sarBussionessStand.getFileId(); + } else { + yuan = sarBussionessStand.getFileId(); + } } } }