token管理查询接口参数修改

This commit is contained in:
liuzhaotian
2025-03-05 11:59:44 +08:00
parent 8374365163
commit 418ac7cc79
5 changed files with 42 additions and 34 deletions
@@ -29,7 +29,7 @@ public class TokenConfigPageReqVO extends PageParam {
@Schema(description = "时间范围", example = "[2022-07-01 ,2022-07-01]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate[] expiresTime;
private LocalDate[] timeType;
}
@@ -9,6 +9,7 @@ import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
@@ -23,13 +24,13 @@ import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.ge
public interface TokenConfigMapper extends BaseMapperX<TokenConfigDO> {
default PageResult<TokenConfigDO> selectConfigPage(TokenConfigPageReqVO pageReqVO) {
default PageResult<TokenConfigDO> selectConfigPage(TokenConfigPageReqVO pageReqVO, LocalDateTime[] localDateTimes) {
return selectPage(pageReqVO, new LambdaQueryWrapperX<TokenConfigDO>()
.eq(TokenConfigDO::getOrganId,getUserOrganId())
.eq(TokenConfigDO::getDeleted,false)
.likeIfPresent(TokenConfigDO::getAppToken,pageReqVO.getAppToken())
.likeIfPresent(TokenConfigDO::getAppName,pageReqVO.getAppName())
.betweenIfPresent(TokenConfigDO::getExpiresTime,pageReqVO.getExpiresTime())
.betweenIfPresent(TokenConfigDO::getExpiresTime,localDateTimes)
.orderByDesc(TokenConfigDO::getId));
}
@@ -7,6 +7,7 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.util.Assert.AssertUtils;
import com.cf.imes.framework.common.util.date.DateUtils;
import com.cf.imes.framework.common.util.date.LocalDateTimeUtils;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.module.system.controller.admin.tokenconfig.vo.JwtConfig;
import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigPageReqVO;
@@ -32,10 +33,8 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.time.LocalTime;
import java.util.*;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
@@ -66,7 +65,16 @@ public class TokenConfigServiceImpl implements TokenConfigService{
@Override
public PageResult<TokenConfigRespVO> getTokenConfigPage(TokenConfigPageReqVO pageReqVO) {
PageResult<TokenConfigDO> pageResult = tokenConfigMapper.selectConfigPage(pageReqVO);
LocalDateTime[] localDateTimes = new LocalDateTime[1];
if(pageReqVO.getTimeType() != null){
LocalDate[] expiresTime = pageReqVO.getTimeType();
localDateTimes = Arrays.stream(expiresTime)
.map(date -> date.atTime(LocalTime.MIDNIGHT))
.toArray(LocalDateTime[]::new);
localDateTimes = LocalDateTimeUtils.generateTimeSection(localDateTimes);
}
PageResult<TokenConfigDO> pageResult = tokenConfigMapper.selectConfigPage(pageReqVO,localDateTimes);
if(CollUtil.isEmpty(pageResult.getList())) {
return new PageResult<>();
}