fix: 修改平台登录相关BUG

@@ -21,7 +21,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 
 
 @RestController
-@RequestMapping("api/v1/role")
+@RequestMapping("api/yt/role")
 @RequiredArgsConstructor
 public class RoleController extends BaseController {
 
@@ -50,7 +50,7 @@ public class RoleController extends BaseController {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
-    return roleService.page(getCurrentUser().isSysadmin(), getCurrentUser().isPlatformAdmin(), getCurrentUser().getCurrentTenantId(),queryMap);
+    return roleService.page(getCurrentUser().isPtSysadmin(), getCurrentUser().isPtmAdmin(), getCurrentUser().getCurrentTenantId(),queryMap);
   }
 
   @DeleteMapping
@@ -60,27 +60,27 @@ public class RoleController extends BaseController {
 
   @GetMapping("/me/permissions")
   public Set<String> getPermissions() throws ThingsboardException {
-    return roleService.getPermissions(getCurrentUser().isSysadmin(), getCurrentUser().isTenantAdmin(), getCurrentUser().getCurrentTenantId(), getCurrentUser().getCurrentUserId());
+    return roleService.getPermissions(getCurrentUser().isPtSysadmin(), getCurrentUser().isPtTenantAdmin(), getCurrentUser().getCurrentTenantId(), getCurrentUser().getCurrentUserId());
   }
 
   @PutMapping("updateRoleStatus/{roleId}/{status}")
   public void updateRoleStatus(
       @PathVariable("roleId") String roleId, @PathVariable("status") int status) throws ThingsboardException {
     Assert.isTrue(status == 0 || status == 1, "role status is not correct");
-    roleService.updateRoleStatus(roleId, status, getCurrentUser().isSysadmin() ,getCurrentUser().getCurrentTenantId());
+    roleService.updateRoleStatus(roleId, status, getCurrentUser().isPtSysadmin() ,getCurrentUser().getCurrentTenantId());
   }
 
   @PostMapping("saveOrUpdateRoleInfoWithMenu")
   public RoleDTO saveOrUpdateRoleInfoWithMenu(@RequestBody RoleReqDTO roleReqDTO) throws ThingsboardException {
     return roleService.saveOrUpdateRoleInfoWithMenu(
         roleReqDTO,
-        getCurrentUser().isSysadmin(),
-        getCurrentUser().isPlatformAdmin(),
+        getCurrentUser().isPtSysadmin(),
+        getCurrentUser().isPtmAdmin(),
         getCurrentUser().getCurrentTenantId());
   }
 
   @PostMapping("/find/list")
   public List<RoleDTO> findRoleInfoList(@RequestBody RoleDTO roleDTO) throws ThingsboardException {
-    return roleService.findRoleInfo(getCurrentUser().isTenantAdmin(), getCurrentUser().getCurrentTenantId(),getCurrentUser().getCurrentUserId(), roleDTO);
+    return roleService.findRoleInfo(getCurrentUser().isPtTenantAdmin(), getCurrentUser().getCurrentTenantId(),getCurrentUser().getCurrentUserId(), roleDTO);
   }
 }

@@ -27,7 +27,7 @@ import java.util.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
-@RequestMapping("api/v1/admin")
+@RequestMapping("api/yt/admin")
 @RequiredArgsConstructor
 @PreAuthorize("hasAnyRole('SYS_ADMIN','PLATFORM_ADMIN')")
 public class YtAdminController extends BaseController {
@@ -94,7 +94,7 @@ public class YtAdminController extends BaseController {
     Assert.notNull(ids, "ids cannot be null");
     userService.deleteUser(
         new HashSet<>(Arrays.asList(ids)),
-        getCurrentUser().isSysadmin(),
+        getCurrentUser().isPtSysadmin(),
         getCurrentUser().getCurrentTenantId());
   }
 
@@ -115,12 +115,12 @@ public class YtAdminController extends BaseController {
             userDTO,
             sendEmail,
             sendMsg,
-            getCurrentUser().isSysadmin(),
+            getCurrentUser().isPtSysadmin(),
             getCurrentUser().getCurrentTenantId());
     Optional<UserDTO> optional =
         userService.getUser(
             newUserDTO.getId(),
-            getCurrentUser().isSysadmin(),
+            getCurrentUser().isPtSysadmin(),
             getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(optional.get());
   }
@@ -130,13 +130,13 @@ public class YtAdminController extends BaseController {
     return ResponseEntity.ok(menuService.getAllMenus(getCurrentUser().getCurrentTenantId()));
   }
 
-  @GetMapping("me/menus")
+  @GetMapping("/me/menus")
   public ResponseEntity<List<MenuDTO>> getMyMenus() throws ThingsboardException {
     return ResponseEntity.ok(
         menuService.getMyMenus(
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentUserId(),
-            getCurrentUser().isSysadmin(), getCurrentUser().isTenantAdmin()));
+            getCurrentUser().isPtSysadmin(), getCurrentUser().isPtTenantAdmin()));
   }
 
   @PutMapping("/menu/assign/{tenantCode}")

@@ -39,7 +39,7 @@ import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
-@RequestMapping("api/v1/user")
+@RequestMapping("api/yt/user")
 @RequiredArgsConstructor
 @Api(value = "用户接口")
 public class YtUserController extends BaseController {
@@ -51,7 +51,7 @@ public class YtUserController extends BaseController {
       throws ThingsboardException {
     return ResponseEntity.of(
         userService.getUser(
-            userId, getCurrentUser().isSysadmin(), getCurrentUser().getCurrentTenantId()));
+            userId, getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId()));
   }
 
   @GetMapping("me/info")
