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 a00ab75c..8f2f6dfb 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 @@ -432,5 +432,11 @@ public class SarBussionessStandController extends BaseController ResponseMessage importSarBussionessStandFile(MultipartFile file); + ResponseMessage repetitionFile(); } 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 99ddb075..b01995e9 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 @@ -2937,16 +2937,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); - //获取所有的文件表信息 - List loreAttacheList = sarStandardsInfoDao.selectOldSystemFile(); - //数据组合 List oldArr = new ArrayList(); List oldArr1 = new ArrayList(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 - for (OldSystem oldSystem : oldSystemInfoList) { - for (OldSystem SarStandardsInfo: SarStandardsInfoList){ + for (OldSystem SarStandardsInfo: SarStandardsInfoList){ + for (OldSystem oldSystem : oldSystemInfoList) { if(StringUtils.isNotBlank(SarStandardsInfo.getBuildId())){ if(oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { //通过,号分割文件,通过id去查询文件 获取文件名称 @@ -2961,12 +2958,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList){ + public String isTheSame (String oldFileName,String buildId){ + List loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); if(loreAttacheList.size()>0){ for (OldSystem src : loreAttacheList) { if(StringUtils.isNotBlank(src.getFileSrc())){ @@ -3098,4 +3097,38 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList = sarStandardsInfoDao.selectOldSystemFile(); + for (OldSystem src : loreAttacheList) { + if(StringUtils.isNotBlank(src.getFileSrc())){ + // 通过 / 去分割 / 的最后一位 + String[] split = src.getFileSrc().split("/"); + List asList = Arrays.asList(split); + //集合的最后一个就是名称 + int size = asList.size(); + String s = asList.get(size-1); + for (OldSystem data: loreAttacheList){ + //相等证明是数据本身 + if(!src.getFileId().equals(data.getFileId())) { + if (StringUtils.isNotBlank(data.getFileSrc())) { + // 通过 / 去分割 / 的最后一位 + String[] split1 = data.getFileSrc().split("/"); + List asList1 = Arrays.asList(split1); + //集合的最后一个就是名称 + int size1 = asList1.size(); + String s1 = asList1.get(size1 - 1); + if (s.equals(s1)) { + set.add(src.getFileId()); + } + } + } + } + } + } + return Result.success(null,"数量="+set.size()+"====",set); + } } 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 d997aeb7..786e3629 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 @@ -107,4 +107,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List OldSystemFile(@Param("loreDocId") String loreDocId); List selectOldSystemFile(); + + List selectOldSystemFileBuildId(@Param("buildId") String buildId); + + OldSystem loreDepotSort(@Param("sortId") String sortId); } 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 38607da4..1b0f4d38 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 @@ -1891,12 +1891,8 @@ + + + +