From 5baaed06e6ef8f2bc29bf36bec6ed86a2f44e1cd Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期一, 08 十一月 2021 09:19:40 +0800 Subject: [PATCH] [add] #todo 129741,我的清單、加入清單、快速篩選API --- pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 49 insertions(+), 9 deletions(-) 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 07cd771..e71667b 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java @@ -1,49 +1,89 @@ package com.pollex.pam.service; import com.pollex.pam.domain.Consultant; +import com.pollex.pam.domain.CustomFavoriteConsultant; +import com.pollex.pam.domain.User; +import com.pollex.pam.enums.ContactStatusEnum; import com.pollex.pam.repository.ConsultantRepository; +import com.pollex.pam.repository.CustomFavoriteConsultantRepository; import com.pollex.pam.service.dto.*; import com.pollex.pam.service.mapper.ConsultantMapper; import com.pollex.pam.web.rest.errors.ConsultantNotFoundException; +import com.pollex.pam.web.rest.errors.NotLoginException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; @Service public class ConsultantService { private final ConsultantRepository consultantRepository; + private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository; private final ConsultantMapper consultantMapper; + private final UserService userService; - public ConsultantService(ConsultantRepository consultantRepository, ConsultantMapper consultantMapper) { + public ConsultantService( + ConsultantRepository consultantRepository, + CustomFavoriteConsultantRepository customFavoriteConsultantRepository, + ConsultantMapper consultantMapper, + UserService userService + ) { this.consultantRepository = consultantRepository; + this.customFavoriteConsultantRepository = customFavoriteConsultantRepository; this.consultantMapper = consultantMapper; + this.userService = userService; } public List<ConsultantDTO> getMyConsultantList() { - return Collections.emptyList(); + User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new); + return customFavoriteConsultantRepository.findAllByCustomId(user.getId()) + .stream() + .map(consultantMapper::toDto) + .collect(Collectors.toList()); } public List<ConsultantDTO> getRecommendConsultantList() { - List<Consultant> recommendConsultantList = consultantRepository.findAllByRecommendIsTrue(); - return consultantMapper.toDto(recommendConsultantList); - } - - public void addConsultantToOwnList(AddConsultantParam param) { - List<String> agentNoList = param.getAgentNoList(); + return consultantRepository.findAllByRecommendIsTrue() + .stream() + .map(consultantMapper::toDto) + .collect(Collectors.toList()); } public List<ConsultantDTO> strictQueryConsultant(StrictQueryConsultantParam param) { + + return Collections.emptyList(); } public List<ConsultantDTO> fastQueryConsultant(FastQueryConsultantParam param) { - return Collections.emptyList(); + return consultantRepository.findAll(ConsultantQuerySpec.getFastQuerySpec(param)) + .stream() + .map(consultantMapper::toDto) + .collect(Collectors.toList()); } public ConsultantDetailDTO getConsultantDetail(String agentNo) { Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new); return consultantMapper.toDetailDto(consultant); } + + @Transactional + public void addConsultantToCustomList(AddConsultantParam param) { + List<String> agentNoList = param.getAgentNoList(); + List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList); + User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new); + + consultants.forEach(consultant -> { + CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant(); + customFavoriteConsultant.setConsultant(consultant); + customFavoriteConsultant.setCustomId(user.getId()); + customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED); + + customFavoriteConsultantRepository.save(customFavoriteConsultant); + }); + + } } -- Gitblit v1.8.0