瀏覽代碼

Merge remote-tracking branch 'origin/master'

yumeng 5 年之前
父節點
當前提交
dd3f8ed55d
共有 33 個文件被更改,包括 1002 次插入97 次删除
  1. 69 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java
  2. 5 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/KuaishouMatcostAccountMayMapper.xml
  3. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/KuaishouMatcostAccountMayServiceImpl.java
  4. 27 5
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  5. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/BindAccountLoginMapper.xml
  6. 13 11
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountLoginServiceImpl.java
  7. 2 0
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/entity/PangolinReportBillMonth.java
  8. 13 13
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinAppMapper.xml
  9. 19 19
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportAppHourMapper.xml
  10. 4 4
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportBillMonthMapper.xml
  11. 10 12
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportChannelDailyMapper.xml
  12. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinAppServiceImpl.java
  13. 13 11
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinCrawlerServiceImpl.java
  14. 0 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportAppHourServiceImpl.java
  15. 0 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/KuaishouBidWarningServiceImpl.java
  16. 259 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceAreaInfoController.java
  17. 171 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceInterestCategoryController.java
  18. 72 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceAreaInfo.java
  19. 73 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceInterestCategory.java
  20. 15 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceAreaInfoMapper.java
  21. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceInterestCategoryMapper.java
  22. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceAreaInfoMapper.xml
  23. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceInterestCategoryMapper.xml
  24. 16 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceAreaInfoService.java
  25. 1 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceGroupApiService.java
  26. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceInterestCategoryService.java
  27. 33 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceAreaInfoServiceImpl.java
  28. 26 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceGroupApiServiceImpl.java
  29. 11 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceInterestCategoryServiceImpl.java
  30. 4 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceBidWarningServiceImpl.java
  31. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/ByteDanceVideoReportDailyMapper.xml
  32. 7 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceReportDailyAgentService.java
  33. 111 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportDailyAgentServiceImpl.java

