From 5627ff30acb556d090133cf4dbf47ae9c96c9f90 Mon Sep 17 00:00:00 2001 From: gaosong Date: Fri, 29 Jul 2022 13:51:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoDataController.java | 70 ++++++++++++----- .../controller/ExtRepoFolderController.java | 76 ++++++++++++++++--- .../enums/ExtRepoMamagerRoleIdEnum.java | 7 +- .../extRepo/service/IExtRepoDataService.java | 72 +++++++++--------- .../service/IExtRepoFolderService.java | 8 ++ .../impl/ExtRepoFolderServiceImpl.java | 52 +++++-------- 6 files changed, 181 insertions(+), 104 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 0eab59998..a6f651b3d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.modules.extRepo.entity.ExtRepoData; @@ -66,13 +67,12 @@ public class ExtRepoDataController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); // 文件名称模糊查询 String fileName = req.getParameter("fileName"); if (StringUtils.isNotBlank(fileName)) { queryWrapper.like(ExtRepoData::getFileName, fileName); } - // 上传人模糊查询 String createBy = req.getParameter("createBy"); if (StringUtils.isNotBlank(createBy)) { @@ -88,10 +88,6 @@ public class ExtRepoDataController extends JeroController pageList = extRepoDataService.page(page, queryWrapper); - log.info("查询当前页：" + pageList.getCurrent()); - log.info("查询当前页数量：" + pageList.getSize()); - log.info("查询结果数量：" + pageList.getRecords().size()); - log.info("数据总数：" + pageList.getTotal()); ExtRepoDataPage res = new ExtRepoDataPage(extRepoFolderService.haveManageAuth(extRepoData.getSupFolder()), pageList); return Result.OK(res); } @@ -118,13 +114,22 @@ public class ExtRepoDataController extends JeroController add(@Validated @RequestBody ExtRepoData extRepoData) { + public Result add(@Validated @RequestBody ExtRepoData extRepoData, + @RequestParam("cut") String cut) { if (extRepoFolderService.haveManageAuth(extRepoData.getSupFolder())) { log.info("对外报告数据表收到文件添加请求，开始处理文件:【" + sdf.format(new Date()) + "】"); int res = extRepoDataService.add(extRepoData); - return Result.OK("添加成功" + res + "条数据！"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("添加成功:" + res + "条数据！"); + } else { + return Result.OK("success:" + res + "data！"); + } } else { - return Result.error("没有权限！"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("没有权限！"); + } else { + return Result.error("No Permission！"); + } } } @@ -138,15 +143,24 @@ public class ExtRepoDataController extends JeroController edit(@Validated @RequestBody ExtRepoData extRepoData) { + public Result edit(@Validated @RequestBody ExtRepoData extRepoData, + @RequestParam("cut") String cut) { ExtRepoData erd = extRepoDataService.queryById(extRepoData.getId()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) { extRepoData.setSupFolder(erd.getSupFolder()); extRepoDataService.editById(extRepoData); - return Result.OK("添加成功！"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("添加成功！"); + } else { + return Result.OK("success！"); + } } else { - return Result.error("没有权限！"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("没有权限！"); + } else { + return Result.error("No Permission！"); + } } } @@ -159,18 +173,27 @@ public class ExtRepoDataController extends JeroController delete(@RequestParam("id") String id) { + public Result delete(@RequestParam("id") String id, + @RequestParam("cut") String cut) { ExtRepoData erd = extRepoDataService.queryById(id); if (null != erd) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) { extRepoDataService.deleteById(id); - return Result.OK("删除成功!"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("删除成功!"); + } else { + return Result.OK("Delete success!"); + } } else { - return Result.error("没有权限！"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("没有权限！"); + } else { + return Result.error("No Permission！"); + } } } else { - return Result.error("没有此数据！"); + return Result.error("Delete Error！"); } } @@ -183,17 +206,26 @@ public class ExtRepoDataController extends JeroController deleteBatch(@RequestParam("ids") String ids) { + public Result deleteBatch(@RequestParam("ids") String ids, + @RequestParam("cut") String cut) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List idsList = Arrays.asList(ids.split(",")); for (String id : idsList) { ExtRepoData erd = extRepoDataService.queryById(id); if (null != erd && !extRepoFolderService.isManager() && !sysUser.getUsername().equals(erd.getCreateBy())) { - return Result.error("没有权限!"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("没有权限！"); + } else { + return Result.error("No Permission！"); + } } } this.extRepoDataService.deleteByIds(idsList); - return Result.OK("批量删除成功!"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("删除成功!"); + } else { + return Result.OK("Delete success!"); + } } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java index 67bc95ced..8c0caae2c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java @@ -2,6 +2,7 @@ package com.jero.modules.extRepo.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.extRepo.entity.ERFTreeData; import com.jero.modules.extRepo.entity.ExtRepoFolder; @@ -52,9 +53,22 @@ public class ExtRepoFolderController extends JeroController add(@Validated @RequestBody ExtRepoFolder extRepoFolder) { - extRepoFolderService.add(extRepoFolder); - return Result.OK("添加成功！"); + public Result add(@Validated @RequestBody ExtRepoFolder extRepoFolder, + @RequestParam("cut") String cut) { + if (extRepoFolderService.haveManageAuth(extRepoFolder.getSupFolder())) { + extRepoFolderService.add(extRepoFolder); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("添加成功！"); + } else { + return Result.OK("success！"); + } + } else { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("没有权限！"); + } else { + return Result.error("No Permission！"); + } + } } /** @@ -66,9 +80,22 @@ public class ExtRepoFolderController extends JeroController edit(@Validated @RequestBody ExtRepoFolder extRepoFolder) { - extRepoFolderService.editById(extRepoFolder); - return Result.OK("编辑成功!"); + public Result edit(@Validated @RequestBody ExtRepoFolder extRepoFolder, + @RequestParam("cut") String cut) { + if (extRepoFolderService.haveManageAuth(extRepoFolder.getId())) { + extRepoFolderService.editById(extRepoFolder); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("编辑成功!"); + } else { + return Result.OK("success！"); + } + } else { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("没有权限！"); + } else { + return Result.error("No Permission！"); + } + } } /** @@ -80,9 +107,31 @@ public class ExtRepoFolderController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { - extRepoFolderService.deleteById(id); - return Result.OK("删除成功!"); + public Result delete(@RequestParam(name = "id", required = true) String id, + @RequestParam("cut") String cut) { + if (extRepoFolderService.haveManageAuth(id)) { + List resList = extRepoFolderService.getListBySupFolder(id); + if (resList.isEmpty()) { + extRepoFolderService.deleteById(id); + } else { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("请先删除子文件夹！"); + } else { + return Result.error("Please Delete Subfolder First！"); + } + } + } else { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("没有权限！"); + } else { + return Result.error("No Permission！"); + } + } + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK("删除成功!"); + } else { + return Result.OK("success！"); + } } /** @@ -94,10 +143,15 @@ public class ExtRepoFolderController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { + public Result queryById(@RequestParam(name = "id", required = true) String id, + @RequestParam("cut") String cut) { ExtRepoFolder extRepoFolder = extRepoFolderService.queryById(id); if (extRepoFolder == null) { - return Result.error("未找到对应数据"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("未找到对应数据"); + } else { + return Result.error("No Data！"); + } } return Result.OK(extRepoFolder); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java index 542d4ef58..1033458c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/enums/ExtRepoMamagerRoleIdEnum.java @@ -4,9 +4,8 @@ import java.util.ArrayList; import java.util.List; public enum ExtRepoMamagerRoleIdEnum { - MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",1), - ERMANAGER_ID("对外报告管理员","ExternalReportsManager","ExternalReportsManager","1552536424587862017",2); - + MANAGER_ID("系统管理员", "Administrator", "admin", "f6817f48af4fb3af11b9e8bf182f618b", 1), + ERMANAGER_ID("对外报告管理员", "ExternalReportsManager", "ExternalReportsManager", "1552536424587862017", 2); String name; String enName; @@ -68,6 +67,6 @@ public enum ExtRepoMamagerRoleIdEnum { for (ExtRepoMamagerRoleIdEnum ermriEnum : values) { idList.add(ermriEnum.getId()); } - return idList; + return idList; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java index 2a88e9294..cb141bd4e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoDataService.java @@ -8,55 +8,55 @@ import java.util.List; /** * @Description: 对外报告数据表 * @Author: jero-boot - * @Date: 2022-07-25 + * @Date: 2022-07-25 * @Version: V1.0 */ public interface IExtRepoDataService extends IService { - /** - * 保存 - * - * @param extRepoData - * @return - */ - int add(ExtRepoData extRepoData); + /** + * 保存 + * + * @param extRepoData + * @return + */ + int add(ExtRepoData extRepoData); - /** - * 更新 - * - * @param extRepoData - * @return - */ + /** + * 更新 + * + * @param extRepoData + * @return + */ void editById(ExtRepoData extRepoData); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ ExtRepoData queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java index a207ba037..de4d4da8f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/IExtRepoFolderService.java @@ -83,4 +83,12 @@ public interface IExtRepoFolderService extends IService { * @return */ boolean isManager(); + + /** + * 查找子文件夹 + * + * @param supFolder + * @return + */ + List getListBySupFolder(String supFolder); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index 136271e33..b6dffeed7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -34,7 +34,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getListBySupFolder(String supFolder) { + @Override + public List getListBySupFolder(String supFolder) { ExtRepoFolder erf = new ExtRepoFolder(); erf.setSupFolder(supFolder); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(erf, new HashMap<>()); @@ -100,17 +97,13 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl resList = getListBySupFolder(id); - if (resList.isEmpty()) { - removeById(id); - } else { - throw new JeroBootException("请先删除子文件夹！"); - } - } else { - throw new JeroBootException("没有权限！"); - } + removeById(id); } catch (Exception ex) { log.error("删除对外报告文件夹失败：" + ex.getMessage()); throw new JeroBootException("删除文件夹失败！");