From 8a278fc79ec5e7417c2c6abd5f781c3ca104b23c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 17:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/task/AutoPublishIcPartyActTask.java | 14 +++++++++- .../feign/ResiPartyMemberOpenFeignClient.java | 13 +++++++++- ...esiPartyMemberOpenFeignClientFallback.java | 7 ++++- .../controller/IcPartyActController.java | 16 +++++++++--- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++- .../partyOrg/service/IcPartyActService.java | 10 ++++++- .../service/impl/IcPartyActServiceImpl.java | 26 ++++++++++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 17 ++++++++---- 8 files changed, 93 insertions(+), 14 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java index 531f41ebeb..d1a9c7a250 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java @@ -1,5 +1,9 @@ package com.epmet.task; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -7,8 +11,11 @@ import org.springframework.stereotype.Component; * @Author yzm * @Date 2022/8/22 15:13 */ +@Slf4j @Component("autoPublishIcPartyActTask") public class AutoPublishIcPartyActTask implements ITask { + @Autowired + private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient; /** * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 * 本任务是自动发布活动 @@ -18,7 +25,12 @@ public class AutoPublishIcPartyActTask implements ITask { */ @Override public void run(String params) { - + Result result=resiPartyMemberOpenFeignClient.autoPublishIcPartyAct(); + if(result.success()){ + log.info("autoPublishIcPartyActTask执行成功"); + }else{ + log.info("autoPublishIcPartyActTask执行失败"); + } } } 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 cae69c38a0..a1b68eaff8 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 @@ -145,6 +145,17 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") Result> getPartyOrgList(); - @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublishTask") + /** + * 您有一个活动3天后即将自动发布 + * @return + */ + @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublish") Result noticePartyActAutoPublishTask(); + + /** + * 自动发布党组织活动 + * @return + */ + @PostMapping("/resi/partymember/icPartyAct/autoPublishIcPartyAct") + Result autoPublishIcPartyAct(); } 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 585e531797..a8d8240645 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 @@ -117,6 +117,11 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp @Override public Result noticePartyActAutoPublishTask() { - return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublishTask"); + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublish"); + } + + @Override + public Result autoPublishIcPartyAct() { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoPublishIcPartyAct"); } } 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 1ed8b5f813..2daee1b686 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 @@ -299,9 +299,19 @@ public class IcPartyActController { * 通知：您有一个活动3天后即将自动发布 * @return */ - @PostMapping("noticePartyActAutoPublishTask") - public Result noticePartyActAutoPublishTask(){ - icPartyActService.noticePartyActAutoPublishTask(); + @PostMapping("noticePartyActAutoPublish") + public Result noticePartyActAutoPublish(){ + icPartyActService.noticePartyActAutoPublish(); + return new Result(); + } + + /** + * 自动发布活动 + * @return + */ + @PostMapping("autoPublishIcPartyAct") + public Result autoPublishIcPartyAct(){ + icPartyActService.autoPublishIcPartyAct(); return new Result(); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index e8b0f11dfc..5ab4ed61e3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -45,5 +45,7 @@ public interface IcPartyActDao extends BaseDao { List selectresiPartyActList(IcPartyActListFormDTO formDTO); - List selectNeedRemindAutoPublishAct(String afterThreeDayDate); + List selectNeedRemindAutoPublishAct(String dateId); + + List selectNoPublishList(String dateId); } \ No newline at end of file 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 a8e150b79a..e1aeee4a8a 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 @@ -110,5 +110,13 @@ public interface IcPartyActService extends BaseService { PageData list(IcPartyActListFormDTO formDTO); - void noticePartyActAutoPublishTask(); + /** + * 通知：您有一个活动3天后即将自动发布 + */ + void noticePartyActAutoPublish(); + + /** + * 自动发布活动 + */ + void autoPublishIcPartyAct(); } \ 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 a10b817418..7b29fc8cc5 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 @@ -661,8 +661,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + /** + * 通知：您有一个活动3天后即将自动发布 + */ @Override - public void noticePartyActAutoPublishTask() { + public void noticePartyActAutoPublish() { Date nowDate=new Date(); Date afterThreeDayDate=DateUtils.calDateBaseDay(nowDate,3); // log.info("现在时间:"+DateUtils.format(nowDate,"yyyy-MM-dd HH:mm:ss")+";3天后="+DateUtils.format(afterThreeDayDate,"yyyy-MM-dd HH:mm:ss")); @@ -681,4 +684,25 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNoPublishList(dateId); + for(IcPartyActEntity act:list){ + //置为已发布 + act.setIsPublish(NumConstant.ONE_STR); + baseDao.updateById(act); + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(act.getCustomerId()); + msg.setIcPartyActId(act.getId()); + msg.setType("publish"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 7ed122e31a..f7d256aa49 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -209,15 +209,22 @@ + \ No newline at end of file