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 9ca6c76c5d..f019090330 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 @@ -1,15 +1,17 @@ package com.epmet.commons.rocketmq.messages; +import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * 党建小助手发布活动、活动到期提醒、活动发布提醒推送MQ * @author sun */ @Data -public class PartyMeetingMessageMQMsg implements Serializable { +public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializable { //客户Id private String customerId; @@ -17,10 +19,5 @@ public class PartyMeetingMessageMQMsg implements Serializable { private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; - //党组织Id - private String publishOrgId; - //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 - private String publishOrgType; - } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java index 7b9d1d877b..debd15686f 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java @@ -243,28 +243,4 @@ public class SendMqMsgUtil { return false; } - /** - * @Description 党建小助手消息同步Mq - * @author sun - */ - public boolean partyMeetingMQMsg(String msgType, PartyMeetingMessageMQMsg msgContent) { - try { - SystemMsgFormDTO form = new SystemMsgFormDTO(msgType,msgContent); - Result sendMsgResult; - log.info("partyMeetingMQMsg param:{}",msgContent); - int retryTime = 0; - do { - sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); - } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO); - - if (sendMsgResult != null && sendMsgResult.success()) { - return true; - } - log.error("发送党建小助手系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(form)); - } catch (Exception e) { - log.error("partyMeetingMQMsg exception", e); - } - return false; - } - } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java new file mode 100644 index 0000000000..5789e543e8 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 13:52 + * @DESC + */ +@Data +public class ActAndScheduleListFormDTO implements Serializable { + + private static final long serialVersionUID = -6776882545589530612L; + + private String startDate; + private String endDate; + private String dateId; + + /** + * 是否本人创建的活动，1：是；0：否 + */ + private String isSelf; + + /** + * 党组织ID + */ + private String orgId; + + private String customerId; + private String staffId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java new file mode 100644 index 0000000000..611d4bf6ed --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -0,0 +1,53 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/8/19 13:41 + * @DESC + */ +@Data +public class ActAndScheduleListResultDTO implements Serializable { + + private static final long serialVersionUID = 7378300105829566449L; + + private Integer scheduleTotal; + private Integer activityTotal; + private String dateId; + + private List activityList; + + private List scheduleList; + + + @Data + public static class ActivityListDTO implements Serializable{ + + private static final long serialVersionUID = -9050507457068805831L; + + private String activityId; + private String topic; + private String address; + private String holdTime; + private String type; + private String isPublicValue; + private String joinTypeValue; + private Boolean isMe; + + } + + public static class ScheduleListDTO implements Serializable{ + + private static final long serialVersionUID = 5372167729733804267L; + + private String scheduleId; + private String title; + private String remindTime; + private String remark; + private Boolean isMe; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 9886fb6b13..2de07478c1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -11,7 +11,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +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 org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -105,5 +107,33 @@ public class IcPartyActController { formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icPartyActService.getHomeMonthTotal(formDTO)); } + + /** + * Desc:【党建日历】活动、日程列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/8/19 13:57 + */ + @PostMapping("actAndScheduleList") + public Result getActAndScheduleList(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icPartyActService.getActAndScheduleList(formDTO)); + } + + /** + * Desc:【党建日历】某月/天数据搜索列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/8/19 14:00 + */ + @PostMapping("homeSearch") + public Result> homeSearch(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyActService.homeSearch(formDTO)); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 5dca25642b..d0f1d68d65 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -8,7 +8,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +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 java.util.List; @@ -59,4 +61,20 @@ public interface IcPartyActService extends BaseService { * @return */ IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId); + + /** + * Desc: 【党建日历】活动、日程列表 + * @param formDTO + * @author zxc + * @date 2022/8/19 13:57 + */ + ActAndScheduleListResultDTO getActAndScheduleList(ActAndScheduleListFormDTO formDTO); + + /** + * Desc: 【党建日历】某月/天数据搜索列表 + * @param formDTO + * @author zxc + * @date 2022/8/19 14:01 + */ + List homeSearch(ActAndScheduleListFormDTO formDTO); } \ No newline at end of file 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 f8d8067598..b96dd74b60 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 @@ -10,18 +10,12 @@ import com.epmet.commons.tools.page.PageData; 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.SpringContextUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; import com.epmet.modules.partyOrg.dao.IcScheduleDao; -import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; -import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; -import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; -import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; @@ -205,4 +199,26 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { + return null; + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 39bae20e11..d4cd5a8674 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -37,7 +37,7 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND HOLD_YEAR_ID = #{yearId} - + AND CREATED_BY = #{staffId} AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%')