Forráskód Böngészése

封面关联素材

yumeng 5 éve
szülő
commit
d57a40f6a0

+ 5 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java

@@ -4,8 +4,6 @@ import cn.com.ctop.common.module.entity.MaterialImageInfo;
 import cn.com.ctop.common.module.service.IMaterialImageInfoService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -52,24 +50,19 @@ public class MaterialImageInfoController {
      * 分页列表查询
      *
      * @param MaterialImageInfo
-     * @param pageNo
-     * @param pageSize
      * @param req
      * @return
      */
     @AutoLog(value = "素材-分页列表查询")
     @ApiOperation(value = "素材-分页列表查询", notes = "素材-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<MaterialImageInfo>> queryPageList(MaterialImageInfo MaterialImageInfo,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<MaterialImageInfo>> result = new Result<IPage<MaterialImageInfo>>();
+    public Result<List<MaterialImageInfo>> queryPageList(MaterialImageInfo MaterialImageInfo,
+                                                         HttpServletRequest req) {
+        Result<List<MaterialImageInfo>> result = new Result<>();
         QueryWrapper<MaterialImageInfo> queryWrapper = QueryGenerator.initQueryWrapper(MaterialImageInfo, req.getParameterMap());
-        Page<MaterialImageInfo> page = new Page<MaterialImageInfo>(pageNo, pageSize);
-        IPage<MaterialImageInfo> pageList = MaterialImageInfoService.page(page, queryWrapper);
+        List<MaterialImageInfo> list = MaterialImageInfoService.list(queryWrapper);
         result.setSuccess(true);
-        result.setResult(pageList);
+        result.setResult(list);
         return result;
     }
 

+ 38 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/FileController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fileupload.controller;
 
+import cn.com.ctop.common.module.service.IMaterialImageInfoService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
@@ -27,11 +28,48 @@ public class FileController {
     @Autowired
     private IMaterialInfoService materialInfoService;
 
+    @Autowired
+    private IMaterialImageInfoService materialImageInfoService;
+
     @RequestMapping("file/check")
     public Map<String, Object> chenckFile(String code, Long projectId) {
         return materialInfoService.checkMaterialInfo(code, projectId);
     }
 
+
+
+    @RequestMapping("file/imageCheck")
+    public Map<String, Object> imageCheck(String code, Long projectId) {
+        return materialImageInfoService.checkMaterialInfo(code, projectId);
+    }
+
+
+
+    @PostMapping("/insertV2")
+    public Map<String, Object> insertV2(@RequestBody JSONObject json) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject()
+                .getPrincipal();
+
+        json.put("userId", user.getId());
+        return materialInfoService.correlationUpload(json);
+    }
+
+
+
+
+    @PostMapping("/insertImage")
+    public Map<String, Object> insertImage(@RequestBody JSONObject json) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject()
+                .getPrincipal();
+
+        json.put("userId", user.getId());
+        return materialInfoService.insertImage(json);
+    }
+
+
+
+
+
     @PostMapping("file/insert")
     public Map<String, Object> insertFile(@RequestBody JSONObject json) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject()

+ 76 - 2
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -4,8 +4,11 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -41,12 +44,12 @@ public class SampleTest {
         try {
 
             QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("account_id",3727345L);
+            queryWrapper.eq("account_id", 3727345L);
             CtopOauthToken token = tokenMapper.selectOne(queryWrapper);
 
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             Date parse = simpleDateFormat.parse("2020-03-12");
-            kuaishouInterfaceService.getAdvertiserReportDaily(token,parse,parse);
+            kuaishouInterfaceService.getAdvertiserReportDaily(token, parse, parse);
 
 
 //            reportTaskService.createTask(3727345L, "871fc2c248782a94ad2962c941555abc", "");
@@ -164,7 +167,78 @@ public class SampleTest {
     }
 
 
+    @Test
+    public void wanHuaTong() {
+        String url = "https://ad.oceanengine.com/open_api/2/kaleidoscope/job/smart_cut/submit/";
+
+        JSONObject conditions = new JSONObject();
+
+        // 1629785592929294
+
+        conditions.put("advertiser_id", "109437044830");
+        JSONObject job = new JSONObject();
+        job.put("job_conf_id", 10);
+        JSONArray input = new JSONArray();
+        JSONObject inputJson = new JSONObject();
+        inputJson.put("task_id", 1);
+        JSONArray videoIds = new JSONArray();
+        videoIds.add("v02033290000bgq1cejpqv6e4k29b2jg");
+        inputJson.put("video_ids", videoIds);
+        JSONArray music_id = new JSONArray();
+        JSONArray image_urls = new JSONArray();
+        JSONArray texts = new JSONArray();
+
+        texts.add("哈哈哈哈,这是一个测试文案");
+        inputJson.put("texts", texts);
+
+        JSONArray tts = new JSONArray();
+        tts.add("true");
+        inputJson.put("tts", tts);
+
+        JSONArray video_ratio = new JSONArray();
+        video_ratio.add("1");
+        inputJson.put("video_ratio", video_ratio);
+
+
+        JSONArray music_style = new JSONArray();
+        music_style.add("1");
+        inputJson.put("music_style", music_style);
+
+        JSONArray video_duration = new JSONArray();
+        video_duration.add("8");
+        inputJson.put("video_duration", video_duration);
+
+
+        JSONArray speed = new JSONArray();
+        speed.add("1.2");
+        inputJson.put("speed", speed);
+
+        job.put("input", inputJson);
+        job.put("mesg", "测试万花筒");
+        conditions.put("job", job);
+
+
+        JSONObject jsonObject = HttpUtils.bytedancePostRequest("8ea30cb02cab8d92b480c4ab01cfc4545fdce33e", url, conditions);
+        System.err.println(jsonObject);
+
+
+    }
+
+
 }
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialImageInfoService.java

@@ -4,6 +4,8 @@ import cn.com.ctop.common.module.entity.MaterialImageInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * 素材
  *
@@ -17,4 +19,6 @@ public interface IMaterialImageInfoService extends IService<MaterialImageInfo> {
      * 根据视频id  关联封面
      */
     void insertImage(JSONObject imageJson);
+
+    Map<String, Object> checkMaterialInfo(String code, Long projectId);
 }

+ 9 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -48,4 +48,13 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
      * @return
      */
     Map<String, Object> correlationUpload(JSONObject json);
+
+
+    /**
+     * 关联上传封面
+     *
+     * @param json
+     * @return
+     */
+    Map<String, Object> insertImage(JSONObject json);
 }

+ 36 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialImageInfoServiceImpl.java

@@ -4,13 +4,19 @@ import cn.com.ctop.common.module.entity.MaterialImageInfo;
 import cn.com.ctop.common.module.mapper.MaterialImageInfoMapper;
 import cn.com.ctop.common.module.service.IMaterialImageInfoService;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 素材
  *
@@ -25,6 +31,7 @@ public class MaterialImageInfoServiceImpl extends ServiceImpl<MaterialImageInfoM
     @Autowired
     private MaterialImageInfoMapper materialImageInfoMapper;
 
+
     @Override
     public void insertImage(JSONObject imageJson) {
         String videoId = imageJson.getString("videoId");
@@ -35,6 +42,7 @@ public class MaterialImageInfoServiceImpl extends ServiceImpl<MaterialImageInfoM
         String userId = imageJson.getString("userId");
         Long projectId = imageJson.getLong("projectId");
         JSONArray imageArr = imageJson.getJSONArray("imageArr");
+        System.err.println(imageArr);
         for (int i = 0; i < imageArr.size(); i++) {
             JSONObject json = imageArr.getJSONObject(i);
             if (!Check.isNull(json)) {
@@ -45,8 +53,10 @@ public class MaterialImageInfoServiceImpl extends ServiceImpl<MaterialImageInfoM
                 materialImageInfo.setType("IMAGE");
                 materialImageInfo.setHeight(json.getString("height"));
                 materialImageInfo.setWidth(json.getString("width"));
-                materialImageInfo.setSize(json.getString("size"));
-                materialImageInfo.setUrl(json.getString("url"));
+
+
+                materialImageInfo.setSize(String.valueOf(json.getLong("size") / 1024));
+                materialImageInfo.setUrl("https:" + json.getString("url"));
                 materialImageInfo.setMaterialName(json.getString("materialName"));
                 materialImageInfo.setStatus(0);
                 materialImageInfo.setProjectId(projectId);
@@ -57,6 +67,30 @@ public class MaterialImageInfoServiceImpl extends ServiceImpl<MaterialImageInfoM
 
         }
 
+    }
+
+    @Override
+    public Map<String, Object> checkMaterialInfo(String code, Long projectId) {
+
+
+        Map<String, Object> result = new HashMap<>();
+        QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", code);
+        queryWrapper.eq("project_id", projectId);
+        queryWrapper.last("limit 1");
+        MaterialImageInfo info = this.getOne(queryWrapper);
+        if (null != info) {
+            //文件已存在
+            ResultMapUtils.setResultMap(result, StatusCode.FILE_HAS_UPLOAD.getCode());
+            result.put("url", info.getUrl());
+            return result;
+        } else {
+            //文件尚未上传
+            ResultMapUtils.setResultMap(result, StatusCode.FILE_HAS_NOT_UPLOAD.getCode());
+            return result;
+        }
 
     }
+
+
 }

+ 15 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -477,7 +477,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             JSONArray imageArr = json.getJSONArray("imageArr");
             if (!Check.isNull(imageArr)) {
                 JSONObject imageJson = new JSONObject();
-                imageJson.put("videoId", info.getId());
+                imageJson.put("videoId", info.getCode());
                 imageJson.put("userId", userId);
                 imageJson.put("projectId", projectId);
                 imageJson.put("imageArr", imageArr);
@@ -534,4 +534,18 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
 
 
     }
+
+    @Override
+    public Map<String, Object> insertImage(JSONObject imageJson) {
+        Map<String, Object> resultMap = new HashMap<>();
+        ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
+        try {
+            materialImageInfoService.insertImage(imageJson);
+        } catch (Exception e) {
+            ResultMapUtils.setResultMap(resultMap, StatusCode.MATERIAL_UPLOAD_FAIL.getCode());
+            e.printStackTrace();
+        }
+
+        return resultMap;
+    }
 }

+ 7 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1052,12 +1052,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
     @Override
     public void loadKuaishouDataSingle(CtopOauthToken token) throws java.text.ParseException {
-        log.info("----------------开始历史数据获取,accountId:{}", token.getAccountId());
 
-        String endDateStr = DateUtils.getDate("yyyy-MM-dd");
-        String startDate = DateUtils.addMonth(endDateStr, -6);
-
-        historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
 
         Date endDate = new Date();
         for (int i = 0; i < 7; i++) {
@@ -1083,9 +1078,15 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         //获取图片信息数据
         getImageList(token, null, null);
 
-
         getAppList(token.getAccountId(), token.getAccessToken());
 
+        log.info("----------------开始历史数据获取,accountId:{}", token.getAccountId());
+
+        String endDateStr = DateUtils.getDate("yyyy-MM-dd");
+        String startDate = DateUtils.addMonth(endDateStr, -6);
+
+        historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
+
 
     }