From e3a295496de4d8c16d0b9d0d3f71e65fc8dfa8f8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 10 十一月 2021 12:06:59 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 8 ++++----
pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java | 12 +++++++-----
pamapi/src/doc/顧問API/嚴選配對.txt | 4 ++--
pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 4 ++--
pamapi/src/doc/顧問API/快速篩選.txt | 2 +-
5 files changed, 16 insertions(+), 14 deletions(-)
diff --git "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt" "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt"
index b0355ba..e9fe861 100644
--- "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt"
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt"
@@ -1,7 +1,7 @@
-http get: http://localhost:8080/api/consultant/strictQuery
+http post: http://localhost:8080/api/consultant/strictQuery
request body:
-{
+{
"gender":"female",
"avgScore":5,
"status": "online", // phase 1 disalbed
diff --git "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt" "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt"
index 82148a2..e07d9fa 100644
--- "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt"
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt"
@@ -1,4 +1,4 @@
-http get: http://localhost:8080/api/consultant/fastQuery
+http post: http://localhost:8080/api/consultant/fastQuery
request body:
{
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
index 68f4d9e..bd8c3d7 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -25,9 +25,9 @@
public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
Set<Predicate> set = new HashSet<>();
- if(StringUtils.isNotEmpty(param.getCommunicationStyle())) {
- set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyle()));
- }
+ param.getCommunicationStyles().forEach((communicationStyle) -> {
+ set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyles()));
+ });
if(Objects.nonNull(param.getGender())) {
set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
@@ -39,7 +39,7 @@
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
- return criteriaBuilder.and(predicates);
+ return criteriaBuilder.or(predicates);
}
};
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java b/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java
index d14fe36..76471f5 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java
@@ -2,9 +2,11 @@
import com.pollex.pam.enums.GenderEnum;
+import java.util.List;
+
public class FastQueryConsultantParam {
private GenderEnum gender;
- private String communicationStyle;
+ private List<String> communicationStyles;
private Number avgScore;
private String status;
@@ -16,12 +18,12 @@
this.gender = gender;
}
- public String getCommunicationStyle() {
- return communicationStyle;
+ public List<String> getCommunicationStyles() {
+ return communicationStyles;
}
- public void setCommunicationStyle(String communicationStyle) {
- this.communicationStyle = communicationStyle;
+ public void setCommunicationStyles(List<String> communicationStyles) {
+ this.communicationStyles = communicationStyles;
}
public Number getAvgScore() {
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
index ef325c3..766cf53 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
@@ -36,13 +36,13 @@
return new ResponseEntity<>(HttpStatus.ACCEPTED);
}
- @GetMapping("/strictQuery")
+ @PostMapping("/strictQuery")
public ResponseEntity<List<ConsultantDTO>> strictQueryConsultant(@RequestBody StrictQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.strictQueryConsultant(param);
return new ResponseEntity<>(queryResult, HttpStatus.OK);
}
- @GetMapping("/fastQuery")
+ @PostMapping("/fastQuery")
public ResponseEntity<List<ConsultantDTO>> fastQueryConsultant(@RequestBody FastQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.fastQueryConsultant(param);
return new ResponseEntity<>(queryResult, HttpStatus.OK);
--
Gitblit v1.8.0