yumeng 5 ngày trước cách đây
mục cha
commit
4eca5b6afa
39 tập tin đã thay đổi với 11 bổ sung1720 xóa
  1. 2 37
      job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdqAssetController.java
  2. 1 36
      job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdqController.java
  3. 0 23
      job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdvBudgetController.java
  4. 2 4
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdqAccountReportMapper.java
  5. 0 17
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdqAssetReportMapper.java
  6. 0 42
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdvBudgetMapper.java
  7. 0 15
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AppBanWarnMapper.java
  8. 0 14
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AppletTokenRefreshMapper.java
  9. 0 10
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/ClCreativeUserMapper.java
  10. 0 13
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/RefreshTokenMapper.java
  11. 1 55
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAccountReportMapper.xml
  12. 0 170
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAssetReportMapper.xml
  13. 0 104
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdvBudgetMapper.xml
  14. 0 32
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AppBanWarnMapper.xml
  15. 0 31
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AppletTokenRefreshMapper.xml
  16. 0 23
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/ClCreativeUserMapper.xml
  17. 0 16
      job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/RefreshTokenMapper.xml
  18. 0 11
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAdqAssetReportService.java
  19. 0 6
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAdvBudgetService.java
  20. 0 5
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAppBanWarnService.java
  21. 0 7
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAppletTokenRefreshService.java
  22. 0 5
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IClCreativeUserService.java
  23. 0 5
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IRefreshTokenService.java
  24. 0 2
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAccountReportServiceImpl.java
  25. 0 265
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAssetReportServiceImpl.java
  26. 0 102
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdvBudgetServiceImpl.java
  27. 0 80
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AppBanWarnServiceImpl.java
  28. 0 69
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AppletTokenRefreshServiceImpl.java
  29. 0 122
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/ClCreativeUserServiceImpl.java
  30. 0 57
      job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/RefreshTokenServiceImpl.java
  31. 0 141
      job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqAccountReportJob.java
  32. 0 23
      job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqRefreshTokenJob.java
  33. 2 33
      job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqRetryReportJob.java
  34. 0 23
      job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdvBudgetJob.java
  35. 0 31
      job-adq/src/main/java/cn/com/ctop/job/adq/handler/AppletTokenRefreshJob.java
  36. 0 33
      job-adq/src/main/java/cn/com/ctop/job/adq/handler/ClCreativeUserJob.java
  37. 0 33
      job-adq/src/main/java/cn/com/ctop/job/adq/handler/appBanWarnJob.java
  38. 1 21
      job-adq/src/main/resources/application.yml
  39. 2 4
      job-adq/src/main/resources/logback-dev.xml

+ 2 - 37
job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdqAssetController.java

@@ -2,7 +2,6 @@ package cn.com.ctop.job.adq.controller;
 
 import cn.com.ctop.job.adq.data.entity.MessageModel;
 import cn.com.ctop.job.adq.data.service.IAdqAdIncomeService;
-import cn.com.ctop.job.adq.data.service.IAdqAssetReportService;
 import cn.com.ctop.job.adq.data.service.IAdqCreativeReportService;
 import cn.com.ctop.job.adq.data.utils.Check;
 import cn.com.ctop.job.adq.data.utils.DateUtils;
