From c951ee65ff4328beeba9bdea1940a33f1291f97e Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 09 十一月 2021 17:13:22 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 73 ++++++++++++++++-------
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 4
pamapi/src/doc/顧問API/嚴選配對.txt | 47 +++++++++++++++
pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java | 2
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 11 ++-
5 files changed, 107 insertions(+), 30 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"
new file mode 100644
index 0000000..b0355ba
--- /dev/null
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt"
@@ -0,0 +1,47 @@
+http get: http://localhost:8080/api/consultant/strictQuery
+
+request body:
+{
+ "gender":"female",
+ "avgScore":5,
+ "status": "online", // phase 1 disalbed
+ "area":"獢��",
+ "requirements": ["�摨瑁����","靽�瑼�/閬��"],
+ "otherRequirement": "���",
+ "seniority":"鞈楛",
+ "popularTags":["��","憭梯","����"],
+ "otherPopularTags":"���"
+}
+
+response body:
+[
+ {
+ "agentNo": "12345",
+ "name": "皜祈岫��璆剖�",
+ "img": "",
+ "expertise": [
+ "鞎∪����",
+ "鞈頧宏"
+ ],
+ "avgScore": 4.7,
+ "contactStatus": null,
+ "updateTime": null,
+ "seniority": "4撟�2���",
+ "new": false
+ },
+ {
+ "agentNo": "12346",
+ "name": "皜祈岫璆剖�",
+ "img": "",
+ "expertise": [
+ "鞈頧宏",
+ "蝭�蝔�",
+ "璅暑��隡�"
+ ],
+ "avgScore": 3.8,
+ "contactStatus": null,
+ "updateTime": null,
+ "seniority": "2撟�3���",
+ "new": false
+ }
+]
diff --git a/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java b/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java
index e0c6c3a..dc7cd2d 100644
--- a/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java
+++ b/pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java
@@ -85,6 +85,8 @@
.antMatchers("/api/account/reset-password/finish").permitAll()
.antMatchers("/api/consultant/recommend").permitAll()
.antMatchers("/api/consultant/detail").permitAll()
+ .antMatchers("/api/consultant/fastQuery").permitAll()
+ .antMatchers("/api/consultant/strictQuery").permitAll()
.antMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN)
.antMatchers("/api/**").authenticated()
.antMatchers("/websocket/**").authenticated()
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 bfefa21..68f4d9e 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -2,6 +2,7 @@
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.service.dto.FastQueryConsultantParam;
+import com.pollex.pam.service.dto.StrictQueryConsultantParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.jpa.domain.Specification;
@@ -9,8 +10,7 @@
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -25,35 +25,62 @@
public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
Set<Predicate> set = new HashSet<>();
- if(!StringUtils.isEmpty(param.getCommunicationStyle())) {
+ if(StringUtils.isNotEmpty(param.getCommunicationStyle())) {
set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyle()));
}
- set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
- set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ if(Objects.nonNull(param.getGender())) {
+ set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
+ }
+
+ if(Objects.nonNull(param.getAvgScore())) {
+ set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ }
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
- return criteriaBuilder.or(predicates);
+ return criteriaBuilder.and(predicates);
}
};
}
-// public static Specification<Consultant> getStrictQuerySpec(StrictQueryConsultantParam param) {
-// return new Specification<Consultant>() {
-// @Override
-// public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
-// Set<Predicate> set = new HashSet<>();
-//
-// set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
-// set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
-// set.add(criteriaBuilder.like(root.get("serve_area"),"%"+param.getArea()+"%"));
-// set.add(root.get("").in(param.getRequirements()))
-//
-// Predicate[] predicates = new Predicate[set.size()];
-// predicates = set.toArray(predicates);
-// return criteriaBuilder.or(predicates);
-// }
-// };
-// }
+ public static Specification<Consultant> getStrictQuerySpec(StrictQueryConsultantParam param) {
+ return new Specification<Consultant>() {
+ @SuppressWarnings("FieldNameHidesFieldInSuperclass")
+ private static final long serialVersionUID = 664452413090316174L;
+
+ @Override
+ public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
+ Set<Predicate> set = new HashSet<>();
+
+ if(Objects.nonNull(param.getGender())) {
+ set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
+ }
+
+ if(Objects.nonNull(param.getAvgScore())) {
+ set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ }
+
+ if(StringUtils.isNotEmpty(param.getArea())) {
+ set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
+ }
+
+ List<String> allRequirements = Objects.nonNull(param.getRequirements()) ? param.getRequirements() : new ArrayList<>();
+ if(Objects.nonNull(param.getOtherRequirement())) {
+ allRequirements.add(param.getOtherRequirement());
+ }
+ allRequirements.forEach(requirement -> set.add(criteriaBuilder.like(root.get("expertise"), "%" + requirement + "%")));
+
+ List<String> allPopularTags = Objects.nonNull(param.getPopularTags()) ? param.getPopularTags() : new ArrayList<>();
+ if(Objects.nonNull(param.getOtherPopularTags())) {
+ allPopularTags.add(param.getOtherPopularTags());
+ }
+ allPopularTags.forEach(popularTag -> set.add(criteriaBuilder.like(root.get("concept"), "%" + popularTag + "%")));
+
+ Predicate[] predicates = new Predicate[set.size()];
+ predicates = set.toArray(predicates);
+ return criteriaBuilder.and(predicates);
+ }
+ };
+ }
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
index b9fbf53..68dcb21 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -22,7 +22,7 @@
@Service
public class ConsultantService {
- private final static Logger log = LoggerFactory.getLogger(ConsultantService.class);
+ private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
private final ConsultantRepository consultantRepository;
private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
@@ -57,9 +57,10 @@
}
public List<ConsultantDTO> strictQueryConsultant(StrictQueryConsultantParam param) {
-
-
- return Collections.emptyList();
+ return consultantRepository.findAll(ConsultantQuerySpec.getStrictQuerySpec(param))
+ .stream()
+ .map(consultantMapper::toDto)
+ .collect(Collectors.toList());
}
public List<ConsultantDTO> fastQueryConsultant(FastQueryConsultantParam param) {
@@ -92,7 +93,7 @@
customFavoriteConsultantRepository.save(customFavoriteConsultant);
}
else {
- log.info("The consultant is in custom favorite list!");
+ log.info("The consultant is in custom favorite list! customId = {}, consultant AgentNo = {}", user.getId(), consultant.getAgentNo());
}
});
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
index 782e459..4fce9ec 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
@@ -62,8 +62,8 @@
consultantDetailDTO.setAwards(source.getAward());
consultantDetailDTO.setImage("");
- consultantDetailDTO.setSuitability(0);
- consultantDetailDTO.setEvaluation(0);
+ consultantDetailDTO.setSuitability(50);
+ consultantDetailDTO.setEvaluation(50);
consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
--
Gitblit v1.8.0