+ 69 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.ctop.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Data
+@TableName("ctop_bytedance_area_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_area_info对象", description = "省市县信息")
+public class BytedanceAreaInfo {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * name
+     */
+    @Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 5 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/KuaishouMatcostAccountMayMapper.xml

@@ -10,24 +10,16 @@
         where video_code = #{code}
     </update>
     <select id="getMinDateByCode" resultType="java.lang.String">
-        SELECT
-            min(s.stat_date)
-        FROM
-            ctop_kuaishou_report_daily_creative s
-            LEFT JOIN ctop_kuaishou_creative creative2 ON s.creative_id = creative2.creative_id
-            left join ctop_kuaishou_video_get video on video.photo_id = creative2.photo_id and creative2.account_id = video.account_id
-        WHERE
-            video.signature = #{code}
+    select substr(min(tmp.stat_date),1,10) from kuaishou_video_new_v2 video
+        left join tmp_kuaishou_creative_statdate2 tmp on tmp.photo_id = video.photo_id
+        where video.video_code = #{code}
     </select>
     <select id="getCostByParams" resultType="java.math.BigDecimal">
         SELECT
             sum(report.charge)
         FROM
-        ctop_kuaishou_report_daily_creative report
-        LEFT JOIN ctop_kuaishou_creative creative2 ON report.creative_id = creative2.creative_id
-        left join ctop_kuaishou_video_get video on video.photo_id = creative2.photo_id and creative2.account_id = video.account_id
+        tmp_kuaishou_creative_report report
         WHERE
-        video.signature =#{code} and report.stat_date &gt;= #{startDate} and report.stat_date &lt;= #{endDate};
-
+        report.video_code =#{code} and report.state_date &gt;= #{startDate} and report.state_date &lt; #{endDate};
     </select>
 </mapper>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/KuaishouMatcostAccountMayServiceImpl.java

@@ -17,7 +17,7 @@ public class KuaishouMatcostAccountMayServiceImpl extends ServiceImpl<KuaishouMa
     @Override
     public KuaishouMatcostAccountMay getOne() {
         QueryWrapper<KuaishouMatcostAccountMay>queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNotNull("end_date").isNotNull("video_code").isNull("twcost").last("limit 1");
+        queryWrapper.isNull("twcost").isNotNull("end_date").last("limit 1");
         return this.getOne(queryWrapper);
     }
 

+ 27 - 5
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -10,6 +10,7 @@ import cn.com.ctop.crawler.modules.pangolin.service.PangolinCrawlerService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinLoginService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
@@ -22,6 +23,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -36,10 +38,23 @@ public class SampleTest {
     private ICtopOauthTokenService oauthTokenService;
     @Autowired
     private IByteDanceAdvertiserDataService advertiserDataService;
+    @Autowired
+    private IReportService reportService;
     @Test
     public void testOceanEngineJob() {
-        CtopOauthToken token = oauthTokenService.getTokenByAccountId(1629785592929294L);
-        advertiserDataService.getMaterialList(token);
+        CtopOauthToken token1 = oauthTokenService.getTokenByAccountId(1670725854459911L);
+        CtopOauthToken token2 = oauthTokenService.getTokenByAccountId(1670827164313607L);
+        CtopOauthToken token3 = oauthTokenService.getTokenByAccountId(1670801593147405L);
+        CtopOauthToken token4 = oauthTokenService.getTokenByAccountId(1670827163327501L);
+        CtopOauthToken token5 = oauthTokenService.getTokenByAccountId(1670827163853832L);
+        for(int i=0;i<100;i++){
+            Date startDate = DateUtils.addDay(new Date(),-i);
+            reportService.getAdvertiserReport(token1,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token2,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token3,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token4,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+            reportService.getAdvertiserReport(token5,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
+        }
     }
 
     @Autowired
@@ -133,6 +148,13 @@ public class SampleTest {
             }else{
                 matcostAccountMayService.updateCostByCode(matcostAccountMay.getVideoCode(),BigDecimal.ZERO);
             }
+//            String minDate = matcostAccountMayService.getMinDate(matcostAccountMay.getVideoCode());
+//            if(null == minDate||minDate.trim().equals("")){
+//                matcostAccountMayService.updateByCode(matcostAccountMay.getVideoCode(),"-");
+//            }else{
+//                matcostAccountMayService.updateByCode(matcostAccountMay.getVideoCode(),minDate);
+//            }
+
             loadData();
         }
     }
@@ -146,9 +168,9 @@ public class SampleTest {
         List<BindAccountLogin> list = bindAccountLoginService.list(queryWrapper);
         if (list != null && !list.isEmpty()) {
             for (BindAccountLogin bindAccountLogin : list) {
-//                pangolinCrawlerService.getChannelList(bindAccountLogin);
-                pangolinCrawlerService.getActivationList(bindAccountLogin, DateUtils.getNowDate("yyyy-MM-dd"), 1);
-                pangolinCrawlerService.getCheckList(bindAccountLogin);
+                pangolinCrawlerService.getChannelList(bindAccountLogin);
+//                pangolinCrawlerService.getActivationList(bindAccountLogin, DateUtils.getNowDate("yyyy-MM-dd"), 1);
+//                pangolinCrawlerService.getCheckList(bindAccountLogin);
 //                QueryWrapper<PangolinApp> queryWrapper1 = new QueryWrapper<>();
 //                queryWrapper1.eq("account_name", bindAccountLogin.getAccountName());
 //                List<PangolinApp> appList = pangolinAppService.list(queryWrapper1);

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/BindAccountLoginMapper.xml

@@ -25,7 +25,7 @@
         from
         ctop_bind_account_login login
         left join ctop_project project on login.project_id = project.id
-        where 1=1
+        where login.status = 1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>

+ 13 - 11
module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountLoginServiceImpl.java

@@ -34,6 +34,8 @@ import java.util.Map;
 @Slf4j
 @Service
 public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMapper, BindAccountLogin> implements IBindAccountLoginService {
+    @Autowired
+    private BindAccountLoginMapper bindAccountLoginMapper;
     @Override
     public boolean checkLogin(BindAccountLogin bindAccountLogin, String response) {
         if (response.contains("<html>")) {
@@ -43,6 +45,7 @@ public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMap
         }
         return true;
     }
+
     @Override
     public BindAccountLogin selectByAccountId(String accountId) {
         QueryWrapper<BindAccountLogin> queryWrapper = new QueryWrapper<>();
@@ -68,21 +71,20 @@ public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMap
 
     @Override
     public List<PangolinProjectVO> getProjectByParams(String userId, String loginType) {
-        List<PangolinProjectVO> projectVOS =  bindAccountLoginMapper.getProjectByParams(userId,loginType,null);
-        List<PangolinProjectVO> setProjectVOS = new ArrayList<>();
-        if(null!=projectVOS&&!projectVOS.isEmpty()){
-            projectVOS.forEach(pangolinProjectVO -> {
-                List<PangolinAccountVO>accountVOS = bindAccountLoginMapper.getAccountByParams(userId,loginType,pangolinProjectVO.getProjectId());
-                pangolinProjectVO.setAccountVOList(accountVOS);
-                setProjectVOS.add(pangolinProjectVO);
+        List<PangolinProjectVO> projectVos =  bindAccountLoginMapper.getProjectByParams(userId,loginType,null);
+        List<PangolinProjectVO> setProjectVos = new ArrayList<>();
+        if(null!=projectVos&&!projectVos.isEmpty()){
+            projectVos.forEach(pangolinProjectVO -> {
+                List<PangolinAccountVO>accountVos = bindAccountLoginMapper.getAccountByParams(userId,loginType,pangolinProjectVO.getProjectId());
+                if(null!=accountVos&&!accountVos.isEmpty()){
+                    pangolinProjectVO.setAccountVOList(accountVos);
+                    setProjectVos.add(pangolinProjectVO);
+                }
             });
         }
-        return setProjectVOS;
+        return setProjectVos;
     }
 
-    @Autowired
-    private BindAccountLoginMapper bindAccountLoginMapper;
-
     @Override
     public Map<String, Object> getListByUserId(String userId) {
         Map<String,Object>result = new HashMap<>();

+ 2 - 0
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/entity/PangolinReportBillMonth.java

@@ -44,4 +44,6 @@ public class PangolinReportBillMonth {
      * 账户质量分
      */
     private BigDecimal accountQualityScore;
+
+    private String accountName;
 }

+ 13 - 13
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinAppMapper.xml

@@ -2,28 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.crawler.modules.pangolin.mapper.PangolinAppMapper">
     <select id="getListByParams" resultType="cn.com.ctop.crawler.modules.pangolin.entity.PangolinApp">
-        select app.*
+        select distinct app.app_id as 'id',name
             from ctop_pangolin_app app
         left join ctop_bind_account_login login on login.account_name = app.account_name
         where
-        1=1
+        login.status = 1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
-              <if test="accountNames!=null">
-                  or login.account_name in
-                  <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
+                <if test="accountNames!=null">
+                    or login.account_name in
+                    <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                       #{item}
-                  </foreach>
-              </if>
-            <if test="projectIds!=null">
-                or login.project_id in
-                <foreach item="item" index="index" collection="projectIds" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+                    </foreach>
+                </if>
+                <if test="projectIds!=null">
+                    or login.project_id in
+                    <foreach item="item" index="index" collection="projectIds" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
               )
         </if>
     </select>

+ 19 - 19
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportAppHourMapper.xml

@@ -15,12 +15,12 @@
             hour
        from (select num,date,hour
 from ctop_pangolin_report_app_hour appHourActive
-         left join ctop_pangolin_app app on app.id = appHourActive.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+         left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
 where appHourActive.type = #{type}
 and date =  #{today} and hour = #{hour}
 <if test="appId!=null">
-    and app.id = #{appId}
+    and app.app_id = #{appId}
 </if>
 <if test="userId!=null">
     and login.user_id = #{userId}
@@ -28,7 +28,7 @@ and date =  #{today} and hour = #{hour}
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or appHourActive.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -44,12 +44,12 @@ and date =  #{today} and hour = #{hour}
 group by appHourActive.date, appHourActive.hour
 union all select num,date,hour
 from ctop_pangolin_report_app_hour appHourActive
-         left join ctop_pangolin_app app on app.id = appHourActive.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+         left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
 where appHourActive.type = #{type}
         and date =  #{yesterday} and hour = #{hour}
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="userId!=null">
             and login.user_id = #{userId}
@@ -57,7 +57,7 @@ where appHourActive.type = #{type}
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or appHourActive.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -73,12 +73,12 @@ where appHourActive.type = #{type}
         group by appHourActive.date, appHourActive.hour
 union all select num,date,hour
 from ctop_pangolin_report_app_hour appHourActive
-         left join ctop_pangolin_app app on app.id = appHourActive.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+         left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
 where appHourActive.type = #{type}
         and date =  #{sevenDaysAgo} and hour = #{hour}
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="userId!=null">
             and login.user_id = #{userId}
@@ -86,7 +86,7 @@ where appHourActive.type = #{type}
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or appHourActive.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -104,8 +104,8 @@ where appHourActive.type = #{type}
     union all
     select num,date,hour
     from ctop_pangolin_report_app_hour appHourActive
-    left join ctop_pangolin_app app on app.id = appHourActive.app_id
-    left join ctop_bind_account_login login on login.account_name = app.account_name
+    left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+    left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
     where appHourActive.type = #{type}
     and date =  #{compareTime1} and hour = #{hour}
     <if test="appId!=null">
@@ -117,7 +117,7 @@ where appHourActive.type = #{type}
     <if test="accountNames!=null or projectIds!=null">
         and  ( 1=0
         <if test="accountNames!=null">
-            or login.account_name in
+            or appHourActive.account_name in
             <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -136,12 +136,12 @@ where appHourActive.type = #{type}
             union all
             select num,date,hour
             from ctop_pangolin_report_app_hour appHourActive
-            left join ctop_pangolin_app app on app.id = appHourActive.app_id
-            left join ctop_bind_account_login login on login.account_name = app.account_name
+            left join ctop_pangolin_app app on app.app_id = appHourActive.app_id
+            left join ctop_bind_account_login login on login.account_name = appHourActive.account_name
             where appHourActive.type = #{type}
             and date =  #{compareTime2} and hour = #{hour}
             <if test="appId!=null">
-                and app.id = #{appId}
+                and app.app_id = #{appId}
             </if>
             <if test="userId!=null">
                 and login.user_id = #{userId}
@@ -149,7 +149,7 @@ where appHourActive.type = #{type}
             <if test="accountNames!=null or projectIds!=null">
                 and  ( 1=0
                 <if test="accountNames!=null">
-                    or login.account_name in
+                    or appHourActive.account_name in
                     <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                         #{item}
                     </foreach>

+ 4 - 4
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportBillMonthMapper.xml

@@ -16,14 +16,14 @@
        round(avg(bill.account_quality_score),2) as 'account_quality_score',
        sum(bill.actual_total_price) as 'actual_total_price'
     from ctop_pangolin_report_bill_month bill
-         left join ctop_pangolin_app app on app.id = bill.app_id
-         left join ctop_bind_account_login login on login.account_name = app.account_name
+         left join ctop_pangolin_app app on app.app_id = bill.app_id
+         left join ctop_bind_account_login login on login.account_name = bill.account_name
          where 1=1
          <if test="userId!=null">
              and login.user_id = #{userId}
          </if>
          <if test="appId!=null">
-             and app.id = #{appId}
+             and app.app_id = #{appId}
          </if>
         <if test="startDate!=null">
             and bill.date &gt;= #{startDate}
@@ -37,7 +37,7 @@
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or bill.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>

+ 10 - 12
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/mapper/xml/PangolinReportChannelDailyMapper.xml

@@ -6,7 +6,8 @@
             resultType="cn.com.ctop.crawler.modules.pangolin.entity.PangolinReportChannelDaily">
         select
             daily.date,
-            channel.name as 'channel_name',
+--             daily.channel_name as 'channel_name',
+            '-' as 'channel_name',
             <if test="appId == null">
                 '-' as 'app_name',
             </if>
@@ -18,15 +19,14 @@
             sum(daily.total_price)as 'total_price'
         from
         ctop_pangolin_report_channel_daily daily
-        left join ctop_pangolin_channel channel on channel.name = daily.channel_name
-        left join ctop_bind_account_login login on login.account_name = channel.account_name
-        left join ctop_pangolin_app app on app.account_name = channel.account_name
+        left join ctop_bind_account_login login on login.account_name = daily.account_name
+        left join ctop_pangolin_app app on app.name = daily.app_name and app.account_name = daily.account_name
         where 1=1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="startDate!=null">
             and daily.date &gt;= #{startDate}
@@ -40,7 +40,7 @@
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or daily.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -60,15 +60,14 @@
             sum(daily.external_activation)
         from
         ctop_pangolin_report_channel_daily daily
-        left join ctop_pangolin_channel channel on channel.name = daily.channel_name
-        left join ctop_bind_account_login login on login.account_name = channel.account_name
-        left join ctop_pangolin_app app on app.account_name = channel.account_name
+        left join ctop_bind_account_login login on login.account_name = daily.account_name
+        left join ctop_pangolin_app app on app.account_name = daily.account_name and daily.app_name = app.name
         where 1=1
         <if test="userId!=null">
             and login.user_id = #{userId}
         </if>
         <if test="appId!=null">
-            and app.id = #{appId}
+            and app.app_id = #{appId}
         </if>
         <if test="startDate!=null">
             and daily.date &gt;= #{startDate}
@@ -82,7 +81,7 @@
         <if test="accountNames!=null or projectIds!=null">
             and  ( 1=0
             <if test="accountNames!=null">
-                or login.account_name in
+                or daily.account_name in
                 <foreach item="item" index="index" collection="accountNames" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -95,7 +94,6 @@
             </if>
             )
         </if>
-
     </select>
 
 </mapper>

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinAppServiceImpl.java

@@ -71,7 +71,7 @@ public class PangolinAppServiceImpl extends ServiceImpl<PangolinAppMapper, Pango
         if(null == getApp){
             this.save(app);
         }else{
-            getApp.setName(app.getAccountName());
+            getApp.setName(app.getName());
             this.updateById(getApp);
         }
     }

+ 13 - 11
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinCrawlerServiceImpl.java

@@ -80,11 +80,13 @@ public class PangolinCrawlerServiceImpl implements PangolinCrawlerService {
                     pangolinReportBillMonth.setYear(Integer.parseInt(date.split("-")[0]));
                     pangolinReportBillMonth.setMonth(Integer.parseInt(date.split("-")[1]));
                     pangolinReportBillMonth.setDate(date);
+                    pangolinReportBillMonth.setAccountName(bindAccountLogin.getAccountName());
                     QueryWrapper<PangolinReportBillMonth> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("os", pangolinReportBillMonth.getOs());
                     queryWrapper.eq("app_id", pangolinReportBillMonth.getAppId());
                     queryWrapper.eq("month", pangolinReportBillMonth.getMonth());
                     queryWrapper.eq("year", pangolinReportBillMonth.getYear());
+                    queryWrapper.eq("account_name", pangolinReportBillMonth.getAccountName());
                     if (pangolinReportBillMonthService.getOne(queryWrapper) == null) {
                         pangolinReportBillMonthService.save(pangolinReportBillMonth);
                     } else {
@@ -135,17 +137,17 @@ public class PangolinCrawlerServiceImpl implements PangolinCrawlerService {
                     app.setName(name);
                     pangolinAppService.saveOrUpdateApp(app);
                 }
-                Iterator<JsonNode> channelIterator = resultNode.get("data").get("ChannelNameList").elements();
-                while (channelIterator.hasNext()) {
-                    JsonNode channelNode = channelIterator.next();
-                    Long id = channelNode.get("Id").asLong();
-                    String name = channelNode.get("Name").asText();
-                    PangolinChannel channel = new PangolinChannel();
-                    channel.setAccountName(bindAccountLogin.getAccountName());
-                    channel.setId(id);
-                    channel.setName(name);
-                    pangolinChannelService.saveOrUpdate(channel);
-                }
+//                Iterator<JsonNode> channelIterator = resultNode.get("data").get("ChannelNameList").elements();
+//                while (channelIterator.hasNext()) {
+//                    JsonNode channelNode = channelIterator.next();
+//                    Long id = channelNode.get("Id").asLong();
+//                    String name = channelNode.get("Name").asText();
+//                    PangolinChannel channel = new PangolinChannel();
+//                    channel.setAccountName(bindAccountLogin.getAccountName());
+//                    channel.setId(id);
+//                    channel.setName(name);
+//                    pangolinChannelService.saveOrUpdate(channel);
+//                }
             }
         } catch (IOException e) {
             e.printStackTrace();

+ 0 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportAppHourServiceImpl.java

@@ -24,7 +24,6 @@ public class PangolinReportAppHourServiceImpl extends ServiceImpl<PangolinReport
 
     @Override
     public Map<String, Object> getRealTimeData(String userId, JSONObject data) {
-
         Map<String, Object> resultMap = new HashMap<>();
         String today = DateUtils.formatDate();
         String yesterday = DateUtils.addDay(today,-1);

+ 0 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/KuaishouBidWarningServiceImpl.java

@@ -15,7 +15,6 @@ import cn.com.ctop.kuaishou.modules.material.service.IKuaishouBidWarningService;
 import cn.com.feishu.provider.MessageProvider;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +44,6 @@ public class KuaishouBidWarningServiceImpl implements IKuaishouBidWarningService
         XxlJobLogger.log("快手出价预警定时任务开始");
         long start = System.currentTimeMillis();
         try {
-            QueryWrapper<Project> projectQueryWrapper = new QueryWrapper<>();
             List<Project> projects = projectService.list();
             if (Check.isNull(projects)) {
                 return;

+ 259 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceAreaInfoController.java

@@ -0,0 +1,259 @@
+package cn.com.ctop.toutiao.modules.batch.controller;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceAreaInfoService;
+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;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Slf4j
+@Api(tags = "省市县信息")
+@RestController
+@RequestMapping("/ctop/bytedanceAreaInfo")
+public class BytedanceAreaInfoController {
+    @Autowired
+    private IBytedanceAreaInfoService bytedanceAreaInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param bytedanceAreaInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "省市县信息-分页列表查询")
+    @ApiOperation(value = "省市县信息-分页列表查询", notes = "省市县信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<BytedanceAreaInfo>> queryPageList(BytedanceAreaInfo bytedanceAreaInfo,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<BytedanceAreaInfo>> result = new Result<>();
+        QueryWrapper<BytedanceAreaInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, req.getParameterMap());
+        Page<BytedanceAreaInfo> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.page(page, queryWrapper);
+        List<BytedanceAreaInfo> areaInfos = pageList.getRecords();
+        if(null!=areaInfos&&!areaInfos.isEmpty()){
+            List<BytedanceAreaInfo>setAreas = new ArrayList<>();
+            areaInfos.forEach(areaInfo->{
+                boolean hasChild = bytedanceAreaInfoService.hasChild(areaInfo);
+                areaInfo.setHasChild(hasChild);
+                setAreas.add(areaInfo);
+            });
+            pageList.setRecords(setAreas);
+        }
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param bytedanceAreaInfo
+     * @return
+     */
+    @AutoLog(value = "省市县信息-添加")
+    @ApiOperation(value = "省市县信息-添加", notes = "省市县信息-添加")
+    @PostMapping(value = "/add")
+    public Result<BytedanceAreaInfo> add(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        try {
+            bytedanceAreaInfoService.save(bytedanceAreaInfo);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param bytedanceAreaInfo
+     * @return
+     */
+    @AutoLog(value = "省市县信息-编辑")
+    @ApiOperation(value = "省市县信息-编辑", notes = "省市县信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<BytedanceAreaInfo> edit(@RequestBody BytedanceAreaInfo bytedanceAreaInfo) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        BytedanceAreaInfo bytedanceAreaInfoEntity = bytedanceAreaInfoService.getById(bytedanceAreaInfo.getId());
+        if (bytedanceAreaInfoEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = bytedanceAreaInfoService.updateById(bytedanceAreaInfo);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "省市县信息-通过id删除")
+    @ApiOperation(value = "省市县信息-通过id删除", notes = "省市县信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            bytedanceAreaInfoService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "省市县信息-批量删除")
+    @ApiOperation(value = "省市县信息-批量删除", notes = "省市县信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<BytedanceAreaInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.bytedanceAreaInfoService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "省市县信息-通过id查询")
+    @ApiOperation(value = "省市县信息-通过id查询", notes = "省市县信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<BytedanceAreaInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<BytedanceAreaInfo> result = new Result<BytedanceAreaInfo>();
+        BytedanceAreaInfo bytedanceAreaInfo = bytedanceAreaInfoService.getById(id);
+        if (bytedanceAreaInfo == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(bytedanceAreaInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<BytedanceAreaInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                BytedanceAreaInfo bytedanceAreaInfo = JSON.parseObject(deString, BytedanceAreaInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(bytedanceAreaInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<BytedanceAreaInfo> pageList = bytedanceAreaInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "省市县信息列表");
+        mv.addObject(NormalExcelConstants.CLASS, BytedanceAreaInfo.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("省市县信息列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<BytedanceAreaInfo> listBytedanceAreaInfos = ExcelImportUtil.importExcel(file.getInputStream(), BytedanceAreaInfo.class, params);
+                bytedanceAreaInfoService.saveBatch(listBytedanceAreaInfos);
+                return Result.ok("文件导入成功!数据行数:" + listBytedanceAreaInfos.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 171 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/controller/BytedanceInterestCategoryController.java

@@ -0,0 +1,171 @@
+package cn.com.ctop.toutiao.modules.batch.controller;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceInterestCategoryService;
+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.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+@RestController
+@Slf4j
+public class BytedanceInterestCategoryController {
+    @Autowired
+    private IBytedanceInterestCategoryService bytedanceInterestCategoryService;
+
+    @GetMapping(value = "/listbycode")
+    public Result<IPage<BytedanceInterestCategory>> queryPageListByCode(@RequestParam(name = "parentCode", defaultValue = "0") String code,
+                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                        HttpServletRequest req) {
+        Result<IPage<BytedanceInterestCategory>> result = new Result<>();
+        BytedanceInterestCategory category = new BytedanceInterestCategory();
+        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(category, req.getParameterMap());
+        queryWrapper.eq("parent_code", code);
+        Page<BytedanceInterestCategory> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 分页列表查询
+     *
+     * @param bytedanceInterestCategory
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-分页列表查询")
+    @ApiOperation(value = "兴趣分类信息-分页列表查询", notes = "兴趣分类信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<BytedanceInterestCategory>> queryPageList(BytedanceInterestCategory bytedanceInterestCategory,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+        Result<IPage<BytedanceInterestCategory>> result = new Result<>();
+        QueryWrapper<BytedanceInterestCategory> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceInterestCategory, req.getParameterMap());
+        Page<BytedanceInterestCategory> page = new Page<>(pageNo, pageSize);
+        IPage<BytedanceInterestCategory> pageList = bytedanceInterestCategoryService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param bytedanceInterestCategory
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-添加")
+    @ApiOperation(value = "兴趣分类信息-添加", notes = "兴趣分类信息-添加")
+    @PostMapping(value = "/add")
+    public Result<BytedanceInterestCategory> add(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        try {
+            bytedanceInterestCategoryService.save(bytedanceInterestCategory);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param bytedanceInterestCategory
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-编辑")
+    @ApiOperation(value = "兴趣分类信息-编辑", notes = "兴趣分类信息-编辑")
+    @PutMapping(value = "/edit")
+    public Result<BytedanceInterestCategory> edit(@RequestBody BytedanceInterestCategory bytedanceInterestCategory) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        BytedanceInterestCategory bytedanceInterestCategoryEntity = bytedanceInterestCategoryService.getById(bytedanceInterestCategory.getId());
+        if (bytedanceInterestCategoryEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = bytedanceInterestCategoryService.updateById(bytedanceInterestCategory);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-通过id删除")
+    @ApiOperation(value = "兴趣分类信息-通过id删除", notes = "兴趣分类信息-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            bytedanceInterestCategoryService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-批量删除")
+    @ApiOperation(value = "兴趣分类信息-批量删除", notes = "兴趣分类信息-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<BytedanceInterestCategory> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.bytedanceInterestCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "兴趣分类信息-通过id查询")
+    @ApiOperation(value = "兴趣分类信息-通过id查询", notes = "兴趣分类信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<BytedanceInterestCategory> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<BytedanceInterestCategory> result = new Result<>();
+        BytedanceInterestCategory bytedanceInterestCategory = bytedanceInterestCategoryService.getById(id);
+        if (bytedanceInterestCategory == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(bytedanceInterestCategory);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+}
+

+ 72 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceAreaInfo.java

@@ -0,0 +1,72 @@
+package cn.com.ctop.toutiao.modules.batch.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Data
+@TableName("ctop_bytedance_area_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_area_info对象", description = "省市县信息")
+public class BytedanceAreaInfo {
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * name
+     */
+    @Excel(name = "name", width = 15)
+    @ApiModelProperty(value = "name")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private Boolean hasChild;
+}

+ 73 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/entity/BytedanceInterestCategory.java

@@ -0,0 +1,73 @@
+package cn.com.ctop.toutiao.modules.batch.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 兴趣分类信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-18
+ */
+@Data
+@TableName("ctop_bytedance_interest_category")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_bytedance_interest_category对象", description = "兴趣分类信息")
+public class BytedanceInterestCategory {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 名称
+     */
+    @Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * parentCode
+     */
+    @Excel(name = "parentCode", width = 15)
+    @ApiModelProperty(value = "parentCode")
+    private String parentCode;
+    /**
+     * level
+     */
+    @Excel(name = "level", width = 15)
+    @ApiModelProperty(value = "level")
+    private Integer level;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private Boolean hasChild;
+}

+ 15 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceAreaInfoMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.toutiao.modules.batch.mapper;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 省市县信息
+ *
+ * @author: jeecg-boot
+ * @date: 2019-09-17
+ * @cersion: V1.0
+ */
+public interface BytedanceAreaInfoMapper extends BaseMapper<BytedanceAreaInfo> {
+
+}

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/BytedanceInterestCategoryMapper.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.batch.mapper;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface BytedanceInterestCategoryMapper extends BaseMapper<BytedanceInterestCategory> {
+}

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceAreaInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.toutiao.modules.batch.mapper.BytedanceAreaInfoMapper">
+
+</mapper>

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/mapper/xml/BytedanceInterestCategoryMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.toutiao.modules.batch.mapper.BytedanceInterestCategoryMapper">
+
+</mapper>

+ 16 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceAreaInfoService.java

@@ -0,0 +1,16 @@
+package cn.com.ctop.toutiao.modules.batch.service;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+public interface IBytedanceAreaInfoService extends IService<BytedanceAreaInfo> {
+
+    boolean hasChild(BytedanceAreaInfo areaInfo);
+}

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceGroupApiService.java

@@ -10,4 +10,5 @@ import java.util.Map;
 public interface IBytedanceGroupApiService {
     List<ByteDanceCampaign> getGroupListByParams(CtopOauthToken token, JSONArray ids, String campaignName, String landingType, String status, String campaignCreateTime, Integer page, Integer pageSize);
     Map<String,Object>createGroup(CtopOauthToken token,String campaignName,String operation,String budgetMode,String budget,String landingType,String uniqueFk);
+    Map<String,Object>updateGroup(CtopOauthToken token, String campaignId, String campaignName, String modifyTime,String budget);
 }

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/IBytedanceInterestCategoryService.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.batch.service;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IBytedanceInterestCategoryService extends IService<BytedanceInterestCategory> {
+}

+ 33 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceAreaInfoServiceImpl.java

@@ -0,0 +1,33 @@
+package cn.com.ctop.toutiao.modules.batch.service.impl;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.modules.batch.mapper.BytedanceAreaInfoMapper;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceAreaInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 省市县信息
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-09-17
+ */
+@Service
+public class BytedanceAreaInfoServiceImpl extends ServiceImpl<BytedanceAreaInfoMapper, BytedanceAreaInfo> implements IBytedanceAreaInfoService {
+
+    @Override
+    public boolean hasChild(BytedanceAreaInfo areaInfo) {
+        QueryWrapper<BytedanceAreaInfo>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("parent_code",areaInfo.getCode());
+        List<BytedanceAreaInfo>areaInfos = this.list(queryWrapper);
+        if(null == areaInfos||areaInfos.isEmpty()){
+            return false;
+        }else{
+            return true;
+        }
+    }
+}

+ 26 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceGroupApiServiceImpl.java

@@ -20,7 +20,6 @@ import java.util.Map;
 @Service
 @Slf4j
 public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
-
     @Override
     /**
      * 获取广告组数据
@@ -76,6 +75,17 @@ public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
         return campaigns;
     }
 
+    /**
+     * 每个广告主账号下最多可允许创建500个广告组,如超出需要先删除一部分广告组后才可继续创建。
+     * @param token
+     * @param campaignName
+     * @param operation
+     * @param budgetMode
+     * @param budget
+     * @param landingType
+     * @param uniqueFk
+     * @return
+     */
     @Override
     public Map<String, Object> createGroup(CtopOauthToken token, String campaignName, String operation, String budgetMode, String budget, String landingType, String uniqueFk) {
         Map<String,Object>result = new HashMap<>();
@@ -114,4 +124,19 @@ public class BytedanceGroupApiServiceImpl implements IBytedanceGroupApiService {
         result.put("campaign_id",campaignId);
         return result;
     }
+
+    @Override
+    public Map<String, Object> updateGroup(CtopOauthToken token, String campaignId, String campaignName, String modifyTime,String budget) {
+        // 请求地址
+        String url = "https://ad.oceanengine.com/open_api/2/campaign/update/";
+        // 请求参数
+        JSONObject data = new JSONObject();
+        data.put("advertiser_id",token.getAccountId());
+        data.put("campaign_name",campaignName);
+        data.put("budget",budget);
+        data.put("campaign_id", campaignId);
+        data.put("modify_time", modifyTime);
+        JSONObject result = HttpUtils.bytedancePostRequest(token.getAccessToken(),url,data);
+        return new HashMap<>();
+    }
 }

+ 11 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceInterestCategoryServiceImpl.java

@@ -0,0 +1,11 @@
+package cn.com.ctop.toutiao.modules.batch.service.impl;
+
+import cn.com.ctop.toutiao.modules.batch.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.modules.batch.mapper.BytedanceInterestCategoryMapper;
+import cn.com.ctop.toutiao.modules.batch.service.IBytedanceInterestCategoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BytedanceInterestCategoryServiceImpl extends ServiceImpl<BytedanceInterestCategoryMapper, BytedanceInterestCategory> implements IBytedanceInterestCategoryService {
+}

+ 4 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceBidWarningServiceImpl.java

@@ -56,11 +56,14 @@ public class BytedanceBidWarningServiceImpl implements IBytedanceBidWarningServi
                 }
                 Long maxBid = project.getMaxBid();
                 Long projectId = project.getId();
-                List<UserAllocation> userAllocations = userAllocationService.getByParams(projectId,null,1);
+                List<UserAllocation> userAllocations = userAllocationService.getByParams(projectId,null,null);
                 if (Check.isNull(userAllocations)) {
                     continue;
                 }
                 for (UserAllocation userAllocation : userAllocations) {
+                    if (userAllocation.getAccountStatus() == 1) {
+                        continue;
+                    }
                     Long accountId = userAllocation.getAccountId();
                     List<String> unitWarning = new ArrayList<>();
                     if ("1".equals(userAllocation.getMediaId())) {

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/ByteDanceVideoReportDailyMapper.xml

@@ -683,7 +683,7 @@
         from ctop_bytedance_report_material_daily a
         left join (select * from ctop_user_allocation group by account_id) b on a.account_id = b.account_id
         left join user_company c on b.user_id = c.user_id
-        left join ctop_bytedance_video_info d on a.material_id = d.material_id
+        left join (select * from ctop_bytedance_video_info group by material_id) d on a.material_id = d.material_id
         left join (select code,url,material_name from ctop_material_info group by code) e on d.signature = e.code
         where c.company_id = #{companyId}      -- '6608ed13c0dd42de93c790dbdf124234'
         and a.image_mode in ('CREATIVE_IMAGE_MODE_VIDEO',

+ 7 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/IBytedanceReportDailyAgentService.java

@@ -0,0 +1,7 @@
+package cn.com.ctop.toutiao.modules.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface IBytedanceReportDailyAgentService {
+
+}

+ 111 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportDailyAgentServiceImpl.java

@@ -0,0 +1,111 @@
+package cn.com.ctop.toutiao.modules.report.service.impl;
+
+import cn.com.ctop.common.module.utils.ChaojiyingUtils;
+import cn.com.ctop.common.module.utils.HttpUtils2;
+import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportDailyAgentService;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.cookie.BasicClientCookie;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Cookie;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+public class BytedanceReportDailyAgentServiceImpl implements IBytedanceReportDailyAgentService {
+//    @Value("${jeecg.path.chrome-driver}")
+    private String chromeDriver = "D:/chromedriver.exe";
+    public static void main(String[] args){
+        BytedanceReportDailyAgentServiceImpl i = new BytedanceReportDailyAgentServiceImpl();
+        //账户列表 get
+        //https://agent.oceanengine.com/agent/optimize/adv-manage/adv-list/history/?beginDate=2020-07-03&endDate=2020-07-03&page=1&size=10&sortDir=descend&sortField=salesCost
+        //公司列表 post
+        //https://agent.oceanengine.com/agent/optimize/adv-company-manage/company-list/history/
+        /**
+         * Content-Disposition: form-data; name="page"
+         * 1
+         * Content-Disposition: form-data; name="size"
+         * 10
+         * Content-Disposition: form-data; name="sortField"
+         * advertiserCompanyCost
+         * Content-Disposition: form-data; name="sortDir"
+         * descend
+         * Content-Disposition: form-data; name="beginDate"
+         * 2020-07-01
+         */
+        i.loginAgent();
+    }
+    public boolean loginAgent() {
+        boolean loginStatus = false;
+        System.getProperties().setProperty("webdriver.chrome.driver", chromeDriver);
+        String url = "https://agent.oceanengine.com/login";
+        ChromeOptions chromeOptions = new ChromeOptions();
+        chromeOptions.addArguments("--headless");
+        chromeOptions.addArguments("--no-sandbox");
+        chromeOptions.addArguments("--disable-dev-shm-usage");
+        chromeOptions.addArguments("--incognito");
+        chromeOptions.addArguments("--disable-gpu");
+        chromeOptions.addArguments("--window-size=1920,1080");
+        chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
+        chromeOptions.setAcceptInsecureCerts(true);
+        WebDriver webDriver = new ChromeDriver(chromeOptions);
+        try {
+            Thread.sleep(3000L);
+            HttpUtils2.cookieStore = new BasicCookieStore();
+            webDriver.manage().deleteAllCookies();
+            //获取登录页面
+            webDriver.get(url);
+            Thread.sleep(3000L);
+            WebElement accountElement = webDriver.findElement(By.xpath("//input[@name='account']"));
+            accountElement.sendKeys("guoyanling@c-top.com.cn");
+            Thread.sleep(3000L);
+            WebElement passwordElement = webDriver.findElement(By.xpath("//input[@name='password']"));
+            passwordElement.sendKeys("HCST-hcst888");
+            WebElement captchaElement = webDriver.findElement(By.xpath("//div[contains(@class,'custom-toutiao-captcha')]"));
+            String bg = captchaElement.getCssValue("background-image");
+            System.out.println(bg.split("\"")[1]);
+            String result = ChaojiyingUtils.process(bg.split(",")[1],1004);
+            //{"err_no":0,"err_str":"OK","pic_id":"9109919322855101177","pic_str":"jdww","md5":"230db313e423211fcd989a9b4797fd87"}
+            WebElement captchaInputElement = webDriver.findElement(By.xpath("//input[@name='captcha']"));
+            System.out.println(result);
+            WebElement loginElement = webDriver.findElement(By.xpath("//div[contains(text(),'登录')]"));
+            Thread.sleep(3000L);
+            //点击登录
+            loginElement.click();
+            Thread.sleep(3000L);
+
+            Set<Cookie> cookies = webDriver.manage().getCookies();
+            Iterator iterator = cookies.iterator();
+            while (iterator.hasNext()) {
+                String cookieStr = iterator.next().toString();
+                String[] cookieArray = cookieStr.split(";");
+                Map<String, String> cookieMap = new HashMap<>();
+                for (String cookie : cookieArray) {
+                    String[] kv = cookie.split("=");
+                    if (kv.length > 1) {
+                        cookieMap.put(kv[0].trim(), kv[1].trim());
+                    }
+                }
+                BasicClientCookie clientCookie = new BasicClientCookie(cookieArray[0].split("=")[0],
+                        cookieArray[0].split("=")[1]);
+                clientCookie.setDomain("agent.oceanengine.com");
+                clientCookie.setPath(cookieMap.get("path"));
+                HttpUtils2.cookieStore.addCookie(clientCookie);
+            }
+            loginStatus = true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            loginStatus = false;
+        } finally {
+            webDriver.manage().deleteAllCookies();
+            webDriver.quit();
+        }
+        return loginStatus;
+    }
+}