@@ -28,47 +27,13 @@ public class AdqAssetController {
 
     @Autowired
     private IAdqCreativeReportService adqCreativeReportService;
-    @Autowired
-    private IAdqAssetReportService adqAssetReportService;
+
     @Autowired
     private IAdqAdIncomeService adqAdIncomeService;
 
-    @GetMapping("/assetInfo")
-    public MessageModel assetInfo(@RequestParam(required = false) Long advertiserId) {
-        List<JSONObject> allAdvertiserIdsInfo = adqCreativeReportService.getAccountList(advertiserId);
-        for (JSONObject info : allAdvertiserIdsInfo) {
-            Long advId = info.getLong("advertiserId");
-            String accessToken = info.getString("accessToken");
-            dailyExecutorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    if (!Check.isNull(accessToken)) {
-                        adqAssetReportService.getAdqAssetInfo("MARKETING_TARGET_TYPE_SHORT_DRAMA", null, advId, accessToken, 1, null, null);
-                    }
-                }
-            });
-        }
-        return MessageModel.ok();
-    }
 
 
-    @GetMapping("/assetReport")
-    public MessageModel assetReport(@RequestParam(required = false) Long advertiserId, String startDate, String endDate) {
-        List<JSONObject> allAdvertiserIdsInfo = adqCreativeReportService.getAccountList(advertiserId);
-        for (JSONObject jsonObject : allAdvertiserIdsInfo) {
-            Long adverId = jsonObject.getLong("advertiserId");
-            String accessToken = jsonObject.getString("accessToken");
-            dailyExecutorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    if (!Check.isNull(accessToken)) {
-                        adqAssetReportService.getAdqAssetDailyReport(adverId, accessToken, startDate, endDate, 1, 1, null, null);
-                    }
-                }
-            });
-        }
-        return MessageModel.ok();
-    }
+
 
     @GetMapping("/miniAppAdIncome")
     public MessageModel miniAppAdIncome(@RequestParam(required = false) String appId,

+ 1 - 36
job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdqController.java

@@ -43,43 +43,20 @@ public class AdqController {
 
     @Autowired
     private IAdqFlowDetailsReportService adqFlowDetailsReportService;
-    @Autowired
-    private IAppBanWarnService appBanWarnService;
+
 
     @Autowired
     private IAdqMaterialReportService adqMaterialReportService;
     @Autowired
     private IDailyBalanceReportService dailyBalanceReportService;
-    @Autowired
-    private IClCreativeUserService creativeUserService;
-    @Autowired
-    private IMovieLevelService movieLevelService;
-    @Autowired
-    private IRefreshTokenService refreshTokenService;
 
-    @GetMapping("/refreshToken")
-    public JSONObject refreshToken() throws InterruptedException {
-        refreshTokenService.refreshToken();
-        return null;
 
-    }
 
-    @GetMapping("/sendMovie")
-    public JSONObject sendMovie() throws InterruptedException {
-        movieLevelService.sendMovieLevel();
-        return null;
-
-    }
 
 
-    @GetMapping("/clCreativeUser")
-    public JSONObject clCreativeUser() throws InterruptedException {
 
-        creativeUserService.getCreativeUser(1);
 
-        return null;
 
-    }
 
 
     @GetMapping("/getBalanceReport")
@@ -144,19 +121,7 @@ public class AdqController {
     }
 
 
-    @GetMapping("/testCreativeHour")
-    public JSONObject testRefreshToken(Long advertiserId, String accessToken, String date) {
 
-        long currentTimeMillis = System.currentTimeMillis();
-        // 转换为秒级时间戳
-        long currentTimeSeconds = currentTimeMillis / 1000;
-        // 计算10分钟之前的时间戳(秒级)
-        long tenMinutesAgoSeconds = currentTimeSeconds - 600; // 10分钟前的时间戳(秒级)
-        System.err.println(tenMinutesAgoSeconds);
-        appBanWarnService.appBanWarnJob(tenMinutesAgoSeconds);
-        return null;
-
-    }
 
 
     @GetMapping("/testCreativeDaily")

+ 0 - 23
job-adq/src/main/java/cn/com/ctop/job/adq/controller/AdvBudgetController.java

@@ -1,23 +0,0 @@
-package cn.com.ctop.job.adq.controller;
-
-
-import cn.com.ctop.job.adq.data.service.IAdvBudgetService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/advBudget")
-@Slf4j
-public class AdvBudgetController {
-
-    @Autowired
-    private IAdvBudgetService advBudgetService;
-
-    @GetMapping("/sumPayAmountByPeriodAndMerchant")
-    public void sumPayAmountByPeriodAndMerchant() {
-        advBudgetService.sumPayAmountByPeriodAndMerchant();
-    }
-}

+ 2 - 4
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdqAccountReportMapper.java

@@ -9,12 +9,10 @@ import java.util.List;
 
 public interface AdqAccountReportMapper {
     void addAccountHourList(@Param("adds") List<AdqAdvertiserReportHour> hourList);
-    @DS("sd_group_commit")
-    void addAccountHourListSD(@Param("adds") List<AdqAdvertiserReportHour> hourList);
+
 
     void addAccountDailyList(@Param("adds") List<AdqAdvertiserReportDaily> dailyList);
-    @DS("sd_group_commit")
-    void addAccountDailyListSD(@Param("adds") List<AdqAdvertiserReportDaily> dailyList);
+
 
     void updateAdqAccountStatus();
 

+ 0 - 17
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdqAssetReportMapper.java

@@ -1,17 +0,0 @@
-package cn.com.ctop.job.adq.data.mapper;
-
-import cn.com.ctop.job.adq.data.entity.AdqAssetInfo;
-import cn.com.ctop.job.adq.data.entity.AdqAssetReportDaily;
-import com.baomidou.dynamic.datasource.annotation.DS;
-
-import java.util.List;
-
-public interface AdqAssetReportMapper {
-    void insertAdqAssetReportDaily(List<AdqAssetReportDaily> reports);
-    @DS("sd_group_commit")
-    void insertAdqAssetReportDailySD(List<AdqAssetReportDaily> reports);
-
-    void insertAdqAssetInfo(List<AdqAssetInfo> infos);
-    @DS("sd_group_commit")
-    void insertAdqAssetInfoSD(List<AdqAssetInfo> infos);
-}

+ 0 - 42
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AdvBudgetMapper.java

@@ -1,42 +0,0 @@
-package cn.com.ctop.job.adq.data.mapper;
-
-
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-
-public interface AdvBudgetMapper {
-
-    /**
-     * 按 app_id 和 settle_begin 分组汇总广告金发放情况
-     * @param params 查询参数 Map
-     * @return List<Map<String, Object>>
-     */
-    List<Map<String, Object>> groupByAppIdAndSettleBegin(Map<String, Object> params);
-
-    /**
-     * 查询分销商
-     * @return List<Map<String, Object>>
-     */
-    List<Map<String, Object>> listTopLevelDistributors();
-
-    /**
-     * 查询订单
-     * @param payMerchant
-     * @param settleBegin
-     * @param settleEnd
-     * @param personId
-     * @return
-     */
-    Long sumPayAmountByPeriodAndMerchant(
-            @Param("payMerchant")   Integer payMerchant,    // 可传 null
-            @Param("settleBegin")   Long settleBegin,       // 可传 null
-            @Param("settleEnd")     Long settleEnd,         // 可传 null
-            @Param("personId")      Integer personId,       // 可传 null
-            @Param("appId")      String appId
-    );
-
-    int replaceAdvBudget(Map<String, Object> params);
-}

+ 0 - 15
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AppBanWarnMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.job.adq.data.mapper;
-
-import cn.com.ctop.job.adq.data.entity.LySendMessageLog;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface AppBanWarnMapper {
-    List<JSONObject> getAppBanList(@Param("createAt") long createAt);
-
-    void insertSendLog(LySendMessageLog sendMessageLog);
-
-    Integer checkNum(@Param("appId") String appId, @Param("date") String date);
-}

+ 0 - 14
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/AppletTokenRefreshMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.job.adq.data.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface AppletTokenRefreshMapper {
-
-    List<JSONObject> queryAppletList();
-
-    void refreshAppletTokens(@Param("list") List<JSONObject> list);
-
-}

+ 0 - 10
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/ClCreativeUserMapper.java

@@ -1,10 +0,0 @@
-package cn.com.ctop.job.adq.data.mapper;
-
-import cn.com.ctop.job.adq.data.entity.ClCreativeUserList;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface ClCreativeUserMapper {
-    void addCreatives(@Param("addList") List<ClCreativeUserList> addList);
-}

+ 0 - 13
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/RefreshTokenMapper.java

@@ -1,13 +0,0 @@
-package cn.com.ctop.job.adq.data.mapper;
-
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface RefreshTokenMapper {
-    List<JSONObject> getAllTokenList();
-
-    void updateToken(@Param("adminAdvertiserId") Long adminAdvertiserId, @Param("updateAccessToken") String updateAccessToken, @Param("updateRefreshToken") String updateRefreshToken);
-}

+ 1 - 55
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAccountReportMapper.xml

@@ -59,61 +59,7 @@
         </foreach>
     </insert>
 
-    <insert id="addAccountHourListSD">
-        insert into adq_advertiser_report_hour (
-        advertiser_id,
-        stat_time_day,
-        `hour`,
-        cost,
-        view_count,
-        valid_click_count,
-        conversions_count,
-        deep_conversions_count,
-        activated_count,
-        reg_pv,
-        retention_count,
-        video_outer_play_count,
-        video_outer_play100_count,
-        key_behavior_conversions_count,
-        purchase_pv,
-        purchase_amount,
-        first_pay_count,
-        ad_monetization_amount,
-        app_ad_paying_users,
-        income_pv_pla,
-        income_val_1,
-        ad_paying_users_d1,
-        income_pv_1d_pla
-        )
-        values
-        <foreach collection="adds" item="item" separator=",">
-            (
-            #{item.advertiserId},
-            #{item.statTimeDay},
-            #{item.hour},
-            #{item.cost},
-            #{item.viewCount},
-            #{item.validClickCount},
-            #{item.conversionsCount},
-            #{item.deepConversionsCount},
-            #{item.activatedCount},
-            #{item.regPv},
-            #{item.retentionCount},
-            #{item.videoOuterPlayCount},
-            #{item.videoOuterPlay100Count},
-            #{item.keyBehaviorConversionsCount},
-            #{item.purchasePv},
-            #{item.purchaseAmount},
-            #{item.firstPayCount},
-            #{item.adMonetizationAmount},
-            #{item.appAdPayingUsers},
-            #{item.incomePvPla},
-            #{item.incomeVal1},
-            #{item.adPayingUsersD1},
-            #{item.incomePv1dPla}
-            )
-        </foreach>
-    </insert>
+
 
     <insert id="addAccountDailyList">
         replace into adq_advertiser_report_daily (

+ 0 - 170
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdqAssetReportMapper.xml

@@ -1,170 +0,0 @@
-<?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.job.adq.data.mapper.AdqAssetReportMapper">
-
-    <insert id="insertAdqAssetReportDaily" parameterType="java.util.List">
-        replace INTO media_api.adq_asset_report_daily (
-        stat_time_day,
-        advertiser_id,
-        adgroup_id,
-        adgroup_name,
-        marketing_asset_id,
-        marketing_target_type,
-        cost,
-        view_count,
-        valid_click_count,
-        conversions_count,
-        deep_conversions_count,
-        activated_count,
-        reg_pv,
-        retention_count,
-        video_outer_play_count,
-        video_outer_play100_count,
-        key_behavior_conversions_count,
-        purchase_pv,
-        purchase_amount,
-        first_pay_count,
-        ad_monetization_amount,
-        app_ad_paying_users,
-        income_pv_pla,
-        income_val_1,
-        ad_paying_users_d1,
-        income_pv_1d_pla
-        ) VALUES
-        <foreach collection="list" item="item" separator=",">
-            (
-            #{item.statTimeDay},
-            #{item.advertiserId},
-            #{item.adgroupId},
-            #{item.adgroupName},
-            #{item.marketingAssetId},
-            #{item.marketingTargetType},
-            #{item.cost},
-            #{item.viewCount},
-            #{item.validClickCount},
-            #{item.conversionsCount},
-            #{item.deepConversionsCount},
-            #{item.activatedCount},
-            #{item.regPv},
-            #{item.retentionCount},
-            #{item.videoOuterPlayCount},
-            #{item.videoOuterPlay100Count},
-            #{item.keyBehaviorConversionsCount},
-            #{item.purchasePv},
-            #{item.purchaseAmount},
-            #{item.firstPayCount},
-            #{item.adMonetizationAmount},
-            #{item.appAdPayingUsers},
-            #{item.incomePvPla},
-            #{item.incomeVal1},
-            #{item.adPayingUsersD1},
-            #{item.incomePv1dPla}
-            )
-        </foreach>
-    </insert>
-
-    <insert id="insertAdqAssetReportDailySD" parameterType="java.util.List">
-        insert INTO media_api.adq_asset_report_daily (
-        stat_time_day,
-        advertiser_id,
-        adgroup_id,
-        adgroup_name,
-        marketing_asset_id,
-        marketing_target_type,
-        cost,
-        view_count,
-        valid_click_count,
-        conversions_count,
-        deep_conversions_count,
-        activated_count,
-        reg_pv,
-        retention_count,
-        video_outer_play_count,
-        video_outer_play100_count,
-        key_behavior_conversions_count,
-        purchase_pv,
-        purchase_amount,
-        first_pay_count,
-        ad_monetization_amount,
-        app_ad_paying_users,
-        income_pv_pla,
-        income_val_1,
-        ad_paying_users_d1,
-        income_pv_1d_pla
-        ) VALUES
-        <foreach collection="list" item="item" separator=",">
-            (
-            #{item.statTimeDay},
-            #{item.advertiserId},
-            #{item.adgroupId},
-            #{item.adgroupName},
-            #{item.marketingAssetId},
-            #{item.marketingTargetType},
-            #{item.cost},
-            #{item.viewCount},
-            #{item.validClickCount},
-            #{item.conversionsCount},
-            #{item.deepConversionsCount},
-            #{item.activatedCount},
-            #{item.regPv},
-            #{item.retentionCount},
-            #{item.videoOuterPlayCount},
-            #{item.videoOuterPlay100Count},
-            #{item.keyBehaviorConversionsCount},
-            #{item.purchasePv},
-            #{item.purchaseAmount},
-            #{item.firstPayCount},
-            #{item.adMonetizationAmount},
-            #{item.appAdPayingUsers},
-            #{item.incomePvPla},
-            #{item.incomeVal1},
-            #{item.adPayingUsersD1},
-            #{item.incomePv1dPla}
-            )
-        </foreach>
-    </insert>
-
-
-    <insert id="insertAdqAssetInfo" parameterType="java.util.List">
-        replace INTO media_api.adq_asset_info (
-        advertiser_id,
-        marketing_asset_id,
-        marketing_asset_name,
-        marketing_target_type,
-        promoted_asset_attr_key_short_drama_drama_mall,
-        promoted_asset_attr_key_sku_id
-        ) VALUES
-        <foreach collection="list" item="item" separator=",">
-            (
-            #{item.advertiserId},
-            #{item.marketingAssetId},
-            #{item.marketingAssetName},
-            #{item.marketingTargetType},
-            #{item.promotedAssetAttrKeyShortDramaDramaMall},
-            #{item.promotedAssetAttrKeySkuId}
-            )
-        </foreach>
-    </insert>
-
-    <insert id="insertAdqAssetInfoSD" parameterType="java.util.List">
-        insert INTO media_api.adq_asset_info (
-        advertiser_id,
-        marketing_asset_id,
-        marketing_asset_name,
-        marketing_target_type,
-        promoted_asset_attr_key_short_drama_drama_mall,
-        promoted_asset_attr_key_sku_id
-        ) VALUES
-        <foreach collection="list" item="item" separator=",">
-            (
-            #{item.advertiserId},
-            #{item.marketingAssetId},
-            #{item.marketingAssetName},
-            #{item.marketingTargetType},
-            #{item.promotedAssetAttrKeyShortDramaDramaMall},
-            #{item.promotedAssetAttrKeySkuId}
-            )
-        </foreach>
-    </insert>
-
-</mapper>

+ 0 - 104
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AdvBudgetMapper.xml

@@ -1,104 +0,0 @@
-<?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.job.adq.data.mapper.AdvBudgetMapper">
-
-    <select id="listTopLevelDistributors" resultType="map">
-        SELECT
-        id,
-        name
-        FROM thirtpart.ly_responsibility_person
-        WHERE is_distributor = 1
-        AND pid IS NULL
-    </select>
-
-    <select id="groupByAppIdAndSettleBegin" resultType="map">
-        SELECT
-        app_id,
-        settle_begin,
-        settle_end,
-        SUM(CASE WHEN fund_type = 0 THEN remain_amount ELSE 0 END)   AS total_amount_a,   -- 通用赠送
-        SUM(CASE WHEN fund_type = 1 THEN remain_amount ELSE 0 END)   AS total_amount_b,   -- 广告激励
-        SUM(CASE WHEN fund_type = 2 THEN remain_amount ELSE 0 END)   AS total_amount_c,   -- 定向激励
-        expire_time,
-        SUM(CASE
-        WHEN expire_time &lt; UNIX_TIMESTAMP(NOW())
-        AND remain_amount > 0
-        THEN remain_amount
-        ELSE 0
-        END)                                                    AS expired_available_amount
-        FROM adq_vp_ad_fund
-        <where>
-            settle_begin &gt;= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 60 DAY))
-            <if test="appId != null">
-                AND app_id = #{appId}
-            </if>
-            <if test="settleBeginStart != null">
-                AND settle_begin &gt;= #{settleBeginStart}
-            </if>
-            <if test="settleBeginEnd != null">
-                AND settle_begin &lt;= #{settleBeginEnd}
-            </if>
-            <if test="fundType != null">
-                AND fund_type = #{fundType}
-            </if>
-        </where>
-        GROUP BY app_id, settle_begin
-        HAVING total_amount_a > 0
-        OR total_amount_b > 0
-        OR total_amount_c > 0
-        OR expired_available_amount > 0
-        ORDER BY settle_begin DESC
-    </select>
-
-    <select id="sumPayAmountByPeriodAndMerchant" resultType="java.lang.Long">
-        SELECT
-        COALESCE(SUM(total_fee) * 100, 0) AS total_fee
-        FROM thirtpart.ly_pay_record
-        LEFT JOIN thirtpart.ly_official_accounts loa
-        ON ly_pay_record.official_account_id = loa.id
-        <where>
-            link_id IS NOT NULL
-            <if test="payMerchant != null">
-                AND pay_merchant = #{payMerchant}
-            </if>
-            <if test="appId != null">
-                AND loa.app_id = #{appId}
-            </if>
-            <if test="settleBegin != null">
-                AND pay_time &gt;= #{settleBegin}
-            </if>
-            <if test="settleEnd != null">
-                AND pay_time &lt;= #{settleEnd}
-            </if>
-            <if test="personId != null">
-                AND (person_bility_id = #{personId} OR person_id = #{personId})
-            </if>
-            AND status = 1
-        </where>
-    </select>
-
-    <insert id="replaceAdvBudget" parameterType="map">
-        REPLACE INTO thirtpart.adv_budget (
-            person_id,
-            app_id,
-            settle_begin,
-            settle_end,
-            fund_money_a,
-            fund_money_b,
-            fund_money_c,
-            expire_time,
-            scale
-        ) VALUES (
-                     #{personId},
-                     #{appId},
-                     #{settleBegin},
-                     #{settleEnd},
-                     #{fundMoneyA},
-                     #{fundMoneyB},
-                     #{fundMoneyC},
-                     #{expireTime},
-                     #{scale}
-                 )
-    </insert>
-
-</mapper>

+ 0 - 32
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AppBanWarnMapper.xml

@@ -1,32 +0,0 @@
-<?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.job.adq.data.mapper.AppBanWarnMapper">
-    <insert id="insertSendLog">
-        replace into thirtpart.ly_send_message_log
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="appId != null">app_id,</if>
-            <if test="sendDate != null">send_date,</if>
-
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="appId != null">#{appId},</if>
-            <if test="sendDate != null">#{sendDate},</if>
-        </trim>
-    </insert>
-
-
-    <select id="getAppBanList" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT t1.app_id AS 'appId', t2.name AS 'appName', t1.num AS 'num'
-        FROM (SELECT app_id as 'app_id', COUNT(1) AS 'num'
-              FROM thirtpart.ly_ad_message_log
-              WHERE created_at >= #{createAt}
-                AND `output` LIKE '%{"errCode":1007}%'
-              group by app_id) t1
-                 LEFT JOIN thirtpart.ly_applet t2
-                           ON t1.app_id = t2.app_id
-    </select>
-    <select id="checkNum" resultType="java.lang.Integer">
-        select count(1) from thirtpart.ly_send_message_log where app_id = #{appId} and send_date = #{date}
-    </select>
-</mapper>
-

+ 0 - 31
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/AppletTokenRefreshMapper.xml

@@ -1,31 +0,0 @@
-<?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.job.adq.data.mapper.AppletTokenRefreshMapper">
-
-    <select id="queryAppletList" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT t1.id,
-               t1.name,
-               t1.app_id AS 'appId', t1.app_secret AS 'appSecret', t2.id as 'officialAccountId'
-        FROM thirtpart.ly_applet t1
-                 LEFT JOIN thirtpart.ly_official_accounts t2 ON t1.id = t2.applet_id
-        WHERE t1.source != 2 AND t1.type =1
-    </select>
-
-    <insert id="refreshAppletTokens">
-        replace into thirtpart.applet_tokens (
-        app_id,
-        official_account_id,
-        applet_id,
-        token
-        )
-        values
-        <foreach collection="list" item="item" separator=",">
-            (
-            #{item.appId},
-            #{item.officialAccountId},
-            #{item.id},
-            #{item.token}
-            )
-        </foreach>
-    </insert>
-</mapper>

+ 0 - 23
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/ClCreativeUserMapper.xml

@@ -1,23 +0,0 @@
-<?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.job.adq.data.mapper.ClCreativeUserMapper">
-
-
-    <insert id="addCreatives">
-        replace into deepthink.cl_creative_user_list (
-        creative_id,
-        is_temporary,
-        `name`,
-        user_id
-        )
-        values
-        <foreach collection="addList" item="item" separator=",">
-            (
-            #{item.creativeId},
-            #{item.isTemporary},
-            #{item.name},
-            #{item.userId}
-            )
-        </foreach>
-    </insert>
-</mapper>

+ 0 - 16
job-adq/src/main/java/cn/com/ctop/job/adq/data/mapper/xml/RefreshTokenMapper.xml

@@ -1,16 +0,0 @@
-<?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.job.adq.data.mapper.RefreshTokenMapper">
-    <update id="updateToken">
-        update deepthink.adq_auth_list
-        set access_token  = #{updateAccessToken},
-            refresh_token = #{updateRefreshToken}
-        where admin_advertiser_id = #{adminAdvertiserId}
-    </update>
-
-
-    <select id="getAllTokenList" resultType="com.alibaba.fastjson.JSONObject">
-        select admin_advertiser_id as 'adminAdvertiserId', client_id as 'clientId', client_secret as 'clientSecret', refresh_token as 'refreshToken'
-        from deepthink.adq_auth_list
-    </select>
-</mapper>

+ 0 - 11
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAdqAssetReportService.java

@@ -1,11 +0,0 @@
-package cn.com.ctop.job.adq.data.service;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public interface IAdqAssetReportService {
-    void getAdqAssetDailyReport(Long advertiserId, String accessToken, String startDate, String endDate, Integer page, Integer isLog, Long errId, Integer isSend);
-    void getAdqAssetInfo(Map<String, Set<String>> assetIdsMap, Long advertiserId, String accessToken, Integer isLog, Long errId, Integer isSend);
-    void getAdqAssetInfo(String type, List<String> assetIds, Long advertiserId, String accessToken, Integer isLog, Long errId, Integer isSend);
-}

+ 0 - 6
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAdvBudgetService.java

@@ -1,6 +0,0 @@
-package cn.com.ctop.job.adq.data.service;
-
-public interface IAdvBudgetService {
-
-    void sumPayAmountByPeriodAndMerchant();
-}

+ 0 - 5
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAppBanWarnService.java

@@ -1,5 +0,0 @@
-package cn.com.ctop.job.adq.data.service;
-
-public interface IAppBanWarnService {
-    void appBanWarnJob(long tenMinutesAgoSeconds);
-}

+ 0 - 7
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IAppletTokenRefreshService.java

@@ -1,7 +0,0 @@
-package cn.com.ctop.job.adq.data.service;
-
-public interface IAppletTokenRefreshService {
-
-    void buildAppletTokens();
-
-}

+ 0 - 5
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IClCreativeUserService.java

@@ -1,5 +0,0 @@
-package cn.com.ctop.job.adq.data.service;
-
-public interface IClCreativeUserService {
-    void getCreativeUser(int page);
-}

+ 0 - 5
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/IRefreshTokenService.java

@@ -1,5 +0,0 @@
-package cn.com.ctop.job.adq.data.service;
-
-public interface IRefreshTokenService {
-    void refreshToken();
-}

+ 0 - 2
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAccountReportServiceImpl.java

@@ -101,7 +101,6 @@ public class AdqAccountReportServiceImpl implements IAdqAccountReportService {
             }
             if (!Check.isNull(hourList)) {
                 accountReportMapper.addAccountHourList(hourList);
-                //accountReportMapper.addAccountHourListSD(hourList);
             }
             if (hourList.size() >= 1000) {
                 getAdqAccountHour(advertiserId, accessToken, startDate, endDate, page + 1, isLog);
@@ -177,7 +176,6 @@ public class AdqAccountReportServiceImpl implements IAdqAccountReportService {
             }
             if (!Check.isNull(dailyList)) {
                 accountReportMapper.addAccountDailyList(dailyList);
-                //accountReportMapper.addAccountDailyListSD(dailyList);
             }
             if (dailyList.size() >= 1000) {
                 getAdqAccountHour(advertiserId, accessToken, startDate, endDate, page + 1, isLog);

+ 0 - 265
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdqAssetReportServiceImpl.java

@@ -1,265 +0,0 @@
-package cn.com.ctop.job.adq.data.service.impl;
-
-import cn.com.ctop.job.adq.data.entity.AdqAssetInfo;
-import cn.com.ctop.job.adq.data.entity.AdqAssetReportDaily;
-import cn.com.ctop.job.adq.data.entity.AdqErrorLog;
-import cn.com.ctop.job.adq.data.mapper.AdqAssetReportMapper;
-import cn.com.ctop.job.adq.data.mapper.AdqErrorLogMapper;
-import cn.com.ctop.job.adq.data.service.IAdqAssetReportService;
-import cn.com.ctop.job.adq.data.utils.AlertUtils;
-import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.HttpUtils;
-import cn.com.ctop.job.adq.data.utils.JsonUtils;
-import cn.com.ctop.job.adq.utils.RandomStringGenerator;
-import cn.com.ctop.job.adq.utils.doris.sink.DorisMultiTableStreamLoadManager;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.google.common.collect.Lists;
-
-import java.time.Instant;
-import java.util.*;
-
-@Slf4j
-@Service
-public class AdqAssetReportServiceImpl implements IAdqAssetReportService {
-    @Autowired
-    private DorisMultiTableStreamLoadManager dorisLoadManager;
-    @Autowired
-    private AdqErrorLogMapper adqErrorLogMapper;
-    @Autowired
-    private AdqAssetReportMapper adqAssetReportMapper;
-
-    @Override
-    public void getAdqAssetDailyReport(Long advertiserId, String accessToken, String startDate, String endDate, Integer page, Integer isLog, Long errId, Integer isSend) {
-        try {
-            Map<String, Object> paramsMap = new HashMap<>();
-            paramsMap.put("access_token", accessToken);
-            paramsMap.put("timestamp", String.valueOf(Instant.now().getEpochSecond()));
-            paramsMap.put("nonce", RandomStringGenerator.generateRandomString(32));
-            paramsMap.put("page", page);
-            paramsMap.put("page_size", 1000);
-            paramsMap.put("account_id", advertiserId);
-            paramsMap.put("level", "REPORT_LEVEL_MARKETING_ASSET");
-            paramsMap.put("date_range", new JSONObject().fluentPut("start_date", startDate).fluentPut("end_date", endDate));
-            paramsMap.put("time_line", "REPORTING_TIME");
-            paramsMap.put("group_by", new JSONArray(Arrays.asList("date", "adgroup_id", "marketing_target_type", "marketing_asset_id")));
-            paramsMap.put("fields", new JSONArray(Arrays.asList("date", "account_id", "adgroup_id", "adgroup_name", "marketing_target_type", "marketing_asset_id", "cost", "view_count", "valid_click_count", "conversions_count", "deep_conversions_count", "activated_count", "reg_pv", "retention_count", "video_outer_play_count", "video_outer_play100_count", "key_behavior_conversions_count", "purchase_pv", "purchase_amount", "first_pay_count",
-                    "ad_monetization_amount","app_ad_paying_users","income_pv_pla","income_val_1","ad_paying_users_d1","income_pv_1d_pla")));
-            List<AdqAssetReportDaily> dailies = new ArrayList<>();
-            HashMap<String, Set<String>> assetIdsMap = new HashMap<>();
-            String s = HttpUtils.httpGet("https://api.e.qq.com/v3.0/daily_reports/get", paramsMap, null);
-            JSONObject jsonObject = JSONObject.parseObject(s);
-            int totalPage = 1;
-            if (!Check.isNull(jsonObject)) {
-                Integer code = jsonObject.getInteger("code");
-                if (code == 0) {
-                    JSONObject data = jsonObject.getJSONObject("data");
-                    if (!Check.isNull(data)) {
-                        JSONObject pageInfo = data.getJSONObject("page_info");
-                        if (!Check.isNull(pageInfo)) {
-                            totalPage = pageInfo.getInteger("total_page");
-                        }
-                        JSONArray list = data.getJSONArray("list");
-                        if (!Check.isNull(list)) {
-                            for (int i = 0; i < list.size(); i++) {
-                                JSONObject dataJson = list.getJSONObject(i);
-                                AdqAssetReportDaily report = JSONObject.parseObject(dataJson.toJSONString(), AdqAssetReportDaily.class);
-                                report.setAdvertiserId(advertiserId);
-                                report.setStatTimeDay(Integer.valueOf(dataJson.getString("date").replace("-", "")));
-                                dailies.add(report);
-
-                                String filterJSON = JsonUtils.toFilterJSON(report);
-                                JSONObject filterJsonObject = JSONObject.parseObject(filterJSON);
-                                filterJsonObject.put("video_outer_play100_count", report.getVideoOuterPlay100Count());
-                                dorisLoadManager.add("media_api", "adq_asset_report_daily", filterJsonObject);
-
-                                Long marketingAssetId = report.getMarketingAssetId();
-                                if (!Check.isNull(marketingAssetId)) {
-                                    String marketingTargetType = report.getMarketingTargetType();
-                                    Set<String> orDefault = assetIdsMap.getOrDefault(marketingTargetType, new HashSet<>());
-                                    orDefault.add(marketingAssetId.toString());
-                                    assetIdsMap.put(marketingTargetType, orDefault);
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    log.error("请求产品日报失败,account_id:{},返回信息:{}", advertiserId, jsonObject);
-                    insertErrorLog(isLog, advertiserId, "asset", startDate, endDate, jsonObject.getString("message_cn"));
-                    return;
-                }
-            } else {
-                log.error("请求产品日报失败,account_id:{},返回为空。", advertiserId);
-                insertErrorLog(isLog, advertiserId, "asset", startDate, endDate, "请求返回结果为空");
-                return;
-            }
-            if (!Check.isNull(dailies)) {
-                adqAssetReportMapper.insertAdqAssetReportDaily(dailies);
-                //adqAssetReportMapper.insertAdqAssetReportDailySD(dailies);
-            }
-            if (!Check.isNullMap(assetIdsMap)) {
-                getAdqAssetInfo(assetIdsMap, advertiserId, accessToken, 1, null, null);
-            }
-            if (page < totalPage) {
-                getAdqAssetDailyReport(advertiserId, accessToken, startDate, endDate, page + 1, isLog, errId, isSend);
-            } else {
-                log.info("请求产品日报完成,account_id:{},日期:{}~{}", advertiserId, startDate, endDate);
-                if (errId != null) {
-                    adqErrorLogMapper.deleteInfoByErrorId(errId);
-                }
-                if (isSend != null && isSend == 1) {
-                    AlertUtils.sendMessage(advertiserId, startDate, endDate, 3, "daily", 1, "asset");
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Override
-    public void getAdqAssetInfo(Map<String, Set<String>> assetIdsMap, Long advertiserId, String accessToken, Integer isLog, Long errId, Integer isSend) {
-        try {
-            Set<Map.Entry<String, Set<String>>> entries = assetIdsMap.entrySet();
-            for (Map.Entry<String, Set<String>> entry : entries) {
-                String type = entry.getKey();
-                List<String> assetIds = new ArrayList<>(entry.getValue());
-                List<List<String>> chunks = Lists.partition(assetIds, 100);
-                chunks.forEach(chunk -> {
-                    getAdqAssetInfo(type, chunk, advertiserId, accessToken, isLog, errId, isSend);
-                });
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Override
-    public void getAdqAssetInfo(String type, List<String> assetIds, Long advertiserId, String accessToken, Integer isLog, Long errId, Integer isSend) {
-        try {
-            int page = 1;
-            int totalPage = 1;
-            type = "MARKETING_TARGET_TYPE_SHORT_DRAMA";
-            while (page <= totalPage) {
-                Map<String, Object> paramsMap = new HashMap<>();
-                paramsMap.put("account_id", advertiserId);
-                paramsMap.put("access_token", accessToken);
-                paramsMap.put("timestamp", String.valueOf(Instant.now().getEpochSecond()));
-                paramsMap.put("nonce", RandomStringGenerator.generateRandomString(32));
-                paramsMap.put("marketing_target_type", type);
-                paramsMap.put("page", page);
-                paramsMap.put("page_size", 100);
-
-                if (!Check.isNull(assetIds)) {
-                    JSONObject filter = new JSONObject()
-                            .fluentPut("field", "marketing_asset_id")
-                            .fluentPut("operator", "IN")
-                            .fluentPut("values", assetIds);
-                    paramsMap.put("filtering", new JSONArray().fluentAdd(filter));
-                }
-
-                List<AdqAssetInfo> infos = new ArrayList<>();
-
-                String s = HttpUtils.httpGet("https://api.e.qq.com/v3.0/marketing_target_assets/get", paramsMap, null);
-                JSONObject jsonObject = JSONObject.parseObject(s);
-
-                if (!Check.isNull(jsonObject)) {
-                    Integer code = jsonObject.getInteger("code");
-                    if (code == 0) {
-                        JSONObject data = jsonObject.getJSONObject("data");
-                        if (!Check.isNull(data)) {
-                            JSONObject pageInfo = data.getJSONObject("page_info");
-                            if (!Check.isNull(pageInfo)) {
-                                totalPage = pageInfo.getInteger("total_page");
-                            }
-                            JSONArray list = data.getJSONArray("list");
-                            if (!Check.isNull(list)) {
-                                for (int i = 0; i < list.size(); i++) {
-                                    JSONObject dataJson = list.getJSONObject(i);
-                                    AdqAssetInfo info = JSONObject.parseObject(dataJson.toJSONString(), AdqAssetInfo.class);
-                                    info.setAdvertiserId(advertiserId);
-                                    info.setMarketingTargetType(type);
-                                    JSONArray properties = dataJson.getJSONArray("properties");
-                                    if (!Check.isNull(properties)) {
-                                        for (int j = 0; j < properties.size(); j++) {
-                                            JSONObject propertyJson = properties.getJSONObject(j);
-                                            String propertyName = propertyJson.getString("property_name");
-                                            JSONArray propertyValue = propertyJson.getJSONArray("property_value");
-                                            if ("PROMOTED_ASSET_ATTR_KEY_SHORT_DRAMA_DRAMA_MALL".equals(propertyName) && !Check.isNull(propertyValue)) {
-                                                info.setPromotedAssetAttrKeyShortDramaDramaMall(propertyValue.getString(0));
-                                            } else if ("PROMOTED_ASSET_ATTR_KEY_SKU_ID".equals(propertyName) && !Check.isNull(propertyValue)) {
-                                                info.setPromotedAssetAttrKeySkuId(propertyValue.getString(0));
-                                            }
-                                            if (!Check.isNull(info.getPromotedAssetAttrKeyShortDramaDramaMall()) && !Check.isNull(info.getPromotedAssetAttrKeySkuId())) {
-                                                break;
-                                            }
-                                        }
-                                        infos.add(info);
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        log.error("请求产品信息列表失败,account_id:{},返回信息:{}", advertiserId, jsonObject);
-                        insertErrorLog(isLog, advertiserId, "asset_info", "-", "-", new JSONObject()
-                                .fluentPut("msg", jsonObject.getString("message_cn"))
-                                .fluentPut("marketing_target_type", type)
-                                .fluentPut("marketing_asset_ids", assetIds)
-                                .toJSONString()
-                        );
-                        return;
-                    }
-                } else {
-                    log.error("请求产品信息列表失败,account_id:{},返回为空。", advertiserId);
-                    insertErrorLog(isLog, advertiserId, "asset_info", "-", "-", new JSONObject()
-                            .fluentPut("msg", "请求返回结果为空")
-                            .fluentPut("marketing_target_type", type)
-                            .fluentPut("marketing_asset_ids", assetIds)
-                            .toJSONString()
-                    );
-                    return;
-                }
-                if (!Check.isNull(infos)) {
-                    adqAssetReportMapper.insertAdqAssetInfo(infos);
-                    //adqAssetReportMapper.insertAdqAssetInfoSD(infos);
-                    dorisLoadManager.add("media_api", "adq_asset_info", infos);
-                }
-
-                if (page == totalPage) {
-                    log.info("请求产品信息列表完成,account_id:{}, assetIds:{} ", advertiserId, assetIds);
-                    if (errId != null) {
-                        adqErrorLogMapper.deleteInfoByErrorId(errId);
-                    }
-                    if (isSend != null && isSend == 1) {
-                        AlertUtils.sendMessage(advertiserId, "-", "-", 3, "daily", 1, "asset_info");
-                    }
-                }
-
-                page = page + 1;
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    private void insertErrorLog(Integer isLog, Long advertiserId, String dataDimension, String startDate, String endDate, String msg) {
-        if (isLog != null && isLog == 1) {
-            AdqErrorLog errorInfo = new AdqErrorLog();
-            errorInfo.setAdvertiserId(advertiserId);
-            errorInfo.setStartDate(startDate);
-            errorInfo.setEndDate(endDate);
-            errorInfo.setDataDimension(dataDimension);
-            errorInfo.setDataType("daily");
-            errorInfo.setMsg(msg);
-            adqErrorLogMapper.replaceErrorInfo(errorInfo);
-        }
-    }
-
-
-}

+ 0 - 102
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AdvBudgetServiceImpl.java

@@ -1,102 +0,0 @@
-package cn.com.ctop.job.adq.data.service.impl;
-
-import cn.com.ctop.job.adq.data.mapper.AdvBudgetMapper;
-import cn.com.ctop.job.adq.data.service.IAdvBudgetService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-@Service
-public class AdvBudgetServiceImpl implements IAdvBudgetService {
-
-    @Autowired
-    private AdvBudgetMapper advBudgetMapper;
-
-    public void sumPayAmountByPeriodAndMerchant() {
-        //广告金数据
-        List<Map<String, Object>> adFund = advBudgetMapper.groupByAppIdAndSettleBegin(null);
-
-        //分销商数据
-        List<Map<String, Object>> fx = advBudgetMapper.listTopLevelDistributors();
-
-        for (Map<String, Object> adFundItem : adFund){
-            //周期开始时间
-            Long settleBegin = (Long) adFundItem.get("settle_begin");
-            //周期结束时间
-            Long settleEnd = (Long) adFundItem.get("settle_end");
-            //小程序ID
-            String appId = (String) adFundItem.get("app_id");
-
-            //总通用广告金金额
-            Long totalAmountA = ((Number) adFundItem.get("total_amount_a")).longValue();
-            //总广告激励金金额
-            Long totalAmountB = ((Number) adFundItem.get("total_amount_b")).longValue();
-            //总定向激励金额
-            Long totalAmountC = ((Number) adFundItem.get("total_amount_c")).longValue();
-
-            //过期时间
-            Long expireTime = (Long) adFundItem.get("expire_time");
-
-            //虚拟支付总收入数据
-            Long sum = advBudgetMapper.sumPayAmountByPeriodAndMerchant(15, settleBegin, settleEnd, null, appId);
-
-            //循环分销商数据
-            for (Map<String, Object> fxItem : fx) {
-                //分销商ID
-                Integer distributorId = (Integer) fxItem.get("id");
-                //虚拟支付分销商数据
-                Long fxsum = advBudgetMapper.sumPayAmountByPeriodAndMerchant(15, settleBegin, settleEnd, distributorId, appId);
-
-                if(fxsum > 0){
-                    //比例
-                    BigDecimal percent = BigDecimal.valueOf(fxsum).divide(BigDecimal.valueOf(sum), 4, RoundingMode.HALF_UP);
-                    Double fxPercent = percent.setScale(5, RoundingMode.HALF_UP).doubleValue();
-
-                    // 通用广告金金额
-                    Integer amountA = (int)(totalAmountA * fxPercent);
-                    // 广告激励金金额
-                    Integer amountB = (int)(totalAmountB * fxPercent);
-                    // 定向激励金额
-                    Integer amountC = (int)(totalAmountC * fxPercent);
-
-//                    System.err.println("小程序周期内总收入:"+sum);
-//                    System.err.println("分销商小程序周期内总收入:"+fxsum);
-//                    System.err.println("精确比例:"+percent);
-//                    System.err.println("四舍五入比例:"+fxPercent);
-//                    System.err.println("可用通用广告金金额:"+totalAmountA);
-//                    System.err.println("分销商通用广告金金额:"+amountA);
-//                    System.err.println("可用广告激励金金额:"+totalAmountB);
-//                    System.err.println("分销商广告激励金金额:"+amountB);
-//                    System.err.println("可用定向激励金额:"+totalAmountC);
-//                    System.err.println("分销商定向激励金额:"+amountC);
-
-                    Map<String, Object> data = new HashMap<>();
-                    data.put("appId", appId);
-                    data.put("personId", distributorId);
-                    data.put("settleBegin", settleBegin);
-                    data.put("settleEnd", settleEnd);
-                    data.put("fundMoneyA", amountA);
-                    data.put("fundMoneyB", amountB);
-                    data.put("fundMoneyC", amountC);
-                    data.put("expireTime", expireTime);
-                    data.put("scale", fxPercent);
-                    int rows =advBudgetMapper.replaceAdvBudget(data);
-//                    if (rows == 1) {
-//                        System.err.println("成功插入新记录");
-//                    } else if (rows == 2) {
-//                        System.err.println("成功覆盖旧记录");
-//                    } else if (rows == 0) {
-//                        System.err.println("没有任何变化");
-//                    }
-//                    System.err.println("----------分割线------------");
-                }
-
-            }
-        }
-    }
-}

+ 0 - 80
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AppBanWarnServiceImpl.java

@@ -1,80 +0,0 @@
-package cn.com.ctop.job.adq.data.service.impl;
-
-import cn.com.ctop.job.adq.data.entity.LySendMessageLog;
-import cn.com.ctop.job.adq.data.mapper.AppBanWarnMapper;
-import cn.com.ctop.job.adq.data.service.IAppBanWarnService;
-import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.DateUtils;
-import cn.com.ctop.job.adq.data.utils.HttpUtils;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@Slf4j
-public class AppBanWarnServiceImpl implements IAppBanWarnService {
-    @Autowired
-    private AppBanWarnMapper appBanWarnMapper;
-
-    @Override
-    public void appBanWarnJob(long createAt) {
-        String date = DateUtils.getNowDate("yyyyMMdd");
-        List<JSONObject> list = appBanWarnMapper.getAppBanList(createAt);
-        if (Check.isNull(list)) {
-            return;
-        }
-        for (int i = 0; i < list.size(); i++) {
-            JSONObject jsonObject = list.get(i);
-            String appId = jsonObject.getString("appId");
-            if(Check.isNull(appId)){
-                continue;
-            }
-            String appName = jsonObject.getString("appName");
-            String num = jsonObject.getString("num");
-            Integer sendNum = appBanWarnMapper.checkNum(appId, date);
-            if (sendNum == 0) {
-                JSONObject returnJson = sendMessage(appId, appName, num);
-                if (!Check.isNull(returnJson)) {
-                    Integer statusCode = returnJson.getInteger("StatusCode");
-                    Integer code = returnJson.getInteger("code");
-                    if (code == 0 && statusCode == 0) {
-                        LySendMessageLog sendMessageLog = new LySendMessageLog();
-                        sendMessageLog.setAppId(appId);
-                        sendMessageLog.setSendDate(date);
-                        appBanWarnMapper.insertSendLog(sendMessageLog);
-                    }
-                }
-            } else {
-                log.info("此应用今日已经发送预警,此次跳过,appid:{},date:{}", appId, date);
-            }
-        }
-    }
-
-
-    public JSONObject sendMessage(String appId, String appName, String num) {
-        String url = "https://open.feishu.cn/open-apis/bot/v2/hook/f7278c1e-0455-40d9-8893-d09d7936eca4";
-        // String url = "https://open.feishu.cn/open-apis/bot/v2/hook/bb4853d2-9740-4007-a0c2-92ec319c914e";
-        JSONObject param = new JSONObject();
-        param.put("msg_type", "interactive");
-        JSONObject card = new JSONObject();
-        card.put("type", "template");
-        JSONObject data = new JSONObject();
-        data.put("template_id", "AAqdt9MmVURPx");
-        JSONObject template_variable = new JSONObject();
-        template_variable.put("appId", appId);
-        template_variable.put("appName", appName);
-        template_variable.put("num", num);
-
-
-        data.put("template_variable", template_variable);
-        card.put("data", data);
-        param.put("card", card);
-        String s = HttpUtils.httpPostRequest(url, param, null);
-        JSONObject jsonObject = JSONObject.parseObject(s);
-        return jsonObject;
-
-    }
-}

+ 0 - 69
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/AppletTokenRefreshServiceImpl.java

@@ -1,69 +0,0 @@
-package cn.com.ctop.job.adq.data.service.impl;
-
-import cn.com.ctop.job.adq.data.mapper.AppletTokenRefreshMapper;
-import cn.com.ctop.job.adq.data.service.IAppletTokenRefreshService;
-import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.HttpUtils;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-@Service
-@Slf4j
-public class AppletTokenRefreshServiceImpl implements IAppletTokenRefreshService {
-
-    @Autowired
-    private AppletTokenRefreshMapper tokenRefreshMapper;
-
-    @Resource
-    private RedisTemplate redis2Template_db5;
-
-    @Override
-    public void buildAppletTokens() {
-        List<JSONObject> list = tokenRefreshMapper.queryAppletList();
-        for (JSONObject applet : list) {
-            buildAppletToken(applet, 0);
-        }
-        tokenRefreshMapper.refreshAppletTokens(list);
-    }
-
-    //构建小程序token
-    private void buildAppletToken(JSONObject applet, int count) {
-        String name = applet.getString("name");
-        try {
-            Map<String, Object> param = new HashMap<>();
-            String appId = applet.getString("appId");
-            param.put("appid", appId);
-            param.put("secret", applet.getString("appSecret"));
-            param.put("grant_type", "client_credential");
-//            String result = HttpUtils.httpGet("https://api.weixin.qq.com/cgi-bin/token", param, null);
-            String result = HttpUtils.httpPostRequest("https://api.weixin.qq.com/cgi-bin/stable_token", param, null);
-            JSONObject tokenInfo = JSONObject.parseObject(result);
-            if (!Check.isNull(tokenInfo)) {
-                String accessToken = tokenInfo.getString("access_token");
-                redis2Template_db5.opsForValue().set("wechat-applet-access-token-key-" + applet.getInteger("id"), accessToken, tokenInfo.getInteger("expires_in"), TimeUnit.SECONDS);
-                applet.put("token", accessToken);
-                log.info("小程序:{},更新token完成", name);
-            } else {
-                if (count < 3) {
-                    Thread.sleep(5000L);
-                    buildAppletToken(applet, count + 1);
-                } else {
-                    log.error("小程序:{},更新token失败!,结果:{}", name, tokenInfo);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("小程序:{},更新token异常!", name);
-        }
-    }
-
-}

+ 0 - 122
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/ClCreativeUserServiceImpl.java

@@ -1,122 +0,0 @@
-package cn.com.ctop.job.adq.data.service.impl;
-
-import cn.com.ctop.job.adq.data.entity.ClCreativeUserList;
-import cn.com.ctop.job.adq.data.mapper.ClCreativeUserMapper;
-import cn.com.ctop.job.adq.data.service.IClCreativeUserService;
-import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.Signature;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.com.ctop.job.adq.data.utils.Signature.unicodeToString;
-
-@Slf4j
-@Service
-public class ClCreativeUserServiceImpl implements IClCreativeUserService {
-    private static String secret = "302424a82b378320e5dc7008a916e2ab";
-    private static String email = "yuyang2@hrcentury.cn";
-    @Autowired
-    private ClCreativeUserMapper clCreativeUserMapper;
-
-
-    @Override
-    public void getCreativeUser(int page) {
-        try {
-            String url = "https://openapi.mobgi.com/api/material/getCreativeUser";
-            JSONObject json = new JSONObject();
-            json.put("page", page);
-            json.put("page_size", 100);
-            JSONObject jsonObject = this.httpRequest(url, json);
-            boolean isNextPage = false;
-            if (!Check.isNull(jsonObject)) {
-                Integer code = jsonObject.getInteger("code");
-                if (code == 0) {
-                    JSONObject data = jsonObject.getJSONObject("data");
-                    if (!Check.isNull(data)) {
-                        JSONObject pagination = data.getJSONObject("pagination");
-                        if (!Check.isNull(pagination)) {
-                            Integer totalPage = pagination.getInteger("total_page");
-                            if (!Check.isNull(totalPage)) {
-                                if (totalPage > page) {
-                                    isNextPage = true;
-                                }
-                            }
-                        }
-                        JSONArray list = data.getJSONArray("list");
-                        if (!Check.isNull(list)) {
-                            List<ClCreativeUserList> addList = new ArrayList<>();
-                            for (int i = 0; i < list.size(); i++) {
-                                JSONObject addJson = list.getJSONObject(i);
-                                ClCreativeUserList userList = new ClCreativeUserList();
-                                Long creativeId = addJson.getLong("id");
-                                Long userId = addJson.getLong("user_id");
-                                Integer isTemporary = addJson.getInteger("is_temporary");
-                                String name = addJson.getString("name");
-                                userList.setCreativeId(creativeId);
-                                userList.setUserId(userId);
-                                userList.setIsTemporary(isTemporary);
-                                userList.setName(name);
-                                addList.add(userList);
-                            }
-                            if (!Check.isNull(addList)) {
-                                clCreativeUserMapper.addCreatives(addList);
-                            }
-                        }
-                    }
-                } else {
-                    log.error("创量获取创意人员失败,result:{}", jsonObject);
-                }
-            }
-
-            if (isNextPage) {
-                getCreativeUser(page + 1);
-            }
-            log.info("创量创意人员获取成功");
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-    public JSONObject httpRequest(String url, JSONObject requestJson) throws Exception {
-        long timestamp = System.currentTimeMillis() / 1000;
-        ObjectMapper objectMapper = new ObjectMapper();
-        Map<String, Object> params = objectMapper.readValue(requestJson.toString(), new TypeReference<Map<String, Object>>() {
-        });
-        Signature signature = new Signature(secret);
-        String signStr = signature.buildSignature(timestamp, params);
-        //设置header
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.parseMediaType("application/json; charset=UTF-8"));
-        headers.add("email", email);
-        headers.add("timestamp", String.valueOf(timestamp));
-        headers.add("signature", signStr);
-        //接口请求
-        HttpEntity<Map<String, Object>> entity = new HttpEntity<>(params, headers);
-        RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, entity, String.class);
-
-        JSONObject returnJson = new JSONObject();
-        //获得响应
-        String body = responseEntity.getBody();
-        if (!Check.isNull(body)) {
-            returnJson = JSONObject.parseObject(unicodeToString(body));
-        }
-        return returnJson;
-    }
-}

+ 0 - 57
job-adq/src/main/java/cn/com/ctop/job/adq/data/service/impl/RefreshTokenServiceImpl.java

@@ -1,57 +0,0 @@
-package cn.com.ctop.job.adq.data.service.impl;
-
-import cn.com.ctop.job.adq.data.mapper.RefreshTokenMapper;
-import cn.com.ctop.job.adq.data.service.IRefreshTokenService;
-import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.HttpUtils;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class RefreshTokenServiceImpl implements IRefreshTokenService {
-    @Autowired
-    private RefreshTokenMapper refreshTokenMapper;
-
-
-    @Override
-    public void refreshToken() {
-        List<JSONObject> tokenList = refreshTokenMapper.getAllTokenList();
-        if (Check.isNull(tokenList)) {
-            return;
-        }
-        for (JSONObject tokenJson : tokenList) {
-            Long adminAdvertiserId = tokenJson.getLong("adminAdvertiserId");
-            String clientId = tokenJson.getString("clientId");
-            String clientSecret = tokenJson.getString("clientSecret");
-            String refreshToken = tokenJson.getString("refreshToken");
-            Map<String, Object> param = new HashMap<>();
-            param.put("client_id", clientId);
-            param.put("client_secret", clientSecret);
-            param.put("refresh_token", refreshToken);
-            param.put("grant_type", "refresh_token");
-            String s = HttpUtils.httpGet("https://api.e.qq.com/oauth/token", param, new HashMap<>());
-            JSONObject tokenResult = JSONObject.parseObject(s);
-            if (Check.isNull(tokenResult)) {
-                continue;
-            }
-            Integer code = tokenResult.getInteger("code");
-            if (code != 0) {
-                continue;
-            }
-            JSONObject data = tokenResult.getJSONObject("data");
-            if (Check.isNull(data)) {
-                continue;
-            }
-            String updateAccessToken = data.getString("access_token");
-            String updateRefreshToken = data.getString("refresh_token");
-            refreshTokenMapper.updateToken(adminAdvertiserId, updateAccessToken, updateRefreshToken);
-        }
-
-
-    }
-}

+ 0 - 141
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqAccountReportJob.java

@@ -25,8 +25,6 @@ import java.util.concurrent.Executors;
 @Component
 public class AdqAccountReportJob {
     @Autowired
-    private IAdqAssetReportService adqAssetReportService;
-    @Autowired
     private IAdqAccountReportService accountReportService;
     @Autowired
     private IAdqAdIncomeService adqAdIncomeService;
@@ -103,60 +101,9 @@ public class AdqAccountReportJob {
         });
     }
 
-    @XxlJob("assetReport")
-    public void assetReport() throws Exception {
-        String param = XxlJobHelper.getJobParam(); // 执行参数
-        if (Check.isNull(param)) {
-            log.error("入参为空");
-            return;
-        }
-
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String data = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        String[] s = param.split("_");
-        Long advertiserId = Long.valueOf(s[0]);
-        String accessToken = s[1];
-        dailyExecutorService.submit(new Runnable() {
-            @Override
-            public void run() {
-                adqAssetReportService.getAdqAssetDailyReport(advertiserId, accessToken, data, data, 1, 1, null, null);
-            }
-        });
-    }
 
-    @XxlJob("miniAppAdIncome")
-    public void miniAppAdIncome() {
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        String start = DateUtils.getNowAddDate("yyyy-MM-dd", -1);
-        String end = DateUtils.getNowDate("yyyy-MM-dd");
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            adqAdIncomeService.getAdqAdIncome(start, end, app, appletId, 1, 1, null, null);
-        }
-    }
 
-    @XxlJob("miniAppAdPosIncome")
-    public void miniAppAdPosIncome() {
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        String start = DateUtils.getNowAddDate("yyyy-MM-dd", -1);
-        String end = DateUtils.getNowDate("yyyy-MM-dd");
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            adqAdIncomeService.getAdqAdPosIncome(start, end, app, appletId, 1, 1, null, null);
-        }
-    }
 
-    @XxlJob("miniAppAdUnitList")
-    public void miniAppAdUnitList() {
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            adqAdIncomeService.getAdqAdUnitList(app, appletId, 1);
-        }
-    }
 
     @XxlJob("yesMaterialDaily")
     public void yesMaterialDaily() throws Exception {
@@ -178,94 +125,6 @@ public class AdqAccountReportJob {
         });
     }
 
-    @XxlJob("miniAppAdIncomeRate")
-    public void miniAppAdIncomeRate() {
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String yesDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            adqAdIncomeService.getAdqAdIncomeRate(app, appletId, yesDate, yesDate);
-        }
-    }
-
-    @XxlJob("gameGiftList")
-    public void gameGiftList() {
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        String start = DateUtils.getNowAddDate("yyyy-MM-dd", -3);
-        String end = DateUtils.getNowDate("yyyy-MM-dd");
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            adqAdIncomeService.getGameGiftList(start, end, app, appletId, 1, 1, null, null);
-        }
-    }
-
-    @XxlJob("gameDiviceSave")
-    public void gameDiviceSave() {
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            adqAdIncomeService.getGameDiviceSave(app, appletId, 1, 1, null, null);
-        }
-    }
-
-    @XxlJob("gameDiviceTransfer")
-    public void gameDiviceTransfer() {
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        String start = DateUtils.getNowAddDate("yyyy-MM-dd", -60);
-        String end = DateUtils.getNowDate("yyyy-MM-dd");
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            adqAdIncomeService.getGameDiviceTransfer(start, end, app, appletId, 1, 1, null, null);
-        }
-    }
-
-    @XxlJob("vpAdFunds")
-    public void vpAdFunds(){
-        List<JSONObject> adqMiniApp = adqAdIncomeService.getAdqAllMiniApp(null);
-        String start = DateUtils.getNowAddDate("yyyy-MM-dd", -180) ;
-        String end = DateUtils.getNowDate("yyyy-MM-dd");
-        for (JSONObject jsonObject : adqMiniApp) {
-            String app = jsonObject.getString("app_id");
-            Long appletId = jsonObject.getLong("applet_id");
-            String prodKey = jsonObject.getString("prod_key");
-            dailyExecutorService.submit(new Runnable() {
-                @Override
-                public void run() {
-                    adqAdIncomeService.queryVPAdFunds(start, end, app, appletId, prodKey, 1, 0, null, null);
-                }
-            });
-        }
-    }
-
-
-    @XxlJob("yesDateBalance")
-    public void yesDateBalance() throws Exception {
-        String param = XxlJobHelper.getJobParam(); // 执行参数
-        if (Check.isNull(param)) {
-            log.error("入参为空");
-            return;
-        }
 
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String yesDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        String[] s = param.split("_");
-        Long advertiserId = Long.valueOf(s[0]);
-        String accessToken = s[1];
-        balanceExecutorService.submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    dailyBalanceReportService.getAdqBalanceReport(advertiserId, accessToken, yesDate, yesDate, 1, null);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        });
-    }
 
 }

+ 0 - 23
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqRefreshTokenJob.java

@@ -1,23 +0,0 @@
-package cn.com.ctop.job.adq.handler;
-
-
-import cn.com.ctop.job.adq.data.service.IRefreshTokenService;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-
-@Slf4j
-@Component
-public class AdqRefreshTokenJob {
-    @Autowired
-    private IRefreshTokenService refreshTokenService;
-
-    @XxlJob("refreshToken")
-    public void refreshToken() throws Exception {
-        refreshTokenService.refreshToken();
-    }
-
-
-}

+ 2 - 33
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdqRetryReportJob.java

@@ -43,8 +43,7 @@ public class AdqRetryReportJob {
     private IAdqCreativeReportService adqReportService;
     @Autowired
     private IAdqRetryReportService retryReportService;
-    @Autowired
-    private IAdqAssetReportService assetReportService;
+
     @Autowired
     private IAdqAdIncomeService adqAdIncomeService;
     @Autowired
@@ -116,37 +115,7 @@ public class AdqRetryReportJob {
                         });
                     }
 
-                } else if ("asset".equals(dataDimension)) {
-                    assetExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                assetReportService.getAdqAssetDailyReport(advertiserId, accessToken, startDate, endDate, 1, null, id, isSend);
-                            }
-                        }
-                    });
-                } else if ("asset_info".equals(dataDimension)) {
-                    assetExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                JSONObject msg = jsonObject.getJSONObject("msg");
-                                String marketingTargetType = msg.getString("marketing_target_type");
-                                JSONArray marketingAssetIds = msg.getJSONArray("marketing_asset_ids");
-                                List<String> assetIds = new ArrayList<>();
-                                if (!Check.isNull(marketingAssetIds)) {
-                                    assetIds = marketingAssetIds.toJavaList(String.class);
-                                    List<List<String>> chunks = Lists.partition(assetIds, 100);
-                                    chunks.forEach(chunk -> {
-                                        assetReportService.getAdqAssetInfo(marketingTargetType, chunk, advertiserId, accessToken, null, id, isSend);
-                                    });
-                                } else {
-                                    assetReportService.getAdqAssetInfo(marketingTargetType, assetIds, advertiserId, accessToken, null, id, isSend);
-                                }
-                            }
-                        }
-                    });
-                } else if ("flow_details".equals(dataDimension)) {
+                }  else if ("flow_details".equals(dataDimension)) {
                     flowExecutorService.submit(new Runnable() {
 
                         @Override

+ 0 - 23
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AdvBudgetJob.java

@@ -1,23 +0,0 @@
-package cn.com.ctop.job.adq.handler;
-
-import cn.com.ctop.job.adq.data.service.IAdvBudgetService;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-
-@Slf4j
-@Component
-public class AdvBudgetJob {
-    @Autowired
-    private IAdvBudgetService advBudgetService;
-
-    /**
-     * 调取接口上传商品库文件到oss
-     */
-    @XxlJob("sumPayAmountByPeriodAndMerchant")
-    public void sumPayAmountByPeriodAndMerchant() throws Exception {
-        advBudgetService.sumPayAmountByPeriodAndMerchant();
-    }
-}

+ 0 - 31
job-adq/src/main/java/cn/com/ctop/job/adq/handler/AppletTokenRefreshJob.java

@@ -1,31 +0,0 @@
-package cn.com.ctop.job.adq.handler;
-
-import cn.com.ctop.job.adq.data.service.IAppletTokenRefreshService;
-import com.xxl.job.core.context.XxlJobHelper;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 微信小程序clientToke刷新
- */
-@Slf4j
-@Component
-public class AppletTokenRefreshJob {
-
-    @Autowired
-    private IAppletTokenRefreshService tokenRefreshService;
-
-    @XxlJob("wechatAppletTokenRefreshJob")
-    public void wechatAppletTokenRefreshJob() {
-        log.info("[wechatAppletTokenRefreshJob] 小程序token更新任务开始...");
-        try {
-            // 生成小程序token
-            tokenRefreshService.buildAppletTokens();
-        } catch (Exception e) {
-            XxlJobHelper.handleFail("[wechatAppletTokenRefreshJob] 异常 + " + e.getMessage());
-        }
-    }
-
-}

+ 0 - 33
job-adq/src/main/java/cn/com/ctop/job/adq/handler/ClCreativeUserJob.java

@@ -1,33 +0,0 @@
-package cn.com.ctop.job.adq.handler;
-
-
-import cn.com.ctop.job.adq.data.service.*;
-import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.DateUtils;
-import com.alibaba.fastjson.JSONObject;
-import com.xxl.job.core.context.XxlJobHelper;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-
-
-@Slf4j
-@Component
-public class ClCreativeUserJob {
-
-    @Autowired
-    private IClCreativeUserService creativeUserService;
-
-    @XxlJob("getCreativeUser")
-    public void getCreativeUser() throws Exception {
-        creativeUserService.getCreativeUser(1);
-    }
-
-
-}

+ 0 - 33
job-adq/src/main/java/cn/com/ctop/job/adq/handler/appBanWarnJob.java

@@ -1,33 +0,0 @@
-package cn.com.ctop.job.adq.handler;
-
-import cn.com.ctop.job.adq.data.service.IAdqFlowDetailsReportService;
-import cn.com.ctop.job.adq.data.service.IAppBanWarnService;
-import cn.com.ctop.job.adq.data.utils.Check;
-import cn.com.ctop.job.adq.data.utils.DateUtils;
-import com.xxl.job.core.context.XxlJobHelper;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-
-@Slf4j
-@Component
-public class appBanWarnJob {
-@Autowired
-private IAppBanWarnService appBanWarnService;
-
-    @XxlJob("appBanWarnJob")
-    public void appBanWarnJob() throws Exception {
-        long currentTimeMillis = System.currentTimeMillis();
-        // 转换为秒级时间戳
-        long currentTimeSeconds = currentTimeMillis / 1000;
-        // 计算10分钟之前的时间戳(秒级)
-        long tenMinutesAgoSeconds = currentTimeSeconds - 600; // 10分钟前的时间戳(秒级)
-        appBanWarnService.appBanWarnJob(tenMinutesAgoSeconds);
-    }
-
-}

+ 1 - 21
job-adq/src/main/resources/application.yml

@@ -88,17 +88,7 @@ spring:
           username: data
           password: hr@2025..
           driver-class-name: com.mysql.jdbc.Driver
-        selectdb:
-          url: jdbc:mysql://selectdb-cn-vym4at1qw04.selectdbfe.rds.aliyuncs.com:9030/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&sessionVariables=enable_unique_key_partial_update=true,enable_insert_strict=false
-          username: data
-          password: hr@2025..
-          driver-class-name: com.mysql.jdbc.Driver
-        sd_group_commit:
-          ## 注意此selectdb数据源不支持列更新,insert into 对于未指定列会被置为null,类似tidb replace into
-          url: jdbc:mysql://selectdb-cn-vym4at1qw04.selectdbfe.rds.aliyuncs.com:9030/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&useServerPrepStmts=true&useLocalSessionState=true&rewriteBatchedStatements=true&cachePrepStmts=true&prepStmtCacheSqlLimit=99999&prepStmtCacheSize=500&sessionVariables=group_commit=async_mode,enable_nereids_planner=false
-          username: data
-          password: hr@2025..
-          driver-class-name: com.mysql.jdbc.Driver
+
 
   # redis 配置
   redis:
@@ -134,16 +124,6 @@ spring:
       min-idle: 8
     port: 6379
 
-  doris:
-    fe-host: http://selectdb-cn-vym4at1qw04.selectdbfe.rds.aliyuncs.com:8080
-    user: data
-    password: hr@2025..
-    label-prefix: spring-adq
-    sink-threads: 3
-    sink-batch-rows: 50000
-    sink-batch-mb: 20
-    sink-batch-seconds: 20
-
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml

+ 2 - 4
job-adq/src/main/resources/logback-dev.xml

@@ -9,10 +9,8 @@
 
     <!-- 定义日志存储的路径,不要配置相对路径 -->
  <!--   <property name="FILE_PATH" value="/Users/yumeng/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>-->
-<!--
-    <property name="FILE_PATH" value="/data/webapp/hr_job-adq/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>
--->
-    <property name="FILE_PATH" value="/Users/yumeng/logs/spring-log.%d{yyyy-MM-dd}.%i.log"/>
+    <property name="FILE_PATH" value="/home/webapp/hr_job-adq/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>
+
 
     <!-- 控制台输出日志 -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">