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

Merge remote-tracking branch 'origin/master'

syh 5 éve
szülő
commit
6b255c1124

+ 44 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -254,6 +254,50 @@ public class TestController {
         return "Success";
     }
 
+
+    @GetMapping(value = "/getVideoByAccountId")
+    public String getVideoByAccountId(Long accountId) throws IOException {
+
+        try {
+
+            Thread thread = new Thread() {
+                @Override
+                public void run() {
+                    QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
+                    tokenQueryWrapper.eq("media_id", 2);
+                    tokenQueryWrapper.eq("account_id", accountId);
+                    CtopOauthToken one = tokenService.getOne(tokenQueryWrapper);
+                    try {
+                        kuaishouInterfaceService.getSuZaoList(one.getAccessToken(), one.getAccountId(), 1);
+                        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+                        String videoEndDate = DateUtils.addDay(nowDate, -180);
+                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                        Date end = simpleDateFormat.parse(nowDate);
+                        Date start = simpleDateFormat.parse(videoEndDate);
+                        List<Date> dates = DateUtils.findDates(start, end);
+                        for (int i = 0; i < dates.size(); i++) {
+                            String formatDate = simpleDateFormat.format(dates.get(i));
+                            kuaishouInterfaceService.getVideoList(one, formatDate);
+                            kuaishouInterfaceService.getImageList(one, formatDate);
+                            Thread.sleep(100);
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    } finally {
+                    }
+
+
+                    log.info("快手物料数据同步完成");
+                }
+            };
+            thread.start();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "Success";
+    }
+
+
     @GetMapping(value = "/createCutTask")
     public String createCutTask(String startDate, String endDate) throws IOException {
 
@@ -477,8 +521,6 @@ public class TestController {
     }
 
 
-
-
     @GetMapping(value = "/gerCreative")
     public void gerCreative() {
         QueryWrapper<CtopOauthToken> oauthTokenQueryWrapper = new QueryWrapper<>();

+ 1 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -224,7 +224,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                                             videoGet.setSignature(signature);
                                             String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
                                             videoGet.setStatDate(DateUtils.parseDate(nowDate, "yyyy-MM-dd"));
-                                            videoGet.setCoverUrl(materialInfo.getUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
+                                            videoGet.setCoverUrl(materialInfo.getUrl() + "?x-oss-process=video/snapshot,t_0,m_fast");
                                             videoGet.setUploadDate(new Date());
                                             kuaiShouVideoGetService.saveOrUpdate(videoGet);
                                             materialUploadImageService.uploadImage(videoGet.getSignature(), accountId, ctopOauthToken.getAccessToken());

+ 17 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/BatchController.java

@@ -182,8 +182,13 @@ public class BatchController {
                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                            HttpServletRequest req) {
-        Result<IPage<KuaiShouCampaign>> result = new Result<IPage<KuaiShouCampaign>>();
+        Result<IPage<KuaiShouCampaign>> result = new Result<>();
+        String campaignName = kuaiShouCampaign.getCampaignName();
+        kuaiShouCampaign.setCampaignName(null);
         QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
+        if (!Check.isNull(campaignName)) {
+            queryWrapper.like("campaign_name", campaignName);
+        }
         queryWrapper.orderByDesc("put_create_time");
         Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
         IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
@@ -391,7 +396,12 @@ public class BatchController {
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                     HttpServletRequest req) {
         Result<IPage<KuaiShouGroup>> result = new Result<IPage<KuaiShouGroup>>();
+        String unitName = kuaiShouGroup.getUnitName();
+        kuaiShouGroup.setUnitName(null);
         QueryWrapper<KuaiShouGroup> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroup, req.getParameterMap());
+        if (!Check.isNull(unitName)) {
+            queryWrapper.like("unit_name", unitName);
+        }
         queryWrapper.orderByDesc("group_create_time");
         Page<KuaiShouGroup> page = new Page<KuaiShouGroup>(pageNo, pageSize);
         IPage<KuaiShouGroup> pageList = kuaiShouGroupService.page(page, queryWrapper);
@@ -698,8 +708,13 @@ public class BatchController {
     public Result<IPage<KuaiShouCreative>> getCreativeList(KuaiShouCreative kuaiShouCreative, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         Result<IPage<KuaiShouCreative>> result = new Result<>();
+        String creativeName = kuaiShouCreative.getCreativeName();
+        kuaiShouCreative.setCreativeName(null);
         QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreative, req.getParameterMap());
-        queryWrapper.orderByDesc("creative_id");
+        if (!Check.isNull(creativeName)) {
+            queryWrapper.like("creative_name", creativeName);
+        }
+        queryWrapper.orderByDesc("creative_create_time");
         Page<KuaiShouCreative> page = new Page<>(pageNo, pageSize);
         IPage<KuaiShouCreative> creativeList = kuaiShouCreativeService.page(page, queryWrapper);
         result.setSuccess(true);

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupServiceImpl.java

@@ -59,6 +59,7 @@ public class KuaiShouGroupServiceImpl extends ServiceImpl<KuaiShouGroupMapper, K
         campaignQueryWrapper.eq("status", 4);
         campaignQueryWrapper.eq("put_status", 1);
         campaignQueryWrapper.orderByDesc("put_create_time");
+        campaignQueryWrapper.last("limit 15");
         List<KuaiShouCampaign> list = kuaiShouCampaignService.list(campaignQueryWrapper);
         if (Check.isNull(list)) {
             return;