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

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

@@ -36,8 +36,8 @@ public class AdBaseVideoController {
     @GetMapping("/status")
     public CommonResponse<List<AdBaseVideoStatusVo>> getAdBaseVideoStatusVo() {
         List<AdBaseVideoStatusVo> res = new ArrayList<>();
-        res.add(new AdBaseVideoStatusVo(AdBaseVideoStatusEnum.FIRST_VERIFY_SUCCESS.getStatus(), AdBaseVideoStatusEnum.FIRST_VERIFY_SUCCESS.getDesc()));
-        res.add(new AdBaseVideoStatusVo(AdBaseVideoStatusEnum.FIRST_VERIFY_FAIL.getStatus(), AdBaseVideoStatusEnum.FIRST_VERIFY_FAIL.getDesc()));
+//        res.add(new AdBaseVideoStatusVo(AdBaseVideoStatusEnum.FIRST_VERIFY_SUCCESS.getStatus(), AdBaseVideoStatusEnum.FIRST_VERIFY_SUCCESS.getDesc()));
+//        res.add(new AdBaseVideoStatusVo(AdBaseVideoStatusEnum.FIRST_VERIFY_FAIL.getStatus(), AdBaseVideoStatusEnum.FIRST_VERIFY_FAIL.getDesc()));
         res.add(new AdBaseVideoStatusVo(AdBaseVideoStatusEnum.SECOND_VERIFY_SUCCESS.getStatus(), AdBaseVideoStatusEnum.SECOND_VERIFY_SUCCESS.getDesc()));
         res.add(new AdBaseVideoStatusVo(AdBaseVideoStatusEnum.SECOND_VERIFY_FAIL.getStatus(), AdBaseVideoStatusEnum.SECOND_VERIFY_FAIL.getDesc()));
         return CommonResponse.success(res);

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

@@ -9,6 +9,10 @@ public class AdMuseTask {
 
     private Long adVideoImageId;
 
+    private String accountId;
+
+    private String subtitle;
+
     private Integer status;
 
     private Long taskId;
@@ -47,6 +51,22 @@ public class AdMuseTask {
         this.adVideoImageId = adVideoImageId;
     }
 
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getSubtitle() {
+        return subtitle;
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle = subtitle;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -112,6 +132,8 @@ public class AdMuseTask {
         sb.append(", id=").append(id);
         sb.append(", adVideoId=").append(adVideoId);
         sb.append(", adVideoImageId=").append(adVideoImageId);
+        sb.append(", accountId=").append(accountId);
+        sb.append(", subtitle=").append(subtitle);
         sb.append(", status=").append(status);
         sb.append(", taskId=").append(taskId);
         sb.append(", taskType=").append(taskType);

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

@@ -296,6 +296,146 @@ public class AdMuseTaskExample {
             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 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/service/AdMuseTaskService.java

@@ -19,7 +19,7 @@ public interface AdMuseTaskService {
 
     List<AdMuseTask> getAdMuseTask(Long adVideoId, Integer status, List<Long> adMuseTaskIds);
 
-    boolean getMuseTaskRes(String accountId, String accessToken, AdMuseTask adMuseTask, String subtitle);
+    boolean getMuseTaskRes(AdMuseTask adMuseTask, String accessToken);
 
     CommonResponse<List<AdMuseImageVo>> getAdMuseImageVoList(Long adVideoId);
 

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

@@ -41,6 +41,7 @@ public class AdBaseVideoServiceImpl implements AdBaseVideoService {
         for (AdBaseVideoVo adBaseVideoVo : baseVideoList) {
             AdBaseVideo adBaseVideo = new AdBaseVideo();
             BeanUtils.copyProperties(adBaseVideoVo, adBaseVideo);
+            adBaseVideo.setStatus(AdBaseVideoStatusEnum.FIRST_VERIFY_SUCCESS.getStatus());
             adBaseVideoMapper.insertSelective(adBaseVideo);
         }
         return CommonResponse.success();

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

@@ -96,8 +96,10 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
                 adMuseTask.setTaskId(data.getLong("task_id"));
                 adMuseTask.setTaskStatus(data.getString("task_status"));
                 adMuseTask.setTaskType(data.getString("task_type"));
+                adMuseTask.setAccountId(accountId);
                 adMuseTask.setAdVideoId(adVideoImage.getAdVideoId());
                 adMuseTask.setAdVideoImageId(adVideoImage.getId());
+                adMuseTask.setSubtitle(adVideoImage.getSubtitle());
                 adMuseTaskMapper.insertSelective(adMuseTask);
             }
         } catch (Exception e) {
@@ -117,7 +119,7 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
         return adMuseTaskMapper.selectByExample(example);
     }
 
-    public boolean getMuseTaskRes(String accountId, String accessToken, AdMuseTask adMuseTask, String subtitle) {
+    public boolean getMuseTaskRes(AdMuseTask adMuseTask, String accessToken) {
         try {
             long now = System.currentTimeMillis();
             long create = adMuseTask.getCreateTime().getTime();
@@ -127,7 +129,7 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
             long timestamp = System.currentTimeMillis() / 1000;
             String url = String.format("https://api.e.qq.com/v3.0/muse_ai_task/get?access_token=%s&timestamp=%s&nonce=%s" +
                             "&account_id=%s&task_id=%s",
-                    accessToken, timestamp, timestamp, accountId, adMuseTask.getTaskId());
+                    accessToken, timestamp, timestamp, adMuseTask.getAccountId(), adMuseTask.getTaskId());
             String res = httpPoolClient.get(url);
             JSONObject jsonObject = JSONObject.parseObject(res);
             if (jsonObject != null && jsonObject.getInteger("code") == 0) {
@@ -137,12 +139,14 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
                     adMuseTask.setTaskStatus(taskStatus);
                     JSONArray results = data.getJSONArray("results");
                     for (int i = 0; i < results.size(); i++) {
-                        JSONObject result = results.getJSONObject(1);
+                        JSONObject result = results.getJSONObject(i);
                         AdMuseImage adMuseImage = new AdMuseImage();
+                        adMuseImage.setAdVideoImageId(adMuseTask.getAdVideoImageId());
+                        adMuseImage.setAdVideoId(adMuseTask.getAdVideoId());
                         adMuseImage.setAdMuseTaskId(adMuseTask.getId());
                         adMuseImage.setMuseMaterialId(result.getLong("muse_material_id"));
                         adMuseImage.setMuseUrl(result.getString("url"));
-                        adMuseImage.setStitchUrl(getStitchUrl(result.getString("url"), subtitle));
+                        adMuseImage.setStitchUrl(getStitchUrl(result.getString("url"), adMuseTask.getSubtitle()));
                         adMuseImageMapper.insertSelective(adMuseImage);
                     }
                     adMuseTask.setStatus(AdMuseTaskStatusEnum.CREATE_SUCCESS.getStatus());
@@ -199,6 +203,9 @@ public class AdMuseTaskServiceImpl implements AdMuseTaskService {
             if (adMuseImageStatusEnum != null) {
                 adMuseImageVo.setStatusName(adMuseImageStatusEnum.getDesc());
             }
+            if (StringUtils.isNotEmpty(adMuseImage.getFinalUrl())) {
+                adMuseImageVo.setStitchUrl(adMuseImage.getFinalUrl());
+            }
             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);

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

@@ -112,6 +112,7 @@ public class AdVideoImageServiceImpl implements AdVideoImageService {
             updateAdVideoImage.setStatus(adVideoImageParam.getStatus());
             updateAdVideoImage.setSimilarity(adVideoImageParam.getSimilarity());
             updateAdVideoImage.setDimensionSize(adVideoImageParam.getDimensionSize());
+            updateAdVideoImage.setSubtitle(adVideoImageParam.getSubtitle());
             updateAdVideoImage.setText2imgDesc(adVideoImageParam.getText2imgDesc());
             updateAdVideoImage.setAccountId(adVideoImageParam.getAccountId());
             int update = adVideoImageMapper.updateByPrimaryKeySelective(updateAdVideoImage);

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

@@ -215,13 +215,9 @@ public class AdVideoServiceImpl implements AdVideoService {
     public void refreshMuseTaskStatus() {
         List<AdMuseTask> adMuseTasks = adMuseTaskService.getAdMuseTask(AdMuseTaskStatusEnum.DEFAULT.getStatus());
         for (AdMuseTask adMuseTask : adMuseTasks) {
-            AdVideoImage adVideoImage = adVideoImageService.getAdVideoImageById(adMuseTask.getAdVideoImageId());
-            if (adVideoImage == null) {
-                continue;
-            }
-            String accountId = adVideoImage.getAccountId();
+            String accountId = adMuseTask.getAccountId();
             String accessToken = accountService.getAccessToken(accountId);
-            adMuseTaskService.getMuseTaskRes(adVideoImage.getAccountId(), accessToken, adMuseTask, adVideoImage.getSubtitle());
+            adMuseTaskService.getMuseTaskRes(adMuseTask, accessToken);
         }
     }
 

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

@@ -5,6 +5,8 @@
     <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="account_id" jdbcType="VARCHAR" property="accountId" />
+    <result column="subtitle" jdbcType="VARCHAR" property="subtitle" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="task_id" jdbcType="BIGINT" property="taskId" />
     <result column="task_type" jdbcType="VARCHAR" property="taskType" />
@@ -72,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, ad_video_id, ad_video_image_id, `status`, task_id, task_type, task_status, is_delete, 
-    create_time, update_time
+    id, ad_video_id, ad_video_image_id, account_id, subtitle, `status`, task_id, task_type, 
+    task_status, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseTaskExample" resultMap="BaseResultMap">
     select
@@ -110,13 +112,15 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseTask">
     insert into ad_muse_task (id, ad_video_id, ad_video_image_id, 
-      `status`, task_id, task_type, 
-      task_status, is_delete, create_time, 
-      update_time)
+      account_id, subtitle, `status`, 
+      task_id, task_type, 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}, #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{accountId,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{taskId,jdbcType=BIGINT}, #{taskType,jdbcType=VARCHAR}, #{taskStatus,jdbcType=VARCHAR}, 
+      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.tencentad.model.po.AdMuseTask">
     insert into ad_muse_task
@@ -130,6 +134,12 @@
       <if test="adVideoImageId != null">
         ad_video_image_id,
       </if>
+      <if test="accountId != null">
+        account_id,
+      </if>
+      <if test="subtitle != null">
+        subtitle,
+      </if>
       <if test="status != null">
         `status`,
       </if>
@@ -162,6 +172,12 @@
       <if test="adVideoImageId != null">
         #{adVideoImageId,jdbcType=BIGINT},
       </if>
+      <if test="accountId != null">
+        #{accountId,jdbcType=VARCHAR},
+      </if>
+      <if test="subtitle != null">
+        #{subtitle,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -203,6 +219,12 @@
       <if test="record.adVideoImageId != null">
         ad_video_image_id = #{record.adVideoImageId,jdbcType=BIGINT},
       </if>
+      <if test="record.accountId != null">
+        account_id = #{record.accountId,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>
@@ -234,6 +256,8 @@
     set id = #{record.id,jdbcType=BIGINT},
       ad_video_id = #{record.adVideoId,jdbcType=BIGINT},
       ad_video_image_id = #{record.adVideoImageId,jdbcType=BIGINT},
+      account_id = #{record.accountId,jdbcType=VARCHAR},
+      subtitle = #{record.subtitle,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       task_id = #{record.taskId,jdbcType=BIGINT},
       task_type = #{record.taskType,jdbcType=VARCHAR},
@@ -254,6 +278,12 @@
       <if test="adVideoImageId != null">
         ad_video_image_id = #{adVideoImageId,jdbcType=BIGINT},
       </if>
+      <if test="accountId != null">
+        account_id = #{accountId,jdbcType=VARCHAR},
+      </if>
+      <if test="subtitle != null">
+        subtitle = #{subtitle,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
@@ -282,6 +312,8 @@
     update ad_muse_task
     set ad_video_id = #{adVideoId,jdbcType=BIGINT},
       ad_video_image_id = #{adVideoImageId,jdbcType=BIGINT},
+      account_id = #{accountId,jdbcType=VARCHAR},
+      subtitle = #{subtitle,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       task_id = #{taskId,jdbcType=BIGINT},
       task_type = #{taskType,jdbcType=VARCHAR},

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

@@ -51,12 +51,12 @@
         </javaClientGenerator>
 
 <!--        <table tableName="ad_video" domainObjectName="AdVideo" alias=""/>-->
-        <table tableName="ad_video_image" domainObjectName="AdVideoImage" alias=""/>
+<!--        <table tableName="ad_video_image" domainObjectName="AdVideoImage" alias=""/>-->
         <table tableName="ad_muse_task" domainObjectName="AdMuseTask" alias=""/>
-        <table tableName="ad_creative" domainObjectName="AdCreative" alias=""/>
-        <table tableName="ad_group" domainObjectName="AdGroup" alias=""/>
-        <table tableName="ad_base_video" domainObjectName="AdBaseVideo" alias=""/>
-        <table tableName="ad_muse_image" domainObjectName="AdMuseImage" 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>