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 12:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、es单挑数据删除search+deleteById替换DeleteByQueryRequest；2、springboot升级redis配置变化同步；

Browse Source
This commit is contained in:
gaoqr
2025-07-22 16:18:20 +08:00
parent b9a0c30b4b
commit 909a651de7
11 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-infra/cf-module-infra-biz/src/main/resources/application-dev.yaml
+6 -5
View File
@@ -63,11 +63,12 @@ spring:
password: root
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
data:
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-infra/cf-module-infra-biz/src/main/resources/application-local.yaml
+5 -4
View File
@@ -74,10 +74,11 @@ spring:
# password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
data:
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java
+24 -37
View File
@@ -192,8 +192,7 @@ public class OrderInputProcessor {
throw new ServiceException(500, "未知异常");
}
} catch (IOException | ElasticsearchException e) {
e.printStackTrace();
log.error(e.getMessage());
log.error(e.getMessage(), e);
throw new RuntimeException(e);
}
@@ -217,50 +216,38 @@ public class OrderInputProcessor {
throw new ServiceException(500, "未知异常");
}
} catch (IOException | ElasticsearchException e) {
e.printStackTrace();
log.error(e.getMessage());
log.error(e.getMessage(), e);
throw new RuntimeException(e);
}
}
/**
* 生产单id查询文档id
*/
public List<String> buildRespByOrderId(Long orderId, String index, Integer size) {
SearchRequest.Builder builder = new SearchRequest.Builder();
builder.index(index);
builder.size(size);
builder.query(q -> q.term(b -> b.field(FIELD_ORDER_ID).value(orderId)));
builder.source(s -> s.fetch(false));
try {
SearchResponse<?> search = elasticsearchClient.search(builder.build(), Object.class);
List<? extends Hit<?>> hits = search.hits().hits();
if (CollUtil.isNotEmpty(hits)) {
return hits.stream().map(Hit::id).collect(Collectors.toList());
}
return new ArrayList<>();
} catch (IOException e) {
log.error(e.getMessage());
throw new ServiceException(INTERNAL_SERVER_ERROR);
}
}
/**
* 生产单Id批量删除
* 生产单Id删除
*/
public void deleteByOrderId(Long orderId, String index) {
DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
builder.index(index);
builder.query(q -> q.term(t -> t.field(FIELD_ORDER_ID).value(orderId)));
try {
DeleteByQueryResponse response = elasticsearchClient.deleteByQuery(builder.build());
log.info("Deleted {} documents with planId {}", response.deleted(), orderId);
// 查文档_id
SearchResponse<Void> search = elasticsearchClient.search(s -> s
.index(index)
.size(1) // 只取一条
.query(q -> q.term(t -> t.field("orderId").value(orderId)))
.source(src -> src.fetch(false)), // 不拉取 _source
Void.class
);
List<Hit<Void>> hits = search.hits().hits();
if (hits.isEmpty()) {
log.warn("No document found for orderId: {}", orderId);
return;
}
String docId = hits.get(0).id();
// 按 _id 删除
elasticsearchClient.delete(d -> d.index(index).id(docId));
log.info("Successfully deleted document with orderId={} (docId={})", orderId, docId);
} catch (IOException | ElasticsearchException e) {
log.error("Error deleting documents with planId {}: {}", orderId, e.getMessage());
log.error("Error deleting documents with orderId {}: {}", orderId, e);
throw new ServiceException(INTERNAL_SERVER_ERROR);
}
}
@@ -280,7 +267,7 @@ public class OrderInputProcessor {
DeleteByQueryResponse response = elasticsearchClient.deleteByQuery(builder.build());
log.info("Deleted {} documents with planId {}", response.deleted(), orderIds);
} catch (IOException | ElasticsearchException e) {
log.error("Error deleting documents with planId {}: {}", orderIds, e.getMessage());
log.error("Error deleting documents with planId {}: {}", orderIds, e);
throw new ServiceException(INTERNAL_SERVER_ERROR);
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml
+6 -5
View File
@@ -63,11 +63,12 @@ spring:
password: root
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
data:
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml
+5 -4
View File
@@ -80,10 +80,11 @@ spring:
password: root
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
data:
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml
+6 -5
View File
@@ -63,11 +63,12 @@ spring:
password: root
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
data:
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml
+5 -4
View File
@@ -70,10 +70,11 @@ spring:
# password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
data:
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-report/cf-module-report-biz/src/main/resources/application-dev.yaml
+6 -5
View File
@@ -64,11 +64,12 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
data:
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-report/cf-module-report-biz/src/main/resources/application-local.yaml
+6 -5
View File
@@ -71,11 +71,12 @@ spring:
# password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启
data:
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml
+6 -5
View File
@@ -61,11 +61,12 @@ spring:
password: root
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
data:
redis:
host: 192.168.1.205 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: cf@2024 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml
+5 -4
View File
@@ -68,10 +68,11 @@ spring:
# password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
data:
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: 123456 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################