update 权限更新

nb-system/src/main/java/com/nb/bus/controller/BusClinicController.java

@@ -181,8 +181,8 @@ public class BusClinicController {
 
     @Log(title = "新增其他监控手术信息")
     @PostMapping("/save")
-    @SaCheckPermission(value = {"bus:clinic:save","device:manual:add"},mode = SaMode.OR)
-    @ApiOperation(value = "新增手术信息",notes = "新增病人信息,权限【bus:clinic:save】或【device:manual:add】")
+    @SaCheckPermission(value = {"bus:clinic:add","device:manual:add"},mode = SaMode.OR)
+    @ApiOperation(value = "新增手术信息",notes = "新增病人信息,权限【bus:clinic:add】或【device:manual:add】")
     public R save(@RequestBody ClinicEditVo entity){
         deviceManualService.save(entity.getManual(),entity.getClinic());
         return R.success();

nb-system/src/main/java/com/nb/bus/controller/BusConstantController.java

@@ -57,12 +57,12 @@ public class BusConstantController {
     }
 
     @PostMapping("/{type}/remove")
-    @SaCheckPermission("bus:constant:delete")
+    @SaCheckPermission("bus:constant:remove")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id",value = "主键id",required = true),
             @ApiImplicitParam(name = "type",value = "常量类型",required = true,allowableValues = "mix,doctor,alarm",allowMultiple = true,dataTypeClass = ConstantEnum.class)
     })
-    @ApiOperation(value = "根据ID删除",notes = "权限【bus:constant:delete】")
+    @ApiOperation(value = "根据ID删除",notes = "权限【bus:constant:remove】")
     public R delete(@PathVariable("type") ConstantEnum type,@RequestParam("id") Serializable id) {
         if(StrUtil.isNullOrUndefined(String.valueOf(id))){
             return R.success();

nb-system/src/main/java/com/nb/bus/controller/BusDeviceController.java

@@ -163,8 +163,8 @@ public class BusDeviceController implements
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id",value = "主键id",required = true)
     })
-    @SaCheckPermission("device:info:delete")
-    @ApiOperation(value = "根据ID删除")
+    @SaCheckPermission("device:info:remove")
+    @ApiOperation(value = "根据ID删除",notes = "权限【device:info:remove】")
     public R delete(@RequestParam("id") String id) {
         if(CharSequenceUtil.isNullOrUndefined(String.valueOf(id))){
             return R.success();

nb-system/src/main/java/com/nb/bus/controller/BusHospitalConfigController.java

@@ -14,6 +14,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -44,6 +47,15 @@ public class BusHospitalConfigController extends BaseCrudController<BusHospitalC
         //查询不需要权限
     }
 
+    @Override
+    public void saveAuth() {
+        //新增权限与编辑权限一致
+        if(isAuth()){
+            List<String> savePermission = Arrays.asList(getPermissionPrefix() + ":edit", getPermissionPrefix() + ":all");
+            getStpLogin().checkPermissionOr(savePermission.toArray(new String[2]));
+        }
+    }
+
     @PostMapping("/reset/{type}")
     @SaCheckPermission("hospital:config:edit")
     @ApiOperation(value = "将某一功能项改为默认配置",notes = "权限【hospital:config:edit】")

nb-system/src/main/java/com/nb/bus/controller/BusPatientController.java

@@ -131,9 +131,9 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
     }
 
     @PostMapping("/do/{monitorType}/finished")
-    @SaCheckPermission("bus:patient:finished")
+    @SaCheckPermission("bus:patient:finished:*")
     @ApiResponse(code = 4001,message = "病号当前绑定了多个设备，不可结束管理")
-    @ApiOperation(value = "结束管理",notes = "病患当前绑定主设备必须要在关机、不在服务器、待机中才能结束管理,权限【bus:patient:finished】")
+    @ApiOperation(value = "结束管理",notes = "病患当前绑定主设备必须要在关机、不在服务器、待机中才能结束管理,权限【bus:patient:finished:*】")
     public R<Boolean> finished(@PathVariable("monitorType")@ApiParam(value = "是否为无泵管理 false、无泵 true、有泵",defaultValue = "false" ) boolean haveDevice,
                                @RequestBody MonitorFinishedVo monitorFinishedVo,
                                @RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId){

nb-system/src/main/java/com/nb/bus/controller/BusStatsAnalyseController.java

@@ -49,8 +49,8 @@ public class BusStatsAnalyseController {
     }
 
     @PostMapping("/{type}")
-    @SaCheckPermission("stats:analgesia:*")
-    @ApiOperation(value = "统计",notes = "权限 【stats:analgesia:*】 模糊匹配")
+    @SaCheckPermission("stats:analgesia:query:*")
+    @ApiOperation(value = "统计",notes = "权限 【stats:analgesia:query:*】 模糊匹配")
     public R stats(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId,@PathVariable("type")@ApiParam("统计类型 1、PCA镇痛分析 2、提示分析 3、评价分析 4、自控分析 5、输注量分析") Integer type, @RequestBody @Validated CombineQuery query){
         if (StrUtil.isBlank(tenantId)) {
             throw new TenantException();

nb-system/src/main/java/com/nb/bus/controller/BusVersionController.java

@@ -39,7 +39,7 @@ public class BusVersionController extends BaseCrudController<BusVersionEntity,St
 
 
     @PostMapping
-    @SaCheckPermission("bus:version:save")
+    @SaCheckPermission("bus:version:add")
     @ApiOperation(value="上传安装包",notes = "权限【bus:version:save】")
     public R save(@RequestBody BusVersionEntity busVersionEntity) {
         if(CharSequenceUtil.isAllBlank(busVersionEntity.getId())){