From 04c780243cae30f0367a4fd8fa6267288b9deb14 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 24 Mar 2023 17:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=A0=87=E5=87=86=E9=99=84=E4=BB=B6=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 5 + .../dao/SarBussionessStandDao.java | 4 + .../service/ISarBussionessStandService.java | 2 + .../impl/SarBussionessStandServiceImpl.java | 115 ++++++++++++++++++ .../SarBussionessStandMapper.xml | 18 +++ .../java/com/adc/da/att/dao/AttFileEODao.java | 1 + .../adc/da/att/service/IAttFileEOService.java | 2 + .../service/impl/AttFileEOServiceImpl.java | 16 ++- .../mybatis/mapper/att/AttFileEOMapper.xml | 4 + 9 files changed, 163 insertions(+), 4 deletions(-) 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 6acb0c22..0a0075bd 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 @@ -433,5 +433,10 @@ public class SarBussionessStandController extends BaseController { void importSarBussionessStand(SarBussionessStand sarBussionessStands); List selectListInfo(); + + List getBussionessStandInfo(); + + void updateByIdInfo(@Param("strFile")String strFile, @Param("attfId")String attfId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index c77bac43..0e072d8e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -61,5 +61,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception; ResponseMessage repetitionFile(); + + ResponseMessage newRpetitionFile(); } 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 16478be7..6964430b 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 @@ -122,6 +122,7 @@ import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** *

@@ -3791,6 +3792,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl newFileNameRepetition(List asList){ List attFileEOS = new ArrayList<>(); Set attFileEOArrayList = new HashSet<>(); @@ -3847,4 +3849,117 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objects = new HashSet<>(); + // 名称一致 大小一致 则为重复 + //新系统产品标准 重复附件清除问题 字段修改 文件删除 + List sarBussionessStandList = sarBussionessStandEODao.getBussionessStandInfo(); + if(!sarBussionessStandList.isEmpty()){ + for (OldSystem data : sarBussionessStandList){ + if(StringUtils.isNotBlank(data.getFileId())){ + if(data.getFileId().contains(",")){ + //不包含逗号则证明为一条,一条则不处理 + String[] split = data.getFileId().split(","); + List asList = Arrays.asList(split); + if(!asList.isEmpty() && StringUtils.isNotBlank(data.getStandId())){ + String str = updateInfo(asList, data.getStandId(), data.getAttfid()); + if(StringUtils.isNotBlank(str)){ + objects.add(str); + } + } + } + } + } + } + return Result.success(objects); + } + + public String updateInfo(List asList,String standId,String attfId) { + //重复的集合 + List chongfu = new ArrayList<>(); + //所有数据的集合 + List attFileEOArrayList = new ArrayList<>(); + //辅助循环的集合 + List rocorArrayList = new ArrayList<>(); + //非重复的集合 + List notRepetitionList = new ArrayList<>(); + for (String fileId:asList){ + AttFileEO byId = attFileEOService.getFileInfo(fileId); + if(byId!=null) { + attFileEOArrayList.add(byId); + } + } + String strFileInfo = ""; + String strFile = ""; + if(!attFileEOArrayList.isEmpty()) { + for (int i = 0; i + + + + + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile} + where id = #{attfId} + diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java index b51ade10..7218e09e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java @@ -24,4 +24,5 @@ public interface AttFileEODao extends BaseMapper { public int insertData(AttFileEO attFileEO); + void deleteByIdInfo(String str, String id); } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java index ad3edad4..d7ef8220 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -32,4 +32,6 @@ public interface IAttFileEOService extends IService { public AttFileVo insertFileInfo(File file,String fileName); void downLoadFileList(List multiFileInfos, String fileNowPath) throws IOException; + + void deleteById(String id); } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 7d759ce5..9b178b8b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -23,10 +23,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Date; -import java.util.List; +import java.util.*; @Service("attFileEOService") @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) @@ -438,6 +435,17 @@ public class AttFileEOServiceImpl extends ServiceImpl i } } } + + @Override + public void deleteById(String id) { + if(StringUtils.isNotBlank(id)){ + String[] s = id.split("_"); + List asList = Arrays.asList(s); + String str = "att_file_"+asList.get(2); + baseMapper.deleteByIdInfo(str,id); + } + } + public static void copyFile1(String srcPath, String destPath) throws IOException { // 打开输入流 FileInputStream fis = new FileInputStream(srcPath); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml index 565a95df..1349ee8e 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -100,4 +100,8 @@ update ${tableName} set OLD_FILE_NAME = #{oldFileName} where id = #{id} + + delete from ${str} where id = #{id} + +