From 078e4ddb21f4133ac312f50dd2e1dd48b6d3080e Mon Sep 17 00:00:00 2001 From: hansha Date: Tue, 5 Nov 2024 11:41:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8C=89=E5=AE=A2=E6=88=B7=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E5=AF=BC=E5=87=BA=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/DaCatalog.java | 12 +++++------ .../controller/DaCatalogController.java | 15 +++++++++++++- .../com/da/dangan/mapper/DaCatalogMapper.java | 4 ++++ .../da/dangan/service/IDaCatalogService.java | 2 ++ .../service/impl/DaCatalogServiceImpl.java | 15 ++++++++++++++ .../mapper/dangan/DaCatalogMapper.xml | 20 +++++++++++++++++++ 6 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java b/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java index 0e6c760..02517b6 100644 --- a/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java +++ b/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java @@ -26,27 +26,27 @@ public class DaCatalog extends BaseEntity private String muName; /** 父目录ID */ - @Excel(name = "父目录ID") + //@Excel(name = "父目录ID") private Long pid; /** 祖级列表 */ - @Excel(name = "祖级列表") + //@Excel(name = "祖级列表") private String ancestors; /** 显示顺序 */ - @Excel(name = "显示顺序") + //@Excel(name = "显示顺序") private Long orderNum; /** 业务类型(字典) */ - @Excel(name = "业务类型(字典)") + @Excel(name = "业务类型",dictType = "yw_type") private String ywType; /** 业务类型(字典) */ - @Excel(name = "图片模板") + // @Excel(name = "图片模板") private String picPath; /** 菜单状态（0正常 1停用） */ - @Excel(name = "菜单状态", readConverterExp = "0=正常,1=停用") + // @Excel(name = "菜单状态", readConverterExp = "0=正常,1=停用") private String status; /** 子目录 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java index 6191bd3..06f0387 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java @@ -92,7 +92,7 @@ public class DaCatalogController extends BaseController /** * 导出档案目录列表 */ - @PreAuthorize("@ss.hasPermi('dangan:catalog:export')") + /*@PreAuthorize("@ss.hasPermi('dangan:catalog:export')") @Log(title = "档案目录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, DaCatalog daCatalog) @@ -100,6 +100,19 @@ public class DaCatalogController extends BaseController List list = daCatalogService.selectDaCatalogList(daCatalog, getLoginUser()); ExcelUtil util = new ExcelUtil(DaCatalog.class); util.exportExcel(response, list, "档案目录数据"); + }*/ + + /** + * 根据父级id导出档案目录列表(第一层级) + */ + @PreAuthorize("@ss.hasPermi('dangan:catalog:export')") + @Log(title = "档案目录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DaCatalog daCatalog) + { + List list = daCatalogService.exportDaCatalogList(daCatalog, getLoginUser()); + ExcelUtil util = new ExcelUtil(DaCatalog.class); + util.exportExcel(response, list, "档案目录数据"); } /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java index f26c533..3f709db 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java @@ -70,4 +70,8 @@ public interface DaCatalogMapper List selectContainIdsById(String id); Integer selectNumByPid(Long id); + + List exportDaCatalogList(DaCatalog daCatalog); + + List exportDaCatalogListByUserId(DaCatalog daCatalog); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java index b49b0d6..150c833 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java @@ -88,4 +88,6 @@ public interface IDaCatalogService public List selectDaCatalogListAndcount(DaCatalog daCatalog, LoginUser user); Integer selectNumByPid(Long id); + + List exportDaCatalogList( DaCatalog daCatalog, LoginUser loginUser); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java index d9aff4e..c1232b3 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java @@ -254,6 +254,21 @@ public class DaCatalogServiceImpl implements IDaCatalogService { return daCatalogMapper.selectNumByPid(id); } + @Override + public List exportDaCatalogList( DaCatalog daCatalog, LoginUser loginUser) { + // 超管及角色为管理员显示所有目录信息 + List catalogList; + if (SysUser.isAdmin(loginUser.getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + catalogList = daCatalogMapper.exportDaCatalogList(daCatalog); + } else { //根据用户权限显示目录信息 + daCatalog.getParams().put("userId", loginUser.getUserId()); + catalogList = daCatalogMapper.exportDaCatalogListByUserId(daCatalog); + } + return catalogList; + + } + /** * 新增档案目录 * diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml index 1249828..9757ea6 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml @@ -126,6 +126,26 @@ ) + + + + + + insert into da_catalog From 444067318c6cca05ae028250015d55c7a46af1a3 Mon Sep 17 00:00:00 2001 From: hansha Date: Tue, 5 Nov 2024 11:43:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=89=E5=AE=A2=E6=88=B7=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dangan-admin/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dangan-admin/src/main/resources/application.yml b/dangan-admin/src/main/resources/application.yml index 5429e9e..b047a85 100644 --- a/dangan-admin/src/main/resources/application.yml +++ b/dangan-admin/src/main/resources/application.yml @@ -59,7 +59,7 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 50MB # 设置总上传的文件大小 max-request-size: 500MB # 服务模块