Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

syh 4 gadi atpakaļ
vecāks
revīzija
13d331c3eb

+ 0 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaiShouMaterialControer.java

@@ -144,7 +144,6 @@ public class KuaiShouMaterialControer {
      */
     @PostMapping(value = "/getHistoryVideoList")
     public JSONObject getHistoryVideoList(@RequestBody JSONObject requestJson) {
-        // log.info("获取历史素材入参:{}", requestJson);
         JSONObject returnJson = new JSONObject();
         try {
             if (Check.isNull(requestJson)) {

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

@@ -447,6 +447,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     returnJson.put("code", 0);
                     returnJson.put("message", "程序化创意创建成功");
                 } else {
+                    log.error("创建程序化创意失败,accountId:{},返回结果:{},入参:{}", oauthToken.getAccountId(), resultJson.getString("message"), programCreativeJson);
                     returnJson.put("code", -1);
                     returnJson.put("message", resultJson.getString("message"));
                 }

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

@@ -8,13 +8,42 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.BigDecimalUtil;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.RandomUtil;
-import cn.com.ctop.kuaishou.modules.batch.entity.*;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAdvertiserBaseInfo;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppInfo;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDirectionalTemplate;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupTarget;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListParent;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouTargetingTags;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouPopulation;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.ConvertVo;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.SpendVo;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouTargetingTagsMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.*;
+import cn.com.ctop.kuaishou.modules.batch.service.IBatchService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActionBarTextService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAdvertiserBaseInfoService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppInfoService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDirectionalTemplateService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupTargetService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouRegionListParentService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouPopulationService;
+import cn.com.ctop.kuaishou.modules.batch.service.ISyncPullMaterialService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,7 +55,14 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
 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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -207,6 +243,10 @@ public class BatchController {
         if (!Check.isNull(campaignName)) {
             queryWrapper.like("campaign_name", campaignName);
         }
+        Integer campaignType = kuaiShouCampaign.getCampaignType();
+        if (!Check.isNull(campaignType)) {
+            queryWrapper.eq("campaign_type", campaignType);
+        }
         queryWrapper.orderByDesc("put_create_time");
         Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
         IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);

+ 4 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouBatchCampaignTemplateController.java

@@ -99,8 +99,7 @@ public class KuaiShouBatchCampaignTemplateController {
     @AutoLog(value = "计划模板-编辑")
     @ApiOperation(value = "计划模板-编辑", notes = "计划模板-编辑")
     @PostMapping(value = "/saveOrUpdate")
-    public Result<KuaiShouBatchCampaignTemplate> edit(@RequestBody KuaiShouBatchCampaignTemplate kuaiShouBatchCampaignTemplate) {
-        Result<KuaiShouBatchCampaignTemplate> result = new Result<KuaiShouBatchCampaignTemplate>();
+    public Result<Object> edit(@RequestBody KuaiShouBatchCampaignTemplate kuaiShouBatchCampaignTemplate) {
         boolean ok;
         try {
             Long id = kuaiShouBatchCampaignTemplate.getId();
@@ -115,13 +114,12 @@ public class KuaiShouBatchCampaignTemplateController {
                 }
             }
             if (ok) {
-                result.success("操作成功!");
+                return Result.ok(kuaiShouBatchCampaignTemplate.getId());
             }
+            return Result.error("操作失败");
         } catch (Exception e) {
-            result.error500(e.getMessage());
-            e.printStackTrace();
+            return Result.error(e.getMessage());
         }
-        return result;
     }
 
     /**

+ 5 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouBatchCreativeTemplateController.java

@@ -2,7 +2,6 @@ package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouBatchCampaignTemplate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouBatchCreativeTemplate;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouBatchCreativeTemplateService;
 import com.alibaba.fastjson.JSON;
@@ -101,8 +100,7 @@ public class KuaiShouBatchCreativeTemplateController {
     @AutoLog(value = "创建创意预设模板")
     @ApiOperation(value = "创建创意预设模板", notes = "创建创意预设模板")
     @PostMapping(value = "/saveOrUpdate")
-    public Result<KuaiShouBatchCreativeTemplate> saveOrUpdate(@RequestBody KuaiShouBatchCreativeTemplate kuaiShouBatchCreativeTemplate) {
-        Result<KuaiShouBatchCreativeTemplate> result = new Result<KuaiShouBatchCreativeTemplate>();
+    public Result<Object> saveOrUpdate(@RequestBody KuaiShouBatchCreativeTemplate kuaiShouBatchCreativeTemplate) {
         boolean ok;
         try {
             Long id = kuaiShouBatchCreativeTemplate.getId();
@@ -117,14 +115,14 @@ public class KuaiShouBatchCreativeTemplateController {
                 }
             }
             if (ok) {
-                result.success("操作成功!");
+                return Result.ok(kuaiShouBatchCreativeTemplate.getId());
             }
+            return Result.error("操作失败");
         } catch (Exception e) {
-            result.error500(e.getMessage());
-            e.printStackTrace();
+            return Result.error(e.getMessage());
         }
-        return result;
     }
+
     /**
      * 添加
      *

+ 4 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouBatchGroupTemplateController.java

@@ -100,8 +100,7 @@ public class KuaiShouBatchGroupTemplateController {
     @AutoLog(value = "创建广告组预设模板")
     @ApiOperation(value = "创建广告组预设模板", notes = "创建广告组预设模板")
     @PostMapping(value = "/saveOrUpdate")
-    public Result<KuaiShouBatchGroupTemplate> saveOrUpdate(@RequestBody KuaiShouBatchGroupTemplate kuaiShouBatchGroupTemplate) {
-        Result<KuaiShouBatchGroupTemplate> result = new Result<>();
+    public Result<Object> saveOrUpdate(@RequestBody KuaiShouBatchGroupTemplate kuaiShouBatchGroupTemplate) {
         boolean ok;
         try {
             Long id = kuaiShouBatchGroupTemplate.getId();
@@ -116,13 +115,12 @@ public class KuaiShouBatchGroupTemplateController {
                 }
             }
             if (ok) {
-                result.success("操作成功!");
+                return Result.ok(kuaiShouBatchGroupTemplate.getId());
             }
+            return Result.error("操作失败");
         } catch (Exception e) {
-            result.error500(e.getMessage());
-            e.printStackTrace();
+            return Result.error(e.getMessage());
         }
-        return result;
     }
 
     /**

+ 6 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouTemplateController.java

@@ -66,6 +66,9 @@ public class KuaishouTemplateController {
         result.setResult(list);
         return result;
     }
+
+
+
     /**
      * 分页列表查询
      *
@@ -75,9 +78,9 @@ public class KuaishouTemplateController {
      * @param req
      * @return
      */
-    @AutoLog(value = "快手-定向模板-分页列表查询")
+  /*  @AutoLog(value = "快手-定向模板-分页列表查询")
     @ApiOperation(value = "快手-定向模板-分页列表查询", notes = "快手-定向模板-分页列表查询")
-    @GetMapping(value = "/queryPageList")
+    @GetMapping(value = "/list")
     public Result<IPage<KuaishouTemplate>> queryPageList(KuaishouTemplate kuaishouTemplate,
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -89,7 +92,7 @@ public class KuaishouTemplateController {
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
-    }
+    }*/
 
 
     /**

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoGetServiceImpl.java

@@ -215,7 +215,7 @@ public class KuaiShouVideoGetServiceImpl extends ServiceImpl<KuaiShouVideoGetMap
             }
             String signature = jsonObject.getString("signature");
             materialJson.put("signature", signature);
-            materialJson.put("material_type", jsonObject.getString("materialType"));
+            materialJson.put("material_type", jsonObject.getInteger("materialType"));
             materialJson.put("channel_type", jsonObject.getString("channelType"));
             materialJson.put("photo_name", jsonObject.getString("photoName"));
             List<String> imageList = imageMap.get(signature);
@@ -241,7 +241,7 @@ public class KuaiShouVideoGetServiceImpl extends ServiceImpl<KuaiShouVideoGetMap
     @Override
     public List<KuaiShouVideoGet> getVideoInfoGroupBySignature(String date) {
         QueryWrapper<KuaiShouVideoGet> queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNotNull("signature").likeRight("stat_date",date);
+        queryWrapper.isNotNull("signature").likeRight("stat_date", date);
         queryWrapper.groupBy("signature");
         return this.list(queryWrapper);
     }

+ 11 - 10
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouBatchCampaignPreviewServiceImpl.java

@@ -208,7 +208,9 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
         campaignPreview.setCampaignId(campaignId);
         campaignPreview.setCampaignType(kuaiShouCampaign.getCampaignType());
         campaignPreview.setPutStatus(kuaiShouCampaign.getPutStatus());
-        campaignPreview.setDayBudget(kuaiShouCampaign.getDayBudget());
+        if (!Check.isNull(kuaiShouCampaign.getDayBudget())&&kuaiShouCampaign.getDayBudget() != 0) {
+            campaignPreview.setDayBudget(kuaiShouCampaign.getDayBudget());
+        }
         campaignPreview.setDayBudgetSchedule(kuaiShouCampaign.getDayBudgetSchedule());
         campaignPreview.setIsTime(2);
         campaignPreview.setBatchId(batchId);
@@ -514,16 +516,13 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
         campaignPreview.setCampaignName(campaignJson.getString("campaignName"));
         campaignPreview.setCampaignNameFormat(campaignJson.getString("campaignName"));
         campaignPreview.setCampaignType(campaignJson.getInteger("campaignType"));
-        campaignPreview.setDayBudget(campaignJson.getLong("dayBudget"));
+        if (!Check.isNull(campaignJson.getLong("dayBudget"))&&campaignJson.getLong("dayBudget") != 0) {
+            campaignPreview.setDayBudget(campaignJson.getLong("dayBudget"));
+        }
         campaignPreview.setDayBudgetSchedule(campaignJson.getString("dayBudgetSchedule"));
         campaignPreview.setTimeStart(campaignJson.getString("timeStart"));
-        Integer isTime = campaignJson.getInteger("isTime");
-        if (Check.isNull(isTime) || 1 == isTime) {
-            campaignPreview.setPutStatus(2);
-        } else {
-            campaignPreview.setPutStatus(campaignJson.getInteger("campaignStatus"));
-        }
-        campaignPreview.setIsTime(isTime);
+        campaignPreview.setPutStatus(campaignJson.getInteger("campaignStatus"));
+        campaignPreview.setIsTime(campaignJson.getInteger("isTime"));
         campaignPreview.setBatchId(batchId);
         return campaignPreview;
     }
@@ -563,7 +562,9 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
         groupPreview.setOcpxActionType(groupJson.getInteger("ocpxActionType"));
         groupPreview.setDeepConversionType(groupJson.getInteger("deepConversionType"));
         groupPreview.setDeepConversionBid(groupJson.getInteger("deepConversionBid"));
-        groupPreview.setDayBudget(groupJson.getInteger("dayBudget"));
+        if (!Check.isNull(groupJson.getInteger("dayBudget"))&&groupJson.getInteger("dayBudget") != 0) {
+            groupPreview.setDayBudget(groupJson.getInteger("dayBudget"));
+        }
         groupPreview.setSpeed(groupJson.getInteger("speed"));
         groupPreview.setBeginTime(groupJson.getString("beginTime"));
         groupPreview.setEndTime(groupJson.getString("endTime"));