Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

Tomas

2021-11-09 c951ee65ff4328beeba9bdea1940a33f1291f97e

Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

 pamapi/src/doc/ÅU°ÝAPI/ÄY¿ï°t¹ï.txt

¤ñ¹ï·sÀÉ®×
@@ -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
    }
]

 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()

 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()));
                }

                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);
            }
        };
    }
}

 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());
            }
        });


 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()));