luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

先提一版

dev
syc 3 years ago
parent
ecc0d6f0b3
commit
c1f84de710
5 changed files with 49 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java
  2. 4
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
  3. 4
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
  4. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
  5. 59
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

2
epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java
View File

@ -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;

4
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
View File

@ -339,7 +339,7 @@ public interface ResiGroupOpenFeignClient {
* @Author sun
* @Description 查询小组成员列表
**/
@PostMapping("/resi/group/member/getmemberlist")
Result<List<ResiGroupMemberDTO>> getMemberList(@RequestBody List<String> groupIdList);
@PostMapping("/resi/group/member/groupmemberlist")
Result<List<ResiGroupMemberDTO>> groupMemberList(@RequestBody List<String> groupIdList);
}

4
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
View File

@ -244,8 +244,8 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
}
@Override
public Result<List<ResiGroupMemberDTO>> getMemberList(List<String> groupIdList) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupIdList);
public Result<List<ResiGroupMemberDTO>> groupMemberList(List<String> groupIdList) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupMemberList", groupIdList);
}
}

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
View File

@ -205,7 +205,7 @@ public class ResiGroupMemberController {
return new Result<JoinGroupApplyRealTimeResultDTO>().ok(operationService.applyEnterByLink(param));
}
@PostMapping("getmemberlist")
@PostMapping("groupmemberlist")
public Result<List<ResiGroupMemberDTO>> groupMemberList(@RequestBody List<String> groupIdList){
return new Result<List<ResiGroupMemberDTO>>().ok(resiGroupMemberService.groupMemberList(groupIdList));
}

59
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
View File

@ -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<IcPartyActDao, IcPartyActEntity> implements IcPartyActService {
@Autowired
@ -65,6 +74,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
private IcPartyOrgDao partyOrgDao;
@Autowired
private ResiPartymemberAttachmentDao resiPartymemberAttachmentDao;
@Autowired
private EpmetMessageOpenFeignClient messageOpenFeignClient;
/**
* 活动类型列表
*
@ -313,20 +324,6 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
return result;
}
public static List<ActAndScheduleListResultDTO> constructHomeSearchData(String startDate,String endDate){
List<ActAndScheduleListResultDTO> result = new ArrayList<>();
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
List<String> 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<IcPartyActDao, IcPart
String msg = "活动信息不存在，活动Id:" + formDTO.getIcPartyActId();
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg);
}
List<UserMessageFormDTO> msgList = new ArrayList<>();
//2.根据不同类型消息触发不同处理逻辑
//2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息
if("publish".equals(formDTO.getType())){
@ -351,7 +349,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
//分别查询党组织、党小组下的人
List<String> userIdList = new ArrayList<>();
if(!CollectionUtils.isEmpty(groupIdList)){
Result<List<ResiGroupMemberDTO>> result = resiGroupOpenFeignClient.getMemberList(groupIdList);
Result<List<ResiGroupMemberDTO>> result = resiGroupOpenFeignClient.groupMemberList(groupIdList);
if (!result.success()) {
throw new RenException("调用common service查询secret失败");
}
@ -362,9 +360,38 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
}
//组装消息
userIdList.forEach(id->{
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);
}
}
Write Preview
Loading…
Cancel
Save