Merge remote-tracking branch 'origin/master'

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<SarFileSplitItems
     @AutoLog(value = "新增")
     @ApiOperation(value = "新增")
     @PostMapping("/addSplitItems")
+    @RequiresPermissions("split:sarFileSplitItems:add")
     public Result<?> addSplitItems(@RequestBody Map<String, Object> parameter) {
         List<SarFileSplitItemsValEO>  itemValEOList = (List<SarFileSplitItemsValEO>) parameter.get("itemValEOList");
         if (CollectionUtils.isNotEmpty(itemValEOList)) {
@@ -95,6 +97,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @AutoLog(value = "编辑")
     @ApiOperation(value = "编辑")
     @PostMapping("/updateSplitItems")
+    @RequiresPermissions("split:sarFileSplitItems:update")
     public Result<?> updateSplitItems(@RequestBody Map<String, Object> parameter) {
         List<SarFileSplitItemsValEO>  itemValEOList = (List<SarFileSplitItemsValEO>) parameter.get("itemValEOList");
         if (CollectionUtils.isNotEmpty(itemValEOList)) {
@@ -125,6 +128,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @AutoLog(value = "批量删除")
     @ApiOperation(value = "批量删除")
     @PostMapping("/batchDeleteItems")
+    @RequiresPermissions("split:sarFileSplitItems:delete")
     public Result batchDeleteItems(String ids) {
         if (StringUtils.isNotEmpty(ids)) {
             int result = fileSplitItemsEOService.batchDeleteItems(ids);
@@ -158,6 +162,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @AutoLog(value = "文档拆分条款信息-复制")
     @ApiOperation(value = "文档拆分条款信息-复制")
     @GetMapping("/batchCopyItems")
+    @RequiresPermissions("split:sarFileSplitItems:copy")
     public Result<?> 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<SarFileSplitItems
     @AutoLog(value = "文档拆分条款信息-批量合并")
     @ApiOperation(value = "文档拆分条款信息-批量合并")
     @GetMapping("/batchMergeItems")
+    @RequiresPermissions("split:sarFileSplitItems:merge")
     public Result<Map<String, Object>> batchMergeItems(String ids) {
         Map<String, Object> result = fileSplitItemsEOService.batchMergeItems(ids);
         return Result.OK("合并成功", result);
@@ -176,6 +182,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @AutoLog(value = "文档拆分条款信息-批量设置")
     @ApiOperation(value = "文档拆分条款信息-批量设置")
     @PostMapping("/batchSet")
+    @RequiresPermissions("split:sarFileSplitItems:set")
     public Result<?> batchSet(@RequestBody Map<String, Object> 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<SarFileSplitItems
     @AutoLog(value = "模板下载")
     @ApiOperation(value = "模板下载")
     @GetMapping(value = "/exportTemplate")
+    @RequiresPermissions("split:sarFileSplitItems:template")
     public void exportTemplate(@RequestParam(name = "cut") String cut, HttpServletResponse response, HttpServletRequest request) throws Exception {
         fileSplitItemsEOService.exportTemplate(cut,response,request);
     }
 
     @ApiOperation(value = "文档拆分条款信息-导出")
     @GetMapping(value = "/exportSplitInfoZip")
+    @RequiresPermissions("split:sarFileSplitItems:export")
     public void exportSplitInfoZip(@RequestParam(value = "cut") String cut,
                                    @RequestParam(value = "idList", required = false) String idList,
                                    @RequestParam(value = "exportName", required = false) String exportName,
@@ -202,6 +211,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
 
     @ApiOperation(value = "文档拆分条款信息-导入拆分结果")
     @PostMapping(value = "/importSplitResult")
+    @RequiresPermissions("split:sarFileSplitItems:importSplitResult")
     public Result<?> importSplitResult( String splitFileId,
                                     String cut,
                                     SarFileSplitInfoEO splitInfoEO) throws IOException {
@@ -211,6 +221,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @AutoLog(value = "文档拆分条款信息-导入")
     @ApiOperation(value = "文档拆分条款信息-导入")
     @PostMapping(value = "/importSplitItems")
+    @RequiresPermissions("split:sarFileSplitItems:import")
     public Result<?> importSplitItems( MultipartFile file,
                                           @RequestParam(value = "cut") String cut,
                                           @RequestParam(value = "menuId") String menuId,

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<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-回传至文档库")
 	@ApiOperation(value="文档拆分表-回传至文档库", notes="文档拆分表-回传至文档库")
 	@GetMapping(value = "/bindToDocumentLibrary")
+	@RequiresPermissions("split:sarFileSplitInfo:bind")
 	public Result<?> bindToDocumentLibrary(String id, String connectId, String fileName) {
 		// 设置fileId
 		boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName);
@@ -100,6 +102,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-添加")
 	@ApiOperation(value="文档拆分表-添加", notes="文档拆分表-添加")
 	@PostMapping(value = "/add")
+	@RequiresPermissions("split:sarFileSplitInfo:add")
 	public Result<?> add(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) {
 		sarFileSplitInfoService.add(sarFileSplitInfoEO);
 		return Result.OK("添加成功！");
@@ -128,6 +131,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-通过id删除Y")
 	@ApiOperation(value="文档拆分表-通过id删除", notes="文档拆分表-通过id删除")
 	@GetMapping(value = "/delete")
+	@RequiresPermissions("split:sarFileSplitInfo:delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		sarFileSplitInfoService.deleteById(id);
 		return Result.OK("删除成功!");
@@ -142,6 +146,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-批量删除Y")
 	@ApiOperation(value="文档拆分表-批量删除", notes="文档拆分表-批量删除")
 	@PostMapping(value = "/deleteBatch")
+	@RequiresPermissions("split:sarFileSplitInfo:deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java

@@ -49,7 +49,6 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
 
 	@ApiOperation(value = "文档拆分条款目录-查询Y")
     @GetMapping("/getSplitMenusByInfoId")
-    //@RequiresPermissions("lawss:sarFileSplitMenu:list")
     public Result<List<SarFileSplitMenuEO>> 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<SarFileSplitMen
 
     @ApiOperation(value = "文档拆分条款目录-详情")
     @GetMapping("/{id}")
-    @RequiresPermissions("lawss:sarFileSplitMenu:get")
     public Result<SarFileSplitMenuEO> 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<SarFileSplitMenuEO> create(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception {
         sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO);
         return Result.OK("新增成功",sarFileSplitMenuEO);
@@ -75,7 +73,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
 
     @ApiOperation(value = "文档拆分条款目录-修改Y")
     @PutMapping("/updateMenu")
-//    @RequiresPermissions("lawss:sarFileSplitMenu:update")
+    @RequiresPermissions("split:sarFileSplitMenu:update")
     public Result<SarFileSplitMenuEO> update(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception {
         sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO);
         return Result.OK("修改成功",sarFileSplitMenuEO);
@@ -83,7 +81,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
 
     @ApiOperation(value = "文档拆分条款目录-删除Y")
     @GetMapping("/deleteMenu")
-//    @RequiresPermissions("lawss:sarFileSplitMenu:delete")
+    @RequiresPermissions("split:sarFileSplitMenu:delete")
     public Result delete(@RequestParam(name="id") String id) throws Exception {
         sarFileSplitMenuEOService.deleteMenu(id);
         return Result.OK("删除成功",null);