Browse Source

修改开屏视频、开屏图片预览功能

zhaoxian 2 years ago
parent
commit
b5a310fa92

+ 32 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupTemplateController.java

@@ -4,8 +4,11 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupTemplate;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupTemplateService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -24,7 +27,15 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -57,7 +68,8 @@ public class KuaiShouGroupTemplateController {
     @Autowired
     private ICtopOauthTokenService tokenService;
     static ExecutorService executorService = Executors.newFixedThreadPool(10);
-
+    @Autowired
+    private IKuaiShouImageGetService iKuaiShouImageGetService;
 
     @PostMapping(value = "/getLibraryConfig")
     public Result<JSONObject> getLibraryConfig(@RequestBody JSONObject requestJson) {
@@ -232,6 +244,24 @@ public class KuaiShouGroupTemplateController {
     }
 
 
+    @PostMapping(value = "/queryUrlByImageTokens")
+    public Result<Object> queryUrlByImageTokens(@RequestBody JSONObject requestJson) {
+        try {
+            Long accountId = requestJson.getLong("accountId");
+            JSONArray imageTokens = requestJson.getJSONArray("imageTokens");
+            if (Check.isNull(accountId) || imageTokens.isEmpty()) {
+                throw new Exception("参数不能为空");
+            }
+            List<KuaiShouImageGet> list = iKuaiShouImageGetService.getUrlByImageTokens(accountId, imageTokens);
+            return Result.ok(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.error("查询失败");
+
+    }
+
+
     /**
      * 分页列表查询
      *

+ 3 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouImageGetMapper.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.kuaishou.modules.batch.mapper;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,6 @@ public interface KuaiShouImageGetMapper extends BaseMapper<KuaiShouImageGet> {
     String getUrlByCode(String signature);
 
     String getCutFrameUrlByCode(String signature);
+
+    List<KuaiShouImageGet> getUrlByImageTokens(@Param(value = "accountId") Long accountId, @Param(value = "imageTokens") JSONArray imageTokens);
 }

+ 16 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouImageGetMapper.xml

@@ -39,15 +39,25 @@
     </insert>
 
     <select id="getUrlByCode" resultType="java.lang.String">
-        select url from ctop_material_image_info
-        where  code = #{signature}
-        limit 1
+        select url
+        from ctop_material_image_info
+        where code = #{signature} limit 1
+    </select>
+
+    <select id="getUrlByImageTokens" resultType="cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet">
+        select * from ctop_kuaishou_image_get
+        where account_id = #{accountId}
+        And image_token in
+        <foreach collection="imageTokens" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
     </select>
 
     <select id="getCutFrameUrlByCode" resultType="java.lang.String">
-        select url from ctop_material_cut_frame
-        where  signature = #{signature}
-        limit 1
+        select url
+        from ctop_material_cut_frame
+        where signature = #{signature} limit 1
     </select>
 
 

+ 3 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouImageGetService.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.kuaishou.modules.batch.service;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -17,4 +18,6 @@ public interface IKuaiShouImageGetService extends IService<KuaiShouImageGet> {
     String getUrlByCode(String signature);
 
     KuaiShouImageGet getOneByParams(String url,String code);
+
+    List<KuaiShouImageGet> getUrlByImageTokens(Long accountId, JSONArray imageTokens);
 }

+ 12 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageGetServiceImpl.java

@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouImageGetMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,17 +42,22 @@ public class KuaiShouImageGetServiceImpl extends ServiceImpl<KuaiShouImageGetMap
 
 
     @Override
-    public KuaiShouImageGet getOneByParams(String url,String code) {
-        QueryWrapper<KuaiShouImageGet> queryWrapper= new QueryWrapper<>();
-        if(null!=url&&!"".equals(url.trim())){
-            queryWrapper.eq("url",url);
+    public KuaiShouImageGet getOneByParams(String url, String code) {
+        QueryWrapper<KuaiShouImageGet> queryWrapper = new QueryWrapper<>();
+        if (null != url && !"".equals(url.trim())) {
+            queryWrapper.eq("url", url);
         }
-        if(null!=code&&!"".equals(code.trim())){
-            queryWrapper.eq("signature",code);
+        if (null != code && !"".equals(code.trim())) {
+            queryWrapper.eq("signature", code);
         }
         queryWrapper.orderByDesc("create_time");
         queryWrapper.last("limit 1");
         return this.getOne(queryWrapper);
     }
 
+    @Override
+    public List<KuaiShouImageGet> getUrlByImageTokens(Long accountId, JSONArray imageTokens) {
+        return imageGetMapper.getUrlByImageTokens(accountId, imageTokens);
+    }
+
 }

+ 8 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouBatchCampaignPreviewServiceImpl.java

@@ -98,8 +98,13 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
             for (KuaishouBatchCreativePreview creativePreview : kuaishouBatchCreativePreviews) {
                 if (groupPreview.getPlanId().equals(creativePreview.getPlanId()) && creativePreview.getGroupId().equals(groupPreview.getId())) {
                     JSONObject obj = new JSONObject();
-                    obj.put("photoId", creativePreview.getPhotoId());
-                    obj.put("imageUrl", creativePreview.getImageUrl());
+                    if (!Check.isNull(creativePreview.getPhotoId())) {
+                        obj.put("photoId", creativePreview.getPhotoId());
+                    } else if (!Check.isNull(creativePreview.getSplashPhotoIds())) {
+                        obj.put("photoIds", creativePreview.getSplashPhotoIds());
+                    } else if (!Check.isNull(creativePreview.getSplashImageTokens())) {
+                        obj.put("imageTokens", creativePreview.getSplashImageTokens());
+                    }
                     materialArr.add(obj);
                     descriptionArr.add(creativePreview.getDescription());
                     groupPreview.setSiteId(creativePreview.getSiteId());
@@ -470,7 +475,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
             }
         } else if (NoEn.NO2.valueInt() == type) {
             /**
-             *按照 创意组 分组
+             * 按照 创意组 分组
              * 计划总数 = 创意组数
              * 则同一广告计划内的创意完全相同,定向包不同
              */