pms-base/src/main/java/com/tofly/base/controller/dict/TkDictItemController.java

@@ -12,6 +12,7 @@ import com.tofly.base.server.common.data.utils.tools.ResponseResult;
 import com.tofly.base.server.common.data.utils.tools.TkPageData;
 import com.tofly.base.service.dic.SysDictItemService;
 import com.tofly.base.service.dic.SysDictService;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.ResponseEntity;
@@ -138,10 +139,11 @@ public class TkDictItemController extends BaseController {
         return null;
     }
     @PostMapping
+    @ApiOperation("字典值新增")
     @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:dictItem:post'})")
     public ResponseResult<SysDictItemDTO> saveSysDictItem(
             HttpServletRequest servletRequest,
-            @RequestBody @Validated SysDictItemDTO sysDictItemDTO)
+            @Validated SysDictItemDTO sysDictItemDTO)
             throws ThingsboardException {
         removeRedisKey();
 
@@ -163,10 +165,11 @@ public class TkDictItemController extends BaseController {
     }
 
     @PutMapping
+    @ApiOperation("字典值更新")
     @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:dictItem:update'})")
     public ResponseResult<SysDictItemDTO> updateSysDictItem(
             HttpServletRequest servletRequest,
-           @RequestBody @Validated({UpdateGroup.class}) SysDictItemDTO SysDictItemDTO) {
+            SysDictItemDTO SysDictItemDTO) {
 
         removeRedisKey();
 

pms-base/src/main/java/com/tofly/base/controller/role/TkRoleController.java

@@ -3,6 +3,8 @@ package com.tofly.base.controller.role;//package com.tofly.yxBase.server.control
 import com.tofly.base.config.SysAdminConstant;
 import com.tofly.base.controller.BaseController;
 import com.tofly.base.entity.role.RoleMenuColumn;
+import com.tofly.base.server.common.data.constant.FastIotConstants;
+import com.tofly.base.server.common.data.core.cache.CacheUtils;
 import com.tofly.base.server.common.data.dto.RoleDTO;
 import com.tofly.base.server.common.data.dto.request.RoleReqDTO;
 import com.tofly.base.server.common.data.enums.OrderTypeEnum;
@@ -51,7 +53,7 @@ public class TkRoleController extends BaseController {
     private final RedisTemplate redisTemplate;
 
     private final DataConfig dc;
-
+    private final CacheUtils cacheUtils;
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')")
     public TkPageData<RoleDTO> pageRole(
@@ -101,7 +103,7 @@ public class TkRoleController extends BaseController {
     public Set<String> getPermissions() {
         final SecurityUser currentUser = UserTicketUtil.getCurrentUser();
         return roleService.getPermissions(
-                currentUser.isSystemAdmin(), currentUser.isTenantAdmin(), null, null);
+                false, currentUser.isTenantAdmin(), null, UserTokenUtil.getTokenUserID());
     }
 
     @PutMapping("update_status/{roleId}/{status}")
@@ -141,6 +143,8 @@ public class TkRoleController extends BaseController {
             }
             roleMenuColumnService.updateBatchById(updateColumnList);
         }
+        cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
+
         return ResponseResult.success(roleDTO);
     }
 

pms-base/src/main/java/com/tofly/base/entity/user/User.java

@@ -202,7 +202,7 @@ public class User extends SearchTextBasedWithAdditionalInfo<UserId>
 
   @JsonIgnore
   public boolean isSystemAdmin() {
-    return tenantId == null || EntityId.NULL_UUID.equals(tenantId.getId());
+    return (tenantId == null || EntityId.NULL_UUID.equals(tenantId.getId()));
   }
 
   @JsonIgnore

pms-base/src/main/java/com/tofly/base/utils/UserTokenUtil.java

@@ -13,7 +13,14 @@ public class UserTokenUtil {
     private static String tokenSigningKey = "1qaz2wsx3edc4rfv5tgb6yhn7ujm1qaz2wsx3edc4rfv5tgb6yhn7ujm1qaz2wsx3edc4rfv5tgb6yhn7ujm1qaz2wsx3edc4rfv5tgb6yhn7ujm";
 
     private static String getAuthorization() {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        HttpServletRequest request=null;
+        try{
+             request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+        }catch (Exception e ){
+            return  null;
+        }
+
         String token = request.getHeader("authorization");
         if (!StringUtil.isEmpty(token)) {
             if (token.startsWith("Bearer")) {