生成妙思任务参数放到妙思任务里

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

@@ -28,9 +28,8 @@ public class AdBaseVideoController {
     @GetMapping("/get")
     public CommonResponse<Page<AdBaseVideoVo>> getAdBaseVideo(@RequestParam(defaultValue = "1") Integer pageNum,
                                                               @RequestParam(defaultValue = "10") Integer pageSize,
-                                                              @RequestParam(required = false) List<Integer> status,
-                                                              @RequestParam(required = false) String category) {
-        return adBaseVideoService.getAdBaseVideo(pageNum, pageSize, status, category);
+                                                              @RequestParam(required = false) List<Integer> status) {
+        return adBaseVideoService.getAdBaseVideo(pageNum, pageSize, status);
     }
 
     @GetMapping("/status")

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

@@ -11,8 +11,6 @@ public class AdBaseVideo {
 
     private String videoCover;
 
-    private String category;
-
     private Integer status;
 
     private Integer isDelete;
@@ -53,14 +51,6 @@ public class AdBaseVideo {
         this.videoCover = videoCover;
     }
 
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
     public Integer getStatus() {
         return status;
     }
@@ -103,7 +93,6 @@ public class AdBaseVideo {
         sb.append(", videoId=").append(videoId);
         sb.append(", videoPath=").append(videoPath);
         sb.append(", videoCover=").append(videoCover);
-        sb.append(", category=").append(category);
         sb.append(", status=").append(status);
         sb.append(", isDelete=").append(isDelete);
         sb.append(", createTime=").append(createTime);

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

@@ -376,76 +376,6 @@ public class AdBaseVideoExample {
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIsNull() {
-            addCriterion("category is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryIsNotNull() {
-            addCriterion("category is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryEqualTo(String value) {
-            addCriterion("category =", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryNotEqualTo(String value) {
-            addCriterion("category <>", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryGreaterThan(String value) {
-            addCriterion("category >", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryGreaterThanOrEqualTo(String value) {
-            addCriterion("category >=", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryLessThan(String value) {
-            addCriterion("category <", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryLessThanOrEqualTo(String value) {
-            addCriterion("category <=", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryLike(String value) {
-            addCriterion("category like", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryNotLike(String value) {
-            addCriterion("category not like", value, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryIn(List<String> values) {
-            addCriterion("category in", values, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryNotIn(List<String> values) {
-            addCriterion("category not in", values, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryBetween(String value1, String value2) {
-            addCriterion("category between", value1, value2, "category");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryNotBetween(String value1, String value2) {
-            addCriterion("category not between", value1, value2, "category");
-            return (Criteria) this;
-        }
-
         public Criteria andStatusIsNull() {
             addCriterion("`status` is null");
             return (Criteria) this;

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdMuseTask.java

@@ -11,6 +11,14 @@ public class AdMuseTask {
 
     private String accountId;
 
+    private Integer similarity;
+
+    private String dimensionSize;
+
+    private String img2imgDesc;
+
+    private String text2imgDesc;
+
     private String subtitle;
 
     private Integer status;
@@ -59,6 +67,38 @@ public class AdMuseTask {
         this.accountId = accountId;
     }
 
+    public Integer getSimilarity() {
+        return similarity;
+    }
+
+    public void setSimilarity(Integer similarity) {
+        this.similarity = similarity;
+    }
+
+    public String getDimensionSize() {
+        return dimensionSize;
+    }
+
+    public void setDimensionSize(String dimensionSize) {
+        this.dimensionSize = dimensionSize;
+    }
+
+    public String getImg2imgDesc() {
+        return img2imgDesc;
+    }
+
+    public void setImg2imgDesc(String img2imgDesc) {
+        this.img2imgDesc = img2imgDesc;
+    }
+
+    public String getText2imgDesc() {
+        return text2imgDesc;
+    }
+
+    public void setText2imgDesc(String text2imgDesc) {
+        this.text2imgDesc = text2imgDesc;
+    }
+
     public String getSubtitle() {
         return subtitle;
     }
@@ -133,6 +173,10 @@ public class AdMuseTask {
         sb.append(", adVideoId=").append(adVideoId);
         sb.append(", adVideoImageId=").append(adVideoImageId);
         sb.append(", accountId=").append(accountId);
+        sb.append(", similarity=").append(similarity);
+        sb.append(", dimensionSize=").append(dimensionSize);
+        sb.append(", img2imgDesc=").append(img2imgDesc);
+        sb.append(", text2imgDesc=").append(text2imgDesc);
         sb.append(", subtitle=").append(subtitle);
         sb.append(", status=").append(status);
         sb.append(", taskId=").append(taskId);

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdMuseTaskExample.java

@@ -366,6 +366,276 @@ public class AdMuseTaskExample {
             return (Criteria) this;
         }
 
+        public Criteria andSimilarityIsNull() {
+            addCriterion("similarity is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityIsNotNull() {
+            addCriterion("similarity is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityEqualTo(Integer value) {
+            addCriterion("similarity =", value, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityNotEqualTo(Integer value) {
+            addCriterion("similarity <>", value, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityGreaterThan(Integer value) {
+            addCriterion("similarity >", value, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityGreaterThanOrEqualTo(Integer value) {
+            addCriterion("similarity >=", value, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityLessThan(Integer value) {
+            addCriterion("similarity <", value, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityLessThanOrEqualTo(Integer value) {
+            addCriterion("similarity <=", value, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityIn(List<Integer> values) {
+            addCriterion("similarity in", values, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityNotIn(List<Integer> values) {
+            addCriterion("similarity not in", values, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityBetween(Integer value1, Integer value2) {
+            addCriterion("similarity between", value1, value2, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSimilarityNotBetween(Integer value1, Integer value2) {
+            addCriterion("similarity not between", value1, value2, "similarity");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeIsNull() {
+            addCriterion("dimension_size is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeIsNotNull() {
+            addCriterion("dimension_size is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeEqualTo(String value) {
+            addCriterion("dimension_size =", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeNotEqualTo(String value) {
+            addCriterion("dimension_size <>", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeGreaterThan(String value) {
+            addCriterion("dimension_size >", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeGreaterThanOrEqualTo(String value) {
+            addCriterion("dimension_size >=", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeLessThan(String value) {
+            addCriterion("dimension_size <", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeLessThanOrEqualTo(String value) {
+            addCriterion("dimension_size <=", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeLike(String value) {
+            addCriterion("dimension_size like", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeNotLike(String value) {
+            addCriterion("dimension_size not like", value, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeIn(List<String> values) {
+            addCriterion("dimension_size in", values, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeNotIn(List<String> values) {
+            addCriterion("dimension_size not in", values, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeBetween(String value1, String value2) {
+            addCriterion("dimension_size between", value1, value2, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andDimensionSizeNotBetween(String value1, String value2) {
+            addCriterion("dimension_size not between", value1, value2, "dimensionSize");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescIsNull() {
+            addCriterion("img2img_desc is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescIsNotNull() {
+            addCriterion("img2img_desc is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescEqualTo(String value) {
+            addCriterion("img2img_desc =", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescNotEqualTo(String value) {
+            addCriterion("img2img_desc <>", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescGreaterThan(String value) {
+            addCriterion("img2img_desc >", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescGreaterThanOrEqualTo(String value) {
+            addCriterion("img2img_desc >=", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescLessThan(String value) {
+            addCriterion("img2img_desc <", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescLessThanOrEqualTo(String value) {
+            addCriterion("img2img_desc <=", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescLike(String value) {
+            addCriterion("img2img_desc like", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescNotLike(String value) {
+            addCriterion("img2img_desc not like", value, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescIn(List<String> values) {
+            addCriterion("img2img_desc in", values, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescNotIn(List<String> values) {
+            addCriterion("img2img_desc not in", values, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescBetween(String value1, String value2) {
+            addCriterion("img2img_desc between", value1, value2, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andImg2imgDescNotBetween(String value1, String value2) {
+            addCriterion("img2img_desc not between", value1, value2, "img2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescIsNull() {
+            addCriterion("text2img_desc is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescIsNotNull() {
+            addCriterion("text2img_desc is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescEqualTo(String value) {
+            addCriterion("text2img_desc =", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescNotEqualTo(String value) {
+            addCriterion("text2img_desc <>", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescGreaterThan(String value) {
+            addCriterion("text2img_desc >", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescGreaterThanOrEqualTo(String value) {
+            addCriterion("text2img_desc >=", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescLessThan(String value) {
+            addCriterion("text2img_desc <", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescLessThanOrEqualTo(String value) {
+            addCriterion("text2img_desc <=", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescLike(String value) {
+            addCriterion("text2img_desc like", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescNotLike(String value) {
+            addCriterion("text2img_desc not like", value, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescIn(List<String> values) {
+            addCriterion("text2img_desc in", values, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescNotIn(List<String> values) {
+            addCriterion("text2img_desc not in", values, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescBetween(String value1, String value2) {
+            addCriterion("text2img_desc between", value1, value2, "text2imgDesc");
+            return (Criteria) this;
+        }
+
+        public Criteria andText2imgDescNotBetween(String value1, String value2) {
+            addCriterion("text2img_desc not between", value1, value2, "text2imgDesc");
+            return (Criteria) this;
+        }
+
         public Criteria andSubtitleIsNull() {
             addCriterion("subtitle is null");
             return (Criteria) this;

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdVideoImage.java

@@ -15,16 +15,6 @@ public class AdVideoImage {
 
     private String tencentImageId;
 
-    private Integer similarity;
-
-    private String dimensionSize;
-
-    private String img2imgDesc;
-
-    private String text2imgDesc;
-
-    private String subtitle;
-
     private Integer isDelete;
 
     private Date createTime;
@@ -79,46 +69,6 @@ public class AdVideoImage {
         this.tencentImageId = tencentImageId;
     }
 
-    public Integer getSimilarity() {
-        return similarity;
-    }
-
-    public void setSimilarity(Integer similarity) {
-        this.similarity = similarity;
-    }
-
-    public String getDimensionSize() {
-        return dimensionSize;
-    }
-
-    public void setDimensionSize(String dimensionSize) {
-        this.dimensionSize = dimensionSize;
-    }
-
-    public String getImg2imgDesc() {
-        return img2imgDesc;
-    }
-
-    public void setImg2imgDesc(String img2imgDesc) {
-        this.img2imgDesc = img2imgDesc;
-    }
-
-    public String getText2imgDesc() {
-        return text2imgDesc;
-    }
-
-    public void setText2imgDesc(String text2imgDesc) {
-        this.text2imgDesc = text2imgDesc;
-    }
-
-    public String getSubtitle() {
-        return subtitle;
-    }
-
-    public void setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
-    }
-
     public Integer getIsDelete() {
         return isDelete;
     }
@@ -155,11 +105,6 @@ public class AdVideoImage {
         sb.append(", imageUrl=").append(imageUrl);
         sb.append(", status=").append(status);
         sb.append(", tencentImageId=").append(tencentImageId);
-        sb.append(", similarity=").append(similarity);
-        sb.append(", dimensionSize=").append(dimensionSize);
-        sb.append(", img2imgDesc=").append(img2imgDesc);
-        sb.append(", text2imgDesc=").append(text2imgDesc);
-        sb.append(", subtitle=").append(subtitle);
         sb.append(", isDelete=").append(isDelete);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/po/AdVideoImageExample.java

@@ -506,346 +506,6 @@ public class AdVideoImageExample {
             return (Criteria) this;
         }
 
-        public Criteria andSimilarityIsNull() {
-            addCriterion("similarity is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityIsNotNull() {
-            addCriterion("similarity is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityEqualTo(Integer value) {
-            addCriterion("similarity =", value, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityNotEqualTo(Integer value) {
-            addCriterion("similarity <>", value, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityGreaterThan(Integer value) {
-            addCriterion("similarity >", value, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityGreaterThanOrEqualTo(Integer value) {
-            addCriterion("similarity >=", value, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityLessThan(Integer value) {
-            addCriterion("similarity <", value, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityLessThanOrEqualTo(Integer value) {
-            addCriterion("similarity <=", value, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityIn(List<Integer> values) {
-            addCriterion("similarity in", values, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityNotIn(List<Integer> values) {
-            addCriterion("similarity not in", values, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityBetween(Integer value1, Integer value2) {
-            addCriterion("similarity between", value1, value2, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andSimilarityNotBetween(Integer value1, Integer value2) {
-            addCriterion("similarity not between", value1, value2, "similarity");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeIsNull() {
-            addCriterion("dimension_size is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeIsNotNull() {
-            addCriterion("dimension_size is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeEqualTo(String value) {
-            addCriterion("dimension_size =", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeNotEqualTo(String value) {
-            addCriterion("dimension_size <>", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeGreaterThan(String value) {
-            addCriterion("dimension_size >", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeGreaterThanOrEqualTo(String value) {
-            addCriterion("dimension_size >=", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeLessThan(String value) {
-            addCriterion("dimension_size <", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeLessThanOrEqualTo(String value) {
-            addCriterion("dimension_size <=", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeLike(String value) {
-            addCriterion("dimension_size like", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeNotLike(String value) {
-            addCriterion("dimension_size not like", value, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeIn(List<String> values) {
-            addCriterion("dimension_size in", values, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeNotIn(List<String> values) {
-            addCriterion("dimension_size not in", values, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeBetween(String value1, String value2) {
-            addCriterion("dimension_size between", value1, value2, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andDimensionSizeNotBetween(String value1, String value2) {
-            addCriterion("dimension_size not between", value1, value2, "dimensionSize");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescIsNull() {
-            addCriterion("img2img_desc is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescIsNotNull() {
-            addCriterion("img2img_desc is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescEqualTo(String value) {
-            addCriterion("img2img_desc =", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescNotEqualTo(String value) {
-            addCriterion("img2img_desc <>", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescGreaterThan(String value) {
-            addCriterion("img2img_desc >", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescGreaterThanOrEqualTo(String value) {
-            addCriterion("img2img_desc >=", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescLessThan(String value) {
-            addCriterion("img2img_desc <", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescLessThanOrEqualTo(String value) {
-            addCriterion("img2img_desc <=", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescLike(String value) {
-            addCriterion("img2img_desc like", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescNotLike(String value) {
-            addCriterion("img2img_desc not like", value, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescIn(List<String> values) {
-            addCriterion("img2img_desc in", values, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescNotIn(List<String> values) {
-            addCriterion("img2img_desc not in", values, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescBetween(String value1, String value2) {
-            addCriterion("img2img_desc between", value1, value2, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andImg2imgDescNotBetween(String value1, String value2) {
-            addCriterion("img2img_desc not between", value1, value2, "img2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescIsNull() {
-            addCriterion("text2img_desc is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescIsNotNull() {
-            addCriterion("text2img_desc is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescEqualTo(String value) {
-            addCriterion("text2img_desc =", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescNotEqualTo(String value) {
-            addCriterion("text2img_desc <>", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescGreaterThan(String value) {
-            addCriterion("text2img_desc >", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescGreaterThanOrEqualTo(String value) {
-            addCriterion("text2img_desc >=", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescLessThan(String value) {
-            addCriterion("text2img_desc <", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescLessThanOrEqualTo(String value) {
-            addCriterion("text2img_desc <=", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescLike(String value) {
-            addCriterion("text2img_desc like", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescNotLike(String value) {
-            addCriterion("text2img_desc not like", value, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescIn(List<String> values) {
-            addCriterion("text2img_desc in", values, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescNotIn(List<String> values) {
-            addCriterion("text2img_desc not in", values, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescBetween(String value1, String value2) {
-            addCriterion("text2img_desc between", value1, value2, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andText2imgDescNotBetween(String value1, String value2) {
-            addCriterion("text2img_desc not between", value1, value2, "text2imgDesc");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleIsNull() {
-            addCriterion("subtitle is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleIsNotNull() {
-            addCriterion("subtitle is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleEqualTo(String value) {
-            addCriterion("subtitle =", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleNotEqualTo(String value) {
-            addCriterion("subtitle <>", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleGreaterThan(String value) {
-            addCriterion("subtitle >", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleGreaterThanOrEqualTo(String value) {
-            addCriterion("subtitle >=", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleLessThan(String value) {
-            addCriterion("subtitle <", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleLessThanOrEqualTo(String value) {
-            addCriterion("subtitle <=", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleLike(String value) {
-            addCriterion("subtitle like", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleNotLike(String value) {
-            addCriterion("subtitle not like", value, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleIn(List<String> values) {
-            addCriterion("subtitle in", values, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleNotIn(List<String> values) {
-            addCriterion("subtitle not in", values, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleBetween(String value1, String value2) {
-            addCriterion("subtitle between", value1, value2, "subtitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubtitleNotBetween(String value1, String value2) {
-            addCriterion("subtitle not between", value1, value2, "subtitle");
-            return (Criteria) this;
-        }
-
         public Criteria andIsDeleteIsNull() {
             addCriterion("is_delete is null");
             return (Criteria) this;

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/model/vo/AdVideoImageVo.java

@@ -13,20 +13,6 @@ public class AdVideoImageVo {
 
     private String imageUrl;
 
-    private Integer status;
-
-    private String statusName;
-
-    private Integer similarity;
-
-    private String similarityName;
-
-    private String dimensionSize;
-
-    private String dimensionSizeName;
-
-    private String text2imgDesc;
-
     private String createTime;
 
     private String updateTime;

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

@@ -11,7 +11,7 @@ public interface AdBaseVideoService {
 
     CommonResponse<Void> addAdBaseVideo(List<AdBaseVideoVo> baseVideoList);
 
-    CommonResponse<Page<AdBaseVideoVo>> getAdBaseVideo(Integer pageNum, Integer pageSize, List<Integer> status, String category);
+    CommonResponse<Page<AdBaseVideoVo>> getAdBaseVideo(Integer pageNum, Integer pageSize, List<Integer> status);
 
     CommonResponse<Void> firstVerifyAdBaseVideo(AdBaseVideoParam adBaseVideoParam);
 

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/AdMuseTaskService.java

@@ -6,6 +6,7 @@ import com.tzld.piaoquan.tencentad.model.po.AdMuseTask;
 import com.tzld.piaoquan.tencentad.model.po.AdVideoImage;
 import com.tzld.piaoquan.tencentad.model.vo.AdMuseImageParam;
 import com.tzld.piaoquan.tencentad.model.vo.AdMuseImageVo;
+import com.tzld.piaoquan.tencentad.model.vo.AdVideoImageParam;
 import com.tzld.piaoquan.tencentad.model.vo.AdVideoImageVo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -13,7 +14,7 @@ import java.util.List;
 
 public interface AdMuseTaskService {
 
-    void addMuseTask(String accountId, String accessToken, AdVideoImage adVideoImage);
+    void addMuseTask(String accountId, String accessToken, AdVideoImageParam adVideoImageParam, AdVideoImage adVideoImage);
 
     List<AdMuseTask> getAdMuseTask(Integer status);
 

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/AdVideoImageService.java

@@ -17,7 +17,7 @@ public interface AdVideoImageService {
 
     CommonResponse<Void> updateAdVideoImage(AdVideoImageParam adVideoImageParam);
 
-    boolean uploadImageToTencent(String account, String accessToken, Long adVideoId);
+    String uploadImageToTencent(String account, String accessToken, AdVideoImage adVideoImage);
 
     CommonResponse<Void> uploadMuseImage(MultipartFile file, Long adVideoId);
 

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

@@ -49,7 +49,7 @@ public class AdBaseVideoServiceImpl implements AdBaseVideoService {
 
     @Override
     public CommonResponse<Page<AdBaseVideoVo>> getAdBaseVideo(Integer pageNum, Integer pageSize,
-                                                              List<Integer> status, String category) {
+                                                              List<Integer> status) {
         Page<AdBaseVideoVo> page = new Page<>();
         page.setCurrentPage(pageNum);
         page.setPageSize(pageSize);
@@ -58,9 +58,6 @@ public class AdBaseVideoServiceImpl implements AdBaseVideoService {
         if (status != null) {
             criteria.andStatusIn(status);
         }
-        if (StringUtils.isNotEmpty(category)) {
-            criteria.andCategoryLike(category);
-        }
         example.setOrderByClause("create_time desc");
         example.setPage(page);
         long total = adBaseVideoMapper.countByExample(example);

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/impl/AdMuseTaskServiceImpl.java

@@ -15,6 +15,7 @@ import com.tzld.piaoquan.tencentad.model.bo.ImageParam;
 import com.tzld.piaoquan.tencentad.model.po.*;
 import com.tzld.piaoquan.tencentad.model.vo.AdMuseImageParam;
 import com.tzld.piaoquan.tencentad.model.vo.AdMuseImageVo;
+import com.tzld.piaoquan.tencentad.model.vo.AdVideoImageParam;
 import com.tzld.piaoquan.tencentad.service.AdAccountService;
 import com.tzld.piaoquan.tencentad.service.AdMuseTaskService;
 import com.tzld.piaoquan.tencentad.utils.DateUtils;
@@ -57,32 +58,32 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
     @Autowired
     private AdMuseImageMapper adMuseImageMapper;
 
-    public void addMuseTask(String accountId, String accessToken, AdVideoImage adVideoImage) {
+    public void addMuseTask(String accountId, String accessToken, AdVideoImageParam adVideoImageParam, AdVideoImage adVideoImage) {
         try {
             String url = String.format("https://api.e.qq.com/v3.0/muse_ai_task/add?access_token=%s&timestamp=%s&nonce=%s",
                     accessToken, System.currentTimeMillis() / 1000, UUID.randomUUID().toString().replaceAll("-", ""));
             JSONObject param = new JSONObject();
             param.put("account_id", accountId);
-            if (StringUtils.isNotEmpty(adVideoImage.getText2imgDesc())) {
+            if (StringUtils.isNotEmpty(adVideoImageParam.getText2imgDesc())) {
                 param.put("task_type", "MUSE_AI_TASK_TYPE_TEXT2IMG");
                 JSONObject text2img = new JSONObject();
-                if (StringUtils.isEmpty(adVideoImage.getDimensionSize())) {
-                    text2img.put("dimension_size", adVideoImage.getDimensionSize());
+                if (StringUtils.isEmpty(adVideoImageParam.getDimensionSize())) {
+                    text2img.put("dimension_size", adVideoImageParam.getDimensionSize());
                 } else {
                     text2img.put("dimension_size", "SIZE_1280_720");
                 }
-                text2img.put("prompt", adVideoImage.getText2imgDesc());
+                text2img.put("prompt", adVideoImageParam.getText2imgDesc());
                 param.put("text2img", text2img);
             } else {
                 param.put("task_type", "MUSE_AI_TASK_TYPE_IMG2IMG");
                 JSONObject img2img = new JSONObject();
                 //默认取4级相似
                 img2img.put("image_id", adVideoImage.getTencentImageId());
-                img2img.put("similarity", adVideoImage.getSimilarity() == null ?
-                        SimilarityCodeEnum.FOURTH.getCode() : adVideoImage.getSimilarity());
+                img2img.put("similarity", adVideoImageParam.getSimilarity() == null ?
+                        SimilarityCodeEnum.FOURTH.getCode() : adVideoImageParam.getSimilarity());
                 img2img.put("img2img_style", "MUSE_AI_IMG2IMG_STYLE_PEOPLE");
-                if (StringUtils.isNotEmpty(adVideoImage.getDimensionSize())) {
-                    img2img.put("dimension_size", adVideoImage.getDimensionSize());
+                if (StringUtils.isNotEmpty(adVideoImageParam.getDimensionSize())) {
+                    img2img.put("dimension_size", adVideoImageParam.getDimensionSize());
                 } else {
                     img2img.put("extend_size", true);
                 }
@@ -99,7 +100,7 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
                 adMuseTask.setAccountId(accountId);
                 adMuseTask.setAdVideoId(adVideoImage.getAdVideoId());
                 adMuseTask.setAdVideoImageId(adVideoImage.getId());
-                adMuseTask.setSubtitle(adVideoImage.getSubtitle());
+                adMuseTask.setSubtitle(adVideoImageParam.getSubtitle());
                 adMuseTaskMapper.insertSelective(adMuseTask);
             }
         } catch (Exception e) {

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/service/impl/AdVideoImageServiceImpl.java

@@ -75,22 +75,6 @@ public class AdVideoImageServiceImpl implements AdVideoImageService {
         for (AdVideoImage adVideoImage : adVideoImages) {
             AdVideoImageVo adVideoImageVo = new AdVideoImageVo();
             BeanUtils.copyProperties(adVideoImage, adVideoImageVo);
-            if (adVideoImage.getSimilarity() != null) {
-                SimilarityCodeEnum similarityCodeEnum = SimilarityCodeEnum.getByCode(adVideoImage.getSimilarity());
-                if (similarityCodeEnum != null) {
-                    adVideoImageVo.setSimilarityName(similarityCodeEnum.getDesc());
-                }
-            }
-            if (adVideoImage.getDimensionSize() != null) {
-                DimensionSizeEnum dimensionSizeEnum = DimensionSizeEnum.getBySize(adVideoImage.getDimensionSize());
-                if (dimensionSizeEnum != null) {
-                    adVideoImageVo.setDimensionSizeName(dimensionSizeEnum.getDesc());
-                }
-            }
-            AdVideoImageStatusEnum adVideoImageStatusEnum = AdVideoImageStatusEnum.getByStatus(adVideoImage.getStatus());
-            if (adVideoImageStatusEnum != null) {
-                adVideoImageVo.setStatusName(adVideoImageStatusEnum.getDesc());
-            }
             adVideoImageVo.setCreateTime(DateUtils.getDateString(adVideoImage.getCreateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
             adVideoImageVo.setUpdateTime(DateUtils.getDateString(adVideoImage.getUpdateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
             adVideoImageVos.add(adVideoImageVo);
@@ -107,40 +91,30 @@ public class AdVideoImageServiceImpl implements AdVideoImageService {
             return CommonResponse.create(500, "accessToken获取失败，确认账号无误后重试");
         }
         for (Long id : adVideoImageParam.getIds()) {
-            AdVideoImage updateAdVideoImage = new AdVideoImage();
-            updateAdVideoImage.setId(id);
-            updateAdVideoImage.setStatus(adVideoImageParam.getStatus());
-            updateAdVideoImage.setSimilarity(adVideoImageParam.getSimilarity());
-            updateAdVideoImage.setDimensionSize(adVideoImageParam.getDimensionSize());
-            updateAdVideoImage.setSubtitle(adVideoImageParam.getSubtitle());
-            updateAdVideoImage.setText2imgDesc(adVideoImageParam.getText2imgDesc());
-            updateAdVideoImage.setAccountId(adVideoImageParam.getAccountId());
-            int update = adVideoImageMapper.updateByPrimaryKeySelective(updateAdVideoImage);
-            if (update > 0) {
-                uploadImageToTencent(adVideoImageParam.getAccountId(), accessToken, id);
+            AdVideoImage adVideoImage = adVideoImageMapper.selectByPrimaryKey(id);
+            if (adVideoImage == null) {
+                continue;
+            }
+            String imageId = uploadImageToTencent(adVideoImageParam.getAccountId(), accessToken, adVideoImage);
+            if (StringUtils.isNotEmpty(imageId)) {
+                adMuseTaskService.addMuseTask(adVideoImageParam.getAccountId(), accessToken, adVideoImageParam, adVideoImage);
             }
         }
+
         return CommonResponse.success();
     }
 
     //上传图片到腾讯
     @Override
-    public boolean uploadImageToTencent(String account, String accessToken, Long adVideoImageId) {
-        AdVideoImage adVideoImage = adVideoImageMapper.selectByPrimaryKey(adVideoImageId);
-        if (adVideoImage == null) {
-            return false;
+    public String uploadImageToTencent(String account, String accessToken, AdVideoImage adVideoImage) {
+        if (StringUtils.isNotEmpty(adVideoImage.getTencentImageId())) {
+            return adVideoImage.getTencentImageId();
         }
         String imageId = tencentService.uploadImage(account, accessToken, adVideoImage.getImageUrl());
-        if (StringUtils.isNotEmpty(imageId)) {
-            adVideoImage.setTencentImageId(imageId);
-            adVideoImage.setStatus(AdVideoImageStatusEnum.UPLOAD_SUCCESS.getStatus());
-            adVideoImageMapper.updateByPrimaryKeySelective(adVideoImage);
-            adMuseTaskService.addMuseTask(account, accessToken, adVideoImage);
-        } else {
-            adVideoImage.setStatus(AdVideoImageStatusEnum.UPLOAD_FAIL.getStatus());
-            adVideoImageMapper.updateByPrimaryKeySelective(adVideoImage);
-        }
-        return true;
+        adVideoImage.setTencentImageId(imageId);
+        adVideoImageMapper.updateByPrimaryKeySelective(adVideoImage);
+        return imageId;
+
     }
 
     @Override

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

@@ -120,6 +120,24 @@ public class AdVideoServiceImpl implements AdVideoService {
         }
     }
 
+    public static void main(String[] args) {
+        String url = "http://rescdn.yishihui.com/longvideo/multitranscode/video/vpc/20191121/10426977qXdqkgYwJ8eJp8fFEb20200804131055256947746-1LD.mp4";
+        String imageFolder = "/Users/shimeng/Desktop/image_path" + "/" + UUID.randomUUID();
+        File dir = new File(imageFolder);
+        if (!dir.exists()) {
+            boolean mkdir = dir.mkdir();
+            if (!mkdir) {
+                return;
+            }
+        }
+        String imagePath = imageFolder + "/" + "%04d.jpg";
+        FfmpegUtil.getTargetThumbnail(url, imagePath);
+        File[] fileList = dir.listFiles();
+        if (fileList == null) {
+            return;
+        }
+    }
+
 
     //抽取图片
     public void buildVideoImage(AdVideo adVideo) {

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/utils/FfmpegUtil.java

@@ -16,8 +16,8 @@ public class FfmpegUtil {
             try (ProcessWrapper ffmpeg = new DefaultFFMPEGLocator().createExecutor();) {
                 ffmpeg.addArgument("-i");
                 ffmpeg.addArgument(url);
-                ffmpeg.addArgument("-vf");
-                ffmpeg.addArgument("select='gt(scene\\,0.3)'");
+                ffmpeg.addArgument("-filter:v");
+                ffmpeg.addArgument("select='gt(scene,0.1)',showinfo");
                 ffmpeg.addArgument("-vsync");
                 ffmpeg.addArgument("vfr");
                 ffmpeg.addArgument(targetPath);

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

@@ -6,7 +6,6 @@
     <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="category" jdbcType="VARCHAR" property="category" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -71,8 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, video_id, video_path, video_cover, category, `status`, is_delete, create_time, 
-    update_time
+    id, video_id, video_path, video_cover, `status`, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdBaseVideoExample" resultMap="BaseResultMap">
     select
@@ -109,13 +107,11 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdBaseVideo">
     insert into ad_base_video (id, video_id, video_path, 
-      video_cover, category, `status`, 
-      is_delete, create_time, update_time
-      )
+      video_cover, `status`, is_delete, 
+      create_time, update_time)
     values (#{id,jdbcType=BIGINT}, #{videoId,jdbcType=BIGINT}, #{videoPath,jdbcType=VARCHAR}, 
-      #{videoCover,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{videoCover,jdbcType=VARCHAR}, #{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
@@ -132,9 +128,6 @@
       <if test="videoCover != null">
         video_cover,
       </if>
-      <if test="category != null">
-        category,
-      </if>
       <if test="status != null">
         `status`,
       </if>
@@ -161,9 +154,6 @@
       <if test="videoCover != null">
         #{videoCover,jdbcType=VARCHAR},
       </if>
-      <if test="category != null">
-        #{category,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -199,9 +189,6 @@
       <if test="record.videoCover != null">
         video_cover = #{record.videoCover,jdbcType=VARCHAR},
       </if>
-      <if test="record.category != null">
-        category = #{record.category,jdbcType=VARCHAR},
-      </if>
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=INTEGER},
       </if>
@@ -225,7 +212,6 @@
       video_id = #{record.videoId,jdbcType=BIGINT},
       video_path = #{record.videoPath,jdbcType=VARCHAR},
       video_cover = #{record.videoCover,jdbcType=VARCHAR},
-      category = #{record.category,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -246,9 +232,6 @@
       <if test="videoCover != null">
         video_cover = #{videoCover,jdbcType=VARCHAR},
       </if>
-      <if test="category != null">
-        category = #{category,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
@@ -269,7 +252,6 @@
     set video_id = #{videoId,jdbcType=BIGINT},
       video_path = #{videoPath,jdbcType=VARCHAR},
       video_cover = #{videoCover,jdbcType=VARCHAR},
-      category = #{category,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       is_delete = #{isDelete,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},

tencent-ad-server/src/main/resources/mapper/AdMuseTaskMapper.xml

@@ -6,6 +6,10 @@
     <result column="ad_video_id" jdbcType="BIGINT" property="adVideoId" />
     <result column="ad_video_image_id" jdbcType="BIGINT" property="adVideoImageId" />
     <result column="account_id" jdbcType="VARCHAR" property="accountId" />
+    <result column="similarity" jdbcType="INTEGER" property="similarity" />
+    <result column="dimension_size" jdbcType="VARCHAR" property="dimensionSize" />
+    <result column="img2img_desc" jdbcType="VARCHAR" property="img2imgDesc" />
+    <result column="text2img_desc" jdbcType="VARCHAR" property="text2imgDesc" />
     <result column="subtitle" jdbcType="VARCHAR" property="subtitle" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="task_id" jdbcType="BIGINT" property="taskId" />
@@ -74,8 +78,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, ad_video_id, ad_video_image_id, account_id, subtitle, `status`, task_id, task_type, 
-    task_status, is_delete, create_time, update_time
+    id, ad_video_id, ad_video_image_id, account_id, similarity, dimension_size, img2img_desc, 
+    text2img_desc, subtitle, `status`, task_id, task_type, task_status, is_delete, create_time, 
+    update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseTaskExample" resultMap="BaseResultMap">
     select
@@ -112,15 +117,17 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseTask">
     insert into ad_muse_task (id, ad_video_id, ad_video_image_id, 
-      account_id, subtitle, `status`, 
-      task_id, task_type, task_status, 
-      is_delete, create_time, update_time
-      )
+      account_id, similarity, dimension_size, 
+      img2img_desc, text2img_desc, subtitle, 
+      `status`, task_id, task_type, 
+      task_status, is_delete, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{adVideoId,jdbcType=BIGINT}, #{adVideoImageId,jdbcType=BIGINT}, 
-      #{accountId,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{taskId,jdbcType=BIGINT}, #{taskType,jdbcType=VARCHAR}, #{taskStatus,jdbcType=VARCHAR}, 
-      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{accountId,jdbcType=VARCHAR}, #{similarity,jdbcType=INTEGER}, #{dimensionSize,jdbcType=VARCHAR}, 
+      #{img2imgDesc,jdbcType=VARCHAR}, #{text2imgDesc,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{taskId,jdbcType=BIGINT}, #{taskType,jdbcType=VARCHAR}, 
+      #{taskStatus,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseTask">
     insert into ad_muse_task
@@ -137,6 +144,18 @@
       <if test="accountId != null">
         account_id,
       </if>
+      <if test="similarity != null">
+        similarity,
+      </if>
+      <if test="dimensionSize != null">
+        dimension_size,
+      </if>
+      <if test="img2imgDesc != null">
+        img2img_desc,
+      </if>
+      <if test="text2imgDesc != null">
+        text2img_desc,
+      </if>
       <if test="subtitle != null">
         subtitle,
       </if>
@@ -175,6 +194,18 @@
       <if test="accountId != null">
         #{accountId,jdbcType=VARCHAR},
       </if>
+      <if test="similarity != null">
+        #{similarity,jdbcType=INTEGER},
+      </if>
+      <if test="dimensionSize != null">
+        #{dimensionSize,jdbcType=VARCHAR},
+      </if>
+      <if test="img2imgDesc != null">
+        #{img2imgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="text2imgDesc != null">
+        #{text2imgDesc,jdbcType=VARCHAR},
+      </if>
       <if test="subtitle != null">
         #{subtitle,jdbcType=VARCHAR},
       </if>
@@ -222,6 +253,18 @@
       <if test="record.accountId != null">
         account_id = #{record.accountId,jdbcType=VARCHAR},
       </if>
+      <if test="record.similarity != null">
+        similarity = #{record.similarity,jdbcType=INTEGER},
+      </if>
+      <if test="record.dimensionSize != null">
+        dimension_size = #{record.dimensionSize,jdbcType=VARCHAR},
+      </if>
+      <if test="record.img2imgDesc != null">
+        img2img_desc = #{record.img2imgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.text2imgDesc != null">
+        text2img_desc = #{record.text2imgDesc,jdbcType=VARCHAR},
+      </if>
       <if test="record.subtitle != null">
         subtitle = #{record.subtitle,jdbcType=VARCHAR},
       </if>
@@ -257,6 +300,10 @@
       ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
       ad_video_image_id = #{record.adVideoImageId,jdbcType=BIGINT},
       account_id = #{record.accountId,jdbcType=VARCHAR},
+      similarity = #{record.similarity,jdbcType=INTEGER},
+      dimension_size = #{record.dimensionSize,jdbcType=VARCHAR},
+      img2img_desc = #{record.img2imgDesc,jdbcType=VARCHAR},
+      text2img_desc = #{record.text2imgDesc,jdbcType=VARCHAR},
       subtitle = #{record.subtitle,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       task_id = #{record.taskId,jdbcType=BIGINT},
@@ -281,6 +328,18 @@
       <if test="accountId != null">
         account_id = #{accountId,jdbcType=VARCHAR},
       </if>
+      <if test="similarity != null">
+        similarity = #{similarity,jdbcType=INTEGER},
+      </if>
+      <if test="dimensionSize != null">
+        dimension_size = #{dimensionSize,jdbcType=VARCHAR},
+      </if>
+      <if test="img2imgDesc != null">
+        img2img_desc = #{img2imgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="text2imgDesc != null">
+        text2img_desc = #{text2imgDesc,jdbcType=VARCHAR},
+      </if>
       <if test="subtitle != null">
         subtitle = #{subtitle,jdbcType=VARCHAR},
       </if>
@@ -313,6 +372,10 @@
     set ad_video_id = #{adVideoId,jdbcType=BIGINT},
       ad_video_image_id = #{adVideoImageId,jdbcType=BIGINT},
       account_id = #{accountId,jdbcType=VARCHAR},
+      similarity = #{similarity,jdbcType=INTEGER},
+      dimension_size = #{dimensionSize,jdbcType=VARCHAR},
+      img2img_desc = #{img2imgDesc,jdbcType=VARCHAR},
+      text2img_desc = #{text2imgDesc,jdbcType=VARCHAR},
       subtitle = #{subtitle,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       task_id = #{taskId,jdbcType=BIGINT},

tencent-ad-server/src/main/resources/mapper/AdVideoImageMapper.xml

@@ -8,11 +8,6 @@
     <result column="image_url" jdbcType="VARCHAR" property="imageUrl" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="tencent_image_id" jdbcType="VARCHAR" property="tencentImageId" />
-    <result column="similarity" jdbcType="INTEGER" property="similarity" />
-    <result column="dimension_size" jdbcType="VARCHAR" property="dimensionSize" />
-    <result column="img2img_desc" jdbcType="VARCHAR" property="img2imgDesc" />
-    <result column="text2img_desc" jdbcType="VARCHAR" property="text2imgDesc" />
-    <result column="subtitle" jdbcType="VARCHAR" property="subtitle" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -76,8 +71,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, ad_video_id, account_id, image_url, `status`, tencent_image_id, similarity, dimension_size, 
-    img2img_desc, text2img_desc, subtitle, is_delete, create_time, update_time
+    id, ad_video_id, account_id, image_url, `status`, tencent_image_id, is_delete, create_time, 
+    update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoImageExample" resultMap="BaseResultMap">
     select
@@ -115,14 +110,12 @@
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoImage">
     insert into ad_video_image (id, ad_video_id, account_id, 
       image_url, `status`, tencent_image_id, 
-      similarity, dimension_size, img2img_desc, 
-      text2img_desc, subtitle, is_delete, 
-      create_time, update_time)
+      is_delete, create_time, update_time
+      )
     values (#{id,jdbcType=BIGINT}, #{adVideoId,jdbcType=BIGINT}, #{accountId,jdbcType=VARCHAR}, 
       #{imageUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{tencentImageId,jdbcType=VARCHAR}, 
-      #{similarity,jdbcType=INTEGER}, #{dimensionSize,jdbcType=VARCHAR}, #{img2imgDesc,jdbcType=VARCHAR}, 
-      #{text2imgDesc,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoImage">
     insert into ad_video_image
@@ -145,21 +138,6 @@
       <if test="tencentImageId != null">
         tencent_image_id,
       </if>
-      <if test="similarity != null">
-        similarity,
-      </if>
-      <if test="dimensionSize != null">
-        dimension_size,
-      </if>
-      <if test="img2imgDesc != null">
-        img2img_desc,
-      </if>
-      <if test="text2imgDesc != null">
-        text2img_desc,
-      </if>
-      <if test="subtitle != null">
-        subtitle,
-      </if>
       <if test="isDelete != null">
         is_delete,
       </if>
@@ -189,21 +167,6 @@
       <if test="tencentImageId != null">
         #{tencentImageId,jdbcType=VARCHAR},
       </if>
-      <if test="similarity != null">
-        #{similarity,jdbcType=INTEGER},
-      </if>
-      <if test="dimensionSize != null">
-        #{dimensionSize,jdbcType=VARCHAR},
-      </if>
-      <if test="img2imgDesc != null">
-        #{img2imgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="text2imgDesc != null">
-        #{text2imgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="subtitle != null">
-        #{subtitle,jdbcType=VARCHAR},
-      </if>
       <if test="isDelete != null">
         #{isDelete,jdbcType=INTEGER},
       </if>
@@ -242,21 +205,6 @@
       <if test="record.tencentImageId != null">
         tencent_image_id = #{record.tencentImageId,jdbcType=VARCHAR},
       </if>
-      <if test="record.similarity != null">
-        similarity = #{record.similarity,jdbcType=INTEGER},
-      </if>
-      <if test="record.dimensionSize != null">
-        dimension_size = #{record.dimensionSize,jdbcType=VARCHAR},
-      </if>
-      <if test="record.img2imgDesc != null">
-        img2img_desc = #{record.img2imgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="record.text2imgDesc != null">
-        text2img_desc = #{record.text2imgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subtitle != null">
-        subtitle = #{record.subtitle,jdbcType=VARCHAR},
-      </if>
       <if test="record.isDelete != null">
         is_delete = #{record.isDelete,jdbcType=INTEGER},
       </if>
@@ -279,11 +227,6 @@
       image_url = #{record.imageUrl,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       tencent_image_id = #{record.tencentImageId,jdbcType=VARCHAR},
-      similarity = #{record.similarity,jdbcType=INTEGER},
-      dimension_size = #{record.dimensionSize,jdbcType=VARCHAR},
-      img2img_desc = #{record.img2imgDesc,jdbcType=VARCHAR},
-      text2img_desc = #{record.text2imgDesc,jdbcType=VARCHAR},
-      subtitle = #{record.subtitle,jdbcType=VARCHAR},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
@@ -309,21 +252,6 @@
       <if test="tencentImageId != null">
         tencent_image_id = #{tencentImageId,jdbcType=VARCHAR},
       </if>
-      <if test="similarity != null">
-        similarity = #{similarity,jdbcType=INTEGER},
-      </if>
-      <if test="dimensionSize != null">
-        dimension_size = #{dimensionSize,jdbcType=VARCHAR},
-      </if>
-      <if test="img2imgDesc != null">
-        img2img_desc = #{img2imgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="text2imgDesc != null">
-        text2img_desc = #{text2imgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="subtitle != null">
-        subtitle = #{subtitle,jdbcType=VARCHAR},
-      </if>
       <if test="isDelete != null">
         is_delete = #{isDelete,jdbcType=INTEGER},
       </if>
@@ -343,11 +271,6 @@
       image_url = #{imageUrl,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       tencent_image_id = #{tencentImageId,jdbcType=VARCHAR},
-      similarity = #{similarity,jdbcType=INTEGER},
-      dimension_size = #{dimensionSize,jdbcType=VARCHAR},
-      img2img_desc = #{img2imgDesc,jdbcType=VARCHAR},
-      text2img_desc = #{text2imgDesc,jdbcType=VARCHAR},
-      subtitle = #{subtitle,jdbcType=VARCHAR},
       is_delete = #{isDelete,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -51,7 +51,7 @@
         </javaClientGenerator>
 
 <!--        <table tableName="ad_video" domainObjectName="AdVideo" alias=""/>-->
-<!--        <table tableName="ad_video_image" domainObjectName="AdVideoImage" 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=""/>-->