From c1f84de7102932d5b9d0960fd7640c3f027779e1 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 16:45:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messages/PartyMeetingMessageMQMsg.java | 2 +- .../group/feign/ResiGroupOpenFeignClient.java | 4 +- .../ResiGroupOpenFeignClientFallback.java | 4 +- .../controller/ResiGroupMemberController.java | 2 +- .../service/impl/IcPartyActServiceImpl.java | 59 ++++++++++++++----- 5 files changed, 49 insertions(+), 22 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index f019090330..af8792ea1c 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -15,7 +15,7 @@ public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializa //客户Id private String customerId; - //活动Id + //活动/日程Id private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index f3003fc047..b7a4f54672 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -339,7 +339,7 @@ public interface ResiGroupOpenFeignClient { * @Author sun * @Description 查询小组成员列表 **/ - @PostMapping("/resi/group/member/getmemberlist") - Result> getMemberList(@RequestBody List groupIdList); + @PostMapping("/resi/group/member/groupmemberlist") + Result> groupMemberList(@RequestBody List groupIdList); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index db43abe079..d3bff53996 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -244,8 +244,8 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien } @Override - public Result> getMemberList(List groupIdList) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupIdList); + public Result> groupMemberList(List groupIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupMemberList", groupIdList); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index b931bab11c..cf99c5a61b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -205,7 +205,7 @@ public class ResiGroupMemberController { return new Result().ok(operationService.applyEnterByLink(param)); } - @PostMapping("getmemberlist") + @PostMapping("groupmemberlist") public Result> groupMemberList(@RequestBody List groupIdList){ return new Result>().ok(resiGroupMemberService.groupMemberList(groupIdList)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index ce7530def5..8cd94b00eb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -14,6 +15,12 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; +import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; @@ -35,6 +42,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +59,7 @@ import java.util.stream.Collectors; * @author generator generator@elink-cn.com * @since v1.0.0 2022-08-18 */ +@Slf4j @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { @Autowired @@ -65,6 +74,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl constructHomeSearchData(String startDate,String endDate){ - List result = new ArrayList<>(); - if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ - List days = DateUtils.getDaysBetween(startDate, endDate); - days.forEach(d -> { - ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); - dto.setDateId(d); - result.add(dto); - }); - } - return result; - } - - /** * 党建小助手活动触发为用户推送消息 */ @@ -338,6 +335,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); //2.根据不同类型消息触发不同处理逻辑 //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 if("publish".equals(formDTO.getType())){ @@ -351,7 +349,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl userIdList = new ArrayList<>(); if(!CollectionUtils.isEmpty(groupIdList)){ - Result> result = resiGroupOpenFeignClient.getMemberList(groupIdList); + Result> result = resiGroupOpenFeignClient.groupMemberList(groupIdList); if (!result.success()) { throw new RenException("调用common service查询secret失败"); } @@ -362,9 +360,38 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ + UserMessageFormDTO msg = new UserMessageFormDTO(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setApp(AppClientConstant.APP_RESI); + msg.setTitle("您收到一个新的活动通知"); + msg.setReadFlag(ReadFlagConstant.UN_READ); + StringBuffer str = new StringBuffer(); + str.append("主题:").append(entity.getTopic()).append("\n").append("时间:").append(entity.getHoldTime()).append("\n").append("地点:").append(entity.getAddress()); + msg.setMessageContent(str.toString()); + msg.setMessageType("party"); + msg.setTargetId(formDTO.getIcPartyActId()); + msg.setUserId(id); + msgList.add(msg); + }); + //工作人员 + UserMessageFormDTO msg = new UserMessageFormDTO(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setApp(AppClientConstant.APP_GOV); + msg.setTitle("您有一个活动已经发布"); + msg.setReadFlag(ReadFlagConstant.UN_READ); + StringBuffer str = new StringBuffer(); + str.append("主题:").append(entity.getTopic()).append("\n").append("时间:").append(entity.getHoldTime()).append("\n").append("地点:").append(entity.getAddress()); + msg.setMessageContent(str.toString()); + msg.setMessageType("party"); + msg.setTargetId(formDTO.getIcPartyActId()); + msg.setUserId(entity.getPublishStaffId()); + msgList.add(msg); } + + //推送消息 + Result sendMessageRes = messageOpenFeignClient.saveIcMessageList(msgList); } } \ No newline at end of file From cf53b34dcf241edd0d7ba0304cbeb1175a9d8d3f Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 16:47:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 8cd94b00eb..d4fcb3ae92 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -323,6 +323,18 @@ public class IcPartyActServiceImpl extends BaseServiceImpl constructHomeSearchData(String startDate,String endDate){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ + List days = DateUtils.getDaysBetween(startDate, endDate); + days.forEach(d -> { + ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); + dto.setDateId(d); + result.add(dto); + }); + } + return result; + } /** * 党建小助手活动触发为用户推送消息