update 权限问题

nb-framework/src/main/java/com/nb/framework/web/exception/GlobalExceptionHandler.java

@@ -70,7 +70,6 @@ public class GlobalExceptionHandler {
 
     @ExceptionHandler(RuntimeException.class)
     public R handleRuntimeException(RuntimeException e) {
-//        return R.result(ResultCode.INTERNAL_SERVER_ERROR);
         return R.fail(e.getLocalizedMessage());
     }
 

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

@@ -43,7 +43,6 @@ public class BusConstantController {
     }
 
     @PostMapping("/{type}/page")
-//    @SaCheckPermission("bus:constant:query")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type",value = "常量类型",required = true,allowableValues = "mix,doctor,alarm",allowMultiple = true,dataTypeClass = ConstantEnum.class),
             @ApiImplicitParam(name = "query",value = "查询参数",required = true)

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

@@ -46,6 +46,7 @@ public class BusDeviceController implements
 
     @Log(title = "设备换绑")
     @PostMapping("/shift/bind")
+    @SaCheckPermission("device:info:shift")
     @ApiOperation(value = "设备换绑",notes = "权限【device:info:shift】")
     public R shift(@RequestBody DeviceBindVo vo){
         if(StrUtil.isEmpty(vo.getBindTenantId())|| CollectionUtil.isEmpty(vo.getDeviceIds())){

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

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bus/doc")
-@Api(tags = "医院宣教文档",value = "该接口用于处理医院的帮助文档，统一权限前缀(bus:doc),bus:doc:add")
+@Api(tags = "医院宣教文档",value = "该接口用于处理医院的帮助文档，统一权限前缀(bus:doc),bus:doc:add，查询无权限")
 public class BusDocController extends BaseCrudController<BusDocEntity, String> {
     private final LocalBusDocService docService;
 
@@ -38,6 +38,10 @@ public class BusDocController extends BaseCrudController<BusDocEntity, String> {
         return "bus:doc";
     }
 
+    @Override
+    public void queryAuth() {
+
+    }
 
     @GetMapping("/get/{type}")
     @ApiImplicitParams({

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

@@ -33,6 +33,11 @@ public class BusDrugController extends BaseCrudController<BusDrugEntity,String>
         return "bus:drug";
     }
 
+    @Override
+    public void queryAuth() {
+
+    }
+
     @Override
     public BaseService<? extends Mapper<BusDrugEntity>, BusDrugEntity, String> getService() {
         return drugService;

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

@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bus/hospital")
-@Api(tags = "医院管理",description = "统一权限前缀(bus:hospital),例如新增bus:hospital:add")
+@Api(tags = "医院管理",description = "统一权限前缀(bus:hospital),例如新增bus:hospital:add。查询无需权限")
 public class BusHospitalController extends BaseCrudController<BusHospitalEntity, String> {
     private final LocalBusHospitalService hospitalService;
     private final HospitalManagerRegister hospitalManagerRegister;
@@ -53,6 +53,11 @@ public class BusHospitalController extends BaseCrudController<BusHospitalEntity,
         return "bus:hospital";
     }
 
+    @Override
+    public void queryAuth() {
+
+    }
+
     @Override
     public BaseService<? extends Mapper<BusHospitalEntity>, BusHospitalEntity, String> getService() {
         return hospitalService;
@@ -76,8 +81,8 @@ public class BusHospitalController extends BaseCrudController<BusHospitalEntity,
     }
 
     @PostMapping("/publish/script")
-    @SaCheckPermission("bus:hospital:script:pub")
-    @ApiOperation(value = "发布脚本",notes = "医院必选，发布脚本,发布后即用该脚本解析his数据,权限【bus:hospital:script:pub】")
+    @SaCheckPermission("bus:hospital:script:edit")
+    @ApiOperation(value = "发布脚本",notes = "医院必选，发布脚本,发布后即用该脚本解析his数据,权限【bus:hospital:script:edit】")
     public R publishScript(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId){
         BusHospitalEntity hospital = hospitalService.getById(tenantId);
         if (ObjectUtil.isNull(hospital.getDraftScript())||StrUtil.isEmpty(hospital.getDraftScript().getContent())) {
@@ -111,8 +116,7 @@ public class BusHospitalController extends BaseCrudController<BusHospitalEntity,
 
 
     @PostMapping("/validate")
-    @SaCheckPermission(mode = SaMode.OR,value = {"bus:hospital:edit","bus:hospital:add"})
-    @ApiOperation(value = "校验医院名称是否重复",notes = "权限【bus:hospital:edit 或 bus:hospital:edit】")
+    @ApiOperation(value = "校验医院名称是否重复",notes = "权限【无】")
     public R<Boolean> validate(@RequestBody String name){
         return R.success(this.hospitalService.isExistName(name));
     }

nb-system/src/main/java/com/nb/bus/enums/DeviceAlarmEnum.java

@@ -29,7 +29,7 @@ public enum DeviceAlarmEnum  implements IEnum<Integer> {
     InfusionMax(4,"输注总量报警"),
     Limit(5,"极限报警"),
     Finished(6,"输液结束"),
-    LowBattery(7,"电量耗尽报警"),
+    LowBattery(7,"低电量报警"),
 //    OutOfControl(8,"电机失控报警"),
     Machine(9,"机械故障"),;
 

nb-system/src/main/java/com/nb/bus/stats/analyse/AlarmStatsAnalyse.java

@@ -324,7 +324,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
      * 5、镇痛不足
      * 6、不在服务区
      * 7、机械故障
-     * 8、电量耗尽
+     * 8、低电量
      * 9、气泡无液
      * 10、低输注状态
      * 11、返厂维护
@@ -348,7 +348,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
      * 未装药盒
      * 电机失控
      * 机械故障
-     * 电量耗尽
+     * 低电量
      * 气泡无液
      * 返厂维修
      * @author lifang

nb-system/src/main/java/com/nb/system/service/impl/SysRoleServiceImpl.java

@@ -166,7 +166,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         //分配菜单后将对应的在线人员进行更新
         List<SysUserRole> userRoleList = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getRoleId, req.getRoleId()));
-        userRoleList.parallelStream()
+        userRoleList
                 .forEach(sysUserRole -> {
                     Set<String> permissionsByUserId = sysMenuService.getPermissionsByUserId(sysUserRole.getUserId());
                     List<String> tokens = StpUtil.getTokenValueListByLoginId(sysUserRole.getUserId());