修改早晚报定时发送

pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java

@@ -4,6 +4,8 @@ import com.pcloud.book.adnews.biz.AdNewsBiz;
 import com.pcloud.book.adnews.check.AdNewsCheck;
 import com.pcloud.book.adnews.dao.*;
 import com.pcloud.book.adnews.entity.*;
+import com.pcloud.book.adnews.enums.AdContentFromEnum;
+import com.pcloud.book.advertising.dto.DateCountDTO;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
 import com.pcloud.book.group.biz.WeixinQrcodeBiz;
@@ -13,6 +15,7 @@ import com.pcloud.book.group.dto.GroupQrcodeFoAdDTO;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
+import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.facade.quartz.entity.CallBackParam;
@@ -26,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.DateTimeException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -159,11 +163,12 @@ public class AdNewsBizImpl implements AdNewsBiz {
     @ParamLog("发送编辑端早晚报")
     @Override
     public void sendAdNews(Long adNewsSetId) {
+
         AdNewsSet adNewsSet = adNewsSetDao.getById(adNewsSetId);
         if (adNewsSet == null) {
             return;
         }
-        //查询关联
+        // 查询关联
         List<AdNewsGroup> adNewsGroups = adNewsGroupDao.getListByAdNewsSetId(adNewsSetId);
         if (ListUtils.isEmpty(adNewsGroups)) {
             return;
@@ -174,30 +179,79 @@ public class AdNewsBizImpl implements AdNewsBiz {
         if (ListUtils.isEmpty(groupQrcodeFoAdDTOS)) {
             return;
         }
-        Integer sendCount = adNewsSet.getSendCount();
-        //查询要发的记录
-        Long adviserId = adNewsSet.getCreateUser();
-        List<AdNews> adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser(adNewsSetId, adviserId, sendCount);
-        if (ListUtils.isEmpty(adNewsList)) {
-            return;
-        }
-        //分成300一组
+
+        // 需要发送的早晚报内容
         List<String> contents = new ArrayList<>();
-        String content = "";
-        int i = 1;
-        for (AdNews adNews : adNewsList) {
-            String contentL = content + i + "." + adNews.getTitle() + adNews.getShortUrl() + "\n";
-            if (contentL.length() >= 300) {
-                contents.add(content);
-                content = i + "." + adNews.getTitle() + adNews.getShortUrl() + "\n";
-            } else {
-                content = contentL;
+        // for循环内的临时变量
+        AdNewsGroupRecord adNewsGroupRecord;
+
+        if (adNewsSet.getContentFrom() == AdContentFromEnum.WECHAT.key) {
+
+            //查询要发的记录
+            List<AdNews> adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser(adNewsSetId, adNewsSet.getCreateUser(), adNewsSet.getSendCount());
+            if (ListUtils.isEmpty(adNewsList)) {
+                return;
             }
-            if (i == adNewsList.size()) {
-                contents.add(content);
+            // 将多条需要发送的早晚报拼接成300字符一组的消息
+            contents = this.concatContent(adNewsList);
+            // 通过机器人小号发送消息到微信群
+            this.sendAdNewsToWechatGroup(adNewsSet, groupQrcodeFoAdDTOS, contents);
+            //插入发送记录
+            List<AdNewsGroupRecord> adNewsGroupRecords = new ArrayList<>();
+            for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS) {
+                for (AdNews adNews : adNewsList) {
+                    adNewsGroupRecord = new AdNewsGroupRecord();
+                    adNewsGroupRecord.setAdNewsId(adNews.getId());
+                    adNewsGroupRecord.setAdNewsSetId(adNewsSetId);
+                    adNewsGroupRecord.setBookGroupId(groupQrcodeFoAdDTO.getBookGroupId());
+                    adNewsGroupRecord.setClassifyId(groupQrcodeFoAdDTO.getClassifyId());
+                    adNewsGroupRecord.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
+                    adNewsGroupRecord.setCreateUser(adNewsSet.getCreateUser());
+                    adNewsGroupRecord.setUpdateUser(adNewsSet.getCreateUser());
+                    adNewsGroupRecords.add(adNewsGroupRecord);
+                }
             }
-            i = i + 1;
+            adNewsGroupRecordDao.batchInsert(adNewsGroupRecords);
+
+        } else if (adNewsSet.getContentFrom() == AdContentFromEnum.CUSTOM.key) {
+
+            if (StringUtil.isEmpty(adNewsSet.getMorningContent())) {
+                LOGGER.info("早报内容为空，无法发送");
+                return;
+            }
+            if (StringUtil.isEmpty(adNewsSet.getEveningContent())) {
+                LOGGER.info("晚报内容为空，无法发送");
+                return;
+            }
+            // 获取发送早报还是晚报
+            String customContent = this.getMorningOrEveningContent(adNewsSet);
+            contents.add(customContent);
+            // 通过机器人小号发送消息到微信群
+            this.sendAdNewsToWechatGroup(adNewsSet, groupQrcodeFoAdDTOS, contents);
+            //插入发送记录
+            List<AdNewsGroupRecord> adNewsGroupRecords = new ArrayList<>();
+            for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS) {
+                adNewsGroupRecord = new AdNewsGroupRecord();
+                adNewsGroupRecord.setAdNewsSetId(adNewsSetId);
+                adNewsGroupRecord.setBookGroupId(groupQrcodeFoAdDTO.getBookGroupId());
+                adNewsGroupRecord.setClassifyId(groupQrcodeFoAdDTO.getClassifyId());
+                adNewsGroupRecord.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
+                adNewsGroupRecord.setCreateUser(adNewsSet.getCreateUser());
+                adNewsGroupRecord.setUpdateUser(adNewsSet.getCreateUser());
+                adNewsGroupRecord.setCustomContent(customContent);
+                adNewsGroupRecords.add(adNewsGroupRecord);
+            }
+            adNewsGroupRecordDao.batchInsert(adNewsGroupRecords);
         }
+    }
+
+    /**
+     * 通过机器人小号发送消息到微信群
+     * @param adNewsSet
+     * @param groupQrcodeFoAdDTOS
+     * @param contents
+     */
+    private void sendAdNewsToWechatGroup(AdNewsSet adNewsSet, List<GroupQrcodeFoAdDTO> groupQrcodeFoAdDTOS, List<String> contents) {
         String startContent = "";
         String endContent = "";
         if (adNewsSet.getHasStartContent()) {
@@ -227,22 +281,54 @@ public class AdNewsBizImpl implements AdNewsBiz {
                 sendAdNewsText(endContent, robotId, weixinGroupId);
             }
         }
-        //插入发送记录
-        List<AdNewsGroupRecord> adNewsGroupRecords = new ArrayList<>();
-        for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS) {
-            for (AdNews adNews : adNewsList) {
-                AdNewsGroupRecord adNewsGroupRecord = new AdNewsGroupRecord();
-                adNewsGroupRecord.setAdNewsId(adNews.getId());
-                adNewsGroupRecord.setAdNewsSetId(adNewsSetId);
-                adNewsGroupRecord.setBookGroupId(groupQrcodeFoAdDTO.getBookGroupId());
-                adNewsGroupRecord.setClassifyId(groupQrcodeFoAdDTO.getClassifyId());
-                adNewsGroupRecord.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
-                adNewsGroupRecord.setCreateUser(adviserId);
-                adNewsGroupRecord.setUpdateUser(adviserId);
-                adNewsGroupRecords.add(adNewsGroupRecord);
+    }
+
+
+    /**
+     * 发送早报还是晚报
+     * @param adNewsSet
+     * @return
+     */
+    private String getMorningOrEveningContent(AdNewsSet adNewsSet) {
+        Date date = new Date();
+        String dateOnly = DateUtils.formatDate(date, DateUtils.DATE_FORMAT_DATEONLY);
+        Date morningDateTime = DateUtils.StringToDateTime(dateOnly.concat(" ").concat(adNewsSet.getMorningTime()));
+        Date eveningDateTime = DateUtils.StringToDateTime(dateOnly.concat(" ").concat(adNewsSet.getEveningTime()));
+        Long morningDiff = date.getTime() - morningDateTime.getTime();
+        Long eveningDiff = date.getTime() - eveningDateTime.getTime();
+        // 判断正负太麻烦，直接判断绝对值，哪个时间差小就发哪个
+        return Math.abs(morningDiff) <= Math.abs(eveningDiff) ? adNewsSet.getMorningContent() : adNewsSet.getEveningContent();
+    }
+
+    /**
+     * 将内容拼接为300字符一条数据项的数组【微信目前单次消息发送字符长度为300】
+     * 拼接内容大致为
+     * 1.xxxxxxxxxxx 2.xxxxxxxxxx 3.xxxxxxxx   【假设此条数据加下一条数据【4.xxx】 就大于300字符，那就先将之前的存一条到数组】
+     * 4.xxxxx 5.xxxxxxx   【多余300字符再重新拼接，以此循环下去】
+     *
+     * @param adNewsList
+     * @return
+     */
+    private List<String> concatContent(List<AdNews> adNewsList) {
+        List<String> contents = new ArrayList<>();
+        String content = "";
+        int i = 1;
+        for (AdNews adNews : adNewsList) {
+            String temp = content + i + "." + adNews.getTitle() + adNews.getShortUrl() + "\n";
+            if (temp.length() >= 300) {
+                // 如果本次拼接后的长度大于 300，那么将之前拼接的内容存入数组
+                contents.add(content);
+                // 重置 content 的内容
+                content = i + "." + adNews.getTitle() + adNews.getShortUrl() + "\n";
+            } else {
+                content = temp;
+            }
+            if (i == adNewsList.size()) {
+                contents.add(content);
             }
+            i = i + 1;
         }
-        adNewsGroupRecordDao.batchInsert(adNewsGroupRecords);
+        return contents;
     }
 
     @ParamLog("获取编辑早晚报设置")
@@ -351,7 +437,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
 
     @ParamLog("增加公众号反馈")
     @Override
-    public Long addAdNewsWechat(AdNewsWechat adNewsWechat){
+    public Long addAdNewsWechat(AdNewsWechat adNewsWechat) {
         return adNewsWechatDao.insert(adNewsWechat);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsGroupRecord.java

@@ -35,6 +35,9 @@ public class AdNewsGroupRecord extends BaseEntity{
     @ApiModelProperty("修改人")
     private Long updateUser;
 
+    @ApiModelProperty("自定义内容")
+    private String customContent;
+
     public Long getQrcodeId() {
         return qrcodeId;
     }
@@ -91,6 +94,14 @@ public class AdNewsGroupRecord extends BaseEntity{
         this.updateUser = updateUser;
     }
 
+    public String getCustomContent() {
+        return customContent;
+    }
+
+    public void setCustomContent(String customContent) {
+        this.customContent = customContent;
+    }
+
     @Override
     public String toString() {
         return "AdNewsGroupRecord{" +
@@ -101,6 +112,9 @@ public class AdNewsGroupRecord extends BaseEntity{
                 ", adNewsSetId=" + adNewsSetId +
                 ", createUser=" + createUser +
                 ", updateUser=" + updateUser +
-                "} " + super.toString();
+                ", customContent='" + customContent + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsWechat.java

@@ -16,15 +16,15 @@ public class AdNewsWechat extends BaseEntity {
     public AdNewsWechat() {
     }
 
-    public AdNewsWechat(String wechatId, String wechatName, Long adviserId, Boolean isDelete) {
-        this.wechatId = wechatId;
+    public AdNewsWechat(String newsFrom, String wechatName, Long adviserId, Boolean isDelete) {
+        this.newsFrom = newsFrom;
         this.wechatName = wechatName;
         this.adviserId = adviserId;
         this.isDelete = isDelete;
     }
 
     @ApiModelProperty("微信公众号唯一标识")
-    private String wechatId;
+    private String newsFrom;
 
     @ApiModelProperty("微信公众号名称")
     private String wechatName;
@@ -39,12 +39,12 @@ public class AdNewsWechat extends BaseEntity {
         return serialVersionUID;
     }
 
-    public String getWechatId() {
-        return wechatId;
+    public String getNewsFrom() {
+        return newsFrom;
     }
 
-    public void setWechatId(String wechatId) {
-        this.wechatId = wechatId;
+    public void setNewsFrom(String newsFrom) {
+        this.newsFrom = newsFrom;
     }
 
     public String getWechatName() {
@@ -74,7 +74,7 @@ public class AdNewsWechat extends BaseEntity {
     @Override
     public String toString() {
         return "AdNewsWechat{" +
-                "wechatId='" + wechatId + '\'' +
+                "newsFrom='" + newsFrom + '\'' +
                 ", wechatName='" + wechatName + '\'' +
                 ", adviserId=" + adviserId +
                 ", isDelete=" + isDelete +

pcloud-service-book/src/main/java/com/pcloud/book/adnews/facade/AdNewsFacade.java

@@ -38,6 +38,7 @@ public interface AdNewsFacade {
             @RequestHeader("token") @ApiParam("token信息") String token
     ) throws BizException, PermissionException;
 
+    @Deprecated
     @ApiOperation("编辑添加选择的早晚报素材")
     @PostMapping("/createAdNewsChooseBatch")
     ResponseDto<?> createAdNewsChooseBatch(
@@ -45,6 +46,7 @@ public interface AdNewsFacade {
             @RequestBody @ApiParam("新闻id集合") List<Long> adNewsIds
     ) throws BizException, PermissionException;
 
+    @Deprecated
     @ApiOperation("编辑移除选择的早晚报素材")
     @GetMapping("/deleteAdNewsChoose")
     ResponseDto<?> deleteAdNewsChoose(
@@ -52,6 +54,7 @@ public interface AdNewsFacade {
             @RequestParam @ApiParam("adNewsChooseId") Long adNewsChooseId
     ) throws BizException, PermissionException;
 
+    @Deprecated
     @ApiOperation("获取早晚报素材库")
     @GetMapping("/getAdNewsList")
     ResponseDto<?> getAdNewsList(
@@ -61,6 +64,7 @@ public interface AdNewsFacade {
             @RequestParam("numPerPage") @ApiParam("每页条数") Integer numPerPage
     ) throws BizException, PermissionException;
 
+    @Deprecated
     @ApiOperation("获取编辑选择的早晚报素材库")
     @GetMapping("/getAdNewsChooseList")
     ResponseDto<?> getAdNewsChooseList(

pcloud-service-book/src/main/resources/mapper/adnews/AdNewsGroupRecordMapper.xml

@@ -12,10 +12,11 @@
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_user" property="updateUser" jdbcType="BIGINT"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="custom_content" property="customContent" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, qrcode_id, classify_id, book_group_id, ad_news_id, ad_news_set_id, create_user, create_time, update_user, update_time
+        id, qrcode_id, classify_id, book_group_id, ad_news_id, ad_news_set_id, create_user, create_time, update_user, update_time, custom_content
     </sql>
 
     <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -36,7 +37,8 @@
             create_user,
             create_time,
             update_user,
-            update_time
+            update_time,
+            custom_content
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{qrcodeId,jdbcType=BIGINT},
@@ -48,6 +50,7 @@
             NOW(),
             #{updateUser,jdbcType=BIGINT},
             NOW(),
+            #{customContent,jdbcType=VARCHAR}
         </trim>
     </insert>
 
@@ -72,6 +75,9 @@
             <if test="updateUser != null">
                 update_user = #{updateUser,jdbcType=VARCHAR},
             </if>
+            <if test="customContent != null">
+                custom_content = #{customContent,jdbcType=VARCHAR},
+            </if>
             update_time=now()
         </set>
         where id = #{id,jdbcType=BIGINT}
@@ -88,7 +94,8 @@
             create_user,
             create_time,
             update_user,
-            update_time
+            update_time,
+            custom_content
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -101,7 +108,8 @@
             #{item.createUser,jdbcType=BIGINT},
             NOW(),
             #{item.updateUser,jdbcType=BIGINT},
-            NOW()
+            NOW(),
+            #{customContent,jdbcType=VARCHAR}
             )
         </foreach>
     </insert>

pcloud-service-book/src/main/resources/mapper/adnews/AdNewsMapper.xml

@@ -104,32 +104,23 @@
     </insert>
 
     <!--查找要发送的新闻-->
+    <!--
+        1、ad_news_ban 排除掉禁止发送的
+        2、ad_news_group_record 排除掉已发送的
+    -->
     <select id="getNewsToSendBySetIdAndAdviser" parameterType="map" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>
         FROM
-        ad_news t
+            ad_news a
+            INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0
+            INNER JOIN ad_news_wechat_choose c ON c.ad_news_wechat_id = b.id AND c.is_delete = 0 AND c.adviser_id = #{adviserId}
         WHERE
-        t.id IN (
-            SELECT
-            t1.ad_news_id
-            FROM
-            ad_news_choose t1
-            WHERE
-            t1.is_delete=0
-            and t1.adviser_id =#{adviserId}
-        )
-        AND t.id NOT IN (
-            SELECT
-            t2.ad_news_id
-            FROM
-            ad_news_group_record t2
-            WHERE
-            t2.ad_news_set_id =#{adNewsSetId}
-        )
+            NOT EXISTS ( SELECT 1 FROM ad_news_ban e WHERE a.id = e.ad_news_id AND e.adviser_id = c.adviser_id )
+            AND NOT EXISTS (SELECT 1 from ad_news_group_record f WHERE f.ad_news_id=a.id and f.ad_news_set_id=#{adNewsSetId})
         ORDER BY
-        t.create_time DESC
-        LIMIT #{top}
+            a.id DESC
+            LIMIT #{top}
     </select>
 
     <!--获取素材库列表-->

pcloud-service-book/src/main/resources/mapper/adnews/AdNewsWechatMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.pcloud.book.adnews.dao.impl.AdNewsWechatDaoImpl">
     <resultMap id="BaseResultMap" type="com.pcloud.book.adnews.entity.AdNewsWechat">
         <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="wechat_id" property="wechatId" jdbcType="VARCHAR"/>
+        <result column="news_from" property="newsFrom" jdbcType="VARCHAR"/>
         <result column="wechat_name" property="wechatName" jdbcType="VARCHAR"/>
         <result column="adviser_id" property="adviserId" jdbcType="BIGINT"/>
         <result column="is_delete" property="isDelete" jdbcType="BOOLEAN"/>
@@ -12,7 +12,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, wechat_id, wechat_name, adviser_id, is_delete, create_time, update_time
+        id, news_from, wechat_name, adviser_id, is_delete, create_time, update_time
     </sql>
 
     <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -27,7 +27,7 @@
         select <include refid="Base_Column_List"/>
             from ad_news_wechat
         where
-            wechat_id IS NOT NULL
+        news_from IS NOT NULL
         order by id desc
     </select>
 
@@ -35,7 +35,7 @@
     <select id="getAdNewsWechatChooseList" parameterType="map" resultMap="BaseResultMap">
         SELECT
             a.id,
-            a.wechat_id,
+            a.news_from,
             a.wechat_name,
             a.adviser_id,
             a.is_delete,
@@ -47,17 +47,17 @@
             AND b.is_delete = 0
             AND b.adviser_id = #{partyId}
         WHERE
-            a.`wechat_id` IS NOT NULL
+            a.`news_from` IS NOT NULL
     </select>
 
 
     <insert id="insert" parameterType="com.pcloud.book.adnews.entity.AdNewsWechat" useGeneratedKeys="true" keyProperty="id">
         insert into ad_news_wechat
         <trim prefix="(" suffix=")" suffixOverrides=",">
-             wechat_id, wechat_name, adviser_id, is_delete, create_time
+            news_from, wechat_name, adviser_id, is_delete, create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            #{wechatId,jdbcType=VARCHAR},
+            #{newsFrom,jdbcType=VARCHAR},
             #{wechatName,jdbcType=VARCHAR},
             #{adviserId,jdbcType=BIGINT},
             #{isDelete,jdbcType=BOOLEAN},