早晚报发送记录

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

@@ -58,6 +58,8 @@ public class AdNewsBizImpl implements AdNewsBiz {
     @Autowired
     private AdNewsGroupRecordDao adNewsGroupRecordDao;
     @Autowired
+    private AdNewsMessageStatisticDao adNewsMessageStatisticDao;
+    @Autowired
     private AdNewsBanDao adNewsBanDao;
     @Autowired
     private ScheduleService scheduleService;
@@ -186,8 +188,15 @@ public class AdNewsBizImpl implements AdNewsBiz {
 
         // 需要发送的早晚报内容
         List<String> contents = new ArrayList<>();
+
+        // 插入发送记录
+        List<AdNewsGroupRecord> adNewsGroupRecords = new ArrayList<>();
+        // 插入消息统计信息
+        List<AdNewsMessageStatistic> adNewsMessageStatistics = new ArrayList<>();
+
         // for循环内的临时变量
         AdNewsGroupRecord adNewsGroupRecord;
+        AdNewsMessageStatistic adNewsMessageStatistic;
 
         if (adNewsSet.getContentFrom() == AdContentFromEnum.WECHAT.key) {
 
@@ -200,8 +209,6 @@ public class AdNewsBizImpl implements AdNewsBiz {
             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();
@@ -212,11 +219,21 @@ public class AdNewsBizImpl implements AdNewsBiz {
                     adNewsGroupRecord.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
                     adNewsGroupRecord.setCreateUser(adNewsSet.getCreateUser());
                     adNewsGroupRecord.setUpdateUser(adNewsSet.getCreateUser());
+                    adNewsGroupRecord.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
                     adNewsGroupRecords.add(adNewsGroupRecord);
                 }
+                // 统计记录
+                adNewsMessageStatistic = new AdNewsMessageStatistic();
+                adNewsMessageStatistic.setAdNewsSetId(adNewsSetId);
+                adNewsMessageStatistic.setBookGroupId(groupQrcodeFoAdDTO.getBookGroupId());
+                adNewsMessageStatistic.setClassifyId(groupQrcodeFoAdDTO.getClassifyId());
+                adNewsMessageStatistic.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
+                adNewsMessageStatistic.setCreateUser(adNewsSet.getCreateUser());
+                adNewsMessageStatistic.setContentFrom(adNewsSet.getContentFrom());
+                adNewsMessageStatistic.setMessageCount(adNewsList.size());
+                adNewsMessageStatistic.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
+                adNewsMessageStatistics.add(adNewsMessageStatistic);
             }
-            adNewsGroupRecordDao.batchInsert(adNewsGroupRecords);
-
         } else if (adNewsSet.getContentFrom() == AdContentFromEnum.CUSTOM.key) {
 
             if (StringUtil.isEmpty(adNewsSet.getMorningContent())) {
@@ -232,8 +249,6 @@ public class AdNewsBizImpl implements AdNewsBiz {
             contents.add(customContent);
             // 通过机器人小号发送消息到微信群
             this.sendAdNewsToWechatGroup(adNewsSet, groupQrcodeFoAdDTOS, contents);
-            //插入发送记录
-            List<AdNewsGroupRecord> adNewsGroupRecords = new ArrayList<>();
             for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS) {
                 adNewsGroupRecord = new AdNewsGroupRecord();
                 adNewsGroupRecord.setAdNewsSetId(adNewsSetId);
@@ -243,10 +258,27 @@ public class AdNewsBizImpl implements AdNewsBiz {
                 adNewsGroupRecord.setCreateUser(adNewsSet.getCreateUser());
                 adNewsGroupRecord.setUpdateUser(adNewsSet.getCreateUser());
                 adNewsGroupRecord.setCustomContent(customContent);
+                adNewsGroupRecord.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
                 adNewsGroupRecords.add(adNewsGroupRecord);
+                // 统计记录
+                adNewsMessageStatistic = new AdNewsMessageStatistic();
+                adNewsMessageStatistic.setAdNewsSetId(adNewsSetId);
+                adNewsMessageStatistic.setBookGroupId(groupQrcodeFoAdDTO.getBookGroupId());
+                adNewsMessageStatistic.setClassifyId(groupQrcodeFoAdDTO.getClassifyId());
+                adNewsMessageStatistic.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
+                adNewsMessageStatistic.setCreateUser(adNewsSet.getCreateUser());
+                adNewsMessageStatistic.setContentFrom(adNewsSet.getContentFrom());
+                adNewsMessageStatistic.setMessageCount(1);
+                adNewsMessageStatistic.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
+                adNewsMessageStatistics.add(adNewsMessageStatistic);
             }
-            adNewsGroupRecordDao.batchInsert(adNewsGroupRecords);
         }
+        adNewsMessageStatisticDao.batchInsert(adNewsMessageStatistics);
+        // 不会mybatis的主从表批量插入，所以只能这么做
+        for (AdNewsMessageStatistic item : adNewsMessageStatistics){
+            adNewsGroupRecords.stream().filter(x->x.getInsertMark()==item.getInsertMark()).forEach(x->x.setMessageStatisticId(item.getId()));
+        }
+        adNewsGroupRecordDao.batchInsert(adNewsGroupRecords);
     }
 
     /**
@@ -425,7 +457,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(content);
         sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
+        sendTextMessageVO.setWxGroupId(weixinGroupId);
         sendTextMessageVO.setIp(findIp(weixinGroupId));
         WxGroupSDK.sendTextMessage(sendTextMessageVO);
         LOGGER.info("发送编辑端早晚报" + sendTextMessageVO.toString());

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsMessageStatisticDao.java

+package com.pcloud.book.adnews.dao;
+
+import com.pcloud.book.adnews.entity.AdNewsMessageStatistic;
+import com.pcloud.common.core.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/13 19:05
+ */
+public interface AdNewsMessageStatisticDao extends BaseDao<AdNewsMessageStatistic> {
+    Integer batchInsert(List<AdNewsMessageStatistic> list);
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/impl/AdNewsMessageStatisticDaoImpl.java

+package com.pcloud.book.adnews.dao.impl;
+
+import com.pcloud.book.adnews.dao.AdNewsMessageStatisticDao;
+import com.pcloud.book.adnews.entity.AdNewsGroupRecord;
+import com.pcloud.book.adnews.entity.AdNewsMessageStatistic;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/13 19:05
+ */
+@Repository("adNewsMessageStatisticDao")
+public class AdNewsMessageStatisticDaoImpl extends BaseDaoImpl<AdNewsMessageStatistic> implements AdNewsMessageStatisticDao {
+    @Override
+    public Integer batchInsert(List<AdNewsMessageStatistic> list) {
+        return super.getSqlSession().insert(getStatement("batchInsert"), list);
+    }
+}

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

@@ -3,6 +3,7 @@ package com.pcloud.book.adnews.entity;
 import com.pcloud.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @Description
@@ -10,10 +11,14 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date 2019/7/17 15:55
  **/
 @ApiModel("编辑新闻发送记录")
+@Data
 public class AdNewsGroupRecord extends BaseEntity{
 
     private static final long serialVersionUID = -3271071194854381077L;
 
+    @ApiModelProperty("消息统计表id")
+    private Long messageStatisticId;
+
     @ApiModelProperty("群id")
     private Long qrcodeId;
 
@@ -38,83 +43,6 @@ public class AdNewsGroupRecord extends BaseEntity{
     @ApiModelProperty("自定义内容")
     private String customContent;
 
-    public Long getQrcodeId() {
-        return qrcodeId;
-    }
-
-    public void setQrcodeId(Long qrcodeId) {
-        this.qrcodeId = qrcodeId;
-    }
-
-    public Long getClassifyId() {
-        return classifyId;
-    }
-
-    public void setClassifyId(Long classifyId) {
-        this.classifyId = classifyId;
-    }
-
-    public Long getBookGroupId() {
-        return bookGroupId;
-    }
-
-    public void setBookGroupId(Long bookGroupId) {
-        this.bookGroupId = bookGroupId;
-    }
-
-    public Long getAdNewsId() {
-        return adNewsId;
-    }
-
-    public void setAdNewsId(Long adNewsId) {
-        this.adNewsId = adNewsId;
-    }
-
-    public Long getAdNewsSetId() {
-        return adNewsSetId;
-    }
-
-    public void setAdNewsSetId(Long adNewsSetId) {
-        this.adNewsSetId = adNewsSetId;
-    }
-
-    public Long getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
-    }
-
-    public Long getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public String getCustomContent() {
-        return customContent;
-    }
-
-    public void setCustomContent(String customContent) {
-        this.customContent = customContent;
-    }
-
-    @Override
-    public String toString() {
-        return "AdNewsGroupRecord{" +
-                "qrcodeId=" + qrcodeId +
-                ", classifyId=" + classifyId +
-                ", bookGroupId=" + bookGroupId +
-                ", adNewsId=" + adNewsId +
-                ", adNewsSetId=" + adNewsSetId +
-                ", createUser=" + createUser +
-                ", updateUser=" + updateUser +
-                ", customContent='" + customContent + '\'' +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                '}';
-    }
+    @ApiModelProperty("insert时父子表标识")
+    Integer insertMark;
 }

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

+package com.pcloud.book.adnews.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/13 18:51
+ */
+@ApiModel("消息记录统计表")
+@Data
+public class AdNewsMessageStatistic extends BaseEntity {
+
+    @ApiModelProperty("群id")
+    private Long qrcodeId;
+
+    @ApiModelProperty("分类id")
+    private Long classifyId;
+
+    @ApiModelProperty("社群码id")
+    private Long bookGroupId;
+
+    @ApiModelProperty("编辑新闻设置id")
+    private Long adNewsSetId;
+
+    @ApiModelProperty("内容来源")
+    private Integer contentFrom;
+
+    @ApiModelProperty("发送消息数")
+    private Integer messageCount;
+
+    @ApiModelProperty("创建人")
+    private Long createUser;
+
+
+    @ApiModelProperty("insert时父子表标识")
+    Integer insertMark;
+}

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.pcloud.book.adnews.dao.impl.AdNewsGroupRecordDaoImpl">
     <resultMap id="BaseResultMap" type="com.pcloud.book.adnews.entity.AdNewsGroupRecord">
         <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="message_statistic_id" property="messageStatisticId" jdbcType="BIGINT"/>
         <result column="qrcode_id" property="qrcodeId" jdbcType="BIGINT"/>
         <result column="classify_id" property="classifyId" jdbcType="BIGINT"/>
         <result column="book_group_id" property="bookGroupId" jdbcType="BIGINT"/>
@@ -16,7 +17,7 @@
     </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, custom_content
+        id, message_statistic_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">
@@ -29,6 +30,7 @@
     <insert id="insert" parameterType="com.pcloud.book.adnews.entity.AdNewsGroupRecord" useGeneratedKeys="true" keyProperty="id">
         insert into ad_news_group_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            message_statistic_id,
             qrcode_id,
             classify_id,
             book_group_id,
@@ -41,6 +43,7 @@
             custom_content
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{messageStatisticId,jdbcType=BIGINT},
             #{qrcodeId,jdbcType=BIGINT},
             #{classifyId,jdbcType=BIGINT},
             #{bookGroupId,jdbcType=BIGINT},
@@ -57,6 +60,9 @@
     <update id="update" parameterType="com.pcloud.book.adnews.entity.AdNewsGroupRecord">
         update ad_news_group_record
         <set>
+            <if test="messageStatisticId != null">
+                message_statistic_id = #{messageStatisticId,jdbcType=BIGINT},
+            </if>
             <if test="qrcodeId != null">
                 qrcode_id = #{qrcodeId,jdbcType=BIGINT},
             </if>
@@ -86,6 +92,7 @@
     <!--批量新增-->
     <insert id="batchInsert" useGeneratedKeys="true" parameterType="java.util.List">
         insert into ad_news_group_record (
+            message_statistic_id,
             qrcode_id,
             classify_id,
             book_group_id,
@@ -100,6 +107,7 @@
         values
         <foreach collection="list" item="item" index="index" separator="," >
             (
+            #{item.messageStatisticId,jdbcType=BIGINT},
             #{item.qrcodeId,jdbcType=BIGINT},
             #{item.classifyId,jdbcType=BIGINT},
             #{item.bookGroupId,jdbcType=BIGINT},
@@ -109,7 +117,7 @@
             NOW(),
             #{item.updateUser,jdbcType=BIGINT},
             NOW(),
-            #{customContent,jdbcType=VARCHAR}
+            #{item.customContent,jdbcType=VARCHAR}
             )
         </foreach>
     </insert>

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

@@ -110,7 +110,7 @@
     -->
     <select id="getNewsToSendBySetIdAndAdviser" parameterType="map" resultMap="BaseResultMap">
         SELECT
-            <include refid="Base_Column_List"/>
+            a.id, a.type, a.news_from, a.title, a.publisher, a.url, a.short_url, a.news_date, a.create_time
         FROM
             ad_news a
             INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "mybatis-3-mapper.dtd" >
+<mapper namespace="com.pcloud.book.adnews.dao.impl.AdNewsMessageStatisticDaoImpl">
+    <resultMap id="BaseResultMap" type="com.pcloud.book.adnews.entity.AdNewsMessageStatistic">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="qrcode_id" property="qrcodeId" jdbcType="BIGINT"/>
+        <result column="classify_id" property="classifyId" jdbcType="BIGINT"/>
+        <result column="book_group_id" property="bookGroupId" jdbcType="BIGINT"/>
+        <result column="ad_news_set_id" property="adNewsSetId" jdbcType="BIGINT"/>
+        <result column="content_from" property="contentFrom" jdbcType="INTEGER"/>
+        <result column="message_count" property="messageCount" jdbcType="INTEGER"/>
+        <result column="create_user" property="createUser" jdbcType="BIGINT"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, qrcode_id, classify_id, book_group_id, ad_news_set_id, content_from, message_count, create_user, create_time
+    </sql>
+
+    <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from ad_news_group_record
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+
+    <insert id="insert" parameterType="com.pcloud.book.adnews.entity.AdNewsMessageStatistic" useGeneratedKeys="true" keyProperty="id">
+        insert into ad_news_message_statistic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            qrcode_id,
+            classify_id,
+            book_group_id,
+            ad_news_set_id,
+            content_from,
+            message_count,
+            create_user,
+            create_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{qrcodeId,jdbcType=BIGINT},
+            #{classifyId,jdbcType=BIGINT},
+            #{bookGroupId,jdbcType=BIGINT},
+            #{adNewsSetId,jdbcType=BIGINT},
+            #{contentFrom,jdbcType=INTEGER},
+            #{messageCount,jdbcType=INTEGER},
+            #{createUser,jdbcType=BIGINT},
+            NOW()
+        </trim>
+    </insert>
+
+    <!--批量新增-->
+    <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.List">
+        insert into ad_news_message_statistic (
+        qrcode_id,
+        classify_id,
+        book_group_id,
+        ad_news_set_id,
+        content_from,
+        message_count,
+        create_user,
+        create_time
+        )
+        values
+        <foreach collection="list" item="item" index="index" separator="," >
+            (
+            #{item.qrcodeId,jdbcType=BIGINT},
+            #{item.classifyId,jdbcType=BIGINT},
+            #{item.bookGroupId,jdbcType=BIGINT},
+            #{item.adNewsSetId,jdbcType=BIGINT},
+            #{item.contentFrom,jdbcType=INTEGER},
+            #{item.messageCount,jdbcType=INTEGER},
+            #{item.createUser,jdbcType=BIGINT},
+            NOW()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
\ No newline at end of file

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

@@ -16,6 +16,9 @@
         <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="content_from" property="contentFrom" jdbcType="INTEGER"/>
+        <result column="morning_content" property="morningContent" jdbcType="VARCHAR"/>
+        <result column="evening_content" property="eveningContent" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">