From bfb8d1d22d582f843b372fc3265af15ea5f1b0e8 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Fri, 18 Aug 2023 17:19:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96=20=20?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=90=84=E4=B8=AA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/FeiShuNoticeMsgEnum.java | 34 +++++++---- .../com/cool/store/enums/MessageTypeEnum.java | 61 ------------------- .../com/cool/store/dao/HyFollowTaskDAO.java | 8 +-- .../cool/store/mapper/HyFollowTaskMapper.java | 6 +- .../resources/mapper/HyFollowTaskMapper.xml | 8 +-- .../store/dto/message/SendCardMessageDTO.java | 6 +- .../com/cool/store/http/ISVHttpRequest.java | 6 +- .../service/impl/FollowTaskServiceImpl.java | 44 +++---------- .../HyPartnerInterviewPlanServiceImpl.java | 7 +-- .../service/impl/InterviewServiceImpl.java | 2 +- .../store/service/impl/NoticeService.java | 6 +- 11 files changed, 51 insertions(+), 137 deletions(-) delete mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java index 246f0bb10..c01a34ac3 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java @@ -1,5 +1,7 @@ package com.cool.store.enums; +import com.alibaba.fastjson.JSONObject; + /** * @Author: young.yu * @Date: 2023-07-19 16:49 @@ -7,34 +9,40 @@ package com.cool.store.enums; */ public enum FeiShuNoticeMsgEnum { - //分配招商经理 - ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您，线索信息{1}手机号{2}，请及时跟进"), - //转让招商经理 - TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您，线索信息{1}手机号{2}，请及时跟进"), - //意向申请通知 - INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人{0}手机号{1}于 {2} 提交加盟意向申请，请及时处理"); + + ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), + TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), + INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人{0}手机号{1}于 {2} 提交加盟意向申请，请及时处理", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), + FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), + INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), + ; private String title; private String content; + private String imageMediaId; - FeiShuNoticeMsgEnum(String title, String content) { + FeiShuNoticeMsgEnum(String title, String content, String imageMediaId) { this.title = title; this.content = content; + this.imageMediaId = imageMediaId; } public String getTitle() { return title; } - public void setTitle(String title) { - this.title = title; - } - public String getContent() { return content; } - public void setContent(String content) { - this.content = content; + public String getImageMediaId() { + return imageMediaId; + } + + public JSONObject getMessageObject() { + JSONObject object = new JSONObject(); + object.put("name", this.title); + object.put("imageMediaId", this.imageMediaId); + return object; } } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java deleted file mode 100644 index 63f5f53b4..000000000 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.enums; - -import com.alibaba.fastjson.JSONObject; - -/** - * @author zhangchenbiao - * @FileName: MessageTypeEnum - * @Description: - * @date 2023-06-15 10:14 - */ -public enum MessageTypeEnum { - - SCHEDULE_REMINDER("schedule_reminder", "日历提醒事件", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), - FOLLOW_TASK("follow_task", "跟进任务提醒", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag") - - - - ; - - private String code; - - private String name; - - private String imageMediaId; - - MessageTypeEnum(String code, String name, String imageMediaId) { - this.code = code; - this.name = name; - this.imageMediaId = imageMediaId; - } - - public String getCode() { - return code; - } - - public String getName() { - return name; - } - - public String getImageMediaId() { - return imageMediaId; - } - - public static String getImageMediaId(String code){ - for (MessageTypeEnum value : MessageTypeEnum.values()) { - if(value.code.equals(code)){ - return value.imageMediaId; - } - } - return null; - } - - - public JSONObject getMessageTypeObject() { - JSONObject object = new JSONObject(); - object.put("code", this.code); - object.put("name", this.name); - object.put("imageMediaId", this.imageMediaId); - return object; - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java index 38fab3f79..d010ca081 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java @@ -122,18 +122,18 @@ public class HyFollowTaskDAO { * 分页获取任务 * @param followUserId * @param taskStatus - * @param deadlineStartTIme - * @param deadlineEndTIme + * @param deadlineStartTime + * @param deadlineEndTime * @param pageNum * @param pageSize * @return */ - public Page getTaskPage(String followUserId, Integer taskStatus, String deadlineStartTIme, String deadlineEndTIme, Integer pageNum, Integer pageSize){ + public Page getTaskPage(String followUserId, Integer taskStatus, String deadlineStartTime, String deadlineEndTime, Integer pageNum, Integer pageSize){ if(StringUtils.isBlank(followUserId)){ return new Page<>(); } PageHelper.startPage(pageNum, pageSize); - return hyFollowTaskMapper.getTaskPage(followUserId, taskStatus, deadlineStartTIme, deadlineEndTIme); + return hyFollowTaskMapper.getTaskPage(followUserId, taskStatus, deadlineStartTime, deadlineEndTime); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java index 9fe5af082..727282df3 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java @@ -38,11 +38,11 @@ public interface HyFollowTaskMapper { * 获取任务列表 * @param followUserId * @param taskStatus - * @param deadlineStartTIme - * @param deadlineEndTIme + * @param deadlineStartTime + * @param deadlineEndTime * @return */ - Page getTaskPage(@Param("followUserId")String followUserId, @Param("taskStatus")Integer taskStatus, @Param("deadlineStartTIme")String deadlineStartTIme, @Param("deadlineEndTIme")String deadlineEndTIme); + Page getTaskPage(@Param("followUserId")String followUserId, @Param("taskStatus")Integer taskStatus, @Param("deadlineStartTime")String deadlineStartTime, @Param("deadlineEndTime")String deadlineEndTime); /** * 获取跟进任务详情 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml index a7354eff5..a1903be86 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml @@ -151,11 +151,11 @@ and task_status = #{taskStatus} - - and deadline >= #{deadlineStartTIme} + + and deadline >= #{deadlineStartTime} - - + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java index e2e22440b..0989766f2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java @@ -1,6 +1,6 @@ package com.cool.store.dto.message; -import com.cool.store.enums.MessageTypeEnum; +import com.cool.store.enums.FeiShuNoticeMsgEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -27,7 +27,7 @@ public class SendCardMessageDTO { @ApiModelProperty("消息内容") private String content; - @ApiModelProperty("消息类型, MessageTypeEnum") - private MessageTypeEnum messageType; + @ApiModelProperty("消息类型, FeiShuNoticeMsgEnum") + private FeiShuNoticeMsgEnum messageType; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java index cd728c737..6fc28b28d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java @@ -10,7 +10,7 @@ import com.cool.store.dto.enterprise.SysDepartmentDTO; import com.cool.store.dto.login.UserIdInfoDTO; import com.cool.store.dto.message.SendCardMessageDTO; import com.cool.store.dto.response.ResultDTO; -import com.cool.store.enums.MessageTypeEnum; +import com.cool.store.enums.FeiShuNoticeMsgEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.mq.util.HttpRestTemplateService; @@ -357,9 +357,9 @@ public class ISVHttpRequest { String url = isvDomain + "/sendFeiShuCardMessage"; ResultDTO responseEntity = null; try { - MessageTypeEnum messageType = param.getMessageType(); + FeiShuNoticeMsgEnum messageType = param.getMessageType(); JSONObject request = JSONObject.parseObject(JSONObject.toJSONString(param)); - request.put("messageType", messageType.getMessageTypeObject()); + request.put("messageType", messageType.getMessageObject()); responseEntity = httpRestTemplateService.postForObject(url, request, ResultDTO.class); log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); } catch (Exception e) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java index 85ac2d809..e9fe7bef6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java @@ -72,19 +72,19 @@ public class FollowTaskServiceImpl implements FollowTaskService { @Resource private RedisUtilPool redisUtilPool; @Resource - private ISVHttpRequest isvHttpRequest; + private NoticeService noticeService; @Value("${feishu.notice.link.url:null}") private String linkUrl; @Override public PageInfo getFollowTaskPage(Integer pageNum, Integer pageSize, Integer taskStatus, String queryDate, String followUserId) { - String deadlineStartTIme = null, deadlineEndTIme = null; + String deadlineStartTime = null, deadlineEndTIme = null; if(StringUtils.isNotBlank(queryDate) && FollowTaskStatusEnum.TODO.getCode().equals(taskStatus)){ //只有待完成的时候需要根据截止时间查询 - deadlineStartTIme = queryDate + CommonConstants.DAY_START_TIME_SUFFIX; + deadlineStartTime = queryDate + CommonConstants.DAY_START_TIME_SUFFIX; deadlineEndTIme = queryDate + CommonConstants.DAY_END_TIME_SUFFIX; } - Page taskPage = hyFollowTaskDAO.getTaskPage(followUserId, taskStatus, deadlineStartTIme, deadlineEndTIme, pageNum, pageSize); + Page taskPage = hyFollowTaskDAO.getTaskPage(followUserId, taskStatus, deadlineStartTime, deadlineEndTIme, pageNum, pageSize); PageInfo resultPage = new PageInfo(taskPage); if(CollectionUtils.isNotEmpty(taskPage)){ List partnerLineIds = taskPage.stream().map(HyFollowTaskDO::getPartnerLineId).distinct().collect(Collectors.toList()); @@ -213,19 +213,9 @@ public class FollowTaskServiceImpl implements FollowTaskService { //一小时内发送过不再发送通知 continue; } - SendCardMessageDTO sendCardMessage = new SendCardMessageDTO(); - sendCardMessage.setMessageUrl(linkUrl); - sendCardMessage.setMessageType(MessageTypeEnum.SCHEDULE_REMINDER); String dateline = DateUtil.format(followTask.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_2); String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile()); - sendCardMessage.setContent(content); - sendCardMessage.setTitle(MessageConstants.FOLLOW_TASK_MESSAGE_TITLE); - sendCardMessage.setUserIds(Arrays.asList(followTask.getFollowUserId())); - try { - isvHttpRequest.sendFeiShuCardMessage(sendCardMessage); - } catch (ApiException e) { - log.error("跟进任务发送通知失败, {}", JSONObject.toJSONString(followTask)); - } + noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(followTask.getFollowUserId()), content); } } //更新过期的任务状态 @@ -248,17 +238,7 @@ public class FollowTaskServiceImpl implements FollowTaskService { pageNum++; List followTaskList = hyFollowTaskDAO.getUserTaskNum(remindFollowUserIds); for (FollowTaskNumDTO followTask : followTaskList) { - SendCardMessageDTO sendCardMessage = new SendCardMessageDTO(); - sendCardMessage.setMessageUrl(linkUrl); - sendCardMessage.setMessageType(MessageTypeEnum.SCHEDULE_REMINDER); - sendCardMessage.setContent(FollowTaskNumDTO.getMessageContent(followTask)); - sendCardMessage.setTitle(MessageConstants.FOLLOW_TASK_MESSAGE_TITLE); - sendCardMessage.setUserIds(Arrays.asList(followTask.getFollowUserId())); - try { - isvHttpRequest.sendFeiShuCardMessage(sendCardMessage); - } catch (ApiException e) { - log.error("跟进任务发送通知失败, {}", JSONObject.toJSONString(followTask)); - } + noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(followTask.getFollowUserId()), FollowTaskNumDTO.getMessageContent(followTask)); } } } @@ -293,16 +273,6 @@ public class FollowTaskServiceImpl implements FollowTaskService { } String dateline = DateUtil.format(task.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_2); String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile()); - SendCardMessageDTO sendCardMessage = new SendCardMessageDTO(); - sendCardMessage.setMessageUrl(linkUrl); - sendCardMessage.setMessageType(MessageTypeEnum.SCHEDULE_REMINDER); - sendCardMessage.setContent(content); - sendCardMessage.setTitle(MessageConstants.FOLLOW_TASK_MESSAGE_TITLE); - sendCardMessage.setUserIds(Arrays.asList(task.getFollowUserId())); - try { - isvHttpRequest.sendFeiShuCardMessage(sendCardMessage); - } catch (ApiException e) { - log.error("跟进任务发送通知失败, {}", JSONObject.toJSONString(task)); - } + noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(task.getFollowUserId()), content); } } 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 d2b226b2f..2c56063aa 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 @@ -8,10 +8,7 @@ import com.cool.store.dto.message.SendCardMessageDTO; import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.dto.partner.PartnerInterviewInfoDTO; import com.cool.store.entity.*; -import com.cool.store.enums.MessageTypeEnum; -import com.cool.store.enums.RoomStatus; -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.enums.WorkflowStatusEnum; +import com.cool.store.enums.*; import com.cool.store.exception.ApiException; import com.cool.store.http.ISVHttpRequest; import com.cool.store.mapper.HyPartnerInterviewMapper; @@ -272,7 +269,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan userIds.add(interviewMsgDTO.getInterviewerId()); SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); sendCardMessageDTO.setUserIds(userIds); - sendCardMessageDTO.setMessageType(MessageTypeEnum.SCHEDULE_REMINDER); + sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); sendCardMessageDTO.setMessageUrl(linkUrl); sendCardMessageDTO.setTitle("面试预约申请"); sendCardMessageDTO.setContent(interviewService.generateFeiShuInterviewMsg(interviewMsgDTO.getPartnerName(), interviewMsgDTO.getPartnerMobile(), interviewMsgDTO.getStartTime())); 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 7cbf0374c..b964322ba 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 @@ -455,7 +455,7 @@ public class InterviewServiceImpl implements InterviewService { userIds.add(interviewrId); SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); sendCardMessageDTO.setUserIds(userIds); - sendCardMessageDTO.setMessageType(MessageTypeEnum.SCHEDULE_REMINDER); + sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); sendCardMessageDTO.setMessageUrl(linkUrl); sendCardMessageDTO.setTitle("面试预约申请"); sendCardMessageDTO.setContent(generateFeiShuInterviewMsg(interviewVO.getPartnerName(), interviewVO.getPartnerMobile(), interviewVO.getStartTime())); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java index 8d04259fa..76c1df12e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java @@ -3,7 +3,6 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import com.cool.store.dto.message.SendCardMessageDTO; import com.cool.store.enums.FeiShuNoticeMsgEnum; -import com.cool.store.enums.MessageTypeEnum; import com.cool.store.http.ISVHttpRequest; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -26,7 +25,8 @@ public class NoticeService { private String linkUrl; @Autowired private ISVHttpRequest isvHttpRequest; - public void sendFeiShuNotice(FeiShuNoticeMsgEnum feiShuNoticeMsgEnum, List userIds,Object... objects) { + + public void sendFeiShuNotice(FeiShuNoticeMsgEnum feiShuNoticeMsgEnum, List userIds, Object... objects) { try{ if (CollectionUtils.isEmpty(userIds)){ log.info("sendFeiShuNotice_feiShuNoticeMsgEnum:{} userIds:{},objects:{}",feiShuNoticeMsgEnum.getTitle(), JSONObject.toJSONString(userIds),JSONObject.toJSONString(objects)); @@ -34,7 +34,7 @@ public class NoticeService { } SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); sendCardMessageDTO.setUserIds(userIds); - sendCardMessageDTO.setMessageType(MessageTypeEnum.SCHEDULE_REMINDER); + sendCardMessageDTO.setMessageType(feiShuNoticeMsgEnum); sendCardMessageDTO.setMessageUrl(linkUrl); sendCardMessageDTO.setTitle(feiShuNoticeMsgEnum.getTitle()); sendCardMessageDTO.setContent(MessageFormat.format(feiShuNoticeMsgEnum.getContent(),objects)); From 1dd0744b036d8e7e44baeac3a0752b5af73dc4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 21 Aug 2023 12:12:34 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerUserChannelDAO.java | 37 +++++++++++++++++++ .../store/vo/PartnerIntentApplyInfoVO.java | 2 +- .../cool/store/vo/PrivateSeaLineListVo.java | 2 +- .../impl/HyPartnerIntentInfoServiceImpl.java | 8 ++-- .../HyPartnerInterviewPlanServiceImpl.java | 11 +++--- .../impl/HyPartnerLineInfoServiceImpl.java | 8 ++-- 6 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java new file mode 100644 index 000000000..5b33e6c7e --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java @@ -0,0 +1,37 @@ +package com.cool.store.dao; + +import com.cool.store.entity.HyPartnerUserChannelDO; +import com.cool.store.mapper.HyPartnerUserChannelMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author suzhuhong + * @Date 2023/8/21 11:38 + * @Version 1.0 + */ +@Repository +public class HyPartnerUserChannelDAO { + + @Resource + HyPartnerUserChannelMapper hyPartnerUserChannelMapper; + + public Map getChannelMapByIds(List userChannelIds){ + if (CollectionUtils.isEmpty(userChannelIds)){ + return new HashMap<>(1); + } + List userChannelList = hyPartnerUserChannelMapper.getUserChannelByIds(userChannelIds); + Map channelMap = userChannelList.stream().filter(date->date.getChannelId()!=null).collect(Collectors.toMap(x->x.getChannelId().intValue(), HyPartnerUserChannelDO::getChannelName)); + return channelMap; + } + + + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java index 56fe3101b..fd7c1b192 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java @@ -78,7 +78,7 @@ public class PartnerIntentApplyInfoVO { private String userChannelName; public static List convertList(List list, Map wantShopAreaNameMap, String workflowStatus, - Map userChannelMap,Map userPortraitMap ){ + Map userChannelMap,Map userPortraitMap ){ if(CollectionUtils.isEmpty(list)){ return Lists.newArrayList(); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java index 7c156d12b..0259b5779 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java @@ -103,7 +103,7 @@ public class PrivateSeaLineListVo { public static List convertList(List list, Map finalDevManagerMap, Map wantShopAreaNameMap, - Map hyPartnerInterviewPlanDOMap,Map channelMap,Map userPortraitMap){ + Map hyPartnerInterviewPlanDOMap,Map channelMap,Map userPortraitMap){ List resultList = new ArrayList<>(); for (PrivateSeaLineDTO x : list) { PrivateSeaLineListVo privateSeaLineListVo = new PrivateSeaLineListVo(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index add396366..e688072b3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -78,6 +78,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic LabelService labelService; @Autowired private NoticeService noticeService; + @Resource + HyPartnerUserChannelDAO hyPartnerUserChannelDAO; @Override public PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus, @@ -103,12 +105,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic } List list = partnerIntentApplyInfo.getList(); List userChannelIds = list.stream().filter(x -> x.getUserChannelId() != null).map(PartnerIntentApplyInfoDTO::getUserChannelId).collect(Collectors.toList()); - List userChannelList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(userChannelIds)){ - userChannelList = hyPartnerUserChannelMapper.getUserChannelByIds(userChannelIds); - } + Map userChannelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(PartnerIntentApplyInfoDTO::getUserPortrait).collect(Collectors.toList()); - Map userChannelMap = userChannelList.stream().collect(Collectors.toMap(HyPartnerUserChannelDO::getChannelId, HyPartnerUserChannelDO::getChannelName)); List wantShopAreaList = list.stream().filter(x->StringUtils.isNotEmpty(x.getWantShopArea())).map(PartnerIntentApplyInfoDTO::getWantShopArea).map(Long::parseLong).distinct().collect(Collectors.toList()); Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); List resultList = PartnerIntentApplyInfoVO.convertList(list, wantShopAreaNameMap, workflowStatus,userChannelMap,labelService.getUserPortraitMap(userPortraitList)); 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 2c56063aa..eca2f6c8e 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 @@ -82,6 +82,8 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan LabelService labelService; @Resource HyPartnerUserChannelMapper hyPartnerUserChannelMapper; + @Resource + HyPartnerUserChannelDAO hyPartnerUserChannelDAO; @Value("${feishu.notice.link.url:null}") @@ -134,8 +136,8 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan List partnerIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerId).collect(Collectors.toList()); List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds); List userChannelIds = hyPartnerUserInfoDOS.stream().filter(x -> x.getUserChannelId() != null).map(HyPartnerUserInfoDO::getUserChannelId).collect(Collectors.toList()); - List userChannelList = hyPartnerUserChannelMapper.getUserChannelByIds(userChannelIds); - Map channelMap = userChannelList.stream().collect(Collectors.toMap(HyPartnerUserChannelDO::getChannelId, HyPartnerUserChannelDO::getChannelName)); + Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); + List interviewerUserIds = list.stream().filter(x-> StringUtils.isNotEmpty(x.getInterviewer())).map(PartnerInterviewInfoDTO::getInterviewer).collect(Collectors.toList()); List userInfoByUserIds = enterpriseUserDAO.getUserInfoByUserIds(interviewerUserIds); Map interviewerUserMap = userInfoByUserIds.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data)); @@ -180,8 +182,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds); Map userNameMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, Data->Data)); List userChannelIds = hyPartnerUserInfoDOS.stream().filter(x -> x.getUserChannelId() != null).map(HyPartnerUserInfoDO::getUserChannelId).collect(Collectors.toList()); - List userChannelList = hyPartnerUserChannelMapper.getUserChannelByIds(userChannelIds); - Map channelMap = userChannelList.stream().collect(Collectors.toMap(HyPartnerUserChannelDO::getChannelId, HyPartnerUserChannelDO::getChannelName)); + Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); List lineIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerLineId).collect(Collectors.toList()); List hyPartnerLineInfoDOS= hyPartnerLineInfoDAO.getHyPartnerLineInfoListByIds(lineIds); Map hyPartnerLineInfoDOMap = hyPartnerLineInfoDOS.stream().collect(Collectors.toMap(HyPartnerLineInfoDO::getId, data -> data)); @@ -324,7 +325,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan * @param partnerInterviewInfoDTO * @return */ - private PartnerInterviewInfoVO convertPartnerInterviewInfoDTOToVo(PartnerInterviewInfoDTO partnerInterviewInfoDTO,Map userPortraitMap, HyPartnerUserInfoDO hyPartnerUserInfoDO,Map channelMap){ + private PartnerInterviewInfoVO convertPartnerInterviewInfoDTOToVo(PartnerInterviewInfoDTO partnerInterviewInfoDTO,Map userPortraitMap, HyPartnerUserInfoDO hyPartnerUserInfoDO,Map channelMap){ PartnerInterviewInfoVO partnerInterviewInfoVO = new PartnerInterviewInfoVO(); partnerInterviewInfoVO.setInterviewId(partnerInterviewInfoDTO.getInterviewId()); partnerInterviewInfoVO.setInterviewPlanId(partnerInterviewInfoDTO.getId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 9ba7d9f59..11635b6d2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -81,6 +81,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { HyPhoneLocationService hyPhoneLocationService; @Resource HyPartnerUserChannelMapper hyPartnerUserChannelMapper; + @Resource + HyPartnerUserChannelDAO hyPartnerUserChannelDAO; @Autowired private NoticeService noticeService; @@ -529,8 +531,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); List userChannelIds = list.stream().filter(x -> x.getUserChannelId() != null).map(PublicSeaLineDTO::getUserChannelId).collect(Collectors.toList()); - List userChannelList = hyPartnerUserChannelMapper.getUserChannelByIds(userChannelIds); - Map channelMap = userChannelList.stream().collect(Collectors.toMap(HyPartnerUserChannelDO::getChannelId, HyPartnerUserChannelDO::getChannelName)); + Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(PublicSeaLineDTO::getUserPortrait).collect(Collectors.toList()); Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); @@ -601,8 +602,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); List userChannelIds = list.stream().filter(x -> x.getUserChannelId() != null).map(PrivateSeaLineDTO::getUserChannelId).collect(Collectors.toList()); - List userChannelList = hyPartnerUserChannelMapper.getUserChannelByIds(userChannelIds); - Map channelMap = userChannelList.stream().collect(Collectors.toMap(HyPartnerUserChannelDO::getChannelId, HyPartnerUserChannelDO::getChannelName)); + Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(PrivateSeaLineDTO::getUserPortrait).collect(Collectors.toList()); Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); From 6362d5036630cfd60dd9c8711b61e6e16643c853 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Mon, 21 Aug 2023 14:33:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=9B=B4=E6=94=B9&=E8=B7=9F=E8=BF=9B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B7=9F=E6=96=B0sql=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/FeiShuNoticeMsgEnum.java | 12 ++++++------ .../src/main/resources/mapper/HyFollowTaskMapper.xml | 2 +- .../com/cool/store/service/impl/NoticeService.java | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java index c01a34ac3..ee9b48017 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java @@ -9,12 +9,12 @@ import com.alibaba.fastjson.JSONObject; */ public enum FeiShuNoticeMsgEnum { - - ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), - TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), - INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人{0}手机号{1}于 {2} 提交加盟意向申请，请及时处理", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), - FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), - INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), + common_notice("工作台通知", "{0}", "img_v2_45d7a901-1eab-498b-a760-b38d287f0c1g"), + ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"), + TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"), + INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人{0}手机号{1}于 {2} 提交加盟意向申请，请及时处理", "img_v2_69eb6e5f-bf12-4a02-a47f-b17ce24fcfeg"), + FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_1960b7ef-8c4e-4c3d-8b67-3d918a85578g"), + INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"), ; private String title; diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml index a1903be86..51c01a3cf 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml @@ -207,7 +207,7 @@ - +