From 3acf5ad9bca01783f18538a4c7bd4021ec72a1e9 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Wed, 25 Oct 2023 15:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E9=9D=A2=E8=AF=95=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E5=8D=A1=E7=89=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HyPartnerInterviewPlanServiceImpl.java | 29 ++++++++++--------- .../service/impl/InterviewServiceImpl.java | 28 +++++++++++------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 488eb4281..888e89f84 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.dto.partner.PartnerInterviewInfoDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ApiException; +import com.cool.store.http.EventCenterHttpRequest; import com.cool.store.http.ISVHttpRequest; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.mapper.HyPartnerInterviewPlanMapper; @@ -34,10 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -83,6 +81,8 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan @Resource HyPartnerUserChannelDAO hyPartnerUserChannelDAO; + @Autowired + private EventCenterHttpRequest eventCenterHttpRequest; @Value("${feishu.notice.link.url}") private String linkUrl; @@ -269,17 +269,20 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan return; } //发送消息 + List userIds = remindInterviewMsgDTOS.stream().map(RemindInterviewMsgDTO::getInterviewerId).collect(Collectors.toList()); + Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIds); remindInterviewMsgDTOS.stream().forEach(interviewMsgDTO->{ try { - List userIds = new ArrayList<>(); - userIds.add(interviewMsgDTO.getInterviewerId()); - SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); - sendCardMessageDTO.setUserIds(userIds); - sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); - sendCardMessageDTO.setMessageUrl(linkUrl); - sendCardMessageDTO.setTitle("面试预约申请"); - sendCardMessageDTO.setContent(interviewService.generateFeiShuInterviewMsg(interviewMsgDTO.getPartnerName(), interviewMsgDTO.getPartnerMobile(), interviewMsgDTO.getStartTime())); - isvHttpRequest.sendFeiShuCardMessage(sendCardMessageDTO); +// SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); +// sendCardMessageDTO.setUserIds(userIds); +// sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); +// sendCardMessageDTO.setMessageUrl(linkUrl); +// sendCardMessageDTO.setTitle("面试预约申请"); +// sendCardMessageDTO.setContent(interviewService.generateFeiShuInterviewMsg(interviewMsgDTO.getPartnerName(), interviewMsgDTO.getPartnerMobile(), interviewMsgDTO.getStartTime())); + //替换为事件中心发送 + eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, + Arrays.asList(feishuUserIdsByUserIds.get(interviewMsgDTO.getInterviewerId())), + interviewMsgDTO.getPartnerName(), interviewMsgDTO.getPartnerMobile(), interviewMsgDTO.getStartTime()); } catch (ApiException e) { log.error("发送面试提醒消息失败",e); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 266124b95..f35ea8687 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -21,6 +21,7 @@ import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; +import com.cool.store.http.EventCenterHttpRequest; import com.cool.store.http.ISVHttpRequest; import com.cool.store.mapper.*; import com.cool.store.request.*; @@ -42,10 +43,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Author: young.yu @@ -100,6 +98,10 @@ public class InterviewServiceImpl implements InterviewService { @Autowired private WechatMiniAppService wechatMiniAppService; + + @Autowired + private EventCenterHttpRequest eventCenterHttpRequest; + @Override public List getInterviewList(GetInterviewListReq request) { List interviewList = hyPartnerInterviewPlanMapper.getInterviewList(request); @@ -493,13 +495,17 @@ public class InterviewServiceImpl implements InterviewService { InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(String.valueOf(interviewPlanId)); List userIds = new ArrayList<>(); userIds.add(interviewrId); - SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); - sendCardMessageDTO.setUserIds(userIds); - sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); - sendCardMessageDTO.setMessageUrl(linkUrl); - sendCardMessageDTO.setTitle("面试预约申请"); - sendCardMessageDTO.setContent(generateFeiShuInterviewMsg(interviewVO.getPartnerName(), interviewVO.getPartnerMobile(), interviewVO.getStartTime())); - isvHttpRequest.sendFeiShuCardMessage(sendCardMessageDTO); + Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIds); +// SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); +// sendCardMessageDTO.setUserIds(userIds); +// sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); +// sendCardMessageDTO.setMessageUrl(linkUrl); +// sendCardMessageDTO.setTitle("面试预约申请"); +// sendCardMessageDTO.setContent(generateFeiShuInterviewMsg(interviewVO.getPartnerName(), interviewVO.getPartnerMobile(), interviewVO.getStartTime())); + //替换为通过事件中心发送消息 + eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, + Arrays.asList(feishuUserIdsByUserIds.get(interviewrId)), + interviewVO.getPartnerName(), interviewVO.getPartnerMobile(), interviewVO.getStartTime()); //记录日志 PartnerUserInfoVO operator = PartnerUserHolder.getUser();