更新视频图片信息和妙思任务

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/common/enums/AdMuseImageStatusEnum.java

@@ -0,0 +1,38 @@
+package com.tzld.piaoquan.tencentad.common.enums;
+
+import lombok.Getter;
+
+import java.util.Objects;
+
+@Getter
+public enum AdMuseImageStatusEnum {
+
+    DEFAULT(0, "待处理"),
+    VERIFY_SUCCESS(1, "审核通过"),
+    VERIFY_FAIL(2, "审核不通过"),
+    UPLOAD_SUCCESS(3, "上传成功"),
+    UPLOAD_FAIL(4, "上传失败")
+
+    ;
+
+
+    final Integer status;
+
+    final String desc;
+
+    AdMuseImageStatusEnum(Integer status, String desc) {
+        this.status = status;
+        this.desc = desc;
+    }
+
+    public static AdMuseImageStatusEnum getByStatus(Integer status) {
+        for (AdMuseImageStatusEnum adMuseImageStatusEnum : AdMuseImageStatusEnum.values()) {
+            if (Objects.equals(adMuseImageStatusEnum.getStatus(), status)) {
+                return adMuseImageStatusEnum;
+            }
+        }
+        return null;
+    }
+
+
+}

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/common/enums/AdMuseTaskStatusEnum.java

