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 b0970f41..ebc32d5e 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 @@ -44,10 +44,7 @@ public interface SarBussStandAttrInfoDao extends BaseMapper selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId); - 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); } 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 304ad227..6242ec88 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 @@ -2976,15 +2976,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - for (OldSystem sarBussionessStand : SarBussionessStandList) { - String yi = ""; - String yuan = ""; - OldSystem old = new OldSystem(); - 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); - 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); - if(byId!=null){ - 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(sarBussionessStand.getStandId()); - } - - } - } - }else { - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - if(byId!=null){ - 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 { - if (StringUtils.isNotBlank(yuan)) { - yuan = yuan+"," + sarBussionessStand.getFileId(); - } else { - yuan = sarBussionessStand.getFileId(); - } - } - } - } - } - } - } - } - } - } - } - }else { - List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); - 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); - if(byId!=null){ - 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 { - 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(), 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 { - 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 { - fileEOArrayList.add(sarBussionessStand.getStandId()); - } - - } - } - }else { - //循环调用每一个 文件 获取文件名称 - String id = sarBussionessStand.getFileId(); - AttFileEO byId = attFileEOService.getFileInfo(id); - if(byId!=null){ - 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 { - if (StringUtils.isNotBlank(yuan)) { - 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)) { - old.setStandId(sarBussionessStand.getStandId()); - oldArr.add(old); - } - } - // 企业 - for(OldSystem data : oldArr) { - 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("企业修改成功===================================================================================="); - } +// List SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); +// for (OldSystem sarBussionessStand : SarBussionessStandList) { +// String yi = ""; +// String yuan = ""; +// OldSystem old = new OldSystem(); +// 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); +// 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); +// if(byId!=null){ +// 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(sarBussionessStand.getStandId()); +// } +// +// } +// } +// }else { +// String id = sarBussionessStand.getFileId(); +// AttFileEO byId = attFileEOService.getFileInfo(id); +// if(byId!=null){ +// 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 { +// if (StringUtils.isNotBlank(yuan)) { +// yuan = yuan+"," + sarBussionessStand.getFileId(); +// } else { +// yuan = sarBussionessStand.getFileId(); +// } +// } +// } +// } +// } +// } +// } +// } +// } +// } +// } +// }else { +// List OldSystem1 = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); +// 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); +// if(byId!=null){ +// 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 { +// 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(), 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 { +// 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 { +// fileEOArrayList.add(sarBussionessStand.getStandId()); +// } +// +// } +// } +// }else { +// //循环调用每一个 文件 获取文件名称 +// String id = sarBussionessStand.getFileId(); +// AttFileEO byId = attFileEOService.getFileInfo(id); +// if(byId!=null){ +// 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 { +// if (StringUtils.isNotBlank(yuan)) { +// 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)) { +// old.setStandId(sarBussionessStand.getStandId()); +// oldArr.add(old); +// } +// } +// // 企业 +// for(OldSystem data : oldArr) { +// String id = sarBussStandAttrInfoEODao.selectInfoStandId(data.getStandId()); +// if(StringUtils.isNotBlank(id)) { +// //sarBussStandAttrInfoEODao.updateByIdInfo(id,sarBussStandAttrInfo.getFbgbuss(),sarBussStandAttrInfo.getTranslation()); +// logger.info("企业修改成功===================================================================================="); +// } +// +// } + logger.info("企业没有译文件"); } return Result.success(fileEOArrayList); } 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 13266ef0..353743a1 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 @@ -42,7 +42,7 @@ public interface SarStandAttrInfoDao extends BaseMapper { 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); + void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("fbgywbd") String fbgywbd); String selectInfoStandId(@Param("standId")String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 6ba76937..107a7cef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -238,9 +238,4 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("BDTBZH") private String bdtbzh; - @ApiModelProperty(value = "译文件") - @TableField("TRANSLATION") - private String translation; - - } 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 6994a345..dc335c84 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 @@ -242,7 +242,7 @@ - update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.TRANSLATION = #{translation} + update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.FBGYWBD = #{fbgywbd} 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 9f5e4db4..5cd9c06a 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,10 +167,6 @@ where id = #{id} - - update SAR_BUSS_STAND_ATTR_INFO sb set sb.FBGBUSS = #{fbgbuss}, sb.TRANSLATION = #{translation} - where ID = #{id} -