@@ -83,7 +83,7 @@ public class YtUserController extends BaseController {
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put("realName", realName);
     queryMap.put("username", username);
-    if (getCurrentUser().isSysadmin()) {
+    if (getCurrentUser().isPtSysadmin()) {
       if (StringUtils.isEmpty(tenantCode)) {
         tenantCode = getCurrentUser().getCurrentTenantId();
       }
@@ -97,16 +97,16 @@ public class YtUserController extends BaseController {
     }
     return userService.page(
         queryMap,
-        getCurrentUser().isSysadmin(),
-        getCurrentUser().isPlatformAdmin(),
-        getCurrentUser().isTenantAdmin(),
+        getCurrentUser().isPtSysadmin(),
+        getCurrentUser().isPtmAdmin(),
+        getCurrentUser().isPtTenantAdmin(),
         getCurrentUser().getCurrentTenantId());
   }
 
   @PutMapping
   public UserDTO updateUser(@RequestBody UserDTO userDTO) throws ThingsboardException {
     return userService.updateUser(
-        userDTO, getCurrentUser().isSysadmin(), getCurrentUser().getCurrentTenantId());
+        userDTO, getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
   }
 
   @PostMapping
@@ -121,7 +121,7 @@ public class YtUserController extends BaseController {
             userDTO,
             sendEmail,
             sendMsg,
-            getCurrentUser().isSysadmin(),
+            getCurrentUser().isPtSysadmin(),
             getCurrentUser().getCurrentTenantId());
     URI location =
         ServletUriComponentsBuilder.fromCurrentRequest()
@@ -138,14 +138,14 @@ public class YtUserController extends BaseController {
     Assert.notNull(userDTO.getUsername(), "username must exist");
     Assert.notNull(userDTO.getRealName(), "real name must exist");
     return userService.saveTenantAdmin(
-        userDTO, getCurrentUser().isSysadmin(), getCurrentUser().getCurrentTenantId());
+        userDTO, getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
   }
 
   @DeleteMapping
   public void deleteUser(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     userService.deleteUser(
-        deleteDTO.getIds(), getCurrentUser().isSysadmin(), getCurrentUser().getCurrentTenantId());
+        deleteDTO.getIds(), getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
   }
 
   @RequestMapping(

@@ -28,11 +28,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
-import org.thingsboard.server.common.data.yunteng.dto.UserDetailRoleDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
 
-import java.util.Set;
-
 @ApiModel
 @EqualsAndHashCode(callSuper = true)
 public class User extends SearchTextBasedWithAdditionalInfo<UserId>

@@ -48,7 +48,7 @@ public interface FastIotConstants {
   }
 
   interface CacheConfigKey {
-    String CACHE_CONFIG_KEY = "FAST_IOT_CACHE";
+    String CACHE_CONFIG_KEY = "YUN_TENG_IOT_CACHE";
     String USER_PERMISSION_PREFIX = "user_permission_for_";
     String MOBILE_LOGIN_SMS_CODE = "mobile_login_sms_code";
     String DEFAULT_RULE_CHAIN = "default_rule_chain";

 package org.thingsboard.server.common.data.yunteng.core.cache;
-
+import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Component;
-
 import java.util.Objects;
 import java.util.Optional;
 
@@ -22,30 +21,44 @@ public class CacheUtils {
   }
 
   public void put(String cacheName, String key, Object value) {
-    Objects.requireNonNull(cacheManager.getCache(cacheName)).put(key, value);
+    Cache cache = cacheManager.getCache(cacheName);
+    if (null != cache) {
+      cache.put(key, value);
+    }
   }
 
   public void invalidateCacheName(String cacheName) {
-    Objects.requireNonNull(cacheManager.getCache(cacheName)).invalidate();
+    Cache cache = cacheManager.getCache(cacheName);
+    if (null != cache) {
+      cache.invalidate();
+    }
   }
+
   public void invalidate(String key) {
-    Objects.requireNonNull(cacheManager.getCache(COMMON_STORE_AREA)).evictIfPresent(key);
+    Cache cache = cacheManager.getCache(COMMON_STORE_AREA);
+    if (null != cache) {
+      cache.evictIfPresent(key);
+    }
   }
 
   public void invalidate(String cacheName, String key) {
-    Objects.requireNonNull(cacheManager.getCache(cacheName)).evictIfPresent(key);
+    Cache cache = cacheManager.getCache(cacheName);
+    if (null != cache) {
+      cache.evictIfPresent(key);
+    }
   }
 
   @SuppressWarnings("unchecked")
   public <T> Optional<T> get(String key) {
-    return Optional.ofNullable(
-            Objects.requireNonNull(cacheManager.getCache(COMMON_STORE_AREA)).get(key))
+    return Optional.ofNullable(cacheManager.getCache(COMMON_STORE_AREA))
+        .map(cache -> Objects.requireNonNull(cache).get(key))
         .map(v -> (T) v.get());
   }
 
   @SuppressWarnings("unchecked")
   public <T> Optional<T> get(String cacheName, String key) {
-    return Optional.ofNullable(Objects.requireNonNull(cacheManager.getCache(cacheName)).get(key))
+    return Optional.ofNullable(cacheManager.getCache(cacheName))
+        .map(cache -> Objects.requireNonNull(cache).get(key))
         .map(v -> (T) v.get());
   }
 }