Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleController.java

@@ -4,6 +4,7 @@ import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
@@ -32,6 +33,7 @@ public class AppRuleController  extends BaseController {
 
     @ApiOperation(value = "查询规范列表")
     @GetMapping("page")
+    @RequiresPermissions("resumption:rule")
     public TableDataInfo getAppRulePage(AppRule appRule) {
         final TableDataInfo appRulePage = appRuleService.getAppRulePage(appRule);
         return appRulePage;
@@ -39,32 +41,38 @@ public class AppRuleController  extends BaseController {
 
     @ApiOperation(value = "查询所有规范")
     @GetMapping("all")
+    @RequiresPermissions("resumption:rule")
     public AjaxResult getAllAppRule() {
         final List<AppRulePageVo> appRulePage = appRuleService.getAllAppRule();
         return success(appRulePage);
     }
     @ApiOperation(value = "规范详情")
     @GetMapping("{id}")
+    @RequiresPermissions("resumption:rule:query")
     public AjaxResult info(@PathVariable Long id) {
         return success(appRuleService.get(id));
     }
 
     @ApiOperation(value = "新增/编辑")
     @PostMapping("edit")
+    @RequiresPermissions(value={"resumption:rule:add","resumption:rule:edit"})
     public AjaxResult edit(@RequestBody AppRuleEditDto appRuleEditDto) {
 
         return success(appRuleService.edit(appRuleEditDto));
     }
 
     @ApiOperation(value = "删除规范")
+    @RequiresPermissions("resumption:rule:remove")
     @GetMapping("del/{id}")
+
     public AjaxResult del(@PathVariable Long id) {
         appRuleService.del(id);
         return success();
     }
 
-    @ApiOperation(value = "删除规范")
+    @ApiOperation(value = "查询机构可用的规范")
     @GetMapping("ruleListForOrg")
+//    @RequiresPermissions(value={"resumption:rule"})
     public AjaxResult  ruleListForOrg(AppRuleListForOrgDto dto){
        List<IdNameVo> list=  appRuleService.ruleListForOrg(dto);
        return success(list);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleItemController.java

@@ -4,6 +4,7 @@ package com.xunmei.core.resumption.controller;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppRuleItem;
 import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemDto;
@@ -33,18 +34,21 @@ public class AppRuleItemController extends BaseController {
 
     @ApiOperation(value = "新增/编辑")
     @PostMapping("edit")
+    @RequiresPermissions(value={"resumption:ruleManager:edit","resumption:ruleManager:add"})
     public AjaxResult edit(@RequestBody AppRuleItemDto appRuleItemDto) {
         return success(appRuleItemService.edit(appRuleItemDto));
     }
 
     @ApiOperation(value = "分页查询")
     @GetMapping("page")
+    @RequiresPermissions("resumption:ruleManager:query")
     public TableDataInfo page(AppRuleItemPageDto itemPageDto) {
         return appRuleItemService.pageQuery(itemPageDto);
     }
 
     @ApiOperation(value = "删除")
     @DeleteMapping("{id}")
+    @RequiresPermissions("resumption:ruleManager:remove")
     public AjaxResult del(@PathVariable("id") Long id) {
         return success(appRuleItemService.del(id));
     }
@@ -57,8 +61,9 @@ public class AppRuleItemController extends BaseController {
 
     @ApiOperation(value = "规范组")
     @GetMapping("/rule/tree")
+    @RequiresPermissions("resumption:ruleManager:query")
     public AjaxResult getRuleTree() {
-        return success(appRuleItemService.getRuleTree(4352539158904832L));//SecurityUtils.getLoginUser().getSysUser().getOrgId())
+        return success(appRuleItemService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ProtectionController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.resumption.domain.Protection;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.protection.ProtectionEditDto;
@@ -34,6 +35,7 @@ class ProtectionController extends BaseController {
     @ApiOperation(value = "分页")
     @GetMapping(value = "page")
 //    @WebMethodLogDesc("防区状态app")
+    @RequiresPermissions("device:protection")
     TableDataInfo page(final ProtectionPageDto request) {
         TableDataInfo data = this.protectionService.pageList(request);
         return data;
@@ -41,6 +43,7 @@ class ProtectionController extends BaseController {
 
     @ApiOperation(value = "分页")
     @GetMapping(value = "log/page")
+    @RequiresPermissions("device:protection")
     TableDataInfo LogpageList(final ProtectionLogPageDto request) {
         final TableDataInfo page = this.protectionService.history(request);
         return page;
@@ -48,12 +51,14 @@ class ProtectionController extends BaseController {
 
     @ApiOperation(value = "新增/编辑")
     @PostMapping("edit")
+    @RequiresPermissions(value = {"device:protection:add","device:protection:edit"})
     public AjaxResult edit(@RequestBody ProtectionEditDto editDto) {
         return success(protectionService.edit(editDto));
     }
 
-    @ApiOperation(value = "删除规范")
+    @ApiOperation(value = "规范")
     @GetMapping("{id}")
+    @RequiresPermissions("device:protection:query")
     public AjaxResult get(@PathVariable Long id) {
         Protection r = protectionService.get(id);
         return success(r);
@@ -61,6 +66,7 @@ class ProtectionController extends BaseController {
 
     @ApiOperation(value = "删除规范")
     @DeleteMapping("{id}")
+    @RequiresPermissions("device:protection:remove")
     public AjaxResult del(@PathVariable Long id) {
         boolean r = protectionService.del(id);
         return success(r);
@@ -68,6 +74,7 @@ class ProtectionController extends BaseController {
 
     @ApiOperation(value = "布撤防")
     @PostMapping("updatestatus/{protectionId}/{status}")
+    @RequiresPermissions("device:protection:maintain")
     public AjaxResult edit(@PathVariable Long protectionId,@PathVariable String status) {
         return success(protectionService.updateStatus(protectionId,status));
     }