From 6387cea86b900496cf6d682787548b0d1b7fd191 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 1 Aug 2022 17:38:03 +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=E8=8B=B1=E8=AF=AD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoDataController.java | 57 ++++++++++++------- .../controller/ExtRepoFolderController.java | 43 ++++++++------ 2 files changed, 62 insertions(+), 38 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 ff476d228..d659da082 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 @@ -9,10 +9,12 @@ 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.common.util.oss.CosBootUtil; +import com.jero.generater.modules.online.auth.entity.OnlAuthData; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.entity.ExtRepoDataPage; import com.jero.modules.extRepo.service.IExtRepoDataService; import com.jero.modules.extRepo.service.IExtRepoFolderService; +import com.jero.modules.split.entity.SarFileSplitInfoEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -88,6 +90,7 @@ public class ExtRepoDataController extends JeroController pageList = extRepoDataService.page(page, queryWrapper); ExtRepoDataPage res = new ExtRepoDataPage(extRepoFolderService.haveManageAuth(extRepoData.getSupFolder()), pageList); return Result.OK(res); @@ -116,21 +119,23 @@ public class ExtRepoDataController extends JeroController add(@Validated @RequestBody ExtRepoData extRepoData) { + Result result = new Result(); if (extRepoFolderService.haveManageAuth(extRepoData.getSupFolder())) { log.info("对外报告数据表收到文件添加请求，开始处理文件:【" + sdf.format(new Date()) + "】"); int res = extRepoDataService.add(extRepoData); if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { - return Result.OK("添加成功:" + res + "条数据！"); + result.success("添加成功:" + res + "条数据！"); } else { - return Result.OK("success:" + res + "data！"); + result.success(res + " pieces of data are added successfully！"); } } else { if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { - return Result.error("没有权限！"); + result.success("没有权限！"); } else { - return Result.error("No Permission！"); + result.success("You do not have permission ！"); } } + return result; } @@ -144,23 +149,25 @@ public class ExtRepoDataController extends JeroController edit(@Validated @RequestBody ExtRepoData extRepoData) { + Result result = new Result(); 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); if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { - return Result.OK("添加成功！"); + result.success("编辑成功！"); } else { - return Result.OK("success！"); + result.success("Data update successfully！"); } } else { if (CutEnum.CN.getValue().equals(extRepoData.getCut())) { - return Result.error("没有权限！"); + result.success("没有权限！"); } else { - return Result.error("No Permission！"); + result.success("You do not have permission ！"); } } + return result; } /** @@ -174,6 +181,7 @@ public class ExtRepoDataController extends JeroController delete(@RequestParam("id") String id, @RequestParam(name = "cut", defaultValue = "cn") String cut) { + Result result = new Result(); ExtRepoData erd = extRepoDataService.queryById(id); if (null != erd) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -181,20 +189,25 @@ public class ExtRepoDataController extends JeroController deleteBatch(@RequestParam("ids") String ids, @RequestParam(name = "cut", defaultValue = "cn") String cut) { + Result result = new Result(); 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())) { if (CutEnum.CN.getValue().equals(cut)) { - return Result.error("没有权限！"); + result.success("没有权限！"); } else { - return Result.error("No Permission！"); + result.success("You do not have permission!"); } } } for (String id : idsList) { ExtRepoData erd = extRepoDataService.queryById(id); - if(null!=erd){ + if (null != erd) { CosBootUtil.delete(erd.getFileKey()); this.extRepoDataService.deleteById(id); } } if (CutEnum.CN.getValue().equals(cut)) { - return Result.OK("删除成功!"); + result.success("删除成功!"); } else { - return Result.OK("Delete success!"); + result.success("Data deletion successfully!"); } + return result; } /** @@ -244,11 +259,13 @@ public class ExtRepoDataController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); ExtRepoData extRepoData = extRepoDataService.queryById(id); if (extRepoData == null) { - return Result.error("未找到对应数据"); + result.success("未找到对应数据!"); + return result; } - return Result.OK(extRepoData); + return result.OK(extRepoData); } /** 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 169f2b8c3..c37d0ae2a 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 @@ -59,20 +59,22 @@ public class ExtRepoFolderController extends JeroController add(@Validated @RequestBody ExtRepoFolder extRepoFolder) { + Result result = new Result(); if (extRepoFolderService.haveManageAuth(extRepoFolder.getSupFolder())) { extRepoFolderService.add(extRepoFolder); if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { - return Result.OK("添加成功！"); + result.success("添加成功！"); } else { - return Result.OK("success！"); + result.success("Data added successfully！"); } } else { if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { - return Result.error("没有权限！"); + result.success("没有权限！"); } else { - return Result.error("No Permission！"); + result.success("You do not have permission ！"); } } + return result; } /** @@ -85,20 +87,22 @@ public class ExtRepoFolderController extends JeroController edit(@Validated @RequestBody ExtRepoFolder extRepoFolder) { + Result result = new Result(); if (extRepoFolderService.haveManageAuth(extRepoFolder.getId())) { extRepoFolderService.editById(extRepoFolder); if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { - return Result.OK("编辑成功!"); + result.success("编辑成功！"); } else { - return Result.OK("success！"); + result.success("Data update successfully！"); } } else { if (CutEnum.CN.getValue().equals(extRepoFolder.getCut())) { - return Result.error("没有权限！"); + result.success("没有权限！"); } else { - return Result.error("No Permission！"); + result.success("You do not have permission ！"); } } + return result; } /** @@ -112,33 +116,35 @@ public class ExtRepoFolderController extends JeroController delete(@RequestParam(name = "id", required = true) String id, @RequestParam(name = "cut", defaultValue = "cn") String cut) { + Result result = new Result(); if (extRepoFolderService.haveManageAuth(id)) { List resList = extRepoFolderService.getListBySupFolder(id); if (resList.isEmpty()) { List erdList = extRepoDataService.queryByFolder(id); - for (ExtRepoData erd:erdList){ + for (ExtRepoData erd : erdList) { extRepoDataService.deleteById(erd.getId()); } extRepoFolderService.deleteById(id); } else { if (CutEnum.CN.getValue().equals(cut)) { - return Result.error("请先删除子文件夹！"); + result.success("请先删除子文件夹！"); } else { - return Result.error("Please Delete Subfolder First！"); + result.success("Please delete the subfolder first!"); } } } else { if (CutEnum.CN.getValue().equals(cut)) { - return Result.error("没有权限！"); + result.success("没有权限！"); } else { - return Result.error("No Permission！"); + result.success("You do not have permission!"); } } if (CutEnum.CN.getValue().equals(cut)) { - return Result.OK("删除成功!"); + result.success("删除成功！"); } else { - return Result.OK("success！"); + result.success("Data deletion successfully!"); } + return result; } /** @@ -152,14 +158,15 @@ public class ExtRepoFolderController extends JeroController queryById(@RequestParam(name = "id", required = true) String id, @RequestParam(name = "cut", defaultValue = "cn") String cut) { + Result result = new Result(); ExtRepoFolder extRepoFolder = extRepoFolderService.queryById(id); if (extRepoFolder == null) { if (CutEnum.CN.getValue().equals(cut)) { - return Result.error("未找到对应数据"); + result.success("未找到对应数据！"); } else { - return Result.error("No Data！"); + result.success("No Data！"); } } - return Result.OK(extRepoFolder); + return result.OK(extRepoFolder); } }