From 8c91c6adc149853b681e537f694de09ecee897fb Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Mon, 18 Sep 2023 10:52:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=8E=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/ResultCommon.java | 1 + .../LawsBrowsingHistoryController.java | 3 +++ .../LawsStandardCollectionController.java | 5 +++++ .../LawsStandardSharingController.java | 3 +++ .../controller/LawsAssessController.java | 19 +++++++------------ .../LawsEvaluationNotMetController.java | 17 ++++++++++------- .../LawsProjectLibraryController.java | 15 +++++++++++---- .../LawsFriendlyLinksController.java | 3 +++ .../LawsWorkingGroupController.java | 4 ++++ .../LawsWorkingGroupUserController.java | 7 +++++++ .../main/resources/i18n/messages.properties | 12 ++++++------ 11 files changed, 60 insertions(+), 29 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index 8601d113..7aced8ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -37,6 +37,7 @@ public class ResultCommon { public static final String JOB_NUMBER_DOES_NOT_EXIST_EXPORT = "job.number.does.not.exist.export"; // 第{0}行,工号不存在 public static final String DUPLICATE_JOB_NUMBER_EXPORT = "duplicate.job.number.export"; // 第{0}行,工号重复 + public static final String NO_CORRESPONDING_RECORD_FOUND = "no.corresponding.record.found"; // 没有找到对应的记录 public static final String PARAMETERS_CANNOT_BE_NULL = "parameters.cannot.be.null"; // 参数不能为空 diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java index 6c9b2b30..6f15cfaf 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -69,6 +70,7 @@ public class LawsBrowsingHistoryController extends JeroController pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req); @@ -114,7 +115,7 @@ public class LawsAssessController extends JeroController copy(@Validated @RequestBody LawsAssessAddVo lawsAssessAddVo) { String copyProjectId = lawsAssessAddVo.getCopyProjectId(); if (StringUtils.isBlank(copyProjectId)){ - return Result.error("请至少选择一个项目进行复制!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } Date now = new Date(); List lawsAssesses = new ArrayList<>(); @@ -236,9 +234,6 @@ public class LawsAssessController extends JeroController delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } lawsAssessService.deleteById(map.get("id")); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -284,7 +279,7 @@ public class LawsAssessController extends JeroController add(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) { lawsEvaluationNotMetService.add(lawsEvaluationNotMet); - return Result.OK("操作成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -97,7 +100,7 @@ public class LawsEvaluationNotMetController extends JeroController edit(@Validated @RequestBody LawsEvaluationNotMet lawsEvaluationNotMet) { lawsEvaluationNotMetService.editById(lawsEvaluationNotMet); - return Result.OK("操作成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -111,10 +114,10 @@ public class LawsEvaluationNotMetController extends JeroController delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } lawsEvaluationNotMetService.deleteById(map.get("id")); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -128,10 +131,10 @@ public class LawsEvaluationNotMetController extends JeroController deleteBatch(@RequestBody Map map) { if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } this.lawsEvaluationNotMetService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); } /** @@ -146,7 +149,7 @@ public class LawsEvaluationNotMetController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { LawsEvaluationNotMet lawsEvaluationNotMet = lawsEvaluationNotMetService.queryById(id); if(lawsEvaluationNotMet==null) { - return Result.error("未找到对应数据"); + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); } return Result.OK(lawsEvaluationNotMet); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java index 44d1d912..44c7f2bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java @@ -24,6 +24,7 @@ import com.jero.modules.system.service.ISysUserService; import com.sun.deploy.net.URLEncoder; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -54,6 +55,7 @@ public class LawsProjectLibraryController extends JeroController delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } lawsProjectLibraryService.deleteById(map.get("id")); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -106,6 +111,7 @@ public class LawsProjectLibraryController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.queryById(id); if(lawsProjectLibrary==null) { - return Result.error(MessageUtils.getLanguage().equals("EN") ? "No corresponding data found!" : "未找到对应数据"); + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); } return Result.OK(lawsProjectLibrary); } @@ -134,6 +140,7 @@ public class LawsProjectLibraryController extends JeroController