From 7de147f8df5f1b13ee8c9a54d8ebc64ac9c3e951 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 22 Feb 2022 15:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=92=8C=E6=9F=A5=E7=9C=8B=E5=B7=B2=E4=B8=8A=E4=BC=A0=E7=9A=84?= =?UTF-8?q?=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 | 4 +- .../oss/service/impl/OSSFileServiceImpl.java | 10 +++- .../system/controller/CommonController.java | 6 +-- .../BussDocumentLibraryEOController.java | 12 +++++ .../IBussDocumentLibraryEOService.java | 7 +++ .../BussDocumentLibraryEOServiceImpl.java | 53 ++++++++++++++++++- 6 files changed, 86 insertions(+), 6 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 9b3830cf2..2d93b457b 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 @@ -20,7 +20,9 @@ public interface IOSSFileService extends IService { public OSSFile uploadLocal(MultipartFile mf, String bizPath); - public List getFileInfos(String connectId); + public List getFileInfos(String id); + + public List getFileInfosByConnectId(String connectId); boolean delete(OSSFile ossFile); 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 c73b5b61b..fee131bd6 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 @@ -121,7 +121,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl } @Override - public List getFileInfos(String connectId) { + public List getFileInfos(String id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(OSSFile::getId,id.split(",")); + List list = this.list(wrapper); + return list; + } + + @Override + public List getFileInfosByConnectId(String connectId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(OSSFile::getConnectId,connectId); List list = this.list(wrapper); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index 180a75f1c..ed598bf8e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -162,13 +162,13 @@ public class CommonController { /** * 查看已上传的文件 - * @param connectId + * @param id * @return */ @ApiOperation(value="查看已上传的文件", notes="查看已上传的文件") @GetMapping(value = "/getFileInfos") - public Result getFileInfos(String connectId) { - List fileInfos = ossFileService.getFileInfos(connectId); + public Result getFileInfos(String id) { + List fileInfos = ossFileService.getFileInfos(id); return Result.OK(fileInfos); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index ed01c0cb4..ebe2b860b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -211,6 +211,18 @@ public class BussDocumentLibraryEOController extends JeroController> list = bussDocumentLibraryEOService.getDocumentInfoById(id); return Result.OK(list); } + /** + * 详情数据查询 + * @param id + * @return + */ + @AutoLog(value = "详情,编辑数据查询") + @ApiOperation(value="详情,编辑数据查询", notes="详情,编辑数据查询") + @GetMapping(value = "/getInfoById") + public Result>> getInfoById(@RequestParam(name="id",required=true) String id) { + List> list = bussDocumentLibraryEOService.getInfoById(id); + return Result.OK(list); + } /** * 新增数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index 2b8c5b94f..ee7de825a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -74,6 +74,13 @@ public interface IBussDocumentLibraryEOService extends IService> getDocumentInfoById(String id); + /** + * 详情数据查询 + * @param id + * @return + */ + List> getInfoById(String id); + /** * 新增数据 * @param map 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 081fb2a92..8adba4c1b 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 @@ -223,8 +223,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); return dataList; + } - //一下代码为查看已上传的文件(此处已经单独提出一个接口-->/sys/common/getFileInfos) + /** + * 详情数据查询 + * + * @param id + * @return + */ + @Override + public List> getInfoById(String id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BussDocumentLibraryEO::getId, id); + //通过id查询数据 + List> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); +// //一下代码为查看已上传的文件(此处已经单独提出一个接口-->/sys/common/getFileInfos) // //字段属性 // List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); // //文件类型字段 @@ -240,6 +253,44 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea()); + //字段属性 + List fieldList = onlCgformFieldService.getFieldList("1"); + + if(fieldList.size() != 0){ + //过滤出表单字段(is_show_form-->表单是否显示0否 1是) + fieldList = fieldList.stream().filter(e-> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); + } + List> result = new ArrayList<>(); + for (OnlCgformArea onlCgformAreaTemp : areaList) { + Map mapTemp = new HashMap<>(); + List> resultTemp = new ArrayList<>(); + List fieldListTemp = fieldList.stream().filter(e->onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); + for (OnlCgformField onlCgformField : fieldListTemp) { + Map map = new HashMap<>(); + if(dataList.size() != 0){ + dataList.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());//区域 + resultTemp.add(map); + } + mapTemp.put(onlCgformAreaTemp.getShowArea(),resultTemp); + result.add(mapTemp); + } + return dataList; + + } /**