fix: 检查租户或账号登录时是否过期

@@ -16,18 +16,17 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.utils.AccountProperties;
-import org.thingsboard.server.common.data.yunteng.dto.AuthorizeDTO;
-import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
-import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkThirdUserDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.entities.TkThirdUserEntity;
+import org.thingsboard.server.dao.yunteng.service.TkTenantService;
 import org.thingsboard.server.dao.yunteng.service.TkThirdPlatformService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository;
@@ -36,7 +35,9 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -55,6 +56,7 @@ public class TkThirdPlatformController extends BaseController {
   private final TkThirdPlatformService thirdService;
   private final TkUserService tkUserService;
   private final AccountProperties accountProperties;
+  private final TkTenantService tenantService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页")
   public TkPageData<TkThirdUserDTO> pageAlarmProfile(
@@ -130,6 +132,7 @@ public class TkThirdPlatformController extends BaseController {
 
   @NotNull
   private TkLoginResponse buildJwtToken(UserDTO userDto, String thirdUserId) {
+    checkTenantExpireTime(userDto);
     String accessToken = "";
     String refreshToken = "";
     if (userDto != null) {
@@ -168,4 +171,31 @@ public class TkThirdPlatformController extends BaseController {
     result.setRefreshToken(refreshToken);
     return result.setThirdUserId(thirdUserId);
   }
+
+  private void checkTenantExpireTime(UserDTO user)
+  {
+    LocalDateTime nowDateTime = LocalDateTime.now();
+    //租户和客户检查租户是否有效
+    if(user.getLevel()>=2){
+      TenantDTO tenant =  tenantService.findTenantByTenantId(user.getTenantId());
+      Optional.ofNullable(tenant).map(obj->{
+        LocalDateTime tenantExpireTime = obj.getTenantExpireTime();
+        if(null !=tenantExpireTime && nowDateTime.isAfter(tenantExpireTime)){
+          throw new TkDataValidationException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
+        }
+        return obj;
+      }).orElseThrow(()->{
+        throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      });
+    }
+    //检查账号是否过期
+    if(!user.isEnabled()){
+      throw new TkDataValidationException(ErrorMessage.ACCOUNT_DISABLED.getMessage());
+    }
+    if(null != user.getAccountExpireTime()){
+      if(nowDateTime.isAfter(user.getAccountExpireTime())){
+        throw new TkDataValidationException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
+      }
+    }
+  }
 }

@@ -349,6 +349,16 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
         .orElse(null);
   }
 
+  @Override
+  public TenantDTO findTenantByTenantId(String id) {
+    if(StringUtils.isEmpty(id)){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    SysTenantEntity entity = baseMapper.selectOne(new LambdaQueryWrapper<SysTenantEntity>()
+            .eq(SysTenantEntity::getTenantId,id));
+    return Optional.ofNullable(entity).map(obj->obj.getDTO(TenantDTO.class)).orElse(null);
+  }
+
   /**
    * 保存租户与菜单、角色的映射关系
    *

@@ -36,4 +36,6 @@ public interface TkTenantService {
   CompletableFuture<TsValue> findTenantsByTs(LocalDateTime startTs, LocalDateTime endTs,long ts);
 
   List<TenantDTO> checkTenantProfileIdUsedByTenants(String tenantProfileId);
+
+  TenantDTO findTenantByTenantId(String id);
 }