自动发布

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执行失败");
+        }
     }
 }
 

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<Map<String, IcPartyOrgDTO>> getPartyOrgList();
 
-    @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublishTask")
+    /**
+     * 您有一个活动3天后即将自动发布
+     * @return
+     */
+    @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublish")
     Result noticePartyActAutoPublishTask();
+
+    /**
+     * 自动发布党组织活动
+     * @return
+     */
+    @PostMapping("/resi/partymember/icPartyAct/autoPublishIcPartyAct")
+    Result autoPublishIcPartyAct();
 }

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");
     }
 }

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();
     }
 }

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<IcPartyActEntity> {
 
     List<IcPartyActListResultDTO> selectresiPartyActList(IcPartyActListFormDTO formDTO);
 
-    List<IcPartyActEntity> selectNeedRemindAutoPublishAct(String afterThreeDayDate);
+    List<IcPartyActEntity> selectNeedRemindAutoPublishAct(String dateId);
+
+    List<IcPartyActEntity> selectNoPublishList(String dateId);
 }

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<IcPartyActEntity> {
 
     PageData<IcPartyActListResultDTO> list(IcPartyActListFormDTO formDTO);
 
-    void noticePartyActAutoPublishTask();
+    /**
+     * 通知：您有一个活动3天后即将自动发布
+     */
+    void noticePartyActAutoPublish();
+
+    /**
+     * 自动发布活动
+     */
+    void autoPublishIcPartyAct();
 }

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<IcPartyActDao, IcPart
         return new PageData<>(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<IcPartyActDao, IcPart
         }
     }
 
+    /**
+     * 自动发布活动
+     */
+    @Override
+    public void autoPublishIcPartyAct() {
+        Date nowDate=new Date();
+        String dateId=DateUtils.format(nowDate,DateUtils.DATE_PATTERN_YYYYMMDD);
+        List<IcPartyActEntity> 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);
+        }
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml

@@ -209,15 +209,22 @@
     <select id="selectNeedRemindAutoPublishAct" parameterType="java.lang.String" resultType="com.epmet.modules.partyOrg.entity.IcPartyActEntity">
         SELECT
             a.ID,
-            a.CUSTOMER_ID,
-            a.PUBLISH_STAFF_ID,
-            a.AUTO_PUBLIC_TYPE,
-            a.AUTO_PUBLIC_TIME
+            a.CUSTOMER_ID
+        FROM
+            ic_party_act a
+        WHERE
+            a.DEL_FLAG = '0'
+          AND a.IS_PUBLISH = '0'
+          AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d') = #{dateId}
+    </select>
+    <select id="selectNoPublishList" parameterType="java.lang.String" resultType="com.epmet.modules.partyOrg.entity.IcPartyActEntity">
+        SELECT
+            a.*
         FROM
             ic_party_act a
         WHERE
             a.DEL_FLAG = '0'
           AND a.IS_PUBLISH = '0'
-          AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d') =#{afterThreeDayDate}
+          AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i') = #{dateId}
     </select>
 </mapper>