Przeglądaj źródła

Merge remote-tracking branch 'origin/V1.1.2' into V1.1.2

jiequan.bi 4 lat temu
rodzic
commit
393c470a1b

+ 18 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialCutFrameController.java

@@ -8,6 +8,8 @@ import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IMaterialCutFrameTaskService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -44,6 +46,8 @@ public class MaterialCutFrameController {
     private IMaterialInfoService materialInfoService;
     @Autowired
     private IMaterialCutFrameTaskService materialCutFrameTaskServiceTask;
+    @Autowired
+    private IKuaiShouVideoGetService videoGetService;
 
     /**
      * 分页列表查询
@@ -67,4 +71,18 @@ public class MaterialCutFrameController {
         result.setResult(pageList);
         return result;
     }
+
+    @AutoLog(value = "截屏-查询")
+    @ApiOperation(value = "截屏-查询", notes = "截屏-查询")
+    @GetMapping(value = "/queryByPhotoId")
+    public Result<Object> queryByPhotoId(Long photoId) {
+        try {
+            KuaiShouVideoGet videoGet = videoGetService.getVideoByPhotoId(photoId);
+            List<MaterialCutFrame> list = materialCutFrameService.getListByVideoSignature(videoGet.getSignature());
+            return Result.ok(list);
+        } catch (Exception e) {
+            log.error("queryByPhotoId error", e);
+            return Result.error(e.getMessage());
+        }
+    }
 }

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouStrategyMapper.xml

@@ -12,7 +12,7 @@
     </select>
 
     <select id="queryActiveAccount" resultType="java.lang.Long">
-        SELECT account_id FROM ctop_ai_kuaishou_auto_creative_account_info
+        SELECT account_id FROM ctop_ai_kuaishou_advertiser_strategy
         WHERE status = 1
         GROUP BY account_id
     </select>