From 26823e5a2902031c110a560050f051062a381034 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Aug 2022 14:42:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/constants/TopicConstants.java | 2 ++ .../com/epmet/constant/SystemMessageType.java | 7 +++++++ .../impl/SystemMessageServiceImpl.java | 8 +++++++ .../com/epmet/dto/form/PartyPointFormDTO.java | 3 ++- .../epmet/dto/result/PartyPointResultDTO.java | 3 ++- .../epmet/controller/ResiPointController.java | 15 +++++++++++++ .../com/epmet/mq/listener/PointListener.java | 17 +++++++++++++++ .../impl/UserPointActionLogServiceImpl.java | 21 +++++++++++++++++-- .../mapper/UserPointActionLogDao.xml | 15 +++++++++++++ .../feign/ResiPartyMemberOpenFeignClient.java | 4 ++++ ...esiPartyMemberOpenFeignClientFallback.java | 6 ++++++ 11 files changed, 97 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java index 30505f546e..23bfd628a4 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java @@ -89,4 +89,6 @@ public interface TopicConstants { * 消息-党建小助手 */ String IC_MESSAGE = "ic_message"; + + String PARTY_BUILDING = "party_building"; } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java index fd1387fd43..4048ae5902 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java @@ -175,4 +175,11 @@ public interface SystemMessageType { */ String PARTY_MEETING_MESSAGE = "party_meeting_message"; + String ZBWYH = "支部委员会"; + String ZBDYDH = "支部党员大会"; + String DXZH = "党小组会"; + String DANGKE = "党课"; + String ZTDR = "主题党日"; + String WMFWHD = "为民服务活动"; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index 8373666cc4..3eea1f03d8 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -240,6 +240,14 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.PARTY_MEETING_MESSAGE: topic=TopicConstants.IC_MESSAGE; break; + case SystemMessageType.ZBWYH: + case SystemMessageType.ZBDYDH: + case SystemMessageType.DXZH: + case SystemMessageType.DANGKE: + case SystemMessageType.ZTDR: + case SystemMessageType.WMFWHD: + topic=TopicConstants.PARTY_BUILDING; + break; default: logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java index bf8e7a9c0f..8082e71192 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import java.io.Serializable; @@ -10,7 +11,7 @@ import java.io.Serializable; * @Date 2022/8/22 15:57 */ @Data -public class PartyPointFormDTO implements Serializable { +public class PartyPointFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -4811220825653023328L; private String customerId; private String userId; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java index 7574f0b3e5..3a171175e3 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java @@ -20,6 +20,7 @@ public class PartyPointResultDTO implements Serializable { private String point; private String actId; private String actType; - private String actDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date actDate; private String actAddress; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 885910a843..60712e7780 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -255,4 +255,19 @@ public class ResiPointController { ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class); return new Result>().ok(pointAdditiveRecordService.getRecords(pageUserParam)); } + + /** + * 党建积分 + * @Param tokenDto + * @Param formDTO + * @Return {@link Result< PageData< PartyPointResultDTO>>} + * @Author zhaoqifeng + * @Date 2022/8/23 14:12 + */ + @PostMapping("pagePartyPoint") + public Result> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(pointActionLogService.pagePartyPoint(formDTO)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java index 63b4c44e2b..2204d7c7e2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java @@ -113,6 +113,15 @@ public class PointListener implements MessageListenerConcurrently { //给需求服务方（志愿者）发放积分 grantServerPoint(msg); break; + case SystemMessageType.ZBWYH: + case SystemMessageType.ZBDYDH: + case SystemMessageType.DXZH: + case SystemMessageType.DANGKE: + case SystemMessageType.ZTDR: + case SystemMessageType.WMFWHD: + partyAct(msg); + default: + break; } } catch (RenException e) { @@ -218,6 +227,14 @@ public class PointListener implements MessageListenerConcurrently { }); } + private void partyAct(String msg) { + List formList = JSON.parseArray(msg, BasePointEventMsg.class); + + formList.forEach(obj -> { + userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); + }); + } + /** * 需求完成，给志愿者发放积分 * @param msg diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 427b691584..7a339c69e5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -46,6 +46,8 @@ import com.epmet.entity.UserPointActionLogEntity; import com.epmet.entity.UserPointStatisticalDailyEntity; import com.epmet.entity.UserPointTotalEntity; import com.epmet.feign.EpmetHeartOpenFeignClient; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; import com.epmet.utils.DimIdGenerator; import com.epmet.utils.ModuleConstant; @@ -55,13 +57,13 @@ import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; import dto.form.SendPointFormDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.*; @@ -91,6 +93,8 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl page(Map params) { @@ -652,7 +656,20 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl list =baseDao.getPagePartyPoint(formDTO); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + Result actInfo = resiPartyMemberOpenFeignClient.actDetail(item.getActId()); + if (actInfo.success() && null != actInfo.getData()) { + item.setActType(actInfo.getData().getActTypeName()); + item.setActAddress(actInfo.getData().getAddress()); + item.setActDate(actInfo.getData().getHoldTime()); + } + }); + } + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index d340a5bb16..ec1de753c4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -172,6 +172,21 @@ WHERE DEL_FLAG = '0' AND BIZ_TYPE = 'party_building' + AND USER_ID = #{userId} + AND CUSTOMER_ID = #{customerId} + + AND SOURCE_TYPE = #{type} + + + AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate} + + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate} + + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') >= #{startDate} + AND DATE_FORMAT(CREATED_TIME,'%Y%m') <= #{endDate} + ORDER BY CREATED_TIME DESC diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index a1b68eaff8..de72c34234 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.resi.partymember.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; @@ -158,4 +159,7 @@ public interface ResiPartyMemberOpenFeignClient { */ @PostMapping("/resi/partymember/icPartyAct/autoPublishIcPartyAct") Result autoPublishIcPartyAct(); + + @PostMapping("/resi/partymember/icPartyAct/act-detail/{icPartyActId}") + Result actDetail(@PathVariable("icPartyActId")String icPartyActId); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index a8d8240645..2a167d2af9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; @@ -124,4 +125,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result autoPublishIcPartyAct() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoPublishIcPartyAct"); } + + @Override + public Result actDetail(String icPartyActId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "actDetail"); + } }