@@ -9,11 +9,7 @@ public enum AdMuseTaskStatusEnum {
 
     DEFAULT(0, "待处理"),
     CREATE_SUCCESS(1, "创建成功"),
-    CREATE_FAIL(2, "创建失败"),
-    VERIFY_SUCCESS(3, "审核通过"),
-    VERIFY_FAIL(4, "审核不通过"),
-    UPLOAD_SUCCESS(5, "上传成功"),
-    UPLOAD_FAIL(6, "上传失败")
+    CREATE_FAIL(2, "创建失败")
 
     ;
 

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/common/enums/AdVideoStatusEnum.java

@@ -9,15 +9,15 @@ public enum AdVideoStatusEnum {
 
     DEFAULT(0, "默认"),
     CROP_SUCCESS(1, "裁剪成功"),
-    CROP_FAIL(2, "裁剪失败"),
-    VERIFY_SUCCESS(3, "审核通过"),
-    VERIFY_FAIL(4, "审核不通过"),
-    UPLOAD_SUCCESS(5, "上传成功"),
-    UPLOAD_FAIL(6, "上传失败"),
-    MUSE_SUCCESS(7, "妙思任务成功"),
-    MUSE_FAIL(8, "妙思任务成功"),
-    MUSE_UPLOAD_SUCCESS(9, "妙思任务二次编辑上传成功"),
-    MUSE_UPLOAD_FAIL(10, "妙思任务二次编辑上传失败");
+    CROP_FAIL(2, "裁剪失败");
+//    VERIFY_SUCCESS(3, "审核通过"),
+//    VERIFY_FAIL(4, "审核不通过"),
+//    UPLOAD_SUCCESS(5, "上传成功"),
+//    UPLOAD_FAIL(6, "上传失败"),
+//    MUSE_SUCCESS(7, "妙思任务成功"),
+//    MUSE_FAIL(8, "妙思任务成功"),
+//    MUSE_UPLOAD_SUCCESS(9, "妙思任务二次编辑上传成功"),
+//    MUSE_UPLOAD_FAIL(10, "妙思任务二次编辑上传失败");
 
 
     final Integer status;

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

@@ -37,20 +37,20 @@ public class AdVideoController {
         return adVideoService.getAdVideoList(pageNum, pageSize, status);
     }
 
-    @GetMapping("/status")
-    public CommonResponse<List<AdVideoStatusVo>> getAdVideoStatusVo() {
-        List<AdVideoStatusVo> res = new ArrayList<>();
-        res.add(new AdVideoStatusVo(AdVideoStatusEnum.VERIFY_SUCCESS.getStatus(),
-                AdVideoStatusEnum.VERIFY_SUCCESS.getDesc()));
-        res.add(new AdVideoStatusVo(AdVideoStatusEnum.VERIFY_FAIL.getStatus(),
-                AdVideoStatusEnum.VERIFY_FAIL.getDesc()));
-        return CommonResponse.success(res);
-    }
-
-    @PostMapping("/update")
-    public CommonResponse<Void> updateAdVideo(@RequestBody AdVideoParam adVideoParam) {
-        return adVideoService.updateAdVideo(adVideoParam);
-    }
+//    @GetMapping("/status")
+//    public CommonResponse<List<AdVideoStatusVo>> getAdVideoStatusVo() {
+//        List<AdVideoStatusVo> res = new ArrayList<>();
+//        res.add(new AdVideoStatusVo(AdVideoStatusEnum.VERIFY_SUCCESS.getStatus(),
+//                AdVideoStatusEnum.VERIFY_SUCCESS.getDesc()));
+//        res.add(new AdVideoStatusVo(AdVideoStatusEnum.VERIFY_FAIL.getStatus(),
+//                AdVideoStatusEnum.VERIFY_FAIL.getDesc()));
+//        return CommonResponse.success(res);
+//    }
+
+//    @PostMapping("/update")
+//    public CommonResponse<Void> updateAdVideo(@RequestBody AdVideoParam adVideoParam) {
+//        return adVideoService.updateAdVideo(adVideoParam);
+//    }
 
     @GetMapping("/image/get")
     public CommonResponse<List<AdVideoImageVo>> getAdVideoImageList(@RequestParam Long adVideoId) {
@@ -100,16 +100,16 @@ public class AdVideoController {
     @GetMapping("/muse/status")
     public CommonResponse<List<AdVideoMuseStatusVo>> getAdVideoMuseStatusVo() {
         List<AdVideoMuseStatusVo> res = new ArrayList<>();
-        res.add(new AdVideoMuseStatusVo(AdMuseTaskStatusEnum.VERIFY_SUCCESS.getStatus(),
-                AdMuseTaskStatusEnum.VERIFY_SUCCESS.getDesc()));
-        res.add(new AdVideoMuseStatusVo(AdMuseTaskStatusEnum.VERIFY_FAIL.getStatus(),
-                AdMuseTaskStatusEnum.VERIFY_FAIL.getDesc()));
+        res.add(new AdVideoMuseStatusVo(AdMuseImageStatusEnum.VERIFY_SUCCESS.getStatus(),
+                AdMuseImageStatusEnum.VERIFY_SUCCESS.getDesc()));
+        res.add(new AdVideoMuseStatusVo(AdMuseImageStatusEnum.VERIFY_FAIL.getStatus(),
+                AdMuseImageStatusEnum.VERIFY_FAIL.getDesc()));
         return CommonResponse.success(res);
     }
 
     @PostMapping("/muse/update")
     public CommonResponse<Void> updateAdMuseImage(@RequestBody AdMuseImageParam adMuseImageParam) {
-        return adMuseTaskService.updateMuseTask(adMuseImageParam);
+        return adMuseTaskService.updateMuseImage(adMuseImageParam);
     }
 
     @PostMapping("/muse/upload")

tencent-ad-server/src/main/java/com/tzld/piaoquan/tencentad/dao/mapper/AdMuseImageMapper.java

@@ -0,0 +1,30 @@
+package com.tzld.piaoquan.tencentad.dao.mapper;
+
+import com.tzld.piaoquan.tencentad.model.po.AdMuseImage;
+import com.tzld.piaoquan.tencentad.model.po.AdMuseImageExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface AdMuseImageMapper {
+    long countByExample(AdMuseImageExample example);
+
+    int deleteByExample(AdMuseImageExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AdMuseImage record);
+
+    int insertSelective(AdMuseImage record);
+
+    List<AdMuseImage> selectByExample(AdMuseImageExample example);
+
+    AdMuseImage selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") AdMuseImage record, @Param("example") AdMuseImageExample example);
+
+    int updateByExample(@Param("record") AdMuseImage record, @Param("example") AdMuseImageExample example);
+
+    int updateByPrimaryKeySelective(AdMuseImage record);
+
+    int updateByPrimaryKey(AdMuseImage record);
+}

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

@@ -9,10 +9,12 @@ public class AdCreative {
 
     private Long adVideoId;
 
-    private String museIds;
+    private String museImageIds;
 
     private Long dynamicCreativeId;
 
+    private String description;
+
     private Integer status;
 
     private Integer isDelete;
@@ -45,12 +47,12 @@ public class AdCreative {
         this.adVideoId = adVideoId;
     }
 
-    public String getMuseIds() {
-        return museIds;
+    public String getMuseImageIds() {
+        return museImageIds;
     }
 
-    public void setMuseIds(String museIds) {
-        this.museIds = museIds;
+    public void setMuseImageIds(String museImageIds) {
+        this.museImageIds = museImageIds;
     }
 
     public Long getDynamicCreativeId() {
@@ -61,6 +63,14 @@ public class AdCreative {
         this.dynamicCreativeId = dynamicCreativeId;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -102,8 +112,9 @@ public class AdCreative {
         sb.append(", id=").append(id);
         sb.append(", adGroupId=").append(adGroupId);
         sb.append(", adVideoId=").append(adVideoId);
-        sb.append(", museIds=").append(museIds);
+        sb.append(", museImageIds=").append(museImageIds);
         sb.append(", dynamicCreativeId=").append(dynamicCreativeId);
+        sb.append(", description=").append(description);
         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/AdCreativeExample.java

@@ -296,73 +296,73 @@ public class AdCreativeExample {
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsIsNull() {
-            addCriterion("muse_ids is null");
+        public Criteria andMuseImageIdsIsNull() {
+            addCriterion("muse_image_ids is null");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsIsNotNull() {
-            addCriterion("muse_ids is not null");
+        public Criteria andMuseImageIdsIsNotNull() {
+            addCriterion("muse_image_ids is not null");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsEqualTo(String value) {
-            addCriterion("muse_ids =", value, "museIds");
+        public Criteria andMuseImageIdsEqualTo(String value) {
+            addCriterion("muse_image_ids =", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsNotEqualTo(String value) {
-            addCriterion("muse_ids <>", value, "museIds");
+        public Criteria andMuseImageIdsNotEqualTo(String value) {
+            addCriterion("muse_image_ids <>", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsGreaterThan(String value) {
-            addCriterion("muse_ids >", value, "museIds");
+        public Criteria andMuseImageIdsGreaterThan(String value) {
+            addCriterion("muse_image_ids >", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsGreaterThanOrEqualTo(String value) {
-            addCriterion("muse_ids >=", value, "museIds");
+        public Criteria andMuseImageIdsGreaterThanOrEqualTo(String value) {
+            addCriterion("muse_image_ids >=", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsLessThan(String value) {
-            addCriterion("muse_ids <", value, "museIds");
+        public Criteria andMuseImageIdsLessThan(String value) {
+            addCriterion("muse_image_ids <", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsLessThanOrEqualTo(String value) {
-            addCriterion("muse_ids <=", value, "museIds");
+        public Criteria andMuseImageIdsLessThanOrEqualTo(String value) {
+            addCriterion("muse_image_ids <=", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsLike(String value) {
-            addCriterion("muse_ids like", value, "museIds");
+        public Criteria andMuseImageIdsLike(String value) {
+            addCriterion("muse_image_ids like", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsNotLike(String value) {
-            addCriterion("muse_ids not like", value, "museIds");
+        public Criteria andMuseImageIdsNotLike(String value) {
+            addCriterion("muse_image_ids not like", value, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsIn(List<String> values) {
-            addCriterion("muse_ids in", values, "museIds");
+        public Criteria andMuseImageIdsIn(List<String> values) {
+            addCriterion("muse_image_ids in", values, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsNotIn(List<String> values) {
-            addCriterion("muse_ids not in", values, "museIds");
+        public Criteria andMuseImageIdsNotIn(List<String> values) {
+            addCriterion("muse_image_ids not in", values, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsBetween(String value1, String value2) {
-            addCriterion("muse_ids between", value1, value2, "museIds");
+        public Criteria andMuseImageIdsBetween(String value1, String value2) {
+            addCriterion("muse_image_ids between", value1, value2, "museImageIds");
             return (Criteria) this;
         }
 
-        public Criteria andMuseIdsNotBetween(String value1, String value2) {
-            addCriterion("muse_ids not between", value1, value2, "museIds");
+        public Criteria andMuseImageIdsNotBetween(String value1, String value2) {
+            addCriterion("muse_image_ids not between", value1, value2, "museImageIds");
             return (Criteria) this;
         }
 
@@ -426,6 +426,76 @@ public class AdCreativeExample {
             return (Criteria) this;
         }
 
+        public Criteria andDescriptionIsNull() {
+            addCriterion("description is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNotNull() {
+            addCriterion("description is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionEqualTo(String value) {
+            addCriterion("description =", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotEqualTo(String value) {
+            addCriterion("description <>", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThan(String value) {
+            addCriterion("description >", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
+            addCriterion("description >=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThan(String value) {
+            addCriterion("description <", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThanOrEqualTo(String value) {
+            addCriterion("description <=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLike(String value) {
+            addCriterion("description like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotLike(String value) {
+            addCriterion("description not like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIn(List<String> values) {
+            addCriterion("description in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotIn(List<String> values) {
+            addCriterion("description not in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionBetween(String value1, String value2) {
+            addCriterion("description between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotBetween(String value1, String value2) {
+            addCriterion("description not between", value1, value2, "description");
+            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/AdMuseImage.java

@@ -0,0 +1,158 @@
+package com.tzld.piaoquan.tencentad.model.po;
+
+import java.util.Date;
+
+public class AdMuseImage {
+    private Long id;
+
+    private Long adVideoId;
+
+    private Long adVideoImageId;
+
+    private Long adMuseTaskId;
+
+    private Long museMaterialId;
+
+    private String museUrl;
+
+    private String stitchUrl;
+
+    private String finalUrl;
+
+    private Long mediaId;
+
+    private Integer status;
+
+    private Integer isDelete;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAdVideoId() {
+        return adVideoId;
+    }
+
+    public void setAdVideoId(Long adVideoId) {
+        this.adVideoId = adVideoId;
+    }
+
+    public Long getAdVideoImageId() {
+        return adVideoImageId;
+    }
+
+    public void setAdVideoImageId(Long adVideoImageId) {
+        this.adVideoImageId = adVideoImageId;
+    }
+
+    public Long getAdMuseTaskId() {
+        return adMuseTaskId;
+    }
+
+    public void setAdMuseTaskId(Long adMuseTaskId) {
+        this.adMuseTaskId = adMuseTaskId;
+    }
+
+    public Long getMuseMaterialId() {
+        return museMaterialId;
+    }
+
+    public void setMuseMaterialId(Long museMaterialId) {
+        this.museMaterialId = museMaterialId;
+    }
+
+    public String getMuseUrl() {
+        return museUrl;
+    }
+
+    public void setMuseUrl(String museUrl) {
+        this.museUrl = museUrl;
+    }
+
+    public String getStitchUrl() {
+        return stitchUrl;
+    }
+
+    public void setStitchUrl(String stitchUrl) {
+        this.stitchUrl = stitchUrl;
+    }
+
+    public String getFinalUrl() {
+        return finalUrl;
+    }
+
+    public void setFinalUrl(String finalUrl) {
+        this.finalUrl = finalUrl;
+    }
+
+    public Long getMediaId() {
+        return mediaId;
+    }
+
+    public void setMediaId(Long mediaId) {
+        this.mediaId = mediaId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", adVideoId=").append(adVideoId);
+        sb.append(", adVideoImageId=").append(adVideoImageId);
+        sb.append(", adMuseTaskId=").append(adMuseTaskId);
+        sb.append(", museMaterialId=").append(museMaterialId);
+        sb.append(", museUrl=").append(museUrl);
+        sb.append(", stitchUrl=").append(stitchUrl);
+        sb.append(", finalUrl=").append(finalUrl);
+        sb.append(", mediaId=").append(mediaId);
+        sb.append(", status=").append(status);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,1022 @@
+package com.tzld.piaoquan.tencentad.model.po;
+
+import com.tzld.piaoquan.tencentad.utils.page.Page;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class AdMuseImageExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    protected Page page;
+
+    public AdMuseImageExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    public void setPage(Page page) {
+        this.page=page;
+    }
+
+    public Page getPage() {
+        return page;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdIsNull() {
+            addCriterion("ad_video_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdIsNotNull() {
+            addCriterion("ad_video_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdEqualTo(Long value) {
+            addCriterion("ad_video_id =", value, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdNotEqualTo(Long value) {
+            addCriterion("ad_video_id <>", value, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdGreaterThan(Long value) {
+            addCriterion("ad_video_id >", value, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("ad_video_id >=", value, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdLessThan(Long value) {
+            addCriterion("ad_video_id <", value, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdLessThanOrEqualTo(Long value) {
+            addCriterion("ad_video_id <=", value, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdIn(List<Long> values) {
+            addCriterion("ad_video_id in", values, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdNotIn(List<Long> values) {
+            addCriterion("ad_video_id not in", values, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdBetween(Long value1, Long value2) {
+            addCriterion("ad_video_id between", value1, value2, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoIdNotBetween(Long value1, Long value2) {
+            addCriterion("ad_video_id not between", value1, value2, "adVideoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdIsNull() {
+            addCriterion("ad_video_image_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdIsNotNull() {
+            addCriterion("ad_video_image_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdEqualTo(Long value) {
+            addCriterion("ad_video_image_id =", value, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdNotEqualTo(Long value) {
+            addCriterion("ad_video_image_id <>", value, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdGreaterThan(Long value) {
+            addCriterion("ad_video_image_id >", value, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("ad_video_image_id >=", value, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdLessThan(Long value) {
+            addCriterion("ad_video_image_id <", value, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdLessThanOrEqualTo(Long value) {
+            addCriterion("ad_video_image_id <=", value, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdIn(List<Long> values) {
+            addCriterion("ad_video_image_id in", values, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdNotIn(List<Long> values) {
+            addCriterion("ad_video_image_id not in", values, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdBetween(Long value1, Long value2) {
+            addCriterion("ad_video_image_id between", value1, value2, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdVideoImageIdNotBetween(Long value1, Long value2) {
+            addCriterion("ad_video_image_id not between", value1, value2, "adVideoImageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdIsNull() {
+            addCriterion("ad_muse_task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdIsNotNull() {
+            addCriterion("ad_muse_task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdEqualTo(Long value) {
+            addCriterion("ad_muse_task_id =", value, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdNotEqualTo(Long value) {
+            addCriterion("ad_muse_task_id <>", value, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdGreaterThan(Long value) {
+            addCriterion("ad_muse_task_id >", value, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("ad_muse_task_id >=", value, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdLessThan(Long value) {
+            addCriterion("ad_muse_task_id <", value, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdLessThanOrEqualTo(Long value) {
+            addCriterion("ad_muse_task_id <=", value, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdIn(List<Long> values) {
+            addCriterion("ad_muse_task_id in", values, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdNotIn(List<Long> values) {
+            addCriterion("ad_muse_task_id not in", values, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdBetween(Long value1, Long value2) {
+            addCriterion("ad_muse_task_id between", value1, value2, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdMuseTaskIdNotBetween(Long value1, Long value2) {
+            addCriterion("ad_muse_task_id not between", value1, value2, "adMuseTaskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdIsNull() {
+            addCriterion("muse_material_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdIsNotNull() {
+            addCriterion("muse_material_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdEqualTo(Long value) {
+            addCriterion("muse_material_id =", value, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdNotEqualTo(Long value) {
+            addCriterion("muse_material_id <>", value, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdGreaterThan(Long value) {
+            addCriterion("muse_material_id >", value, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("muse_material_id >=", value, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdLessThan(Long value) {
+            addCriterion("muse_material_id <", value, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdLessThanOrEqualTo(Long value) {
+            addCriterion("muse_material_id <=", value, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdIn(List<Long> values) {
+            addCriterion("muse_material_id in", values, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdNotIn(List<Long> values) {
+            addCriterion("muse_material_id not in", values, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdBetween(Long value1, Long value2) {
+            addCriterion("muse_material_id between", value1, value2, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseMaterialIdNotBetween(Long value1, Long value2) {
+            addCriterion("muse_material_id not between", value1, value2, "museMaterialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlIsNull() {
+            addCriterion("muse_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlIsNotNull() {
+            addCriterion("muse_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlEqualTo(String value) {
+            addCriterion("muse_url =", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlNotEqualTo(String value) {
+            addCriterion("muse_url <>", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlGreaterThan(String value) {
+            addCriterion("muse_url >", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("muse_url >=", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlLessThan(String value) {
+            addCriterion("muse_url <", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlLessThanOrEqualTo(String value) {
+            addCriterion("muse_url <=", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlLike(String value) {
+            addCriterion("muse_url like", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlNotLike(String value) {
+            addCriterion("muse_url not like", value, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlIn(List<String> values) {
+            addCriterion("muse_url in", values, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlNotIn(List<String> values) {
+            addCriterion("muse_url not in", values, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlBetween(String value1, String value2) {
+            addCriterion("muse_url between", value1, value2, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMuseUrlNotBetween(String value1, String value2) {
+            addCriterion("muse_url not between", value1, value2, "museUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlIsNull() {
+            addCriterion("stitch_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlIsNotNull() {
+            addCriterion("stitch_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlEqualTo(String value) {
+            addCriterion("stitch_url =", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlNotEqualTo(String value) {
+            addCriterion("stitch_url <>", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlGreaterThan(String value) {
+            addCriterion("stitch_url >", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("stitch_url >=", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlLessThan(String value) {
+            addCriterion("stitch_url <", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlLessThanOrEqualTo(String value) {
+            addCriterion("stitch_url <=", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlLike(String value) {
+            addCriterion("stitch_url like", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlNotLike(String value) {
+            addCriterion("stitch_url not like", value, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlIn(List<String> values) {
+            addCriterion("stitch_url in", values, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlNotIn(List<String> values) {
+            addCriterion("stitch_url not in", values, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlBetween(String value1, String value2) {
+            addCriterion("stitch_url between", value1, value2, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andStitchUrlNotBetween(String value1, String value2) {
+            addCriterion("stitch_url not between", value1, value2, "stitchUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlIsNull() {
+            addCriterion("final_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlIsNotNull() {
+            addCriterion("final_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlEqualTo(String value) {
+            addCriterion("final_url =", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlNotEqualTo(String value) {
+            addCriterion("final_url <>", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlGreaterThan(String value) {
+            addCriterion("final_url >", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("final_url >=", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlLessThan(String value) {
+            addCriterion("final_url <", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlLessThanOrEqualTo(String value) {
+            addCriterion("final_url <=", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlLike(String value) {
+            addCriterion("final_url like", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlNotLike(String value) {
+            addCriterion("final_url not like", value, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlIn(List<String> values) {
+            addCriterion("final_url in", values, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlNotIn(List<String> values) {
+            addCriterion("final_url not in", values, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlBetween(String value1, String value2) {
+            addCriterion("final_url between", value1, value2, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinalUrlNotBetween(String value1, String value2) {
+            addCriterion("final_url not between", value1, value2, "finalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdIsNull() {
+            addCriterion("media_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdIsNotNull() {
+            addCriterion("media_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdEqualTo(Long value) {
+            addCriterion("media_id =", value, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdNotEqualTo(Long value) {
+            addCriterion("media_id <>", value, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdGreaterThan(Long value) {
+            addCriterion("media_id >", value, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("media_id >=", value, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdLessThan(Long value) {
+            addCriterion("media_id <", value, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdLessThanOrEqualTo(Long value) {
+            addCriterion("media_id <=", value, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdIn(List<Long> values) {
+            addCriterion("media_id in", values, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdNotIn(List<Long> values) {
+            addCriterion("media_id not in", values, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdBetween(Long value1, Long value2) {
+            addCriterion("media_id between", value1, value2, "mediaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMediaIdNotBetween(Long value1, Long value2) {
+            addCriterion("media_id not between", value1, value2, "mediaId");
+            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;
+        }
+
+        public Criteria andIsDeleteIsNull() {
+            addCriterion("is_delete is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIsNotNull() {
+            addCriterion("is_delete is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteEqualTo(Integer value) {
+            addCriterion("is_delete =", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotEqualTo(Integer value) {
+            addCriterion("is_delete <>", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThan(Integer value) {
+            addCriterion("is_delete >", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_delete >=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThan(Integer value) {
+            addCriterion("is_delete <", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThanOrEqualTo(Integer value) {
+            addCriterion("is_delete <=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIn(List<Integer> values) {
+            addCriterion("is_delete in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotIn(List<Integer> values) {
+            addCriterion("is_delete not in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteBetween(Integer value1, Integer value2) {
+            addCriterion("is_delete between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_delete not between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -17,16 +17,6 @@ public class AdMuseTask {
 
     private String taskStatus;
 
-    private Long museMaterialId;
-
-    private String museUrl;
-
-    private String stitchUrl;
-
-    private String finalUrl;
-
-    private Long mediaId;
-
     private Integer isDelete;
 
     private Date createTime;
@@ -89,46 +79,6 @@ public class AdMuseTask {
         this.taskStatus = taskStatus;
     }
 
-    public Long getMuseMaterialId() {
-        return museMaterialId;
-    }
-
-    public void setMuseMaterialId(Long museMaterialId) {
-        this.museMaterialId = museMaterialId;
-    }
-
-    public String getMuseUrl() {
-        return museUrl;
-    }
-
-    public void setMuseUrl(String museUrl) {
-        this.museUrl = museUrl;
-    }
-
-    public String getStitchUrl() {
-        return stitchUrl;
-    }
-
-    public void setStitchUrl(String stitchUrl) {
-        this.stitchUrl = stitchUrl;
-    }
-
-    public String getFinalUrl() {
-        return finalUrl;
-    }
-
-    public void setFinalUrl(String finalUrl) {
-        this.finalUrl = finalUrl;
-    }
-
-    public Long getMediaId() {
-        return mediaId;
-    }
-
-    public void setMediaId(Long mediaId) {
-        this.mediaId = mediaId;
-    }
-
     public Integer getIsDelete() {
         return isDelete;
     }
@@ -166,11 +116,6 @@ public class AdMuseTask {
         sb.append(", taskId=").append(taskId);
         sb.append(", taskType=").append(taskType);
         sb.append(", taskStatus=").append(taskStatus);
-        sb.append(", museMaterialId=").append(museMaterialId);
-        sb.append(", museUrl=").append(museUrl);
-        sb.append(", stitchUrl=").append(stitchUrl);
-        sb.append(", finalUrl=").append(finalUrl);
-        sb.append(", mediaId=").append(mediaId);
         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/AdMuseTaskExample.java

@@ -556,336 +556,6 @@ public class AdMuseTaskExample {
             return (Criteria) this;
         }
 
-        public Criteria andMuseMaterialIdIsNull() {
-            addCriterion("muse_material_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdIsNotNull() {
-            addCriterion("muse_material_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdEqualTo(Long value) {
-            addCriterion("muse_material_id =", value, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdNotEqualTo(Long value) {
-            addCriterion("muse_material_id <>", value, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdGreaterThan(Long value) {
-            addCriterion("muse_material_id >", value, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("muse_material_id >=", value, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdLessThan(Long value) {
-            addCriterion("muse_material_id <", value, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdLessThanOrEqualTo(Long value) {
-            addCriterion("muse_material_id <=", value, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdIn(List<Long> values) {
-            addCriterion("muse_material_id in", values, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdNotIn(List<Long> values) {
-            addCriterion("muse_material_id not in", values, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdBetween(Long value1, Long value2) {
-            addCriterion("muse_material_id between", value1, value2, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseMaterialIdNotBetween(Long value1, Long value2) {
-            addCriterion("muse_material_id not between", value1, value2, "museMaterialId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlIsNull() {
-            addCriterion("muse_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlIsNotNull() {
-            addCriterion("muse_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlEqualTo(String value) {
-            addCriterion("muse_url =", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlNotEqualTo(String value) {
-            addCriterion("muse_url <>", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlGreaterThan(String value) {
-            addCriterion("muse_url >", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("muse_url >=", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlLessThan(String value) {
-            addCriterion("muse_url <", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlLessThanOrEqualTo(String value) {
-            addCriterion("muse_url <=", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlLike(String value) {
-            addCriterion("muse_url like", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlNotLike(String value) {
-            addCriterion("muse_url not like", value, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlIn(List<String> values) {
-            addCriterion("muse_url in", values, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlNotIn(List<String> values) {
-            addCriterion("muse_url not in", values, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlBetween(String value1, String value2) {
-            addCriterion("muse_url between", value1, value2, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMuseUrlNotBetween(String value1, String value2) {
-            addCriterion("muse_url not between", value1, value2, "museUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlIsNull() {
-            addCriterion("stitch_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlIsNotNull() {
-            addCriterion("stitch_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlEqualTo(String value) {
-            addCriterion("stitch_url =", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlNotEqualTo(String value) {
-            addCriterion("stitch_url <>", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlGreaterThan(String value) {
-            addCriterion("stitch_url >", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("stitch_url >=", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlLessThan(String value) {
-            addCriterion("stitch_url <", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlLessThanOrEqualTo(String value) {
-            addCriterion("stitch_url <=", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlLike(String value) {
-            addCriterion("stitch_url like", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlNotLike(String value) {
-            addCriterion("stitch_url not like", value, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlIn(List<String> values) {
-            addCriterion("stitch_url in", values, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlNotIn(List<String> values) {
-            addCriterion("stitch_url not in", values, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlBetween(String value1, String value2) {
-            addCriterion("stitch_url between", value1, value2, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStitchUrlNotBetween(String value1, String value2) {
-            addCriterion("stitch_url not between", value1, value2, "stitchUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlIsNull() {
-            addCriterion("final_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlIsNotNull() {
-            addCriterion("final_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlEqualTo(String value) {
-            addCriterion("final_url =", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlNotEqualTo(String value) {
-            addCriterion("final_url <>", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlGreaterThan(String value) {
-            addCriterion("final_url >", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("final_url >=", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlLessThan(String value) {
-            addCriterion("final_url <", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlLessThanOrEqualTo(String value) {
-            addCriterion("final_url <=", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlLike(String value) {
-            addCriterion("final_url like", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlNotLike(String value) {
-            addCriterion("final_url not like", value, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlIn(List<String> values) {
-            addCriterion("final_url in", values, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlNotIn(List<String> values) {
-            addCriterion("final_url not in", values, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlBetween(String value1, String value2) {
-            addCriterion("final_url between", value1, value2, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFinalUrlNotBetween(String value1, String value2) {
-            addCriterion("final_url not between", value1, value2, "finalUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdIsNull() {
-            addCriterion("media_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdIsNotNull() {
-            addCriterion("media_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdEqualTo(Long value) {
-            addCriterion("media_id =", value, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdNotEqualTo(Long value) {
-            addCriterion("media_id <>", value, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdGreaterThan(Long value) {
-            addCriterion("media_id >", value, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("media_id >=", value, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdLessThan(Long value) {
-            addCriterion("media_id <", value, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdLessThanOrEqualTo(Long value) {
-            addCriterion("media_id <=", value, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdIn(List<Long> values) {
-            addCriterion("media_id in", values, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdNotIn(List<Long> values) {
-            addCriterion("media_id not in", values, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdBetween(Long value1, Long value2) {
-            addCriterion("media_id between", value1, value2, "mediaId");
-            return (Criteria) this;
-        }
-
-        public Criteria andMediaIdNotBetween(Long value1, Long value2) {
-            addCriterion("media_id not between", value1, value2, "mediaId");
-            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/po/AdVideo.java

@@ -5,20 +5,12 @@ import java.util.Date;
 public class AdVideo {
     private Long id;
 
-    private String accountId;
-
     private Long videoId;
 
     private String videoPath;
 
     private String videoCover;
 
-    private String category;
-
-    private String description;
-
-    private String subtitle;
-
     private Integer status;
 
     private Integer retryCount;
@@ -37,14 +29,6 @@ public class AdVideo {
         this.id = id;
     }
 
-    public String getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(String accountId) {
-        this.accountId = accountId;
-    }
-
     public Long getVideoId() {
         return videoId;
     }
@@ -69,30 +53,6 @@ public class AdVideo {
         this.videoCover = videoCover;
     }
 
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getSubtitle() {
-        return subtitle;
-    }
-
-    public void setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
-    }
-
     public Integer getStatus() {
         return status;
     }
@@ -140,13 +100,9 @@ public class AdVideo {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
-        sb.append(", accountId=").append(accountId);
         sb.append(", videoId=").append(videoId);
         sb.append(", videoPath=").append(videoPath);
         sb.append(", videoCover=").append(videoCover);
-        sb.append(", category=").append(category);
-        sb.append(", description=").append(description);
-        sb.append(", subtitle=").append(subtitle);
         sb.append(", status=").append(status);
         sb.append(", retryCount=").append(retryCount);
         sb.append(", isDelete=").append(isDelete);

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

@@ -176,76 +176,6 @@ public class AdVideoExample {
             return (Criteria) this;
         }
 
-        public Criteria andAccountIdIsNull() {
-            addCriterion("account_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdIsNotNull() {
-            addCriterion("account_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdEqualTo(String value) {
-            addCriterion("account_id =", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdNotEqualTo(String value) {
-            addCriterion("account_id <>", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdGreaterThan(String value) {
-            addCriterion("account_id >", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdGreaterThanOrEqualTo(String value) {
-            addCriterion("account_id >=", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdLessThan(String value) {
-            addCriterion("account_id <", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdLessThanOrEqualTo(String value) {
-            addCriterion("account_id <=", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdLike(String value) {
-            addCriterion("account_id like", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdNotLike(String value) {
-            addCriterion("account_id not like", value, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdIn(List<String> values) {
-            addCriterion("account_id in", values, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdNotIn(List<String> values) {
-            addCriterion("account_id not in", values, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdBetween(String value1, String value2) {
-            addCriterion("account_id between", value1, value2, "accountId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountIdNotBetween(String value1, String value2) {
-            addCriterion("account_id not between", value1, value2, "accountId");
-            return (Criteria) this;
-        }
-
         public Criteria andVideoIdIsNull() {
             addCriterion("video_id is null");
             return (Criteria) this;
@@ -446,216 +376,6 @@ public class AdVideoExample {
             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 andDescriptionIsNull() {
-            addCriterion("description is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNotNull() {
-            addCriterion("description is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionEqualTo(String value) {
-            addCriterion("description =", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotEqualTo(String value) {
-            addCriterion("description <>", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThan(String value) {
-            addCriterion("description >", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
-            addCriterion("description >=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThan(String value) {
-            addCriterion("description <", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThanOrEqualTo(String value) {
-            addCriterion("description <=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLike(String value) {
-            addCriterion("description like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotLike(String value) {
-            addCriterion("description not like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIn(List<String> values) {
-            addCriterion("description in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotIn(List<String> values) {
-            addCriterion("description not in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionBetween(String value1, String value2) {
-            addCriterion("description between", value1, value2, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotBetween(String value1, String value2) {
-            addCriterion("description not between", value1, value2, "description");
-            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 andStatusIsNull() {
             addCriterion("`status` is null");
             return (Criteria) this;

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

@@ -7,6 +7,8 @@ public class AdVideoImage {
 
     private Long adVideoId;
 
+    private String accountId;
+
     private String imageUrl;
 
     private Integer status;
@@ -17,8 +19,12 @@ public class AdVideoImage {
 
     private String dimensionSize;
 
+    private String img2imgDesc;
+
     private String text2imgDesc;
 
+    private String subtitle;
+
     private Integer isDelete;
 
     private Date createTime;
@@ -41,6 +47,14 @@ public class AdVideoImage {
         this.adVideoId = adVideoId;
     }
 
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
     public String getImageUrl() {
         return imageUrl;
     }
@@ -81,6 +95,14 @@ public class AdVideoImage {
         this.dimensionSize = dimensionSize;
     }
 
+    public String getImg2imgDesc() {
+        return img2imgDesc;
+    }
+
+    public void setImg2imgDesc(String img2imgDesc) {
+        this.img2imgDesc = img2imgDesc;
+    }
+
     public String getText2imgDesc() {
         return text2imgDesc;
     }
@@ -89,6 +111,14 @@ public class AdVideoImage {
         this.text2imgDesc = text2imgDesc;
     }
 
+    public String getSubtitle() {
+        return subtitle;
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle = subtitle;
+    }
+
     public Integer getIsDelete() {
         return isDelete;
     }
@@ -121,12 +151,15 @@ public class AdVideoImage {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", adVideoId=").append(adVideoId);
+        sb.append(", accountId=").append(accountId);
         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

@@ -236,6 +236,76 @@ public class AdVideoImageExample {
             return (Criteria) this;
         }
 
+        public Criteria andAccountIdIsNull() {
+            addCriterion("account_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdIsNotNull() {
+            addCriterion("account_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdEqualTo(String value) {
+            addCriterion("account_id =", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdNotEqualTo(String value) {
+            addCriterion("account_id <>", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdGreaterThan(String value) {
+            addCriterion("account_id >", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdGreaterThanOrEqualTo(String value) {
+            addCriterion("account_id >=", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdLessThan(String value) {
+            addCriterion("account_id <", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdLessThanOrEqualTo(String value) {
+            addCriterion("account_id <=", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdLike(String value) {
+            addCriterion("account_id like", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdNotLike(String value) {
+            addCriterion("account_id not like", value, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdIn(List<String> values) {
+            addCriterion("account_id in", values, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdNotIn(List<String> values) {
+            addCriterion("account_id not in", values, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdBetween(String value1, String value2) {
+            addCriterion("account_id between", value1, value2, "accountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIdNotBetween(String value1, String value2) {
+            addCriterion("account_id not between", value1, value2, "accountId");
+            return (Criteria) this;
+        }
+
         public Criteria andImageUrlIsNull() {
             addCriterion("image_url is null");
             return (Criteria) this;
@@ -566,6 +636,76 @@ public class AdVideoImageExample {
             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;
@@ -636,6 +776,76 @@ public class AdVideoImageExample {
             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/AdCreativeParam.java

@@ -17,5 +17,7 @@ public class AdCreativeParam {
 
     private String adGroupName;
 
-    private List<Long> adMuseIds;
+    private String description;
+
+    private List<Long> adMuseImageIds;
 }

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

@@ -3,11 +3,13 @@ package com.tzld.piaoquan.tencentad.model.vo;
 import lombok.Data;
 import lombok.ToString;
 
+import java.util.List;
+
 @Data
 @ToString
 public class AdVideoImageParam {
 
-    private Long id;
+    private List<Long> ids;
 
     private Integer status;
 
@@ -16,4 +18,8 @@ public class AdVideoImageParam {
     private String dimensionSize;
 
     private String text2imgDesc;
+
+    private String subtitle;
+
+    private String accountId;
 }

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

@@ -7,5 +7,5 @@ import java.util.List;
 public interface AdCreativeService {
 
     boolean addAdCreative(AdVideo adVideo, List<Long> mediaIds, Long adgroupId, Integer accountId,
-                          String adGroupName, List<Long> adMuseIds);
+                          String adGroupName, List<Long> adMuseIds, String description);
 }

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

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.tencentad.service;
 
 import com.tzld.piaoquan.tencentad.common.base.CommonResponse;
+import com.tzld.piaoquan.tencentad.model.po.AdMuseImage;
 import com.tzld.piaoquan.tencentad.model.po.AdMuseTask;
 import com.tzld.piaoquan.tencentad.model.po.AdVideoImage;
 import com.tzld.piaoquan.tencentad.model.vo.AdMuseImageParam;
@@ -14,17 +15,17 @@ public interface AdMuseTaskService {
 
     void addMuseTask(String accountId, String accessToken, AdVideoImage adVideoImage);
 
-    List<AdMuseTask> getAdMuseTask(Long adVideoId, Integer status);
+    List<AdMuseTask> getAdMuseTask(Integer status);
 
     List<AdMuseTask> getAdMuseTask(Long adVideoId, Integer status, List<Long> adMuseTaskIds);
 
-    boolean getMuseTaskRes(String accountId, String accessToken, AdMuseTask adMuseTask, String caption);
-
-    long selectCount(Long adVideoId, List<Integer> status);
+    boolean getMuseTaskRes(String accountId, String accessToken, AdMuseTask adMuseTask, String subtitle);
 
     CommonResponse<List<AdMuseImageVo>> getAdMuseImageVoList(Long adVideoId);
 
-    CommonResponse<Void> updateMuseTask(AdMuseImageParam adMuseImageParam);
+    CommonResponse<Void> updateMuseImage(AdMuseImageParam adMuseImageParam);
 
     CommonResponse<Void> uploadMuseImage(MultipartFile file, Long id);
+
+    List<AdMuseImage> getAdMuseImageList(List<Long> ids);
 }

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

@@ -15,14 +15,11 @@ public interface AdVideoImageService {
 
     CommonResponse<List<AdVideoImageVo>> getAdVideoImageVoList(Long adVideoId);
 
-    List<AdVideoImage> getAdVideoImageList(Long adVideoId, Integer status);
-
     CommonResponse<Void> updateAdVideoImage(AdVideoImageParam adVideoImageParam);
 
     boolean uploadImageToTencent(String account, String accessToken, Long adVideoId);
 
-    long selectCount(Long adVideoId, Integer status);
-
-
     CommonResponse<Void> uploadMuseImage(MultipartFile file, Long adVideoId);
+
+    AdVideoImage getAdVideoImageById(Long adVideoImageId);
 }

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

@@ -20,7 +20,5 @@ public interface AdVideoService {
 
     CommonResponse<Void> createAdCreative(AdCreativeParam adCreativeParam);
 
-    CommonResponse<Void> updateAdVideo(AdVideoParam adVideoParam);
-
     void refreshMuseTaskStatus();
 }

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

@@ -41,7 +41,7 @@ public class AdCreativeServiceImpl implements AdCreativeService {
 
 
     public boolean addAdCreative(AdVideo adVideo, List<Long> mediaIds, Long adgroupId, Integer accountId,
-                                 String adGroupName, List<Long> adMuseIds) {
+                                 String adGroupName, List<Long> adMuseIds, String description) {
 
         JSONObject param = new JSONObject();
 
@@ -62,7 +62,7 @@ public class AdCreativeServiceImpl implements AdCreativeService {
         JSONArray descriptions = new JSONArray();
         JSONObject description1 = new JSONObject();
         JSONObject descriptionValue = new JSONObject();
-        descriptionValue.put("content", adVideo.getDescription());
+        descriptionValue.put("content", description);
         description1.put("value", descriptionValue);
         descriptions.add(description1);
         creativeComponents.put("description", descriptions);
@@ -125,7 +125,7 @@ public class AdCreativeServiceImpl implements AdCreativeService {
                 adCreative.setAdGroupId(adGroup.getId());
                 adCreative.setAdVideoId(adVideo.getId());
                 adCreative.setDynamicCreativeId(dynamicCreativeId);
-                adCreative.setMuseIds(JSONObject.toJSONString(adMuseIds));
+                adCreative.setMuseImageIds(JSONObject.toJSONString(adMuseIds));
                 adCreativeMapper.insertSelective(adCreative);
                 return true;
             }

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

@@ -1,16 +1,16 @@
 package com.tzld.piaoquan.tencentad.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.piaoquan.tencentad.common.base.CommonResponse;
 import com.tzld.piaoquan.tencentad.common.base.ExceptionCodeEnum;
 import com.tzld.piaoquan.tencentad.common.constants.TimeConstant;
+import com.tzld.piaoquan.tencentad.common.enums.AdMuseImageStatusEnum;
 import com.tzld.piaoquan.tencentad.common.enums.AdMuseTaskStatusEnum;
 import com.tzld.piaoquan.tencentad.common.enums.AdVideoStatusEnum;
 import com.tzld.piaoquan.tencentad.common.enums.SimilarityCodeEnum;
 import com.tzld.piaoquan.tencentad.component.HttpPoolClient;
-import com.tzld.piaoquan.tencentad.dao.mapper.AdGroupMapper;
-import com.tzld.piaoquan.tencentad.dao.mapper.AdMuseTaskMapper;
-import com.tzld.piaoquan.tencentad.dao.mapper.AdVideoMapper;
+import com.tzld.piaoquan.tencentad.dao.mapper.*;
 import com.tzld.piaoquan.tencentad.model.bo.ImageParam;
 import com.tzld.piaoquan.tencentad.model.po.*;
 import com.tzld.piaoquan.tencentad.model.vo.AdMuseImageParam;
@@ -49,13 +49,13 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
     private AdMuseTaskMapper adMuseTaskMapper;
 
     @Autowired
-    private AdVideoMapper adVideoMapper;
+    private AdVideoImageMapper adVideoImageMapper;
 
     @Autowired
-    private AdGroupMapper adGroupMapper;
+    private AdAccountService accountService;
 
     @Autowired
-    private AdAccountService accountService;
+    private AdMuseImageMapper adMuseImageMapper;
 
     public void addMuseTask(String accountId, String accessToken, AdVideoImage adVideoImage) {
         try {
@@ -86,7 +86,6 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
                 } else {
                     img2img.put("extend_size", true);
                 }
-
                 param.put("img2img", img2img);
             }
             String res = httpPoolClient.post(url, param.toJSONString());
@@ -106,9 +105,9 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
         }
     }
 
-    public List<AdMuseTask> getAdMuseTask(Long adVideoId, Integer status) {
+    public List<AdMuseTask> getAdMuseTask(Integer status) {
         AdMuseTaskExample example = new AdMuseTaskExample();
-        example.createCriteria().andAdVideoIdEqualTo(adVideoId).andStatusEqualTo(status);
+        example.createCriteria().andStatusEqualTo(status).andIsDeleteEqualTo(0);
         return adMuseTaskMapper.selectByExample(example);
     }
 
@@ -118,7 +117,7 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
         return adMuseTaskMapper.selectByExample(example);
     }
 
-    public boolean getMuseTaskRes(String accountId, String accessToken, AdMuseTask adMuseTask, String caption) {
+    public boolean getMuseTaskRes(String accountId, String accessToken, AdMuseTask adMuseTask, String subtitle) {
         try {
             long now = System.currentTimeMillis();
             long create = adMuseTask.getCreateTime().getTime();
@@ -136,10 +135,16 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
                 String taskStatus = data.getString("task_status");
                 if ("MUSE_AI_TASK_SUCCESS".equals(taskStatus)) {
                     adMuseTask.setTaskStatus(taskStatus);
-                    JSONObject result = data.getJSONArray("results").getJSONObject(0);
-                    adMuseTask.setMuseMaterialId(result.getLong("muse_material_id"));
-                    adMuseTask.setMuseUrl(result.getString("url"));
-                    adMuseTask.setStitchUrl(getStitchUrl(result.getString("url"), caption));
+                    JSONArray results = data.getJSONArray("results");
+                    for (int i = 0; i < results.size(); i++) {
+                        JSONObject result = results.getJSONObject(1);
+                        AdMuseImage adMuseImage = new AdMuseImage();
+                        adMuseImage.setAdMuseTaskId(adMuseTask.getId());
+                        adMuseImage.setMuseMaterialId(result.getLong("muse_material_id"));
+                        adMuseImage.setMuseUrl(result.getString("url"));
+                        adMuseImage.setStitchUrl(getStitchUrl(result.getString("url"), subtitle));
+                        adMuseImageMapper.insertSelective(adMuseImage);
+                    }
                     adMuseTask.setStatus(AdMuseTaskStatusEnum.CREATE_SUCCESS.getStatus());
                     adMuseTaskMapper.updateByPrimaryKeySelective(adMuseTask);
                     return true;
@@ -180,61 +185,55 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
 
     @Override
     public CommonResponse<List<AdMuseImageVo>> getAdMuseImageVoList(Long adVideoId) {
-        AdMuseTaskExample example = new AdMuseTaskExample();
+        AdMuseImageExample example = new AdMuseImageExample();
         example.createCriteria().andAdVideoIdEqualTo(adVideoId);
-        List<AdMuseTask> adMuseTasks = adMuseTaskMapper.selectByExample(example);
+        List<AdMuseImage> adMuseImages = adMuseImageMapper.selectByExample(example);
         List<AdMuseImageVo> res = new ArrayList<>();
-        if (CollectionUtils.isEmpty(adMuseTasks)) {
+        if (CollectionUtils.isEmpty(adMuseImages)) {
             return CommonResponse.success(res);
         }
-        for (AdMuseTask adMuseTask : adMuseTasks) {
+        for (AdMuseImage adMuseImage : adMuseImages) {
             AdMuseImageVo adMuseImageVo = new AdMuseImageVo();
-            BeanUtils.copyProperties(adMuseTask, adMuseImageVo);
-            AdMuseTaskStatusEnum adMuseTaskStatusEnum = AdMuseTaskStatusEnum.getByStatus(adMuseTask.getStatus());
-            if (adMuseTaskStatusEnum != null) {
-                adMuseImageVo.setStatusName(adMuseTaskStatusEnum.getDesc());
+            BeanUtils.copyProperties(adMuseImage, adMuseImageVo);
+            AdMuseImageStatusEnum adMuseImageStatusEnum = AdMuseImageStatusEnum.getByStatus(adMuseImage.getStatus());
+            if (adMuseImageStatusEnum != null) {
+                adMuseImageVo.setStatusName(adMuseImageStatusEnum.getDesc());
             }
-            adMuseImageVo.setCreateTime(DateUtils.getDateString(adMuseTask.getCreateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
-            adMuseImageVo.setUpdateTime(DateUtils.getDateString(adMuseTask.getUpdateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
+            adMuseImageVo.setCreateTime(DateUtils.getDateString(adMuseImage.getCreateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
+            adMuseImageVo.setUpdateTime(DateUtils.getDateString(adMuseImage.getUpdateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
             res.add(adMuseImageVo);
         }
         return CommonResponse.success(res);
     }
 
 
-    public CommonResponse<Void> updateMuseTask(AdMuseImageParam adMuseImageParam) {
+    public CommonResponse<Void> updateMuseImage(AdMuseImageParam adMuseImageParam) {
         if (adMuseImageParam == null || adMuseImageParam.getId() == null || adMuseImageParam.getStatus() == null) {
             return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误");
         }
-        List<Integer> allowStatus = Arrays.asList(AdMuseTaskStatusEnum.VERIFY_SUCCESS.getStatus(), AdMuseTaskStatusEnum.VERIFY_FAIL.getStatus());
+        List<Integer> allowStatus = Arrays.asList(AdMuseImageStatusEnum.VERIFY_SUCCESS.getStatus(), AdMuseImageStatusEnum.VERIFY_FAIL.getStatus());
         if (!allowStatus.contains(adMuseImageParam.getStatus())) {
             return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误，状态无效");
         }
-        AdMuseTask adMuseTask = adMuseTaskMapper.selectByPrimaryKey(adMuseImageParam.getId());
-        if (adMuseTask == null) {
+        AdMuseImage adMuseImage = adMuseImageMapper.selectByPrimaryKey(adMuseImageParam.getId());
+        if (adMuseImage == null) {
             return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误，数据不存在");
         }
-        if (!Objects.equals(adMuseTask.getStatus(), AdMuseTaskStatusEnum.CREATE_SUCCESS.getStatus())) {
-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "该状态不允许审核");
-        }
-        adMuseTask.setStatus(adMuseImageParam.getStatus());
-        adMuseTaskMapper.updateByPrimaryKeySelective(adMuseTask);
-        if (AdMuseTaskStatusEnum.VERIFY_SUCCESS.getStatus().equals(adMuseImageParam.getStatus())) {
-            AdVideo adVideo = adVideoMapper.selectByPrimaryKey(adMuseTask.getAdVideoId());
-            String accessToken = accountService.getAccessToken(adVideo.getAccountId());
-            String url = StringUtils.isEmpty(adMuseTask.getFinalUrl()) ? adMuseTask.getStitchUrl() : adMuseTask.getFinalUrl();
-            Long mediaId = uploadImage(adVideo.getAccountId(), accessToken, url, adMuseTask.getMuseMaterialId());
+        adMuseImage.setStatus(adMuseImageParam.getStatus());
+        adMuseImageMapper.updateByPrimaryKeySelective(adMuseImage);
+        if (AdMuseImageStatusEnum.VERIFY_SUCCESS.getStatus().equals(adMuseImageParam.getStatus())) {
+            AdVideoImage adVideoImage = adVideoImageMapper.selectByPrimaryKey(adMuseImage.getAdVideoImageId());
+            String accountId = adVideoImage.getAccountId();
+            String accessToken = accountService.getAccessToken(accountId);
+            String url = StringUtils.isEmpty(adMuseImage.getFinalUrl()) ? adMuseImage.getStitchUrl() : adMuseImage.getFinalUrl();
+            Long mediaId = uploadImage(accountId, accessToken, url, adMuseImage.getMuseMaterialId());
             if (mediaId != null) {
-                adMuseTask.setMediaId(mediaId);
-                adMuseTask.setStatus(AdMuseTaskStatusEnum.UPLOAD_SUCCESS.getStatus());
-                adMuseTaskMapper.updateByPrimaryKeySelective(adMuseTask);
-                AdVideo updateAdVideo = new AdVideo();
-                updateAdVideo.setId(adVideo.getId());
-                updateAdVideo.setStatus(AdVideoStatusEnum.MUSE_UPLOAD_SUCCESS.getStatus());
-                adVideoMapper.updateByPrimaryKeySelective(updateAdVideo);
+                adMuseImage.setMediaId(mediaId);
+                adMuseImage.setStatus(AdMuseImageStatusEnum.UPLOAD_SUCCESS.getStatus());
+                adMuseImageMapper.updateByPrimaryKeySelective(adMuseImage);
             } else {
-                adMuseTask.setStatus(AdMuseTaskStatusEnum.UPLOAD_FAIL.getStatus());
-                adMuseTaskMapper.updateByPrimaryKeySelective(adMuseTask);
+                adMuseImage.setStatus(AdMuseImageStatusEnum.UPLOAD_FAIL.getStatus());
+                adMuseImageMapper.updateByPrimaryKeySelective(adMuseImage);
             }
         }
         return CommonResponse.success();
@@ -273,6 +272,13 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
         return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "系统异常，上传失败");
     }
 
+    @Override
+    public List<AdMuseImage> getAdMuseImageList(List<Long> ids) {
+        AdMuseImageExample example = new AdMuseImageExample();
+        example.createCriteria().andIdIn(ids);
+        return adMuseImageMapper.selectByExample(example);
+    }
+
     public Long uploadImage(String accountId, String accessToken, String imageUrl, Long museMaterialId) {
         try {
             long timestamp = System.currentTimeMillis() / 1000;

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

@@ -11,6 +11,7 @@ import com.tzld.piaoquan.tencentad.model.po.AdVideoImage;
 import com.tzld.piaoquan.tencentad.model.po.AdVideoImageExample;
 import com.tzld.piaoquan.tencentad.model.vo.AdVideoImageParam;
 import com.tzld.piaoquan.tencentad.model.vo.AdVideoImageVo;
+import com.tzld.piaoquan.tencentad.service.AdAccountService;
 import com.tzld.piaoquan.tencentad.service.AdMuseTaskService;
 import com.tzld.piaoquan.tencentad.service.AdVideoImageService;
 import com.tzld.piaoquan.tencentad.service.TencentService;
@@ -48,6 +49,9 @@ public class AdVideoImageServiceImpl implements AdVideoImageService {
     @Autowired
     private AdMuseTaskService adMuseTaskService;
 
+    @Autowired
+    private AdAccountService accountService;
+
     @Override
     public boolean addAdVideoImage(Long adVideoId, String url) {
         try {
@@ -94,59 +98,48 @@ public class AdVideoImageServiceImpl implements AdVideoImageService {
         return CommonResponse.success(adVideoImageVos);
     }
 
-    @Override
-    public List<AdVideoImage> getAdVideoImageList(Long adVideoId, Integer status) {
-        AdVideoImageExample example = new AdVideoImageExample();
-        example.createCriteria().andAdVideoIdEqualTo(adVideoId).andStatusEqualTo(status)
-                .andIsDeleteEqualTo(0);
-        return adVideoImageMapper.selectByExample(example);
-    }
-
     public CommonResponse<Void> updateAdVideoImage(AdVideoImageParam adVideoImageParam) {
-        if (adVideoImageParam == null || adVideoImageParam.getId() == null) {
+        if (adVideoImageParam == null || CollectionUtils.isEmpty(adVideoImageParam.getIds())) {
             return CommonResponse.create(PARAM_ERROR.getCode(), PARAM_ERROR.getMsg());
         }
-        AdVideoImage updateAdVideoImage = new AdVideoImage();
-        updateAdVideoImage.setId(adVideoImageParam.getId());
-        updateAdVideoImage.setStatus(adVideoImageParam.getStatus());
-        updateAdVideoImage.setSimilarity(adVideoImageParam.getSimilarity());
-        updateAdVideoImage.setDimensionSize(adVideoImageParam.getDimensionSize());
-        updateAdVideoImage.setText2imgDesc(adVideoImageParam.getText2imgDesc());
-        int update = adVideoImageMapper.updateByPrimaryKeySelective(updateAdVideoImage);
-        if (update > 0) {
-            return CommonResponse.success();
-        } else {
-            return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "修改失败");
+        String accessToken = accountService.getAccessToken(adVideoImageParam.getAccountId());
+        if (StringUtils.isEmpty(accessToken)) {
+            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.setText2imgDesc(adVideoImageParam.getText2imgDesc());
+            updateAdVideoImage.setAccountId(adVideoImageParam.getAccountId());
+            int update = adVideoImageMapper.updateByPrimaryKeySelective(updateAdVideoImage);
+            if (update > 0) {
+                uploadImageToTencent(adVideoImageParam.getAccountId(), accessToken, id);
+            }
         }
+        return CommonResponse.success();
     }
 
     //上传图片到腾讯
-    public boolean uploadImageToTencent(String account, String accessToken, Long adVideoId) {
-        List<AdVideoImage> videoImageList = getAdVideoImageList(adVideoId, AdVideoImageStatusEnum.VERIFY_SUCCESS.getStatus());
-        if (CollectionUtils.isEmpty(videoImageList)) {
+    @Override
+    public boolean uploadImageToTencent(String account, String accessToken, Long adVideoImageId) {
+        AdVideoImage adVideoImage = adVideoImageMapper.selectByPrimaryKey(adVideoImageId);
+        if (adVideoImage == null) {
             return false;
         }
-        boolean flag = false;
-        for (AdVideoImage adVideoImage : videoImageList) {
-            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);
-                flag = true;
-            } else {
-                adVideoImage.setStatus(AdVideoImageStatusEnum.UPLOAD_FAIL.getStatus());
-                adVideoImageMapper.updateByPrimaryKeySelective(adVideoImage);
-            }
+        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 flag;
-    }
-
-    public long selectCount(Long adVideoId, Integer status) {
-        AdVideoImageExample example = new AdVideoImageExample();
-        example.createCriteria().andAdVideoIdEqualTo(adVideoId).andStatusEqualTo(status);
-        return adVideoImageMapper.countByExample(example);
+        return true;
     }
 
     @Override
@@ -180,5 +173,10 @@ public class AdVideoImageServiceImpl implements AdVideoImageService {
         return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "系统异常，上传失败");
     }
 
+    @Override
+    public AdVideoImage getAdVideoImageById(Long adVideoImageId) {
+        return adVideoImageMapper.selectByPrimaryKey(adVideoImageId);
+    }
+
 
 }

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

@@ -60,7 +60,6 @@ public class AdVideoServiceImpl implements AdVideoService {
         adVideo.setVideoId(adBaseVideo.getVideoId());
         adVideo.setVideoPath(adBaseVideo.getVideoPath());
         adVideo.setVideoCover(adBaseVideo.getVideoCover());
-        adVideo.setCategory(adBaseVideo.getCategory());
         adVideoMapper.insertSelective(adVideo);
         buildVideoImage(adVideo);
     }
@@ -106,23 +105,14 @@ public class AdVideoServiceImpl implements AdVideoService {
         if (adVideo == null) {
             return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误，adVideoId不存在");
         }
-        if (!Objects.equals(adVideo.getStatus(), AdVideoStatusEnum.MUSE_UPLOAD_SUCCESS.getStatus())) {
-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误，当前状态不允许创建创意");
-        }
-        List<AdMuseTask> adMuseTask;
-        if (CollectionUtils.isEmpty(adCreativeParam.getAdMuseIds())) {
-            adMuseTask = adMuseTaskService.getAdMuseTask(adCreativeParam.getAdVideoId(),
-                    AdMuseTaskStatusEnum.UPLOAD_SUCCESS.getStatus());
-        } else {
-            adMuseTask = adMuseTaskService.getAdMuseTask(adCreativeParam.getAdVideoId(),
-                    AdMuseTaskStatusEnum.UPLOAD_SUCCESS.getStatus(), adCreativeParam.getAdMuseIds());
-        }
-        if (CollectionUtils.isEmpty(adMuseTask)) {
+        List<AdMuseImage> adMuseImages = adMuseTaskService.getAdMuseImageList(adCreativeParam.getAdMuseImageIds());
+        if (CollectionUtils.isEmpty(adMuseImages)) {
             return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "系统错误，当前没有可以创建创意的素材");
         }
-        List<Long> mediaIds = adMuseTask.stream().map(AdMuseTask::getMediaId).collect(Collectors.toList());
+        List<Long> mediaIds = adMuseImages.stream().map(AdMuseImage::getMediaId).collect(Collectors.toList());
         boolean res = adCreativeService.addAdCreative(adVideo, mediaIds, adCreativeParam.getAdGroupId(),
-                adCreativeParam.getAccountId(), adCreativeParam.getAdGroupName(), adCreativeParam.getAdMuseIds());
+                adCreativeParam.getAccountId(), adCreativeParam.getAdGroupName(), adCreativeParam.getAdMuseImageIds(),
+                adCreativeParam.getDescription());
         if (res) {
             return CommonResponse.success();
         } else {
@@ -187,90 +177,51 @@ public class AdVideoServiceImpl implements AdVideoService {
         }
     }
 
-    @Override
-    public CommonResponse<Void> updateAdVideo(AdVideoParam adVideoParam) {
-        if (adVideoParam == null || adVideoParam.getId() == null || adVideoParam.getStatus() == null) {
-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误");
-        }
-        List<Integer> allowStatus =
-                Arrays.asList(AdVideoStatusEnum.VERIFY_SUCCESS.getStatus(), AdVideoStatusEnum.VERIFY_FAIL.getStatus());
-        if (!allowStatus.contains(adVideoParam.getStatus())) {
-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误");
-        }
-        AdVideo adVideo = adVideoMapper.selectByPrimaryKey(adVideoParam.getId());
-        if (adVideo == null) {
-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误，该视频不存在");
-        }
-        if (!Objects.equals(adVideo.getStatus(), AdVideoStatusEnum.CROP_SUCCESS.getStatus())) {
-            return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "该状态不允许修改审核状态");
-        }
-        if (Objects.equals(adVideoParam.getStatus(), AdVideoStatusEnum.VERIFY_SUCCESS.getStatus())) {
-            long count = adVideoImageService.selectCount(adVideoParam.getId(), AdVideoImageStatusEnum.VERIFY_SUCCESS.getStatus());
-            if (count <= 0) {
-                return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "没有审核通过的图片，不允许审核通过");
-            }
-            AdVideo updateAdVideo = new AdVideo();
-            updateAdVideo.setId(adVideoParam.getId());
-            updateAdVideo.setStatus(adVideoParam.getStatus());
-            updateAdVideo.setAccountId(adVideoParam.getAccountId());
-            updateAdVideo.setDescription(adVideoParam.getDescription());
-            updateAdVideo.setSubtitle(adVideoParam.getSubtitle());
-            adVideoMapper.updateByPrimaryKeySelective(updateAdVideo);
-            //可以改成异步操作
-            uploadImageToTencent(adVideo);
-        } else {
-            updateAdVideoStatus(adVideoParam.getId(), adVideoParam.getStatus());
-        }
-        return CommonResponse.success();
-    }
-
-    private void uploadImageToTencent(AdVideo adVideo) {
-        String accessToken = accountService.getAccessToken(adVideo.getAccountId());
-        if (accessToken == null) {
-            return;
-        }
-        Long adVideoId = adVideo.getId();
-        boolean res = adVideoImageService.uploadImageToTencent(adVideo.getAccountId(), accessToken, adVideoId);
-        if (res) {
-            updateAdVideoStatus(adVideoId, AdVideoStatusEnum.UPLOAD_SUCCESS.getStatus());
-        } else {
-            updateAdVideoStatus(adVideoId, AdVideoStatusEnum.UPLOAD_FAIL.getStatus());
-        }
-    }
+//    @Override
+//    public CommonResponse<Void> updateAdVideo(AdVideoParam adVideoParam) {
+//        if (adVideoParam == null || adVideoParam.getId() == null || adVideoParam.getStatus() == null) {
+//            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误");
+//        }
+//        List<Integer> allowStatus =
+//                Arrays.asList(AdVideoStatusEnum.VERIFY_SUCCESS.getStatus(), AdVideoStatusEnum.VERIFY_FAIL.getStatus());
+//        if (!allowStatus.contains(adVideoParam.getStatus())) {
+//            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误");
+//        }
+//        AdVideo adVideo = adVideoMapper.selectByPrimaryKey(adVideoParam.getId());
+//        if (adVideo == null) {
+//            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR.getCode(), "参数错误，该视频不存在");
+//        }
+//        if (!Objects.equals(adVideo.getStatus(), AdVideoStatusEnum.CROP_SUCCESS.getStatus())) {
+//            return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "该状态不允许修改审核状态");
+//        }
+//        if (Objects.equals(adVideoParam.getStatus(), AdVideoStatusEnum.VERIFY_SUCCESS.getStatus())) {
+//            long count = adVideoImageService.selectCount(adVideoParam.getId(), AdVideoImageStatusEnum.VERIFY_SUCCESS.getStatus());
+//            if (count <= 0) {
+//                return CommonResponse.create(ExceptionCodeEnum.SYS_ERROR.getCode(), "没有审核通过的图片，不允许审核通过");
+//            }
+//            AdVideo updateAdVideo = new AdVideo();
+//            updateAdVideo.setId(adVideoParam.getId());
+//            updateAdVideo.setStatus(adVideoParam.getStatus());
+//            updateAdVideo.setAccountId(adVideoParam.getAccountId());
+//            adVideoMapper.updateByPrimaryKeySelective(updateAdVideo);
+//
+//        } else {
+//            updateAdVideoStatus(adVideoParam.getId(), adVideoParam.getStatus());
+//        }
+//        return CommonResponse.success();
+//    }
 
     @Override
     public void refreshMuseTaskStatus() {
-        AdVideoExample example = new AdVideoExample();
-        example.createCriteria().andStatusEqualTo(AdVideoStatusEnum.UPLOAD_SUCCESS.getStatus());
-        List<AdVideo> adVideos = adVideoMapper.selectByExample(example);
-        for (AdVideo adVideo : adVideos) {
-            String accessToken = accountService.getAccessToken(adVideo.getAccountId());
-            if (accessToken == null) {
+        List<AdMuseTask> adMuseTasks = adMuseTaskService.getAdMuseTask(AdMuseTaskStatusEnum.DEFAULT.getStatus());
+        for (AdMuseTask adMuseTask : adMuseTasks) {
+            AdVideoImage adVideoImage = adVideoImageService.getAdVideoImageById(adMuseTask.getAdVideoImageId());
+            if (adVideoImage == null) {
                 continue;
             }
-            long adVideoImageCount = adVideoImageService.selectCount(adVideo.getId(), AdVideoImageStatusEnum.UPLOAD_SUCCESS.getStatus());
-            long adMuseTaskCount = adMuseTaskService.selectCount(adVideo.getId(), new ArrayList<>());
-            if (adVideoImageCount > adMuseTaskCount) {
-                //TODO muse任务上传少
-            } else {
-                boolean flag = true;
-                List<AdMuseTask> adMuseTasks = adMuseTaskService.getAdMuseTask(adVideo.getId(), AdMuseTaskStatusEnum.DEFAULT.getStatus());
-                for (AdMuseTask adMuseTask : adMuseTasks) {
-                    boolean museTaskRes = adMuseTaskService.getMuseTaskRes(adVideo.getAccountId(), accessToken, adMuseTask, adVideo.getSubtitle());
-                    if (!museTaskRes) {
-                        flag = false;
-                    }
-                }
-                if (flag) {
-                    long successCount = adMuseTaskService.selectCount(adVideo.getId(),
-                            Collections.singletonList(AdMuseTaskStatusEnum.CREATE_SUCCESS.getStatus()));
-                    if (successCount > 0) {
-                        updateAdVideoStatus(adVideo.getId(), AdVideoStatusEnum.MUSE_SUCCESS.getStatus());
-                    } else {
-                        updateAdVideoStatus(adVideo.getId(), AdVideoStatusEnum.MUSE_FAIL.getStatus());
-                    }
-                }
-            }
+            String accountId = adVideoImage.getAccountId();
+            String accessToken = accountService.getAccessToken(accountId);
+            adMuseTaskService.getMuseTaskRes(adVideoImage.getAccountId(), accessToken, adMuseTask, adVideoImage.getSubtitle());
         }
     }
 

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

@@ -5,8 +5,9 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="ad_group_id" jdbcType="BIGINT" property="adGroupId" />
     <result column="ad_video_id" jdbcType="BIGINT" property="adVideoId" />
-    <result column="muse_ids" jdbcType="VARCHAR" property="museIds" />
+    <result column="muse_image_ids" jdbcType="VARCHAR" property="museImageIds" />
     <result column="dynamic_creative_id" jdbcType="BIGINT" property="dynamicCreativeId" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
     <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 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, ad_group_id, ad_video_id, muse_ids, dynamic_creative_id, `status`, is_delete, 
-    create_time, update_time
+    id, ad_group_id, ad_video_id, muse_image_ids, dynamic_creative_id, description, `status`, 
+    is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdCreativeExample" resultMap="BaseResultMap">
     select
@@ -109,13 +110,13 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdCreative">
     insert into ad_creative (id, ad_group_id, ad_video_id, 
-      muse_ids, dynamic_creative_id, `status`, 
-      is_delete, create_time, update_time
-      )
+      muse_image_ids, dynamic_creative_id, description, 
+      `status`, is_delete, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{adGroupId,jdbcType=BIGINT}, #{adVideoId,jdbcType=BIGINT}, 
-      #{museIds,jdbcType=VARCHAR}, #{dynamicCreativeId,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, 
-      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{museImageIds,jdbcType=VARCHAR}, #{dynamicCreativeId,jdbcType=BIGINT}, #{description,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.AdCreative">
     insert into ad_creative
@@ -129,12 +130,15 @@
       <if test="adVideoId != null">
         ad_video_id,
       </if>
-      <if test="museIds != null">
-        muse_ids,
+      <if test="museImageIds != null">
+        muse_image_ids,
       </if>
       <if test="dynamicCreativeId != null">
         dynamic_creative_id,
       </if>
+      <if test="description != null">
+        description,
+      </if>
       <if test="status != null">
         `status`,
       </if>
@@ -158,12 +162,15 @@
       <if test="adVideoId != null">
         #{adVideoId,jdbcType=BIGINT},
       </if>
-      <if test="museIds != null">
-        #{museIds,jdbcType=VARCHAR},
+      <if test="museImageIds != null">
+        #{museImageIds,jdbcType=VARCHAR},
       </if>
       <if test="dynamicCreativeId != null">
         #{dynamicCreativeId,jdbcType=BIGINT},
       </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -196,12 +203,15 @@
       <if test="record.adVideoId != null">
         ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
       </if>
-      <if test="record.museIds != null">
-        muse_ids = #{record.museIds,jdbcType=VARCHAR},
+      <if test="record.museImageIds != null">
+        muse_image_ids = #{record.museImageIds,jdbcType=VARCHAR},
       </if>
       <if test="record.dynamicCreativeId != null">
         dynamic_creative_id = #{record.dynamicCreativeId,jdbcType=BIGINT},
       </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=INTEGER},
       </if>
@@ -224,8 +234,9 @@
     set id = #{record.id,jdbcType=BIGINT},
       ad_group_id = #{record.adGroupId,jdbcType=BIGINT},
       ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
-      muse_ids = #{record.museIds,jdbcType=VARCHAR},
+      muse_image_ids = #{record.museImageIds,jdbcType=VARCHAR},
       dynamic_creative_id = #{record.dynamicCreativeId,jdbcType=BIGINT},
+      description = #{record.description,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -243,12 +254,15 @@
       <if test="adVideoId != null">
         ad_video_id = #{adVideoId,jdbcType=BIGINT},
       </if>
-      <if test="museIds != null">
-        muse_ids = #{museIds,jdbcType=VARCHAR},
+      <if test="museImageIds != null">
+        muse_image_ids = #{museImageIds,jdbcType=VARCHAR},
       </if>
       <if test="dynamicCreativeId != null">
         dynamic_creative_id = #{dynamicCreativeId,jdbcType=BIGINT},
       </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
@@ -268,8 +282,9 @@
     update ad_creative
     set ad_group_id = #{adGroupId,jdbcType=BIGINT},
       ad_video_id = #{adVideoId,jdbcType=BIGINT},
-      muse_ids = #{museIds,jdbcType=VARCHAR},
+      muse_image_ids = #{museImageIds,jdbcType=VARCHAR},
       dynamic_creative_id = #{dynamicCreativeId,jdbcType=BIGINT},
+      description = #{description,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       is_delete = #{isDelete,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},

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

@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tzld.piaoquan.tencentad.dao.mapper.AdMuseImageMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.tencentad.model.po.AdMuseImage">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="ad_video_id" jdbcType="BIGINT" property="adVideoId" />
+    <result column="ad_video_image_id" jdbcType="BIGINT" property="adVideoImageId" />
+    <result column="ad_muse_task_id" jdbcType="BIGINT" property="adMuseTaskId" />
+    <result column="muse_material_id" jdbcType="BIGINT" property="museMaterialId" />
+    <result column="muse_url" jdbcType="VARCHAR" property="museUrl" />
+    <result column="stitch_url" jdbcType="VARCHAR" property="stitchUrl" />
+    <result column="final_url" jdbcType="VARCHAR" property="finalUrl" />
+    <result column="media_id" jdbcType="BIGINT" property="mediaId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, ad_video_id, ad_video_image_id, ad_muse_task_id, muse_material_id, muse_url, 
+    stitch_url, final_url, media_id, `status`, is_delete, create_time, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseImageExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ad_muse_image
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    <if test="page != null">
+      limit #{page.offset} , #{page.pageSize}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ad_muse_image
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ad_muse_image
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseImageExample">
+    delete from ad_muse_image
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseImage">
+    insert into ad_muse_image (id, ad_video_id, ad_video_image_id, 
+      ad_muse_task_id, muse_material_id, muse_url, 
+      stitch_url, final_url, media_id, 
+      `status`, is_delete, create_time, 
+      update_time)
+    values (#{id,jdbcType=BIGINT}, #{adVideoId,jdbcType=BIGINT}, #{adVideoImageId,jdbcType=BIGINT}, 
+      #{adMuseTaskId,jdbcType=BIGINT}, #{museMaterialId,jdbcType=BIGINT}, #{museUrl,jdbcType=VARCHAR}, 
+      #{stitchUrl,jdbcType=VARCHAR}, #{finalUrl,jdbcType=VARCHAR}, #{mediaId,jdbcType=BIGINT}, 
+      #{status,jdbcType=INTEGER}, #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseImage">
+    insert into ad_muse_image
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="adVideoId != null">
+        ad_video_id,
+      </if>
+      <if test="adVideoImageId != null">
+        ad_video_image_id,
+      </if>
+      <if test="adMuseTaskId != null">
+        ad_muse_task_id,
+      </if>
+      <if test="museMaterialId != null">
+        muse_material_id,
+      </if>
+      <if test="museUrl != null">
+        muse_url,
+      </if>
+      <if test="stitchUrl != null">
+        stitch_url,
+      </if>
+      <if test="finalUrl != null">
+        final_url,
+      </if>
+      <if test="mediaId != null">
+        media_id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="isDelete != null">
+        is_delete,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="adVideoId != null">
+        #{adVideoId,jdbcType=BIGINT},
+      </if>
+      <if test="adVideoImageId != null">
+        #{adVideoImageId,jdbcType=BIGINT},
+      </if>
+      <if test="adMuseTaskId != null">
+        #{adMuseTaskId,jdbcType=BIGINT},
+      </if>
+      <if test="museMaterialId != null">
+        #{museMaterialId,jdbcType=BIGINT},
+      </if>
+      <if test="museUrl != null">
+        #{museUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="stitchUrl != null">
+        #{stitchUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="finalUrl != null">
+        #{finalUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="mediaId != null">
+        #{mediaId,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="isDelete != null">
+        #{isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseImageExample" resultType="java.lang.Long">
+    select count(*) from ad_muse_image
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update ad_muse_image
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.adVideoId != null">
+        ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
+      </if>
+      <if test="record.adVideoImageId != null">
+        ad_video_image_id = #{record.adVideoImageId,jdbcType=BIGINT},
+      </if>
+      <if test="record.adMuseTaskId != null">
+        ad_muse_task_id = #{record.adMuseTaskId,jdbcType=BIGINT},
+      </if>
+      <if test="record.museMaterialId != null">
+        muse_material_id = #{record.museMaterialId,jdbcType=BIGINT},
+      </if>
+      <if test="record.museUrl != null">
+        muse_url = #{record.museUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.stitchUrl != null">
+        stitch_url = #{record.stitchUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.finalUrl != null">
+        final_url = #{record.finalUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mediaId != null">
+        media_id = #{record.mediaId,jdbcType=BIGINT},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.isDelete != null">
+        is_delete = #{record.isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update ad_muse_image
+    set id = #{record.id,jdbcType=BIGINT},
+      ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
+      ad_video_image_id = #{record.adVideoImageId,jdbcType=BIGINT},
+      ad_muse_task_id = #{record.adMuseTaskId,jdbcType=BIGINT},
+      muse_material_id = #{record.museMaterialId,jdbcType=BIGINT},
+      muse_url = #{record.museUrl,jdbcType=VARCHAR},
+      stitch_url = #{record.stitchUrl,jdbcType=VARCHAR},
+      final_url = #{record.finalUrl,jdbcType=VARCHAR},
+      media_id = #{record.mediaId,jdbcType=BIGINT},
+      `status` = #{record.status,jdbcType=INTEGER},
+      is_delete = #{record.isDelete,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseImage">
+    update ad_muse_image
+    <set>
+      <if test="adVideoId != null">
+        ad_video_id = #{adVideoId,jdbcType=BIGINT},
+      </if>
+      <if test="adVideoImageId != null">
+        ad_video_image_id = #{adVideoImageId,jdbcType=BIGINT},
+      </if>
+      <if test="adMuseTaskId != null">
+        ad_muse_task_id = #{adMuseTaskId,jdbcType=BIGINT},
+      </if>
+      <if test="museMaterialId != null">
+        muse_material_id = #{museMaterialId,jdbcType=BIGINT},
+      </if>
+      <if test="museUrl != null">
+        muse_url = #{museUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="stitchUrl != null">
+        stitch_url = #{stitchUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="finalUrl != null">
+        final_url = #{finalUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="mediaId != null">
+        media_id = #{mediaId,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="isDelete != null">
+        is_delete = #{isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseImage">
+    update ad_muse_image
+    set ad_video_id = #{adVideoId,jdbcType=BIGINT},
+      ad_video_image_id = #{adVideoImageId,jdbcType=BIGINT},
+      ad_muse_task_id = #{adMuseTaskId,jdbcType=BIGINT},
+      muse_material_id = #{museMaterialId,jdbcType=BIGINT},
+      muse_url = #{museUrl,jdbcType=VARCHAR},
+      stitch_url = #{stitchUrl,jdbcType=VARCHAR},
+      final_url = #{finalUrl,jdbcType=VARCHAR},
+      media_id = #{mediaId,jdbcType=BIGINT},
+      `status` = #{status,jdbcType=INTEGER},
+      is_delete = #{isDelete,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

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

@@ -9,11 +9,6 @@
     <result column="task_id" jdbcType="BIGINT" property="taskId" />
     <result column="task_type" jdbcType="VARCHAR" property="taskType" />
     <result column="task_status" jdbcType="VARCHAR" property="taskStatus" />
-    <result column="muse_material_id" jdbcType="BIGINT" property="museMaterialId" />
-    <result column="muse_url" jdbcType="VARCHAR" property="museUrl" />
-    <result column="stitch_url" jdbcType="VARCHAR" property="stitchUrl" />
-    <result column="final_url" jdbcType="VARCHAR" property="finalUrl" />
-    <result column="media_id" jdbcType="BIGINT" property="mediaId" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -77,8 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, ad_video_id, ad_video_image_id, `status`, task_id, task_type, task_status, muse_material_id, 
-    muse_url, stitch_url, final_url, media_id, is_delete, create_time, update_time
+    id, ad_video_id, ad_video_image_id, `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
@@ -116,16 +111,12 @@
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseTask">
     insert into ad_muse_task (id, ad_video_id, ad_video_image_id, 
       `status`, task_id, task_type, 
-      task_status, muse_material_id, muse_url, 
-      stitch_url, final_url, media_id, 
-      is_delete, create_time, update_time
-      )
+      task_status, is_delete, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{adVideoId,jdbcType=BIGINT}, #{adVideoImageId,jdbcType=BIGINT}, 
       #{status,jdbcType=INTEGER}, #{taskId,jdbcType=BIGINT}, #{taskType,jdbcType=VARCHAR}, 
-      #{taskStatus,jdbcType=VARCHAR}, #{museMaterialId,jdbcType=BIGINT}, #{museUrl,jdbcType=VARCHAR}, 
-      #{stitchUrl,jdbcType=VARCHAR}, #{finalUrl,jdbcType=VARCHAR}, #{mediaId,jdbcType=BIGINT}, 
-      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{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
@@ -151,21 +142,6 @@
       <if test="taskStatus != null">
         task_status,
       </if>
-      <if test="museMaterialId != null">
-        muse_material_id,
-      </if>
-      <if test="museUrl != null">
-        muse_url,
-      </if>
-      <if test="stitchUrl != null">
-        stitch_url,
-      </if>
-      <if test="finalUrl != null">
-        final_url,
-      </if>
-      <if test="mediaId != null">
-        media_id,
-      </if>
       <if test="isDelete != null">
         is_delete,
       </if>
@@ -198,21 +174,6 @@
       <if test="taskStatus != null">
         #{taskStatus,jdbcType=VARCHAR},
       </if>
-      <if test="museMaterialId != null">
-        #{museMaterialId,jdbcType=BIGINT},
-      </if>
-      <if test="museUrl != null">
-        #{museUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="stitchUrl != null">
-        #{stitchUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="finalUrl != null">
-        #{finalUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="mediaId != null">
-        #{mediaId,jdbcType=BIGINT},
-      </if>
       <if test="isDelete != null">
         #{isDelete,jdbcType=INTEGER},
       </if>
@@ -254,21 +215,6 @@
       <if test="record.taskStatus != null">
         task_status = #{record.taskStatus,jdbcType=VARCHAR},
       </if>
-      <if test="record.museMaterialId != null">
-        muse_material_id = #{record.museMaterialId,jdbcType=BIGINT},
-      </if>
-      <if test="record.museUrl != null">
-        muse_url = #{record.museUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.stitchUrl != null">
-        stitch_url = #{record.stitchUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.finalUrl != null">
-        final_url = #{record.finalUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.mediaId != null">
-        media_id = #{record.mediaId,jdbcType=BIGINT},
-      </if>
       <if test="record.isDelete != null">
         is_delete = #{record.isDelete,jdbcType=INTEGER},
       </if>
@@ -292,11 +238,6 @@
       task_id = #{record.taskId,jdbcType=BIGINT},
       task_type = #{record.taskType,jdbcType=VARCHAR},
       task_status = #{record.taskStatus,jdbcType=VARCHAR},
-      muse_material_id = #{record.museMaterialId,jdbcType=BIGINT},
-      muse_url = #{record.museUrl,jdbcType=VARCHAR},
-      stitch_url = #{record.stitchUrl,jdbcType=VARCHAR},
-      final_url = #{record.finalUrl,jdbcType=VARCHAR},
-      media_id = #{record.mediaId,jdbcType=BIGINT},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
@@ -325,21 +266,6 @@
       <if test="taskStatus != null">
         task_status = #{taskStatus,jdbcType=VARCHAR},
       </if>
-      <if test="museMaterialId != null">
-        muse_material_id = #{museMaterialId,jdbcType=BIGINT},
-      </if>
-      <if test="museUrl != null">
-        muse_url = #{museUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="stitchUrl != null">
-        stitch_url = #{stitchUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="finalUrl != null">
-        final_url = #{finalUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="mediaId != null">
-        media_id = #{mediaId,jdbcType=BIGINT},
-      </if>
       <if test="isDelete != null">
         is_delete = #{isDelete,jdbcType=INTEGER},
       </if>
@@ -360,11 +286,6 @@
       task_id = #{taskId,jdbcType=BIGINT},
       task_type = #{taskType,jdbcType=VARCHAR},
       task_status = #{taskStatus,jdbcType=VARCHAR},
-      muse_material_id = #{museMaterialId,jdbcType=BIGINT},
-      muse_url = #{museUrl,jdbcType=VARCHAR},
-      stitch_url = #{stitchUrl,jdbcType=VARCHAR},
-      final_url = #{finalUrl,jdbcType=VARCHAR},
-      media_id = #{mediaId,jdbcType=BIGINT},
       is_delete = #{isDelete,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -4,12 +4,15 @@
   <resultMap id="BaseResultMap" type="com.tzld.piaoquan.tencentad.model.po.AdVideoImage">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="ad_video_id" jdbcType="BIGINT" property="adVideoId" />
+    <result column="account_id" jdbcType="VARCHAR" property="accountId" />
     <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" />
@@ -73,8 +76,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, ad_video_id, image_url, `status`, tencent_image_id, similarity, dimension_size, 
-    text2img_desc, is_delete, create_time, update_time
+    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
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoImageExample" resultMap="BaseResultMap">
     select
@@ -110,13 +113,15 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoImage">
-    insert into ad_video_image (id, ad_video_id, image_url, 
-      `status`, tencent_image_id, similarity, 
-      dimension_size, text2img_desc, is_delete, 
+    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)
-    values (#{id,jdbcType=BIGINT}, #{adVideoId,jdbcType=BIGINT}, #{imageUrl,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{tencentImageId,jdbcType=VARCHAR}, #{similarity,jdbcType=INTEGER}, 
-      #{dimensionSize,jdbcType=VARCHAR}, #{text2imgDesc,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, 
+    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})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoImage">
@@ -128,6 +133,9 @@
       <if test="adVideoId != null">
         ad_video_id,
       </if>
+      <if test="accountId != null">
+        account_id,
+      </if>
       <if test="imageUrl != null">
         image_url,
       </if>
@@ -143,9 +151,15 @@
       <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>
@@ -163,6 +177,9 @@
       <if test="adVideoId != null">
         #{adVideoId,jdbcType=BIGINT},
       </if>
+      <if test="accountId != null">
+        #{accountId,jdbcType=VARCHAR},
+      </if>
       <if test="imageUrl != null">
         #{imageUrl,jdbcType=VARCHAR},
       </if>
@@ -178,9 +195,15 @@
       <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>
@@ -207,6 +230,9 @@
       <if test="record.adVideoId != null">
         ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
       </if>
+      <if test="record.accountId != null">
+        account_id = #{record.accountId,jdbcType=VARCHAR},
+      </if>
       <if test="record.imageUrl != null">
         image_url = #{record.imageUrl,jdbcType=VARCHAR},
       </if>
@@ -222,9 +248,15 @@
       <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>
@@ -243,12 +275,15 @@
     update ad_video_image
     set id = #{record.id,jdbcType=BIGINT},
       ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
+      account_id = #{record.accountId,jdbcType=VARCHAR},
       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}
@@ -262,6 +297,9 @@
       <if test="adVideoId != null">
         ad_video_id = #{adVideoId,jdbcType=BIGINT},
       </if>
+      <if test="accountId != null">
+        account_id = #{accountId,jdbcType=VARCHAR},
+      </if>
       <if test="imageUrl != null">
         image_url = #{imageUrl,jdbcType=VARCHAR},
       </if>
@@ -277,9 +315,15 @@
       <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>
@@ -295,12 +339,15 @@
   <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoImage">
     update ad_video_image
     set ad_video_id = #{adVideoId,jdbcType=BIGINT},
+      account_id = #{accountId,jdbcType=VARCHAR},
       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/mapper/AdVideoMapper.xml

@@ -3,13 +3,9 @@
 <mapper namespace="com.tzld.piaoquan.tencentad.dao.mapper.AdVideoMapper">
   <resultMap id="BaseResultMap" type="com.tzld.piaoquan.tencentad.model.po.AdVideo">
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="account_id" jdbcType="VARCHAR" property="accountId" />
     <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="description" jdbcType="VARCHAR" property="description" />
-    <result column="subtitle" jdbcType="VARCHAR" property="subtitle" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="retry_count" jdbcType="INTEGER" property="retryCount" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
@@ -75,8 +71,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, account_id, video_id, video_path, video_cover, category, description, subtitle, 
-    `status`, retry_count, is_delete, create_time, update_time
+    id, video_id, video_path, video_cover, `status`, retry_count, is_delete, create_time, 
+    update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideoExample" resultMap="BaseResultMap">
     select
@@ -112,16 +108,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideo">
-    insert into ad_video (id, account_id, video_id, 
-      video_path, video_cover, category, 
-      description, subtitle, `status`, 
-      retry_count, is_delete, create_time, 
-      update_time)
-    values (#{id,jdbcType=BIGINT}, #{accountId,jdbcType=VARCHAR}, #{videoId,jdbcType=BIGINT}, 
-      #{videoPath,jdbcType=VARCHAR}, #{videoCover,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{retryCount,jdbcType=INTEGER}, #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+    insert into ad_video (id, video_id, video_path, 
+      video_cover, `status`, retry_count, 
+      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}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideo" useGeneratedKeys="true" keyProperty="id">
     insert into ad_video
@@ -129,9 +123,6 @@
       <if test="id != null">
         id,
       </if>
-      <if test="accountId != null">
-        account_id,
-      </if>
       <if test="videoId != null">
         video_id,
       </if>
@@ -141,15 +132,6 @@
       <if test="videoCover != null">
         video_cover,
       </if>
-      <if test="category != null">
-        category,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="subtitle != null">
-        subtitle,
-      </if>
       <if test="status != null">
         `status`,
       </if>
@@ -170,9 +152,6 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
-      <if test="accountId != null">
-        #{accountId,jdbcType=VARCHAR},
-      </if>
       <if test="videoId != null">
         #{videoId,jdbcType=BIGINT},
       </if>
@@ -182,15 +161,6 @@
       <if test="videoCover != null">
         #{videoCover,jdbcType=VARCHAR},
       </if>
-      <if test="category != null">
-        #{category,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="subtitle != null">
-        #{subtitle,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -223,9 +193,6 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.accountId != null">
-        account_id = #{record.accountId,jdbcType=VARCHAR},
-      </if>
       <if test="record.videoId != null">
         video_id = #{record.videoId,jdbcType=BIGINT},
       </if>
@@ -235,15 +202,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.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subtitle != null">
-        subtitle = #{record.subtitle,jdbcType=VARCHAR},
-      </if>
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=INTEGER},
       </if>
@@ -267,13 +225,9 @@
   <update id="updateByExample" parameterType="map">
     update ad_video
     set id = #{record.id,jdbcType=BIGINT},
-      account_id = #{record.accountId,jdbcType=VARCHAR},
       video_id = #{record.videoId,jdbcType=BIGINT},
       video_path = #{record.videoPath,jdbcType=VARCHAR},
       video_cover = #{record.videoCover,jdbcType=VARCHAR},
-      category = #{record.category,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      subtitle = #{record.subtitle,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       retry_count = #{record.retryCount,jdbcType=INTEGER},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
@@ -286,9 +240,6 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideo">
     update ad_video
     <set>
-      <if test="accountId != null">
-        account_id = #{accountId,jdbcType=VARCHAR},
-      </if>
       <if test="videoId != null">
         video_id = #{videoId,jdbcType=BIGINT},
       </if>
@@ -298,15 +249,6 @@
       <if test="videoCover != null">
         video_cover = #{videoCover,jdbcType=VARCHAR},
       </if>
-      <if test="category != null">
-        category = #{category,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="subtitle != null">
-        subtitle = #{subtitle,jdbcType=VARCHAR},
-      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
@@ -327,13 +269,9 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.tencentad.model.po.AdVideo">
     update ad_video
-    set account_id = #{accountId,jdbcType=VARCHAR},
-      video_id = #{videoId,jdbcType=BIGINT},
+    set video_id = #{videoId,jdbcType=BIGINT},
       video_path = #{videoPath,jdbcType=VARCHAR},
       video_cover = #{videoCover,jdbcType=VARCHAR},
-      category = #{category,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      subtitle = #{subtitle,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       retry_count = #{retryCount,jdbcType=INTEGER},
       is_delete = #{isDelete,jdbcType=INTEGER},

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

@@ -50,12 +50,13 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
 
-        <table tableName="ad_video" domainObjectName="AdVideo" 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_muse_image" domainObjectName="AdMuseImage" alias=""/>
 
 
     </context>