Browse Source

修改接口

xueyiming 6 months ago
parent
commit
a0eedb0e78

+ 2 - 2
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/controller/AdBaseVideoController.java

@@ -21,8 +21,8 @@ public class AdBaseVideoController {
     private AdBaseVideoService adBaseVideoService;
 
     @PostMapping("/add")
-    public CommonResponse<Void> addAdBaseVideo(@RequestBody List<AdBaseVideoVo> baseVideoList) {
-        return adBaseVideoService.addAdBaseVideo(baseVideoList);
+    public CommonResponse<Void> addAdBaseVideo(@RequestBody List<Long> videoIds) {
+        return adBaseVideoService.addAdBaseVideo(videoIds);
     }
 
     @GetMapping("/get")

+ 2 - 3
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/controller/AdVideoController.java

@@ -32,9 +32,8 @@ public class AdVideoController {
 
     @GetMapping("/get")
     public CommonResponse<Page<AdVideoVo>> getAdVideoList(@RequestParam(defaultValue = "1") Integer pageNum,
-                                                          @RequestParam(defaultValue = "10") Integer pageSize,
-                                                          @RequestParam(required = false) List<Integer> status) {
-        return adVideoService.getAdVideoList(pageNum, pageSize, status);
+                                                          @RequestParam(defaultValue = "10") Integer pageSize) {
+        return adVideoService.getAdVideoList(pageNum, pageSize);
     }
 
 //    @GetMapping("/status")

+ 55 - 0
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdBaseVideo.java

@@ -11,6 +11,16 @@ public class AdBaseVideo {
 
     private String videoCover;
 
+    private String videoTitle;
+
+    private Integer auditStatus;
+
+    private Integer appAuditStatus;
+
+    private Integer recommendStatus;
+
+    private Integer appRecommendStatus;
+
     private Integer status;
 
     private Integer isDelete;
@@ -51,6 +61,46 @@ public class AdBaseVideo {
         this.videoCover = videoCover;
     }
 
+    public String getVideoTitle() {
+        return videoTitle;
+    }
+
+    public void setVideoTitle(String videoTitle) {
+        this.videoTitle = videoTitle;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public Integer getAppAuditStatus() {
+        return appAuditStatus;
+    }
+
+    public void setAppAuditStatus(Integer appAuditStatus) {
+        this.appAuditStatus = appAuditStatus;
+    }
+
+    public Integer getRecommendStatus() {
+        return recommendStatus;
+    }
+
+    public void setRecommendStatus(Integer recommendStatus) {
+        this.recommendStatus = recommendStatus;
+    }
+
+    public Integer getAppRecommendStatus() {
+        return appRecommendStatus;
+    }
+
+    public void setAppRecommendStatus(Integer appRecommendStatus) {
+        this.appRecommendStatus = appRecommendStatus;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -93,6 +143,11 @@ public class AdBaseVideo {
         sb.append(", videoId=").append(videoId);
         sb.append(", videoPath=").append(videoPath);
         sb.append(", videoCover=").append(videoCover);
+        sb.append(", videoTitle=").append(videoTitle);
+        sb.append(", auditStatus=").append(auditStatus);
+        sb.append(", appAuditStatus=").append(appAuditStatus);
+        sb.append(", recommendStatus=").append(recommendStatus);
+        sb.append(", appRecommendStatus=").append(appRecommendStatus);
         sb.append(", status=").append(status);
         sb.append(", isDelete=").append(isDelete);
         sb.append(", createTime=").append(createTime);

+ 310 - 0
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdBaseVideoExample.java

@@ -376,6 +376,316 @@ public class AdBaseVideoExample {
             return (Criteria) this;
         }
 
+        public Criteria andVideoTitleIsNull() {
+            addCriterion("video_title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleIsNotNull() {
+            addCriterion("video_title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleEqualTo(String value) {
+            addCriterion("video_title =", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleNotEqualTo(String value) {
+            addCriterion("video_title <>", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleGreaterThan(String value) {
+            addCriterion("video_title >", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("video_title >=", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleLessThan(String value) {
+            addCriterion("video_title <", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleLessThanOrEqualTo(String value) {
+            addCriterion("video_title <=", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleLike(String value) {
+            addCriterion("video_title like", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleNotLike(String value) {
+            addCriterion("video_title not like", value, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleIn(List<String> values) {
+            addCriterion("video_title in", values, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleNotIn(List<String> values) {
+            addCriterion("video_title not in", values, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleBetween(String value1, String value2) {
+            addCriterion("video_title between", value1, value2, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleNotBetween(String value1, String value2) {
+            addCriterion("video_title not between", value1, value2, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIsNull() {
+            addCriterion("audit_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIsNotNull() {
+            addCriterion("audit_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusEqualTo(Integer value) {
+            addCriterion("audit_status =", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotEqualTo(Integer value) {
+            addCriterion("audit_status <>", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusGreaterThan(Integer value) {
+            addCriterion("audit_status >", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("audit_status >=", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusLessThan(Integer value) {
+            addCriterion("audit_status <", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("audit_status <=", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIn(List<Integer> values) {
+            addCriterion("audit_status in", values, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotIn(List<Integer> values) {
+            addCriterion("audit_status not in", values, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusBetween(Integer value1, Integer value2) {
+            addCriterion("audit_status between", value1, value2, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("audit_status not between", value1, value2, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusIsNull() {
+            addCriterion("app_audit_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusIsNotNull() {
+            addCriterion("app_audit_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusEqualTo(Integer value) {
+            addCriterion("app_audit_status =", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusNotEqualTo(Integer value) {
+            addCriterion("app_audit_status <>", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusGreaterThan(Integer value) {
+            addCriterion("app_audit_status >", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("app_audit_status >=", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusLessThan(Integer value) {
+            addCriterion("app_audit_status <", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("app_audit_status <=", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusIn(List<Integer> values) {
+            addCriterion("app_audit_status in", values, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusNotIn(List<Integer> values) {
+            addCriterion("app_audit_status not in", values, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusBetween(Integer value1, Integer value2) {
+            addCriterion("app_audit_status between", value1, value2, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("app_audit_status not between", value1, value2, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusIsNull() {
+            addCriterion("recommend_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusIsNotNull() {
+            addCriterion("recommend_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusEqualTo(Integer value) {
+            addCriterion("recommend_status =", value, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusNotEqualTo(Integer value) {
+            addCriterion("recommend_status <>", value, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusGreaterThan(Integer value) {
+            addCriterion("recommend_status >", value, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("recommend_status >=", value, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusLessThan(Integer value) {
+            addCriterion("recommend_status <", value, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("recommend_status <=", value, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusIn(List<Integer> values) {
+            addCriterion("recommend_status in", values, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusNotIn(List<Integer> values) {
+            addCriterion("recommend_status not in", values, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusBetween(Integer value1, Integer value2) {
+            addCriterion("recommend_status between", value1, value2, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("recommend_status not between", value1, value2, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusIsNull() {
+            addCriterion("app_recommend_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusIsNotNull() {
+            addCriterion("app_recommend_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusEqualTo(Integer value) {
+            addCriterion("app_recommend_status =", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusNotEqualTo(Integer value) {
+            addCriterion("app_recommend_status <>", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusGreaterThan(Integer value) {
+            addCriterion("app_recommend_status >", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("app_recommend_status >=", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusLessThan(Integer value) {
+            addCriterion("app_recommend_status <", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("app_recommend_status <=", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusIn(List<Integer> values) {
+            addCriterion("app_recommend_status in", values, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusNotIn(List<Integer> values) {
+            addCriterion("app_recommend_status not in", values, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusBetween(Integer value1, Integer value2) {
+            addCriterion("app_recommend_status between", value1, value2, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("app_recommend_status not between", value1, value2, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
         public Criteria andStatusIsNull() {
             addCriterion("`status` is null");
             return (Criteria) this;

+ 55 - 11
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdVideo.java

@@ -11,9 +11,17 @@ public class AdVideo {
 
     private String videoCover;
 
-    private Integer status;
+    private String videoTitle;
+
+    private Integer auditStatus;
+
+    private Integer appAuditStatus;
+
+    private Integer recommendStatus;
 
-    private Integer retryCount;
+    private Integer appRecommendStatus;
+
+    private Integer status;
 
     private Integer isDelete;
 
@@ -53,20 +61,52 @@ public class AdVideo {
         this.videoCover = videoCover;
     }
 
-    public Integer getStatus() {
-        return status;
+    public String getVideoTitle() {
+        return videoTitle;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setVideoTitle(String videoTitle) {
+        this.videoTitle = videoTitle;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public Integer getAppAuditStatus() {
+        return appAuditStatus;
+    }
+
+    public void setAppAuditStatus(Integer appAuditStatus) {
+        this.appAuditStatus = appAuditStatus;
+    }
+
+    public Integer getRecommendStatus() {
+        return recommendStatus;
+    }
+
+    public void setRecommendStatus(Integer recommendStatus) {
+        this.recommendStatus = recommendStatus;
     }
 
-    public Integer getRetryCount() {
-        return retryCount;
+    public Integer getAppRecommendStatus() {
+        return appRecommendStatus;
     }
 
-    public void setRetryCount(Integer retryCount) {
-        this.retryCount = retryCount;
+    public void setAppRecommendStatus(Integer appRecommendStatus) {
+        this.appRecommendStatus = appRecommendStatus;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
     public Integer getIsDelete() {
@@ -103,8 +143,12 @@ public class AdVideo {
         sb.append(", videoId=").append(videoId);
         sb.append(", videoPath=").append(videoPath);
         sb.append(", videoCover=").append(videoCover);
+        sb.append(", videoTitle=").append(videoTitle);
+        sb.append(", auditStatus=").append(auditStatus);
+        sb.append(", appAuditStatus=").append(appAuditStatus);
+        sb.append(", recommendStatus=").append(recommendStatus);
+        sb.append(", appRecommendStatus=").append(appRecommendStatus);
         sb.append(", status=").append(status);
-        sb.append(", retryCount=").append(retryCount);
         sb.append(", isDelete=").append(isDelete);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);

+ 298 - 48
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdVideoExample.java

@@ -376,123 +376,373 @@ public class AdVideoExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("`status` is null");
+        public Criteria andVideoTitleIsNull() {
+            addCriterion("video_title is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("`status` is not null");
+        public Criteria andVideoTitleIsNotNull() {
+            addCriterion("video_title is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(Integer value) {
-            addCriterion("`status` =", value, "status");
+        public Criteria andVideoTitleEqualTo(String value) {
+            addCriterion("video_title =", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(Integer value) {
-            addCriterion("`status` <>", value, "status");
+        public Criteria andVideoTitleNotEqualTo(String value) {
+            addCriterion("video_title <>", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(Integer value) {
-            addCriterion("`status` >", value, "status");
+        public Criteria andVideoTitleGreaterThan(String value) {
+            addCriterion("video_title >", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("`status` >=", value, "status");
+        public Criteria andVideoTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("video_title >=", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(Integer value) {
-            addCriterion("`status` <", value, "status");
+        public Criteria andVideoTitleLessThan(String value) {
+            addCriterion("video_title <", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("`status` <=", value, "status");
+        public Criteria andVideoTitleLessThanOrEqualTo(String value) {
+            addCriterion("video_title <=", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<Integer> values) {
-            addCriterion("`status` in", values, "status");
+        public Criteria andVideoTitleLike(String value) {
+            addCriterion("video_title like", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<Integer> values) {
-            addCriterion("`status` not in", values, "status");
+        public Criteria andVideoTitleNotLike(String value) {
+            addCriterion("video_title not like", value, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(Integer value1, Integer value2) {
-            addCriterion("`status` between", value1, value2, "status");
+        public Criteria andVideoTitleIn(List<String> values) {
+            addCriterion("video_title in", values, "videoTitle");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("`status` not between", value1, value2, "status");
+        public Criteria andVideoTitleNotIn(List<String> values) {
+            addCriterion("video_title not in", values, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleBetween(String value1, String value2) {
+            addCriterion("video_title between", value1, value2, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoTitleNotBetween(String value1, String value2) {
+            addCriterion("video_title not between", value1, value2, "videoTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIsNull() {
+            addCriterion("audit_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIsNotNull() {
+            addCriterion("audit_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusEqualTo(Integer value) {
+            addCriterion("audit_status =", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotEqualTo(Integer value) {
+            addCriterion("audit_status <>", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusGreaterThan(Integer value) {
+            addCriterion("audit_status >", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("audit_status >=", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusLessThan(Integer value) {
+            addCriterion("audit_status <", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("audit_status <=", value, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusIn(List<Integer> values) {
+            addCriterion("audit_status in", values, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotIn(List<Integer> values) {
+            addCriterion("audit_status not in", values, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusBetween(Integer value1, Integer value2) {
+            addCriterion("audit_status between", value1, value2, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("audit_status not between", value1, value2, "auditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusIsNull() {
+            addCriterion("app_audit_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusIsNotNull() {
+            addCriterion("app_audit_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusEqualTo(Integer value) {
+            addCriterion("app_audit_status =", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusNotEqualTo(Integer value) {
+            addCriterion("app_audit_status <>", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusGreaterThan(Integer value) {
+            addCriterion("app_audit_status >", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("app_audit_status >=", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusLessThan(Integer value) {
+            addCriterion("app_audit_status <", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("app_audit_status <=", value, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusIn(List<Integer> values) {
+            addCriterion("app_audit_status in", values, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusNotIn(List<Integer> values) {
+            addCriterion("app_audit_status not in", values, "appAuditStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppAuditStatusBetween(Integer value1, Integer value2) {
+            addCriterion("app_audit_status between", value1, value2, "appAuditStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountIsNull() {
-            addCriterion("retry_count is null");
+        public Criteria andAppAuditStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("app_audit_status not between", value1, value2, "appAuditStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountIsNotNull() {
-            addCriterion("retry_count is not null");
+        public Criteria andRecommendStatusIsNull() {
+            addCriterion("recommend_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountEqualTo(Integer value) {
-            addCriterion("retry_count =", value, "retryCount");
+        public Criteria andRecommendStatusIsNotNull() {
+            addCriterion("recommend_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountNotEqualTo(Integer value) {
-            addCriterion("retry_count <>", value, "retryCount");
+        public Criteria andRecommendStatusEqualTo(Integer value) {
+            addCriterion("recommend_status =", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountGreaterThan(Integer value) {
-            addCriterion("retry_count >", value, "retryCount");
+        public Criteria andRecommendStatusNotEqualTo(Integer value) {
+            addCriterion("recommend_status <>", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountGreaterThanOrEqualTo(Integer value) {
-            addCriterion("retry_count >=", value, "retryCount");
+        public Criteria andRecommendStatusGreaterThan(Integer value) {
+            addCriterion("recommend_status >", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountLessThan(Integer value) {
-            addCriterion("retry_count <", value, "retryCount");
+        public Criteria andRecommendStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("recommend_status >=", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountLessThanOrEqualTo(Integer value) {
-            addCriterion("retry_count <=", value, "retryCount");
+        public Criteria andRecommendStatusLessThan(Integer value) {
+            addCriterion("recommend_status <", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountIn(List<Integer> values) {
-            addCriterion("retry_count in", values, "retryCount");
+        public Criteria andRecommendStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("recommend_status <=", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountNotIn(List<Integer> values) {
-            addCriterion("retry_count not in", values, "retryCount");
+        public Criteria andRecommendStatusIn(List<Integer> values) {
+            addCriterion("recommend_status in", values, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountBetween(Integer value1, Integer value2) {
-            addCriterion("retry_count between", value1, value2, "retryCount");
+        public Criteria andRecommendStatusNotIn(List<Integer> values) {
+            addCriterion("recommend_status not in", values, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRetryCountNotBetween(Integer value1, Integer value2) {
-            addCriterion("retry_count not between", value1, value2, "retryCount");
+        public Criteria andRecommendStatusBetween(Integer value1, Integer value2) {
+            addCriterion("recommend_status between", value1, value2, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecommendStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("recommend_status not between", value1, value2, "recommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusIsNull() {
+            addCriterion("app_recommend_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusIsNotNull() {
+            addCriterion("app_recommend_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusEqualTo(Integer value) {
+            addCriterion("app_recommend_status =", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusNotEqualTo(Integer value) {
+            addCriterion("app_recommend_status <>", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusGreaterThan(Integer value) {
+            addCriterion("app_recommend_status >", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("app_recommend_status >=", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusLessThan(Integer value) {
+            addCriterion("app_recommend_status <", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("app_recommend_status <=", value, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusIn(List<Integer> values) {
+            addCriterion("app_recommend_status in", values, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusNotIn(List<Integer> values) {
+            addCriterion("app_recommend_status not in", values, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusBetween(Integer value1, Integer value2) {
+            addCriterion("app_recommend_status between", value1, value2, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppRecommendStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("app_recommend_status not between", value1, value2, "appRecommendStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
             return (Criteria) this;
         }
 

+ 9 - 1
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/vo/AdBaseVideoVo.java

@@ -15,7 +15,15 @@ public class AdBaseVideoVo {
 
     private String videoCover;
 
-    private String category;
+    private String videoTitle;
+
+    private Integer auditStatus;
+
+    private Integer appAuditStatus;
+
+    private Integer recommendStatus;
+
+    private Integer appRecommendStatus;
 
     private Integer status;
 

+ 7 - 3
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/vo/AdVideoVo.java

@@ -17,11 +17,15 @@ public class AdVideoVo {
 
     private String videoCover;
 
-    private String category;
+    private String videoTitle;
 
-    private String copywriter;
+    private Integer auditStatus;
 
-    private String caption;
+    private Integer appAuditStatus;
+
+    private Integer recommendStatus;
+
+    private Integer appRecommendStatus;
 
     private Integer status;
 

+ 1 - 1
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/AdBaseVideoService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface AdBaseVideoService {
 
-    CommonResponse<Void> addAdBaseVideo(List<AdBaseVideoVo> baseVideoList);
+    CommonResponse<Void> addAdBaseVideo(List<Long> videoIds);
 
     CommonResponse<Page<AdBaseVideoVo>> getAdBaseVideo(Integer pageNum, Integer pageSize, List<Integer> status);
 

+ 1 - 1
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/AdVideoService.java

@@ -14,7 +14,7 @@ public interface AdVideoService {
 
     void addAdVideo(AdBaseVideo adBaseVideo);
 
-    CommonResponse<Page<AdVideoVo>> getAdVideoList(Integer pageNum, Integer pageSize, List<Integer> status);
+    CommonResponse<Page<AdVideoVo>> getAdVideoList(Integer pageNum, Integer pageSize);
 
     void buildVideoImage(AdVideo adVideo);
 

+ 17 - 11
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/impl/AdBaseVideoServiceImpl.java

@@ -42,13 +42,16 @@ public class AdBaseVideoServiceImpl implements AdBaseVideoService {
 
 
     @Override
-    public CommonResponse<Void> addAdBaseVideo(List<AdBaseVideoVo> baseVideoList) {
-        if (CollectionUtils.isEmpty(baseVideoList)) {
+    public CommonResponse<Void> addAdBaseVideo(List<Long> videoIds) {
+        if (CollectionUtils.isEmpty(videoIds)) {
             return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误,添加列表不能为空");
         }
-        for (AdBaseVideoVo adBaseVideoVo : baseVideoList) {
-            AdBaseVideo adBaseVideo = new AdBaseVideo();
-            BeanUtils.copyProperties(adBaseVideoVo, adBaseVideo);
+        Map<Long, AdBaseVideo> videoDetails = getVideoDetail(videoIds);
+        for (Long videoId : videoIds) {
+            AdBaseVideo adBaseVideo = videoDetails.get(videoId);
+            if (adBaseVideo == null) {
+                continue;
+            }
             adBaseVideo.setStatus(AdBaseVideoStatusEnum.FIRST_VERIFY_SUCCESS.getStatus());
             adBaseVideoMapper.insertSelective(adBaseVideo);
         }
@@ -142,7 +145,7 @@ public class AdBaseVideoServiceImpl implements AdBaseVideoService {
         adBaseVideoMapper.updateByPrimaryKeySelective(updateAdBaseVideo);
     }
 
-    public Map<Long, AdBaseVideo> getVideoDetail(Set<Long> videoIdList) {
+    public Map<Long, AdBaseVideo> getVideoDetail(List<Long> videoIdList) {
         try {
             Map<Long, AdBaseVideo> map = new HashMap<>();
             JSONObject params = new JSONObject();
@@ -154,11 +157,14 @@ public class AdBaseVideoServiceImpl implements AdBaseVideoService {
                 AdBaseVideo adBaseVideo = new AdBaseVideo();
                 JSONObject jsonObject = data.getJSONObject(i);
                 Long videoId = jsonObject.getLong("id");
-
-                String coverImgPath = jsonObject.getJSONObject("coverImg").getString("coverImgPath");
-                String title = jsonObject.getString("title");
-                adBaseVideo.setVideoCover(coverImgPath);
-
+                adBaseVideo.setVideoId(videoId);
+                adBaseVideo.setVideoPath(jsonObject.getString("videoPath"));
+                adBaseVideo.setVideoCover(jsonObject.getJSONObject("coverImg").getString("coverImgPath"));
+                adBaseVideo.setVideoTitle(jsonObject.getString("title"));
+                adBaseVideo.setAuditStatus(jsonObject.getInteger("auditStatus"));
+                adBaseVideo.setAppAuditStatus(jsonObject.getInteger("appAuditStatus"));
+                adBaseVideo.setRecommendStatus(jsonObject.getInteger("recommendStatus"));
+                adBaseVideo.setAppRecommendStatus(jsonObject.getInteger("appRecommendStatus"));
                 map.put(videoId, adBaseVideo);
             }
             return map;

+ 5 - 18
tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/impl/AdVideoServiceImpl.java

@@ -57,23 +57,20 @@ public class AdVideoServiceImpl implements AdVideoService {
 
     public void addAdVideo(AdBaseVideo adBaseVideo) {
         AdVideo adVideo = new AdVideo();
-        adVideo.setVideoId(adBaseVideo.getVideoId());
-        adVideo.setVideoPath(adBaseVideo.getVideoPath());
-        adVideo.setVideoCover(adBaseVideo.getVideoCover());
+        BeanUtils.copyProperties(adBaseVideo, adVideo);
+        adVideo.setId(null);
+        adVideo.setStatus(0);
         adVideoMapper.insertSelective(adVideo);
         buildVideoImage(adVideo);
     }
 
 
     @Override
-    public CommonResponse<Page<AdVideoVo>> getAdVideoList(Integer pageNum, Integer pageSize, List<Integer> status) {
+    public CommonResponse<Page<AdVideoVo>> getAdVideoList(Integer pageNum, Integer pageSize) {
         Page<AdVideoVo> page = new Page<>();
         page.setCurrentPage(pageNum);
         page.setPageSize(pageSize);
         AdVideoExample example = new AdVideoExample();
-        if (!CollectionUtils.isEmpty(status)) {
-            example.createCriteria().andStatusIn(status);
-        }
         example.setOrderByClause("create_time desc");
         example.setPage(page);
         List<AdVideo> adVideos = adVideoMapper.selectByExample(example);
@@ -150,10 +147,7 @@ public class AdVideoServiceImpl implements AdVideoService {
         if (sum > 0) {
             updateAdVideoStatus(adVideo.getId(), AdVideoStatusEnum.CROP_SUCCESS.getStatus());
         } else {
-            updateAdVideoRetry(adVideo);
-            if (adVideo.getRetryCount() >= 2) {
-                updateAdVideoStatus(adVideo.getId(), AdVideoStatusEnum.CROP_FAIL.getStatus());
-            }
+            updateAdVideoStatus(adVideo.getId(), AdVideoStatusEnum.CROP_FAIL.getStatus());
         }
         Path pathToDelete = Paths.get(imageFolder);
         try {
@@ -228,12 +222,5 @@ public class AdVideoServiceImpl implements AdVideoService {
         adVideoMapper.updateByPrimaryKeySelective(updateAdVideo);
     }
 
-    private void updateAdVideoRetry(AdVideo adVideo) {
-        AdVideo updateAdVideo = new AdVideo();
-        updateAdVideo.setId(adVideo.getId());
-        updateAdVideo.setRetryCount(adVideo.getRetryCount() + 1);
-        adVideoMapper.updateByPrimaryKeySelective(updateAdVideo);
-    }
-
 
 }

+ 85 - 5
tencent-ad-server/src/main/resources/mapper/AdBaseVideoMapper.xml

@@ -6,6 +6,11 @@
     <result column="video_id" jdbcType="BIGINT" property="videoId" />
     <result column="video_path" jdbcType="VARCHAR" property="videoPath" />
     <result column="video_cover" jdbcType="VARCHAR" property="videoCover" />
+    <result column="video_title" jdbcType="VARCHAR" property="videoTitle" />
+    <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
+    <result column="app_audit_status" jdbcType="INTEGER" property="appAuditStatus" />
+    <result column="recommend_status" jdbcType="INTEGER" property="recommendStatus" />
+    <result column="app_recommend_status" jdbcType="INTEGER" property="appRecommendStatus" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -70,7 +75,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, video_id, video_path, video_cover, `status`, is_delete, create_time, update_time
+    id, video_id, video_path, video_cover, video_title, audit_status, app_audit_status, 
+    recommend_status, app_recommend_status, `status`, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdBaseVideoExample" resultMap="BaseResultMap">
     select
@@ -107,11 +113,15 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdBaseVideo">
     insert into ad_base_video (id, video_id, video_path, 
-      video_cover, `status`, is_delete, 
-      create_time, update_time)
+      video_cover, video_title, audit_status, 
+      app_audit_status, recommend_status, app_recommend_status, 
+      `status`, is_delete, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{videoId,jdbcType=BIGINT}, #{videoPath,jdbcType=VARCHAR}, 
-      #{videoCover,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{isDelete,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{videoCover,jdbcType=VARCHAR}, #{videoTitle,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, 
+      #{appAuditStatus,jdbcType=INTEGER}, #{recommendStatus,jdbcType=INTEGER}, #{appRecommendStatus,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER}, #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdBaseVideo">
     insert into ad_base_video
@@ -128,6 +138,21 @@
       <if test="videoCover != null">
         video_cover,
       </if>
+      <if test="videoTitle != null">
+        video_title,
+      </if>
+      <if test="auditStatus != null">
+        audit_status,
+      </if>
+      <if test="appAuditStatus != null">
+        app_audit_status,
+      </if>
+      <if test="recommendStatus != null">
+        recommend_status,
+      </if>
+      <if test="appRecommendStatus != null">
+        app_recommend_status,
+      </if>
       <if test="status != null">
         `status`,
       </if>
@@ -154,6 +179,21 @@
       <if test="videoCover != null">
         #{videoCover,jdbcType=VARCHAR},
       </if>
+      <if test="videoTitle != null">
+        #{videoTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null">
+        #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appAuditStatus != null">
+        #{appAuditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="recommendStatus != null">
+        #{recommendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appRecommendStatus != null">
+        #{appRecommendStatus,jdbcType=INTEGER},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -189,6 +229,21 @@
       <if test="record.videoCover != null">
         video_cover = #{record.videoCover,jdbcType=VARCHAR},
       </if>
+      <if test="record.videoTitle != null">
+        video_title = #{record.videoTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditStatus != null">
+        audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.appAuditStatus != null">
+        app_audit_status = #{record.appAuditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.recommendStatus != null">
+        recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.appRecommendStatus != null">
+        app_recommend_status = #{record.appRecommendStatus,jdbcType=INTEGER},
+      </if>
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=INTEGER},
       </if>
@@ -212,6 +267,11 @@
       video_id = #{record.videoId,jdbcType=BIGINT},
       video_path = #{record.videoPath,jdbcType=VARCHAR},
       video_cover = #{record.videoCover,jdbcType=VARCHAR},
+      video_title = #{record.videoTitle,jdbcType=VARCHAR},
+      audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      app_audit_status = #{record.appAuditStatus,jdbcType=INTEGER},
+      recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
+      app_recommend_status = #{record.appRecommendStatus,jdbcType=INTEGER},
       `status` = #{record.status,jdbcType=INTEGER},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -232,6 +292,21 @@
       <if test="videoCover != null">
         video_cover = #{videoCover,jdbcType=VARCHAR},
       </if>
+      <if test="videoTitle != null">
+        video_title = #{videoTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null">
+        audit_status = #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appAuditStatus != null">
+        app_audit_status = #{appAuditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="recommendStatus != null">
+        recommend_status = #{recommendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appRecommendStatus != null">
+        app_recommend_status = #{appRecommendStatus,jdbcType=INTEGER},
+      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
@@ -252,6 +327,11 @@
     set video_id = #{videoId,jdbcType=BIGINT},
       video_path = #{videoPath,jdbcType=VARCHAR},
       video_cover = #{videoCover,jdbcType=VARCHAR},
+      video_title = #{videoTitle,jdbcType=VARCHAR},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      app_audit_status = #{appAuditStatus,jdbcType=INTEGER},
+      recommend_status = #{recommendStatus,jdbcType=INTEGER},
+      app_recommend_status = #{appRecommendStatus,jdbcType=INTEGER},
       `status` = #{status,jdbcType=INTEGER},
       is_delete = #{isDelete,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},

+ 85 - 23
tencent-ad-server/src/main/resources/mapper/AdVideoMapper.xml

@@ -6,8 +6,12 @@
     <result column="video_id" jdbcType="BIGINT" property="videoId" />
     <result column="video_path" jdbcType="VARCHAR" property="videoPath" />
     <result column="video_cover" jdbcType="VARCHAR" property="videoCover" />
+    <result column="video_title" jdbcType="VARCHAR" property="videoTitle" />
+    <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
+    <result column="app_audit_status" jdbcType="INTEGER" property="appAuditStatus" />
+    <result column="recommend_status" jdbcType="INTEGER" property="recommendStatus" />
+    <result column="app_recommend_status" jdbcType="INTEGER" property="appRecommendStatus" />
     <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="retry_count" jdbcType="INTEGER" property="retryCount" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -71,8 +75,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, video_id, video_path, video_cover, `status`, retry_count, is_delete, create_time, 
-    update_time
+    id, video_id, video_path, video_cover, video_title, audit_status, app_audit_status, 
+    recommend_status, app_recommend_status, `status`, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoExample" resultMap="BaseResultMap">
     select
@@ -109,13 +113,15 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideo">
     insert into ad_video (id, video_id, video_path, 
-      video_cover, `status`, retry_count, 
-      is_delete, create_time, update_time
-      )
+      video_cover, video_title, audit_status, 
+      app_audit_status, recommend_status, app_recommend_status, 
+      `status`, is_delete, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{videoId,jdbcType=BIGINT}, #{videoPath,jdbcType=VARCHAR}, 
-      #{videoCover,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{retryCount,jdbcType=INTEGER}, 
-      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{videoCover,jdbcType=VARCHAR}, #{videoTitle,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, 
+      #{appAuditStatus,jdbcType=INTEGER}, #{recommendStatus,jdbcType=INTEGER}, #{appRecommendStatus,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER}, #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideo" useGeneratedKeys="true" keyProperty="id">
     insert into ad_video
@@ -132,12 +138,24 @@
       <if test="videoCover != null">
         video_cover,
       </if>
+      <if test="videoTitle != null">
+        video_title,
+      </if>
+      <if test="auditStatus != null">
+        audit_status,
+      </if>
+      <if test="appAuditStatus != null">
+        app_audit_status,
+      </if>
+      <if test="recommendStatus != null">
+        recommend_status,
+      </if>
+      <if test="appRecommendStatus != null">
+        app_recommend_status,
+      </if>
       <if test="status != null">
         `status`,
       </if>
-      <if test="retryCount != null">
-        retry_count,
-      </if>
       <if test="isDelete != null">
         is_delete,
       </if>
@@ -161,12 +179,24 @@
       <if test="videoCover != null">
         #{videoCover,jdbcType=VARCHAR},
       </if>
+      <if test="videoTitle != null">
+        #{videoTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null">
+        #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appAuditStatus != null">
+        #{appAuditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="recommendStatus != null">
+        #{recommendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appRecommendStatus != null">
+        #{appRecommendStatus,jdbcType=INTEGER},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
-      <if test="retryCount != null">
-        #{retryCount,jdbcType=INTEGER},
-      </if>
       <if test="isDelete != null">
         #{isDelete,jdbcType=INTEGER},
       </if>
@@ -202,12 +232,24 @@
       <if test="record.videoCover != null">
         video_cover = #{record.videoCover,jdbcType=VARCHAR},
       </if>
+      <if test="record.videoTitle != null">
+        video_title = #{record.videoTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditStatus != null">
+        audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.appAuditStatus != null">
+        app_audit_status = #{record.appAuditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.recommendStatus != null">
+        recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.appRecommendStatus != null">
+        app_recommend_status = #{record.appRecommendStatus,jdbcType=INTEGER},
+      </if>
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=INTEGER},
       </if>
-      <if test="record.retryCount != null">
-        retry_count = #{record.retryCount,jdbcType=INTEGER},
-      </if>
       <if test="record.isDelete != null">
         is_delete = #{record.isDelete,jdbcType=INTEGER},
       </if>
@@ -228,8 +270,12 @@
       video_id = #{record.videoId,jdbcType=BIGINT},
       video_path = #{record.videoPath,jdbcType=VARCHAR},
       video_cover = #{record.videoCover,jdbcType=VARCHAR},
+      video_title = #{record.videoTitle,jdbcType=VARCHAR},
+      audit_status = #{record.auditStatus,jdbcType=INTEGER},
+      app_audit_status = #{record.appAuditStatus,jdbcType=INTEGER},
+      recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
+      app_recommend_status = #{record.appRecommendStatus,jdbcType=INTEGER},
       `status` = #{record.status,jdbcType=INTEGER},
-      retry_count = #{record.retryCount,jdbcType=INTEGER},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
@@ -249,12 +295,24 @@
       <if test="videoCover != null">
         video_cover = #{videoCover,jdbcType=VARCHAR},
       </if>
+      <if test="videoTitle != null">
+        video_title = #{videoTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null">
+        audit_status = #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appAuditStatus != null">
+        app_audit_status = #{appAuditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="recommendStatus != null">
+        recommend_status = #{recommendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="appRecommendStatus != null">
+        app_recommend_status = #{appRecommendStatus,jdbcType=INTEGER},
+      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
-      <if test="retryCount != null">
-        retry_count = #{retryCount,jdbcType=INTEGER},
-      </if>
       <if test="isDelete != null">
         is_delete = #{isDelete,jdbcType=INTEGER},
       </if>
@@ -272,8 +330,12 @@
     set video_id = #{videoId,jdbcType=BIGINT},
       video_path = #{videoPath,jdbcType=VARCHAR},
       video_cover = #{videoCover,jdbcType=VARCHAR},
+      video_title = #{videoTitle,jdbcType=VARCHAR},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      app_audit_status = #{appAuditStatus,jdbcType=INTEGER},
+      recommend_status = #{recommendStatus,jdbcType=INTEGER},
+      app_recommend_status = #{appRecommendStatus,jdbcType=INTEGER},
       `status` = #{status,jdbcType=INTEGER},
-      retry_count = #{retryCount,jdbcType=INTEGER},
       is_delete = #{isDelete,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

+ 4 - 4
tencent-ad-server/src/main/resources/mybatis-generator-config.xml

@@ -50,12 +50,12 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
 
-<!--        <table tableName="ad_video" domainObjectName="AdVideo" alias=""/>-->
-        <table tableName="ad_video_image" domainObjectName="AdVideoImage" alias=""/>
-        <table tableName="ad_muse_task" domainObjectName="AdMuseTask" alias=""/>
+        <table tableName="ad_video" domainObjectName="AdVideo" alias=""/>
+<!--        <table tableName="ad_video_image" domainObjectName="AdVideoImage" alias=""/>-->
+<!--        <table tableName="ad_muse_task" domainObjectName="AdMuseTask" alias=""/>-->
 <!--        <table tableName="ad_creative" domainObjectName="AdCreative" alias=""/>-->
 <!--        <table tableName="ad_group" domainObjectName="AdGroup" alias=""/>-->
-<!--        <table tableName="ad_base_video" domainObjectName="AdBaseVideo" alias=""/>-->
+        <table tableName="ad_base_video" domainObjectName="AdBaseVideo" alias=""/>
 <!--        <table tableName="ad_muse_image" domainObjectName="AdMuseImage" alias=""/>-->