From 3f1c4df78abf8d62493396d18b0b1a4e3663a97b Mon Sep 17 00:00:00 2001 From: Ziin Date: Mon, 25 Aug 2025 14:28:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=A7=9F=E6=88=B7=E5=88=B0=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springbootinit/config/SaTokenConfigure.java | 3 ++- .../controller/TenantController.java | 10 +++++++++- .../model/vo/user/SystemTenantVO.java | 15 +++++++++++++++ .../service/SystemTenantService.java | 5 ++++- .../service/impl/SystemTenantServiceImpl.java | 15 +++++++++++++++ src/main/resources/application.yml | 4 +++- 6 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/yupi/springbootinit/model/vo/user/SystemTenantVO.java diff --git a/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java b/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java index 9ec57ba..477d045 100644 --- a/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java +++ b/src/main/java/com/yupi/springbootinit/config/SaTokenConfigure.java @@ -46,7 +46,8 @@ public class SaTokenConfigure implements WebMvcConfigurer { "/user/doLogin", "/tenant/get-id-by-name", "/user/bigbrother-doLogin", - "/user/aiChat-doLogin" + "/user/aiChat-doLogin", + "/error" }; } diff --git a/src/main/java/com/yupi/springbootinit/controller/TenantController.java b/src/main/java/com/yupi/springbootinit/controller/TenantController.java index a1b63e6..a7cb3d5 100644 --- a/src/main/java/com/yupi/springbootinit/controller/TenantController.java +++ b/src/main/java/com/yupi/springbootinit/controller/TenantController.java @@ -4,12 +4,15 @@ import com.yupi.springbootinit.common.BaseResponse; import com.yupi.springbootinit.common.ErrorCode; import com.yupi.springbootinit.common.ResultUtils; import com.yupi.springbootinit.exception.BusinessException; +import com.yupi.springbootinit.model.entity.SystemTenant; +import com.yupi.springbootinit.model.vo.user.SystemTenantVO; import com.yupi.springbootinit.model.vo.user.SystemUsersVO; import com.yupi.springbootinit.service.SystemTenantService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.annotation.security.PermitAll; /* * @author: ziin @@ -30,7 +33,12 @@ public class TenantController { throw new BusinessException(ErrorCode.PARAMS_ERROR); } return ResultUtils.success( systemTenantService.getTenantIdByName(name)); - } + @GetMapping("/get-expired-time") + public BaseResponse getTenantIdExpired(@RequestParam("tenantId") Long tenantId) { + return ResultUtils.success(systemTenantService.getTenantIdExpired(tenantId)); + } + + } diff --git a/src/main/java/com/yupi/springbootinit/model/vo/user/SystemTenantVO.java b/src/main/java/com/yupi/springbootinit/model/vo/user/SystemTenantVO.java new file mode 100644 index 0000000..1440ba9 --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/model/vo/user/SystemTenantVO.java @@ -0,0 +1,15 @@ +package com.yupi.springbootinit.model.vo.user; + +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Date; + +/* + * @author: ziin + * @date: 2025/8/25 14:12 + */ +@Data +public class SystemTenantVO { + private Date expiredTime; +} diff --git a/src/main/java/com/yupi/springbootinit/service/SystemTenantService.java b/src/main/java/com/yupi/springbootinit/service/SystemTenantService.java index f4dd1a2..c503390 100644 --- a/src/main/java/com/yupi/springbootinit/service/SystemTenantService.java +++ b/src/main/java/com/yupi/springbootinit/service/SystemTenantService.java @@ -3,7 +3,8 @@ package com.yupi.springbootinit.service; import com.yupi.springbootinit.common.BaseResponse; import com.yupi.springbootinit.model.entity.SystemTenant; import com.baomidou.mybatisplus.extension.service.IService; - /* +import com.yupi.springbootinit.model.vo.user.SystemTenantVO; +/* * @author: ziin * @date: 2025/6/20 14:50 */ @@ -12,4 +13,6 @@ public interface SystemTenantService extends IService{ Long getTenantIdByName(String name); + + SystemTenantVO getTenantIdExpired(Long tenantId); } diff --git a/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java b/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java index 5c6b554..76fa286 100644 --- a/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java +++ b/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java @@ -1,9 +1,11 @@ package com.yupi.springbootinit.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yupi.springbootinit.common.BaseResponse; import com.yupi.springbootinit.common.ErrorCode; import com.yupi.springbootinit.exception.BusinessException; +import com.yupi.springbootinit.model.vo.user.SystemTenantVO; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -11,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yupi.springbootinit.model.entity.SystemTenant; import com.yupi.springbootinit.mapper.SystemTenantMapper; import com.yupi.springbootinit.service.SystemTenantService; + +import javax.annotation.Resource; /* * @author: ziin * @date: 2025/6/20 14:50 @@ -19,6 +23,9 @@ import com.yupi.springbootinit.service.SystemTenantService; @Service public class SystemTenantServiceImpl extends ServiceImpl implements SystemTenantService{ + @Resource + private SystemTenantMapper systemTenantMapper; + @Override public Long getTenantIdByName(String name) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -31,4 +38,12 @@ public class SystemTenantServiceImpl extends ServiceImpl