Merge branch 'wyp/0225-videoAuditTimeFilter' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/longArticle/ArticleAuditMapper.java

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.mapper.longArticle;
 
+import com.tzld.longarticle.recommend.server.model.param.ListItemFilterOrderParam;
 import com.tzld.longarticle.recommend.server.model.param.videoAudit.ArticleTitleUpdateParam;
 import com.tzld.longarticle.recommend.server.model.param.videoAudit.VideoTitleUpdateParam;
 import com.tzld.longarticle.recommend.server.model.vo.ArticleVideoAuditListVO;
@@ -11,11 +12,13 @@ import java.util.List;
 public interface ArticleAuditMapper {
 
     int articleVideoAuditListCount(List<String> contentId, List<Integer> status,
-                                   List<String> title, List<String> auditAccount, List<String> producePlanIds);
+                                   List<String> title, List<String> auditAccount, List<String> producePlanIds,
+                                   ListItemFilterOrderParam auditTimestamp);
 
     List<ArticleVideoAuditListVO> articleVideoAuditList(List<String> contentId, List<Integer> status,
                                                         List<String> title, List<String> auditAccount,
                                                         List<String> producePlanIds,
+                                                        ListItemFilterOrderParam auditTimestamp,
                                                         int offset, Integer pageSize, String poolLevelDesc);
 
     ArticleVideoAuditListVO articleVideoAuditNext(List<String> contentId, List<Integer> status,

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/longArticle/VideoPoolAuditMapper.java

@@ -1,6 +1,7 @@
 package com.tzld.longarticle.recommend.server.mapper.longArticle;
 
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.PublishSingleVideoSource;
+import com.tzld.longarticle.recommend.server.model.param.ListItemFilterOrderParam;
 import com.tzld.longarticle.recommend.server.model.param.videoAudit.ArticleTitleUpdateParam;
 import com.tzld.longarticle.recommend.server.model.param.videoAudit.VideoTitleUpdateParam;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,11 +12,13 @@ import java.util.List;
 public interface VideoPoolAuditMapper {
 
     int articleVideoAuditListCount(List<String> contentId, List<Integer> status,
-                                   List<String> title, List<String> auditAccount, List<Integer> flowPoolLevels);
+                                   List<String> title, List<String> auditAccount, List<Integer> flowPoolLevels,
+                                   ListItemFilterOrderParam auditTimestamp);
 
     List<PublishSingleVideoSource> articleVideoAuditList(List<String> contentId, List<Integer> status,
                                                          List<String> title, List<String> auditAccount,
                                                          List<Integer> flowPoolLevels,
+                                                         ListItemFilterOrderParam auditTimestamp,
                                                          int offset, Integer pageSize, String poolLevelDesc);
 
     PublishSingleVideoSource articleVideoAuditNext(List<String> contentId, List<Integer> status,

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/param/ListItemFilterOrderParam.java

@@ -0,0 +1,33 @@
+package com.tzld.longarticle.recommend.server.model.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ListItemFilterOrderParam {
+
+    // 列表名
+    private String listName;
+    // 数据项
+    private String itemName;
+    // 渠道
+    private Integer channel;
+    // 模态（2-图文，3-长文，4-视频）
+    private Integer modal;
+    // 监控类型
+    private Integer type;
+    // 动作计划类型
+    private Integer planType;
+    // 选择的值
+    private List<String> selectValues;
+    // 条件操作符（大于/等于/小于/介于/开头是/结尾是/包含/不包含/早于/晚于）
+    private String conditionOperator;
+    // 条件值1
+    private String conditionValue1;
+    // 条件值2
+    private String conditionValue2;
+    // 排序方式，asc/desc
+    private String orderType;
+
+}

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/param/videoAudit/ArticleVideoAuditListParam.java

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.model.param.videoAudit;
 
+import com.tzld.longarticle.recommend.server.model.param.ListItemFilterOrderParam;
 import lombok.Data;
 
 import java.util.List;
@@ -11,6 +12,7 @@ public class ArticleVideoAuditListParam {
     private List<Integer> status;
     private List<String> auditAccount;
     private List<String> sourceProducePlan;
+    private ListItemFilterOrderParam auditTimestamp;
 
     private Integer pageNum = 1;
     private Integer pageSize = 50;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/param/videoAudit/VideoPoolAuditListParam.java

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.model.param.videoAudit;
 
+import com.tzld.longarticle.recommend.server.model.param.ListItemFilterOrderParam;
 import lombok.Data;
 
 import java.util.List;
@@ -11,6 +12,7 @@ public class VideoPoolAuditListParam {
     private List<Integer> status;
     private List<String> auditAccount;
     private List<Integer> flowPoolLevel;
+    private ListItemFilterOrderParam auditTimestamp;
 
     private Integer pageNum = 1;
     private Integer pageSize = 50;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticleVideoAuditService.java

@@ -72,10 +72,10 @@ public class ArticleVideoAuditService {
     public Page<ArticleVideoAuditListVO> list(ArticleVideoAuditListParam param) {
         int offset = (param.getPageNum() - 1) * param.getPageSize();
         int count = articleAuditMapper.articleVideoAuditListCount(param.getContentId(), param.getStatus(),
-                param.getTitle(), param.getAuditAccount(), param.getSourceProducePlan());
+                param.getTitle(), param.getAuditAccount(), param.getSourceProducePlan(), param.getAuditTimestamp());
         List<ArticleVideoAuditListVO> list = articleAuditMapper.articleVideoAuditList(param.getContentId(),
                 param.getStatus(), param.getTitle(), param.getAuditAccount(), param.getSourceProducePlan()
-                , offset, param.getPageSize(), poolLevelDesc);
+                , param.getAuditTimestamp(), offset, param.getPageSize(), poolLevelDesc);
         buildArticleVideoAuditListVO(list);
         Page<ArticleVideoAuditListVO> page = new Page<>(param.getPageNum(), param.getPageSize());
         page.setTotalSize(count);

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/VideoPoolAuditService.java

@@ -53,10 +53,10 @@ public class VideoPoolAuditService {
     public Page<VideoPoolAuditListVO> list(VideoPoolAuditListParam param) {
         int offset = (param.getPageNum() - 1) * param.getPageSize();
         int count = videoPoolAuditMapper.articleVideoAuditListCount(param.getContentId(), param.getStatus(),
-                param.getTitle(), param.getAuditAccount(), param.getFlowPoolLevel());
+                param.getTitle(), param.getAuditAccount(), param.getFlowPoolLevel(), param.getAuditTimestamp());
         List<PublishSingleVideoSource> list = videoPoolAuditMapper.articleVideoAuditList(param.getContentId(),
                 param.getStatus(), param.getTitle(), param.getAuditAccount(), param.getFlowPoolLevel()
-                , offset, param.getPageSize(), poolLevelDesc);
+                , param.getAuditTimestamp(), offset, param.getPageSize(), poolLevelDesc);
         List<VideoPoolAuditListVO> result = buildVideoPoolAuditListVO(list);
         Page<VideoPoolAuditListVO> page = new Page<>(param.getPageNum(), param.getPageSize());
         page.setTotalSize(count);

long-article-recommend-service/src/main/resources/mapper/longArticle/ArticleAuditMapper.xml

@@ -37,6 +37,24 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="auditTimestamp!= null">
+                <if test="auditTimestamp.conditionOperator != null and auditTimestamp.conditionOperator != ''">
+                    <choose>
+                        <when test="auditTimestamp.conditionOperator == '早于'">
+                            and lata.audit_timestamp <![CDATA[ < ]]> #{auditTimestamp.conditionValue1}
+                        </when>
+                        <when test="auditTimestamp.conditionOperator == '等于'">
+                            and lata.audit_timestamp <![CDATA[ = ]]> #{auditTimestamp.conditionValue1}
+                        </when>
+                        <when test="auditTimestamp.conditionOperator == '晚于'">
+                            and lata.audit_timestamp <![CDATA[ > ]]> #{auditTimestamp.conditionValue1}
+                        </when>
+                        <when test="auditTimestamp.conditionOperator == '介于'">
+                            and lata.audit_timestamp BETWEEN #{auditTimestamp.conditionValue1} AND #{auditTimestamp.conditionValue2}
+                        </when>
+                    </choose>
+                </if>
+            </if>
         </where>
     </select>
 
@@ -77,11 +95,32 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="auditTimestamp!= null">
+                <if test="auditTimestamp.conditionOperator != null and auditTimestamp.conditionOperator != ''">
+                    <choose>
+                        <when test="auditTimestamp.conditionOperator == '早于'">
+                            and lata.audit_timestamp <![CDATA[ < ]]> #{auditTimestamp.conditionValue1}
+                        </when>
+                        <when test="auditTimestamp.conditionOperator == '等于'">
+                            and lata.audit_timestamp <![CDATA[ = ]]> #{auditTimestamp.conditionValue1}
+                        </when>
+                        <when test="auditTimestamp.conditionOperator == '晚于'">
+                            and lata.audit_timestamp <![CDATA[ > ]]> #{auditTimestamp.conditionValue1}
+                        </when>
+                        <when test="auditTimestamp.conditionOperator == '介于'">
+                            and lata.audit_timestamp BETWEEN #{auditTimestamp.conditionValue1} AND #{auditTimestamp.conditionValue2}
+                        </when>
+                    </choose>
+                </if>
+            </if>
         </where>
         <choose>
             <when test="poolLevelDesc != null and poolLevelDesc != ''">
                 order by lata.flow_pool_level ${poolLevelDesc}, lata.content_id desc
             </when>
+            <when test="auditTimestamp != null and auditTimestamp.orderType != null and auditTimestamp.orderType != ''">
+                order by lata.audit_timestamp ${auditTimestamp.orderType}
+            </when>
             <otherwise>
                 order by lata.content_id desc
             </otherwise>

long-article-recommend-service/src/main/resources/mapper/longArticle/VideoPoolAuditMapper.xml

@@ -36,6 +36,24 @@
                 #{item}
             </foreach>
         </if>
+        <if test="auditTimestamp!= null">
+            <if test="auditTimestamp.conditionOperator != null and auditTimestamp.conditionOperator != ''">
+                <choose>
+                    <when test="auditTimestamp.conditionOperator == '早于'">
+                        and video_pool_audit_timestamp <![CDATA[ < ]]> #{auditTimestamp.conditionValue1}
+                    </when>
+                    <when test="auditTimestamp.conditionOperator == '等于'">
+                        and video_pool_audit_timestamp <![CDATA[ = ]]> #{auditTimestamp.conditionValue1}
+                    </when>
+                    <when test="auditTimestamp.conditionOperator == '晚于'">
+                        and video_pool_audit_timestamp <![CDATA[ > ]]> #{auditTimestamp.conditionValue1}
+                    </when>
+                    <when test="auditTimestamp.conditionOperator == '介于'">
+                        and video_pool_audit_timestamp BETWEEN #{auditTimestamp.conditionValue1} AND #{auditTimestamp.conditionValue2}
+                    </when>
+                </choose>
+            </if>
+        </if>
     </select>
 
     <select id="articleVideoAuditList"
@@ -73,10 +91,31 @@
                 #{item}
             </foreach>
         </if>
+        <if test="auditTimestamp!= null">
+            <if test="auditTimestamp.conditionOperator != null and auditTimestamp.conditionOperator != ''">
+                <choose>
+                    <when test="auditTimestamp.conditionOperator == '早于'">
+                        and video_pool_audit_timestamp <![CDATA[ < ]]> #{auditTimestamp.conditionValue1}
+                    </when>
+                    <when test="auditTimestamp.conditionOperator == '等于'">
+                        and video_pool_audit_timestamp <![CDATA[ = ]]> #{auditTimestamp.conditionValue1}
+                    </when>
+                    <when test="auditTimestamp.conditionOperator == '晚于'">
+                        and video_pool_audit_timestamp <![CDATA[ > ]]> #{auditTimestamp.conditionValue1}
+                    </when>
+                    <when test="auditTimestamp.conditionOperator == '介于'">
+                        and video_pool_audit_timestamp BETWEEN #{auditTimestamp.conditionValue1} AND #{auditTimestamp.conditionValue2}
+                    </when>
+                </choose>
+            </if>
+        </if>
         <choose>
             <when test="poolLevelDesc != null and poolLevelDesc != ''">
                 order by flow_pool_level ${poolLevelDesc}, content_trace_id desc
             </when>
+            <when test="auditTimestamp != null and auditTimestamp.orderType != null and auditTimestamp.orderType != ''">
+                order by video_pool_audit_timestamp ${auditTimestamp.orderType}
+            </when>
             <otherwise>
                 order by content_trace_id desc
             </otherwise>