Explorar o código

Merge remote-tracking branch 'origin/kuaishou-ai-advertising' into kuaishou-ai-advertising

# Conflicts:
#	module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouReportDailyMaterialMapper.xml
syh %!s(int64=4) %!d(string=hai) anos
pai
achega
4f14914306

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/service/impl/AiStrategyServiceImpl.java

@@ -15,11 +15,9 @@ import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ads.entity.*;
 import org.jeecg.modules.ads.service.*;
-import org.jeecg.modules.ngalain.aop.LogRecordAspect;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +30,9 @@ import java.util.stream.Collectors;
 
 @Service
 public class AiStrategyServiceImpl implements IAiStrategyService {
+
     private static final Logger log = LoggerFactory.getLogger(AiStrategyServiceImpl.class);
+
     @Autowired
     private IKuaiShouVideoGetService videoGetService;
     @Autowired

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

@@ -1,20 +1,17 @@
 package cn.com.ctop.kuaishou.modules.batch.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 快手-策略和计划启动/关停关系表
  * @author jeecg-boot
@@ -29,7 +26,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class kuaishoustrategycampaignRel {
     
 	/**策略ID*/
-	@TableId(type = IdType.UUID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "策略ID")
 	private Long id;
 	/**策略id*/

+ 0 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouReportDailyMaterialMapper.java

@@ -35,8 +35,4 @@ public interface KuaiShouReportDailyMaterialMapper extends BaseMapper<KuaiShouRe
     List<KuaiShouReportDailyMaterial> getSignatureByDate(@Param("date")String date);
 
 
-    List<KuaiShouReportDailyMaterial> getHighQualityMaterialId(@Param(value = "accountId") Long accountId,
-                                                               @Param(value = "days") Integer days,
-                                                               @Param(value = "highQualityNum") Integer highQualityNum);
-
 }

+ 2 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/kuaishoustrategycampaignRelMapper.java

@@ -1,12 +1,11 @@
 package cn.com.ctop.kuaishou.modules.batch.mapper;
 
-import java.util.List;
-
 import cn.com.ctop.kuaishou.modules.batch.entity.kuaishoustrategycampaignRel;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 快手-策略和计划启动/关停关系表
  * @author: jeecg-boot

+ 1 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouStrategyService.java

@@ -2,7 +2,6 @@ package cn.com.ctop.kuaishou.modules.batch.service;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouStrategy;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
@@ -30,12 +29,10 @@ public interface IKuaishouStrategyService extends IService<KuaishouStrategy> {
      * 创建快手广告计划
      *
      * @param oauthToken token签名
-     * @param data  广告计划
+     * @param groupJson  广告计划
      * @return void
      * @throws
      * @author ZHAOXA
      */
     Map<String, Object> createPlanLevelStrategy(CtopOauthToken oauthToken, JSONObject data);
-
-    JSONArray createGroupLevelStrategy(CtopOauthToken oauthToken, JSONObject data);
 }

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

@@ -281,7 +281,6 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {
-
                     QueryWrapper<KuaiShouCampaign> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("campaign_id", campaignId);
                     queryWrapper.eq("account_id", advertiserId);
@@ -300,7 +299,6 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
                     if (i > 0) {
                         log.info("修改广告计划状态本地记录添加成功,campaignId:{}", campaignId);
                     }
-
                     if (putStatus == 3) {
                         Map<String, Object> deleteMap = new HashMap<>();
                         deleteMap.put("account_id", advertiserId);
@@ -324,7 +322,6 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
                 returnMap.put("success", false);
                 returnMap.put("message", "修改广告组预算返回结果为空");
             }
-
         } catch (Exception e) {
             log.error("修改广告计划状态异常,advertiserId:{},campaignId:{}", advertiserId, campaignId);
             e.printStackTrace();
@@ -332,7 +329,6 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
             returnMap.put("success", false);
             returnMap.put("message", "修改广告计划状态算异常");
         }
-
         return returnMap;
     }
 
@@ -375,8 +371,6 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
                     } else {
                         groupService.getGroupByUnitId(token, advertiserId, unitId);
                     }
-
-
                 } else {
                     log.error("修改广告组状态失败,advertiserId:{},unitId:{},返回信息:{}", advertiserId, unitId, resultJson);
                     returnMap.put("code", -1);
@@ -389,7 +383,6 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
                 returnMap.put("success", false);
                 returnMap.put("message", "修改广告组预算返回结果为空");
             }
-
         } catch (Exception e) {
             log.error("修改广告组状态异常,advertiserId:{},unitId:{}", advertiserId, unitId);
             e.printStackTrace();

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

@@ -7,11 +7,7 @@ import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouStrategy;
 import cn.com.ctop.kuaishou.modules.batch.entity.kuaishoustrategycampaignRel;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaishouStrategyMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouStrategyService;
+import cn.com.ctop.kuaishou.modules.batch.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -90,6 +86,11 @@ public class KuaishouStrategyServiceImpl extends ServiceImpl<KuaishouStrategyMap
             }
             if (flag) {
                 obj.put(id.toString(), true);
+                QueryWrapper<KuaishouStrategy> strategyWrapper = new QueryWrapper<>();
+                strategyWrapper.eq("id", id);
+                KuaishouStrategy strategy = new KuaishouStrategy();
+                strategy.setStrategyState(data.getString("state"));
+                kuaishouStrategyMapper.update(strategy, strategyWrapper);
             } else {
                 obj.put(id.toString(), false);
             }
@@ -116,12 +117,11 @@ public class KuaishouStrategyServiceImpl extends ServiceImpl<KuaishouStrategyMap
 
     /**
      * @param oauthToken token签名
-     * @param data  广告计划
+     * @param groupJson  广告计划
      * @return void
      * @throws
      * @author ZHAOXA
      */
-    @Override
     public Map<String, Object> createPlanLevelStrategy(CtopOauthToken oauthToken, JSONObject data) {
         JSONObject planJson = new JSONObject();
         /**计划类型
@@ -147,7 +147,6 @@ public class KuaishouStrategyServiceImpl extends ServiceImpl<KuaishouStrategyMap
         return kuaishouInterfaceService.campaignCreate(oauthToken.getAccessToken(), oauthToken.getAccountId(), planJson);
     }
 
-    @Override
     public JSONArray createGroupLevelStrategy(CtopOauthToken oauthToken, JSONObject data) {
         JSONArray resultArr = new JSONArray();
         JSONArray groupInfo = data.getJSONArray("groupInfo");
@@ -430,8 +429,9 @@ public class KuaishouStrategyServiceImpl extends ServiceImpl<KuaishouStrategyMap
             if (!Check.isNull(groupJson.getInteger("noAreaBreak"))) {
                 intelliExtendJson.put("no_area_break", groupJson.getInteger("noAreaBreak"));
             }
-            targetJson.put("intelli_extend", intelliExtendJson);
-
+            if (!Check.isNull(intelliExtendJson)) {
+                targetJson.put("intelli_extend", intelliExtendJson);
+            }
         }
         // APP行为-按分类
         if (!Check.isNull(groupJson.getJSONArray("appInterest"))) {