From 9c69fc8751972c7db2bec088658191010939f10a Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 11 Apr 2022 17:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=9D=A1-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=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 --- .../split/controller/FileSplitItemsEOController.java | 11 +++++++++++ .../split/controller/SarFileSplitInfoController.java | 5 +++++ .../controller/SarFileSplitMenuEOController.java | 8 +++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index cafab1241..a032848ce 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; @@ -65,6 +66,7 @@ public class FileSplitItemsEOController extends JeroController addSplitItems(@RequestBody Map parameter) { List itemValEOList = (List) parameter.get("itemValEOList"); if (CollectionUtils.isNotEmpty(itemValEOList)) { @@ -95,6 +97,7 @@ public class FileSplitItemsEOController extends JeroController updateSplitItems(@RequestBody Map parameter) { List itemValEOList = (List) parameter.get("itemValEOList"); if (CollectionUtils.isNotEmpty(itemValEOList)) { @@ -125,6 +128,7 @@ public class FileSplitItemsEOController extends JeroController batchCopyItems(@RequestParam(value = "ids",required = false) String ids, @RequestParam(value = "menuids",required = false) String menuIds, @RequestParam(value = "infoIds",required = false) String infoIds) { @@ -168,6 +173,7 @@ public class FileSplitItemsEOController extends JeroController> batchMergeItems(String ids) { Map result = fileSplitItemsEOService.batchMergeItems(ids); return Result.OK("合并成功", result); @@ -176,6 +182,7 @@ public class FileSplitItemsEOController extends JeroController batchSet(@RequestBody Map parameter) { int result = fileSplitItemsEOService.batchSet(parameter); // ids, technology_territory, function_territory, information_category return Result.OK("设置成功", result); @@ -184,12 +191,14 @@ public class FileSplitItemsEOController extends JeroController importSplitResult( String splitFileId, String cut, SarFileSplitInfoEO splitInfoEO) throws IOException { @@ -211,6 +221,7 @@ public class FileSplitItemsEOController extends JeroController importSplitItems( MultipartFile file, @RequestParam(value = "cut") String cut, @RequestParam(value = "menuId") String menuId, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index cc44b5306..0a2f1ede0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +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.*; @@ -81,6 +82,7 @@ public class SarFileSplitInfoController extends JeroController bindToDocumentLibrary(String id, String connectId, String fileName) { // 设置fileId boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName); @@ -100,6 +102,7 @@ public class SarFileSplitInfoController extends JeroController add(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { sarFileSplitInfoService.add(sarFileSplitInfoEO); return Result.OK("添加成功！"); @@ -128,6 +131,7 @@ public class SarFileSplitInfoController extends JeroController delete(@RequestParam(name="id",required=true) String id) { sarFileSplitInfoService.deleteById(id); return Result.OK("删除成功!"); @@ -142,6 +146,7 @@ public class SarFileSplitInfoController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index 7dcc9e506..c894c4278 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -49,7 +49,6 @@ public class SarFileSplitMenuEOController extends JeroController> list(SarFileSplitMenuEOPage page) throws Exception { page.setValidFlag("0"); // page.setOrderBy("regexp_replace(replace('.'||NAME, '.', '.00000000'), '0+([^\\.]{8})', '\\1')"); @@ -60,14 +59,13 @@ public class SarFileSplitMenuEOController extends JeroController find(@PathVariable String id) throws Exception { return Result.OK(sarFileSplitMenuEOService.selectByPrimaryKey(id)); } @ApiOperation(value = "文档拆分条款目录-新增Y") @PostMapping("/addMenu") -// @RequiresPermissions("lawss:sarFileSplitMenu:save") + @RequiresPermissions("split:sarFileSplitMenu:add") public Result create(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO); return Result.OK("新增成功",sarFileSplitMenuEO); @@ -75,7 +73,7 @@ public class SarFileSplitMenuEOController extends JeroController update(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO); return Result.OK("修改成功",sarFileSplitMenuEO); @@ -83,7 +81,7 @@ public class SarFileSplitMenuEOController extends JeroController