Skip to content

Commit bb33452

Browse files
hhhhsc701hhhhsc701
authored
bugfix: 清洗/算子支持名称/描述搜索 (#116)
* bugfix: milvus适配etcd deploy部署 * bugfix: 可以在知识库界面跳转到创建模型
1 parent 5c178d5 commit bb33452

File tree

22 files changed

+88
-56
lines changed

22 files changed

+88
-56
lines changed

‎backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/infrastructure/persistence/Impl/CleaningTaskRepositoryImpl.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,14 @@ public class CleaningTaskRepositoryImpl extends CrudRepository<CleaningTaskMappe
2424

2525
public List<CleaningTaskDto> findTasks(String status, String keywords, Integer page, Integer size) {
2626
LambdaQueryWrapper<CleaningTask> lambdaWrapper = new LambdaQueryWrapper<>();
27-
lambdaWrapper.eq(StringUtils.isNotBlank(status), CleaningTask::getStatus, status)
28-
.like(StringUtils.isNotBlank(keywords), CleaningTask::getName, keywords)
29-
.orderByDesc(CleaningTask::getCreatedAt);
27+
lambdaWrapper.eq(StringUtils.isNotBlank(status), CleaningTask::getStatus, status);
28+
if (StringUtils.isNotBlank(keywords)) {
29+
lambdaWrapper.and(w ->
30+
w.like(CleaningTask::getName, keywords)
31+
.or()
32+
.like(CleaningTask::getDescription, keywords));
33+
}
34+
lambdaWrapper.orderByDesc(CleaningTask::getCreatedAt);
3035
if (size != null && page != null) {
3136
Page<CleaningTask> queryPage = new Page<>(page + 1, size);
3237
IPage<CleaningTask> resultPage = mapper.selectPage(queryPage, lambdaWrapper);

‎backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/infrastructure/persistence/Impl/CleaningTemplateRepositoryImpl.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ public class CleaningTemplateRepositoryImpl extends CrudRepository<CleaningTempl
2525
@Override
2626
public List<TemplateWithInstance> findAllTemplates(String keywords) {
2727
QueryWrapper<TemplateWithInstance> queryWrapper = new QueryWrapper<>();
28-
queryWrapper.like(StringUtils.isNotBlank(keywords), "name", keywords)
29-
.orderByDesc("created_at");
28+
if (StringUtils.isNotBlank(keywords)) {
29+
queryWrapper.like("name", keywords)
30+
.or()
31+
.like("description", keywords);
32+
}
33+
queryWrapper.orderByDesc("created_at");
3034
return mapper.findAllTemplates(queryWrapper);
3135
}
3236

‎backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/interfaces/rest/CleaningTaskController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public class CleaningTaskController {
2020
public PagedResponse<CleaningTaskDto> cleaningTasksGet(
2121
@RequestParam("page") Integer page,
2222
@RequestParam("size") Integer size, @RequestParam(value = "status", required = false) String status,
23-
@RequestParam(value = "keywords", required = false) String keywords) {
24-
List<CleaningTaskDto> tasks = cleaningTaskService.getTasks(status, keywords, page, size);
25-
int count = cleaningTaskService.countTasks(status, keywords);
23+
@RequestParam(value = "keyword", required = false) String keyword) {
24+
List<CleaningTaskDto> tasks = cleaningTaskService.getTasks(status, keyword, page, size);
25+
int count = cleaningTaskService.countTasks(status, keyword);
2626
int totalPages = (count + size + 1) / size;
2727
return PagedResponse.of(tasks, page, count, totalPages);
2828
}

‎backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/interfaces/rest/CleaningTemplateController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class CleaningTemplateController {
3030
public PagedResponse<CleaningTemplateDto> cleaningTemplatesGet(
3131
@RequestParam(value = "page", required = false) Integer page,
3232
@RequestParam(value = "size", required = false) Integer size,
33-
@RequestParam(value = "keywords", required = false) String keyword) {
33+
@RequestParam(value = "keyword", required = false) String keyword) {
3434
List<CleaningTemplateDto> templates = cleaningTemplateService.getTemplates(keyword);
3535
if (page == null || size == null) {
3636
return PagedResponse.of(templates.stream()

‎backend/services/operator-market-service/src/main/java/com/datamate/operator/application/OperatorService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public class OperatorService {
4949
private String operatorBasePath;
5050

5151
public List<OperatorDto> getOperators(Integer page, Integer size, List<String> categories,
52-
String operatorName, Boolean isStar) {
53-
return operatorViewRepo.findOperatorsByCriteria(page, size, operatorName, categories, isStar);
52+
String keyword, Boolean isStar) {
53+
return operatorViewRepo.findOperatorsByCriteria(page, size, keyword, categories, isStar);
5454
}
5555

56-
public int getOperatorsCount(List<String> categories, String operatorName, Boolean isStar) {
57-
return operatorViewRepo.countOperatorsByCriteria(operatorName, categories, isStar);
56+
public int getOperatorsCount(List<String> categories, String keyword, Boolean isStar) {
57+
return operatorViewRepo.countOperatorsByCriteria(keyword, categories, isStar);
5858
}
5959

6060
public OperatorDto getOperatorById(String id) {

‎backend/services/operator-market-service/src/main/java/com/datamate/operator/domain/repository/OperatorViewRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import java.util.List;
88

99
public interface OperatorViewRepository extends IRepository<OperatorView> {
10-
List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, String operatorName,
10+
List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, String keyword,
1111
List<String> categories, Boolean isStar);
1212

13-
Integer countOperatorsByCriteria(String operatorName, List<String> categories, Boolean isStar);
13+
Integer countOperatorsByCriteria(String keyword, List<String> categories, Boolean isStar);
1414

1515
OperatorView findOperatorById(String id);
1616
}

‎backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/Impl/OperatorViewRepositoryImpl.java‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,18 @@ public class OperatorViewRepositoryImpl extends CrudRepository<OperatorViewMappe
2323
private final OperatorViewMapper mapper;
2424

2525
@Override
26-
public List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, String operatorName,
26+
public List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, String keyword,
2727
List<String> categories, Boolean isStar) {
2828
QueryWrapper<OperatorView> queryWrapper = Wrappers.query();
2929
queryWrapper.in(CollectionUtils.isNotEmpty(categories), "category_id", categories)
30-
.like(StringUtils.isNotBlank(operatorName), "operator_name", operatorName)
31-
.eq(isStar != null, "is_star", isStar)
32-
.groupBy("operator_id")
30+
.eq(isStar != null, "is_star", isStar);
31+
if (StringUtils.isNotEmpty(keyword)) {
32+
queryWrapper.and(w ->
33+
w.like("operator_name", keyword)
34+
.or()
35+
.like("description", keyword));
36+
}
37+
queryWrapper.groupBy("operator_id")
3338
.orderByDesc("created_at");
3439
Page<OperatorView> queryPage;
3540
if (size != null && page != null) {
@@ -43,11 +48,16 @@ public List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, Str
4348
}
4449

4550
@Override
46-
public Integer countOperatorsByCriteria(String operatorName, List<String> categories, Boolean isStar) {
51+
public Integer countOperatorsByCriteria(String keyword, List<String> categories, Boolean isStar) {
4752
QueryWrapper<OperatorView> queryWrapper = Wrappers.query();
4853
queryWrapper.in(CollectionUtils.isNotEmpty(categories),"category_id", categories)
49-
.like(StringUtils.isNotBlank(operatorName), "operator_name", operatorName)
5054
.eq(isStar != null, "is_star", isStar);
55+
if (StringUtils.isNotEmpty(keyword)) {
56+
queryWrapper.and(w ->
57+
w.like("operator_name", keyword)
58+
.or()
59+
.like("description", keyword));
60+
}
5161
return mapper.countOperatorsByCriteria(queryWrapper);
5262
}
5363

‎backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/OperatorsListPostRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
public class OperatorsListPostRequest extends PagingQuery {
1818
private List<String> categories = new ArrayList<>();
1919

20-
private String operatorName;
20+
private String keyword;
2121

2222
private String labelName;
2323

‎backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/OperatorController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public PagedResponse<OperatorDto> operatorsListPost(@RequestBody OperatorsListPo
2929
categories.remove(OperatorConstant.CATEGORY_STAR_ID);
3030
}
3131
List<OperatorDto> responses = operatorService.getOperators(request.getPage(), request.getSize(),
32-
categories, request.getOperatorName(), isStar);
33-
int count = operatorService.getOperatorsCount(categories, request.getOperatorName(), isStar);
32+
categories, request.getKeyword(), isStar);
33+
int count = operatorService.getOperatorsCount(categories, request.getKeyword(), isStar);
3434
int totalPages = (count + request.getSize() + 1) / request.getSize();
3535
return PagedResponse.of(responses, request.getPage(), count, totalPages);
3636
}

‎deployment/helm/milvus/charts/etcd/templates/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ spec:
172172
# 警告：以下 Env Vars 依赖 StatefulSet 命名 (headless service 和 ordered names)
173173
# 在 Deployment 中如果不修改副本数为 1，这些配置会导致集群发现失败。
174174
- name: ETCD_ADVERTISE_CLIENT_URLS
175-
value: "{{ $etcdClientProtocol }}://$(MY_POD_NAME).{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.containerPorts.client }},{{ $etcdClientProtocol }}://{{ $etcdFullname }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ coalesce .Values.service.ports.client .Values.service.port }}"
175+
value: "{{ $etcdClientProtocol }}://{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.containerPorts.client }},{{ $etcdClientProtocol }}://{{ $etcdFullname }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ coalesce .Values.service.ports.client .Values.service.port }}"
176176
- name: ETCD_LISTEN_CLIENT_URLS
177177
value: "{{ $etcdClientProtocol }}://0.0.0.0:{{ .Values.containerPorts.client }}"
178178
- name: ETCD_INITIAL_ADVERTISE_PEER_URLS
179-
value: "{{ $etcdPeerProtocol }}://$(MY_POD_NAME).{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.containerPorts.peer }}"
179+
value: "{{ $etcdPeerProtocol }}://{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.containerPorts.peer }}"
180180
- name: ETCD_LISTEN_PEER_URLS
181181
value: "{{ $etcdPeerProtocol }}://0.0.0.0:{{ .Values.containerPorts.peer }}"
182182
{{- if .Values.autoCompactionMode }}

0 commit comments

Comments
 (0)