From 9fd73c235ed9a76989362718a8715a7352c45ae0 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 28 Jun 2024 11:38:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E4=B8=BB=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E3=80=81=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83):=20?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/home/controller/LawsHomeSearchController.java | 3 +++ .../controller/LawsStandardMasterPlanController.java | 6 ++++++ .../standardmasterplan/vo/LawsStandardMasterPlanVO.java | 1 + 3 files changed, 10 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java index 9cba37f2..39130038 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java @@ -82,6 +82,7 @@ public class LawsHomeSearchController { @AutoLog(value = "首页-高级检索（全部）", operateType = CommonConstant.OPERATE_TYPE_1) @ApiOperation(value="首页-高级检索（全部）", notes="首页-高级检索（全部）") @PostMapping(value = "/getAdvancedSearchAll") + @RequiresPermissions("dashboard:advancedSearch:search") public Result>> getAdvancedSearchAll(@RequestBody Map parameterMap) { return lawsHomeSearchService.getAdvancedSearchAll(parameterMap); } @@ -89,6 +90,7 @@ public class LawsHomeSearchController { @AutoLog(value = "首页-高级检索（条款）", operateType = CommonConstant.OPERATE_TYPE_1) @ApiOperation(value="首页-高级检索（条款）", notes="首页-高级检索（条款）") @PostMapping(value = "/getAdvancedSearchClause") + @RequiresPermissions("dashboard:advancedSearch:search") public Result> getAdvancedSearchClause(@RequestBody Map parameterMap) { return Result.OK(lawsHomeSearchService.getAdvancedSearchClause(parameterMap)); } @@ -96,6 +98,7 @@ public class LawsHomeSearchController { @AutoLog(value = "首页-高级检索导出", operateType = CommonConstant.OPERATE_TYPE_6) @ApiOperation(value="首页-高级检索导出", notes="首页-高级检索导出") @PostMapping(value = "/advancedSearchExportExcel") + @RequiresPermissions("dashboard:advancedSearch:export") public ModelAndView advancedSearchExportExcel(@RequestBody Map parameterMap) { return lawsHomeSearchService.advancedSearchExportExcel(parameterMap); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/controller/LawsStandardMasterPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/controller/LawsStandardMasterPlanController.java index 0ae33b4a..7352d137 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/controller/LawsStandardMasterPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/controller/LawsStandardMasterPlanController.java @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -46,6 +47,7 @@ public class LawsStandardMasterPlanController { @AutoLog(value = "标准主计划-分页列表查询", operateType = CommonConstant.OPERATE_TYPE_1) @ApiOperation(value="标准主计划-分页列表查询", notes="标准主计划-分页列表查询") @GetMapping(value = "/queryByPage") + @RequiresPermissions("standardMasterPlan:search") public Result> queryByPage(LawsStandardMasterPlanVO lawsStandardMasterPlanVO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -74,6 +76,7 @@ public class LawsStandardMasterPlanController { @AutoLog(value = "标准主计划-新增", operateType = CommonConstant.OPERATE_TYPE_2) @ApiOperation(value="标准主计划-新增", notes="标准主计划-新增") @PostMapping(value = "/add") + @RequiresPermissions("standardMasterPlan:add") public Result add(@RequestBody LawsStandardMasterPlanDTO lawsStandardMasterPlanDTO) { lawsStandardMasterPlanService.add(lawsStandardMasterPlanDTO); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -87,6 +90,7 @@ public class LawsStandardMasterPlanController { @AutoLog(value = "标准主计划-编辑", operateType = CommonConstant.OPERATE_TYPE_3) @ApiOperation(value="标准主计划-编辑", notes="标准主计划-编辑") @PostMapping(value = "/edit") + @RequiresPermissions("standardMasterPlan:edit") public Result edit(@RequestBody LawsStandardMasterPlanDTO lawsStandardMasterPlanDTO) { lawsStandardMasterPlanService.edit(lawsStandardMasterPlanDTO); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -101,6 +105,7 @@ public class LawsStandardMasterPlanController { @AutoLog(value = "标准主计划-查看", operateType = CommonConstant.OPERATE_TYPE_1) @ApiOperation(value="标准主计划-查看", notes="标准主计划-查看") @GetMapping(value = "/queryDetails") + @RequiresPermissions("standardMasterPlan:detail") public Result queryDetails(String id) { return Result.OK(lawsStandardMasterPlanService.queryDetails(id)); } @@ -122,6 +127,7 @@ public class LawsStandardMasterPlanController { @AutoLog(value = "标准主计划-导出", operateType = CommonConstant.OPERATE_TYPE_6) @ApiOperation(value="标准主计划-导出", notes="标准主计划-导出") @GetMapping(value = "/exportExcel") + @RequiresPermissions("standardMasterPlan:export") public ModelAndView exportExcel(HttpServletRequest request) { return lawsStandardMasterPlanService.exportExcel(request); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java index f83c33ee..01e181ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java @@ -38,5 +38,6 @@ public class LawsStandardMasterPlanVO implements Serializable { /** 适用市场 */ @ApiModelProperty(value = "适用市场") + @Dict(dicCode = "market_state") private java.lang.String applicableMarket; }