Skip to content

M
midjourney-proxy
Commit 3752637b by 郑永强
Options

修改早晚报定时发送

parent c92e4e0d
Showing with 173 additions and 70 deletions
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,31 +104,22 @@
</insert>
<!--查找要发送的新闻-->
<!--
1、ad_news_ban 排除掉禁止发送的
2、ad_news_group_record 排除掉已发送的
-->
<select id="getNewsToSendBySetIdAndAdviser" parameterType="map" resultMap="BaseResultMap">
SELECT
<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
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},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment