fix 权限

nb-auth/src/main/java/com/nb/auth/sa/SaTokenActionDefaultImpl.java

@@ -14,10 +14,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
 import cn.dev33.satoken.annotation.SaCheckSafe;
 import cn.dev33.satoken.basic.SaBasicUtil;
+import cn.dev33.satoken.exception.NotPermissionException;
 import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
+import cn.hutool.core.util.StrUtil;
+import com.nb.auth.utils.SecurityUtil;
 
 /**
  * <h1> v1.27+ 此接口已废弃，目前版本暂时向下兼容，请及时更换为 SaStrategy </h1>
@@ -116,7 +120,7 @@ public class SaTokenActionDefaultImpl implements SaTokenAction {
 	 */
 	@Override
 	public void validateAnnotation(AnnotatedElement target) {
-		
+
 		// 校验 @SaCheckLogin 注解 
 		SaCheckLogin checkLogin = (SaCheckLogin) SaStrategy.me.getAnnotation.apply(target, SaCheckLogin.class);
 		if(checkLogin != null) {
@@ -132,6 +136,11 @@ public class SaTokenActionDefaultImpl implements SaTokenAction {
 		// 校验 @SaCheckPermission 注解
 		SaCheckPermission checkPermission = (SaCheckPermission) SaStrategy.me.getAnnotation.apply(target, SaCheckPermission.class);
 		if(checkPermission != null) {
+			String type= StrUtil.isBlankIfStr(checkPermission.type())?"login":checkPermission.type();
+			StpLogic stpLogic = SecurityUtil.getStpLogic();
+			if (!type.equals(stpLogic.getLoginType())) {
+				throw new NotPermissionException("无权限访问此体系接口");
+			}
 			SaManager.getStpLogic(checkPermission.type()).checkByAnnotation(checkPermission);
 		}
 

nb-auth/src/main/java/com/nb/auth/utils/SecurityUtil.java

@@ -133,7 +133,7 @@ public class SecurityUtil {
         String header ="";
         if(!StrUtil.isNullOrUndefined(loginType)){
             header=loginType;
-        }
+        };
         return SaManager.getStpLogic(header);
     }
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/DeviceHistoryQuery.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @ApiModel("设备历史信息查询参数")
 public class DeviceHistoryQuery {
-    @ApiModelProperty("临床id")
+    @ApiModelProperty(value = "临床id",required = true)
     @NotNull(message = "临床id不能为空")
     private String clinicId;
     @ApiModelProperty("设备id")

nb-service/web-service/src/main/java/com/nb/web/service/system/controller/SysDictController.java

@@ -34,7 +34,7 @@ public class SysDictController {
      * 分页查询
      */
     @GetMapping("/page")
-    @SaCheckPermission("system:sysDict:page")
+//    @SaCheckPermission("system:sysDict:page")
     @Log(title = "字典管理分页查询")
     public R page(Page reqPage, SysDictQueryDTO req) {
         return R.success(sysDictService.page(reqPage, req));
@@ -77,7 +77,7 @@ public class SysDictController {
      * 查看
      */
     @GetMapping("/view")
-    @SaCheckPermission("system:sysDict:view")
+//    @SaCheckPermission("system:sysDict:view")
     @Log(title = "字典管理查看")
     public R view(@RequestParam String id) {
         return R.success(sysDictService.view(id));
@@ -87,7 +87,7 @@ public class SysDictController {
      * 导出
      */
     @GetMapping("/export")
-    @SaCheckPermission("system:sysDict:export")
+//    @SaCheckPermission("system:sysDict:export")
     @Log(title = "字典管理导出")
     public R export(SysDictQueryDTO req) {
         String filepath = ExcelUtil.export("字典列表", SysDict.class, sysDictService.list(req));

nb-service/web-service/src/main/java/com/nb/web/service/system/controller/SysDictItemController.java

@@ -34,7 +34,7 @@ public class SysDictItemController {
      * 分页查询
      */
     @GetMapping("/page")
-    @SaCheckPermission("system:sysDictItem:page")
+//    @SaCheckPermission("system:sysDictItem:page")
     @Log(title = "字典项管理分页查询")
     public R page(Page reqPage, SysDictItemQueryDTO req) {
         return R.success(sysDictItemService.page(reqPage, req));
@@ -77,7 +77,7 @@ public class SysDictItemController {
      * 查看
      */
     @GetMapping("/view")
-    @SaCheckPermission("system:sysDictItem:view")
+//    @SaCheckPermission("system:sysDictItem:view")
     @Log(title = "字典项管理查看")
     public R view(@RequestParam String id) {
         return R.success(sysDictItemService.view(id));