|
@@ -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);
|