Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

token管理查询接口参数修改

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/elasticsearch/EsUtils.java
+12 -13
View File
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch.ElasticsearchClient;
import co.elastic.clients.elasticsearch._types.ElasticsearchException; import co.elastic.clients.elasticsearch._types.ElasticsearchException;
import co.elastic.clients.elasticsearch._types.FieldValue; import co.elastic.clients.elasticsearch._types.FieldValue;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest;
import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse; import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse;
import co.elastic.clients.elasticsearch.core.SearchRequest; import co.elastic.clients.elasticsearch.core.SearchRequest;
@@ -216,26 +217,25 @@ public class EsUtils {
} }
} }
public void deleteEsDocument(String filedName1,String filedName2, Long value1,Long value2, String index) { public void deleteEsDocument(String fieldName1,String fieldName2, Long value1,Long value2, String index) {
DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder(); DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
builder.index(index); builder.index(index);
builder.query(q->q.bool(b->b.filter(f->{ builder.query(q -> q.bool(b -> b.filter(
f.term(t->t.field(filedName1).value(value1)); Query.of(q1 -> q1.term(t -> t.field(fieldName1).value(value1))),
f.term(t->t.field(filedName2).value(value2)); Query.of(q2 -> q2.term(t -> t.field(fieldName2).value(value2)))
return f; )));
})));
try { try {
elasticsearchClient.deleteByQuery(builder.build()); elasticsearchClient.deleteByQuery(builder.build());
} catch (IOException | ElasticsearchException e) { } catch (IOException | ElasticsearchException e) {
log.error("ES文档删除失败：", e.getMessage()); log.error("ES文档删除失败：{}", e.getMessage());
throw new ServiceException(ES_DATA_ERROR); throw new ServiceException(ES_DATA_ERROR);
} }
} }
public void deleteEsDocument(String filedName1,String filedName2, Long value1,List<Long> values2, String index) { public void deleteEsDocument(String filedName1,String filedName2, Long value1,List<Long> values2, String index) {
List<FieldValue> fieldValues = values2.stream().map(FieldValue::of).toList(); List<FieldValue> fieldValues = values2.stream().map(FieldValue::of).toList();
@@ -243,11 +243,10 @@ public class EsUtils {
DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder(); DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
builder.index(index); builder.index(index);
builder.query(q->q.bool(b->b.filter(f->{ builder.query(q-> q.bool(b-> b.filter(
f.term(t->t.field(filedName1).value(value1)); Query.of(q1->q1.term(t->t.field(filedName1).value(value1))),
f.terms(t->t.field(filedName2).terms(v2->v2.value(fieldValues))); Query.of(q2-> q2.terms(t->t.field(filedName2).terms(v2-> v2.value(fieldValues))))
return f; )));
})));
try { try {
elasticsearchClient.deleteByQuery(builder.build()); elasticsearchClient.deleteByQuery(builder.build());
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+13 -13
View File
@@ -382,22 +382,22 @@ public class ErrorCodeConstants {
//=========== 系统配置 1-002-041-000 ============ //=========== 系统配置 1-002-042-000 ============
public static final ErrorCode TOKEN_APP_TYPE_EXIST = new ErrorCode(1_002_041_001, "当前应用以存在token配置，无法继续新增"); public static final ErrorCode TOKEN_APP_TYPE_EXIST = new ErrorCode(1_002_042_001, "当前应用以存在token配置，无法继续新增");
public static final ErrorCode TOKEN_CONFIG_NOT_EXISTS = new ErrorCode(1_002_041_002, "当前应用的token配置不存在"); public static final ErrorCode TOKEN_CONFIG_NOT_EXISTS = new ErrorCode(1_002_042_002, "当前应用的token配置不存在");
public static final ErrorCode TOKEN_TIME_IS_EXPIRES = new ErrorCode(1_002_041_003, "当前token已过期，请重新配置或延长时间"); public static final ErrorCode TOKEN_TIME_IS_EXPIRES = new ErrorCode(1_002_042_003, "当前token已过期，请重新配置或延长时间");
public static final ErrorCode TOKEN_DATA_ERROR = new ErrorCode(1_002_041_004, "token解析失败，请重新配置token"); public static final ErrorCode TOKEN_DATA_ERROR = new ErrorCode(1_002_042_004, "token解析失败，请重新配置token");
public static final ErrorCode TOKEN_APP_TYPE_ERROR = new ErrorCode(1_002_041_005, "token解析失败，当前token和应用不匹配，请重新配置"); public static final ErrorCode TOKEN_APP_TYPE_ERROR = new ErrorCode(1_002_042_005, "token解析失败，当前token和应用不匹配，请重新配置");
public static final ErrorCode TOKEN_APP_TYPE_NO_UPDATE = new ErrorCode(1_002_041_006, "应用名称不允许更改"); public static final ErrorCode TOKEN_APP_TYPE_NO_UPDATE = new ErrorCode(1_002_042_006, "应用名称不允许更改");
public static final ErrorCode TOKEN_DATA_IS_NULL = new ErrorCode(1_002_041_007, "当前token的配置为空，无需删除"); public static final ErrorCode TOKEN_DATA_IS_NULL = new ErrorCode(1_002_042_007, "当前token的配置为空，无需删除");
public static final ErrorCode TOKEN_EXPIRES_TIME_IS_NULL = new ErrorCode(1_002_041_008, "当前未选择有效时间，请选择再进行新增"); public static final ErrorCode TOKEN_EXPIRES_TIME_IS_NULL = new ErrorCode(1_002_042_008, "当前未选择有效时间，请选择再进行新增");
public static final ErrorCode TOKEN_EXPIRES_TIME_DATA_ERROR = new ErrorCode(1_002_041_009, "当前选择的有效时间已过期，请增加有效时间"); public static final ErrorCode TOKEN_EXPIRES_TIME_DATA_ERROR = new ErrorCode(1_002_042_009, "当前选择的有效时间已过期，请增加有效时间");
public static final ErrorCode INSERT_TOKEN_DATA_ERROR = new ErrorCode(1_002_041_010, "token新增失败，请重新尝试"); public static final ErrorCode INSERT_TOKEN_DATA_ERROR = new ErrorCode(1_002_042_010, "token新增失败，请重新尝试");
//=========== 资金管理 1-002-042-000 ============ //=========== 资金管理 1-002-043-000 ============
public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_042_001, "当前组织无资金管理"); public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_043_001, "当前组织无资金管理");
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigPageReqVO.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class TokenConfigPageReqVO extends PageParam {
@Schema(description = "时间范围", example = "[2022-07-01 ,2022-07-01]") @Schema(description = "时间范围", example = "[2022-07-01 ,2022-07-01]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private LocalDate[] expiresTime; private LocalDate[] timeType;
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/tokenconfig/TokenConfigMapper.java
+3 -2
View File
@@ -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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; 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> { 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>() return selectPage(pageReqVO, new LambdaQueryWrapperX<TokenConfigDO>()
.eq(TokenConfigDO::getOrganId,getUserOrganId()) .eq(TokenConfigDO::getOrganId,getUserOrganId())
.eq(TokenConfigDO::getDeleted,false) .eq(TokenConfigDO::getDeleted,false)
.likeIfPresent(TokenConfigDO::getAppToken,pageReqVO.getAppToken()) .likeIfPresent(TokenConfigDO::getAppToken,pageReqVO.getAppToken())
.likeIfPresent(TokenConfigDO::getAppName,pageReqVO.getAppName()) .likeIfPresent(TokenConfigDO::getAppName,pageReqVO.getAppName())
.betweenIfPresent(TokenConfigDO::getExpiresTime,pageReqVO.getExpiresTime()) .betweenIfPresent(TokenConfigDO::getExpiresTime,localDateTimes)
.orderByDesc(TokenConfigDO::getId)); .orderByDesc(TokenConfigDO::getId));
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigServiceImpl.java
+13 -5
View File
@@ -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.pojo.PageResult;
import com.cf.imes.framework.common.util.Assert.AssertUtils; 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.DateUtils;
import com.cf.imes.framework.common.util.date.LocalDateTimeUtils;
import com.cf.imes.framework.common.util.object.BeanUtils; 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.JwtConfig;
import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigPageReqVO; 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.security.NoSuchAlgorithmException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Base64; import java.time.LocalTime;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
@@ -66,7 +65,16 @@ public class TokenConfigServiceImpl implements TokenConfigService{
@Override @Override
public PageResult<TokenConfigRespVO> getTokenConfigPage(TokenConfigPageReqVO pageReqVO) { 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())) { if(CollUtil.isEmpty(pageResult.getList())) {
return new PageResult<>(); return new PageResult<>();
} }