From bdb0a3a96ff10a9e9dcc56a117c69f853149f957 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 22 Feb 2022 14:05:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E6=97=B6,=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oss/service/IOSSFileService.java | 3 + .../oss/service/impl/OSSFileServiceImpl.java | 7 ++ .../BussDocumentLibraryEOServiceImpl.java | 96 ++++++++++++------- 3 files changed, 69 insertions(+), 37 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java index 071b1c843..9b3830cf2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java @@ -30,4 +30,7 @@ public interface IOSSFileService extends IService { */ void updateFileInfo(List ossFileList); + + void deleteByConnectIdList(List connectIdList); + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 8aa5db91c..c73b5b61b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -145,4 +145,11 @@ public class OSSFileServiceImpl extends ServiceImpl impl this.updateBatchById(ossFileList); } + @Override + public void deleteByConnectIdList(List connectIdList) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OSSFile::getConnectId,connectIdList); + this.remove(lambdaQueryWrapper); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 703846e86..a05b2241b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -74,6 +74,29 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl ids) { + + //字段属性 + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //文件类型字段 + List fieldFileList = fieldList.stream().filter(e -> "file".equals(e.getFieldShowType())).collect(Collectors.toList()); + + //删除文件 + + //删除文件 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(BussDocumentLibraryEO::getId,ids); + List> mapList = bussDocumentLibraryEOMapper.selectMaps(lambdaQueryWrapper); + + List connectIdList = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldFileList) { + String connectId = (String) mapList.get(0).get(onlCgformField.getDbFieldName()); + if(StringUtils.isNotBlank(connectId)){ + connectIdList.add(connectId); + } + } + //删除文件 + iOSSFileService.deleteByConnectIdList(connectIdList); + //删除文档库数据 removeByIds(ids); } @@ -193,38 +216,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BussDocumentLibraryEO::getId, id); //通过id查询数据 - List> dateList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); - return dateList; -// //区域管理 -// List areaList = onlCgformAreaServiceImpl.queryList(); -// //字段属性 -// List fieldList = onlCgformFieldService.getFieldList(flag); -// -// if(fieldList.size() != 0){ -// //过滤出表单字段(is_show_form-->表单是否显示0否 1是) -// fieldList = fieldList.stream().filter(e-> YesOrNo.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); -// } -// List> result = new ArrayList<>(); -// for (OnlCgformArea onlCgformAreaTemp : areaList) { -// fieldList = fieldList.stream().filter(e->onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); -// for (OnlCgformField onlCgformField : fieldList) { -// Map map = new HashMap<>(); -// if(dateList.size() != 0){ -// dateList.get(0).entrySet().forEach(entry->{ -// if(onlCgformField.getDbFieldName().equals(entry.getKey())){ -// map.put("value",entry.getValue()); -// } -// }); -// } -// map.put("field_show_type",onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) -// map.put("dict_field",onlCgformField.getDictField()); -// map.put("db_field_name",onlCgformField.getDbFieldName());//字段 -// map.put("db_field_txt",onlCgformField.getDbFieldTxt());//字段中文名 -// map.put("db_field_en_name",onlCgformField.getDbFieldEnName());//字段英文名 -// map.put("area",onlCgformAreaTemp.getShowArea());//区域 -// result.add(map); -// } -// } + List> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); + return dataList; + + //一下代码为查看已上传的文件(此处已经单独提出一个接口-->/sys/common/getFileInfos) +// //字段属性 +// List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); +// //文件类型字段 +// List fieldFileList = fieldList.stream().filter(e -> "file".equals(e.getFieldShowType())).collect(Collectors.toList()); +// for (OnlCgformField onlCgformField : fieldFileList) { +// String dbFieldName = onlCgformField.getDbFieldName(); +// String value = (String) dataList.get(0).get(dbFieldName); +// if(StringUtils.isNotBlank(value)){ +// List fileInfos = iOSSFileService.getFileInfos(value); +// int a = 0; +// if(fileInfos.size() != 0){ +// dataList.get(0).put(dbFieldName +"_file",fileInfos); +// } +// } +// } } /** @@ -339,7 +349,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl oSSFileList = new ArrayList<>(); for (String fileId : value.toString().split(",")) { @@ -349,7 +358,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BussDocumentLibraryEO::getId,(String) map.get("id")); + List> mapList = bussDocumentLibraryEOMapper.selectMaps(lambdaQueryWrapper); + + List connectIdList = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldFileList) { + String connectId = (String) mapList.get(0).get(onlCgformField.getDbFieldName()); + if(StringUtils.isNotBlank(connectId)){ + connectIdList.add(connectId); + } + } + //删除文件 + iOSSFileService.deleteByConnectIdList(connectIdList); //删除文档库数据 bussDocumentLibraryEOMapper.deleteById((String) map.get("id")); bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);