Merge remote-tracking branch 'origin/master'

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/controller/BytedanceXingTuController.java

@@ -0,0 +1,65 @@
+package cn.com.ctop.job.bytedance.controller;
+
+import cn.com.ctop.job.bytedance.data.service.IBytedanceXingTuService;
+import cn.com.ctop.job.bytedance.data.utils.DateUtils;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/bytedance/bytedanceXingTu")
+@Api(tags = "头条星图")
+@Slf4j
+public class BytedanceXingTuController {
+    @Autowired
+    private IBytedanceXingTuService bytedanceXingTuService;
+
+
+    @GetMapping("/taskList")
+    public void taskList(@RequestParam(required = false) Long advertiserId,
+                         @RequestParam(required = false) String startDate,
+                         @RequestParam(required = false) String endDate) {
+        startDate = startDate == null ? DateUtils.getNowAddDate("yyyy-MM-dd", -1) : startDate;
+        endDate = endDate == null ? DateUtils.getNowDate("yyyy-MM-dd") : endDate;
+        List<JSONObject> xingTuAccount = bytedanceXingTuService.getXingTuAccount(advertiserId);
+        for (JSONObject jsonObject : xingTuAccount) {
+            Long advId = jsonObject.getLong("advertiser_id");
+            String accessToken = jsonObject.getString("access_token");
+            bytedanceXingTuService.getXingTuTaskList(advId, accessToken, startDate, endDate, 1, null, 1, null);
+        }
+
+    }
+
+    @GetMapping("/taskInfo")
+    public void taskInfo() {
+        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuActiveTask(null);
+        for (JSONObject taskJson : xingTuTasks) {
+            Long advId = taskJson.getLong("advertiser_id");
+            Long taskId = taskJson.getLong("task_id");
+            String accessToken = taskJson.getString("access_token");
+            bytedanceXingTuService.getXingTuTaskInfo(advId, taskId, accessToken, null, 1, null);
+        }
+
+    }
+
+    @GetMapping("/taskReport")
+    public void taskReport() {
+        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuReportTask(null);
+        for (JSONObject taskJson : xingTuTasks) {
+            Integer taskStatus = taskJson.getInteger("task_status");
+            Long advId = taskJson.getLong("advertiser_id");
+            Long taskId = taskJson.getLong("task_id");
+            String accessToken = taskJson.getString("access_token");
+            bytedanceXingTuService.getXingTuTaskReport(advId, taskId, accessToken, 1, null, 1, null);
+        }
+
+    }
+
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/BytedanceXingTuReport.java

@@ -0,0 +1,56 @@
+package cn.com.ctop.job.bytedance.data.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BytedanceXingTuReport {
+    private Long challengeTaskId;
+    private Long advertiserId;
+    private Long authorId;
+    private Long itemId;
+
+    private Long androidActivateCnt;
+    private String authorNickname;
+    private Long commentCnt;
+    private Long componentClickCnt;
+    private Long estAdCostValue;
+    private Long estAdCostTime;
+    private Long estSalesValue;
+    private Long estSalesTime;
+    private Long iaaCostHour;
+    private Long iapCostHour;
+    private Long iosActivateCnt;
+    private Long likeCnt;
+    private String link;
+
+    private Long playValue;
+    private Long playTime;
+
+    private Long playVv;
+    private Long promoteCnt;
+    private Long providerId;
+    private Long releaseTime;
+    private Long relevanceAuditResult;
+    private Long rewardAmount;
+    private Long rewardLevel;
+
+    private Long settleAdShareValue;
+    private Long settleAdShareTime;
+
+    private Long settleCpsValue;
+    private Long settleCpsTime;
+
+    private Long shareCnt;
+    private String title;
+    private Long uid;
+    private Long validLikeCnt;
+    private Long validPlayVv;
+
+    private List<BytedanceXingTuReportDaily> itemInfoDailyList;
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/BytedanceXingTuReportDaily.java

@@ -0,0 +1,20 @@
+package cn.com.ctop.job.bytedance.data.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BytedanceXingTuReportDaily {
+    private Long challengeTaskId;
+    private Long advertiserId;
+    private Long authorId;
+    private Long itemId;
+    private Integer pDate;
+    private Long estSales;
+    private Long settleCps;
+    private Long estAdCost;
+    private Long settleAdShare;
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/BytedanceXingTuTask.java

@@ -0,0 +1,41 @@
+package cn.com.ctop.job.bytedance.data.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BytedanceXingTuTask {
+    private Long challengeTaskId;
+    private Long advertiserId;
+    // challenge_info fields
+    private Integer accountDivideDay;
+    private String anchorTitle;
+    private String authorList; // JSON string
+    private Integer authorScope;
+    private String authorTaskName;
+    private Integer budget;
+    private String commissionInfo; // JSON string
+    private Integer commissionRate;
+    private Integer commissionType;
+    private String demandDesc;
+    private Long endTime;
+    private Integer maxUploadItemCnt;
+    private String microAppId;
+    private Integer omTaskStatus;
+    private String omTaskTag; // JSON string (array)
+    private String participateAuthorRange; // JSON string
+    private Integer providerScope;
+    private Integer sampleDelivery;
+    private String settlementInfo; // JSON string
+    private String startPage;
+    private Long startTime;
+    private String taskHeadImage;
+    private String taskIcon;
+
+    // demand_info fields
+    private String demandName;
+    private String attachments; // JSON string
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/BytedanceXingTuMapper.java

@@ -0,0 +1,28 @@
+package cn.com.ctop.job.bytedance.data.mapper;
+
+
+import cn.com.ctop.job.bytedance.data.entity.BytedanceXingTuReport;
+import cn.com.ctop.job.bytedance.data.entity.BytedanceXingTuReportDaily;
+import cn.com.ctop.job.bytedance.data.entity.BytedanceXingTuTask;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface BytedanceXingTuMapper {
+    List<JSONObject> queryXingTuAccount(@Param("advertiserId") Long advertiserId);
+
+    List<JSONObject> queryXingTuActiveTask(@Param("advertiserId") Long advertiserId);
+
+    List<JSONObject> queryXingTuReportTask(@Param("advertiserId") Long advertiserId);
+
+    List<JSONObject> queryXingTuRetryJob();
+
+    void insertTaskId(List<BytedanceXingTuTask> tasks);
+
+    void updateTaskInfo(BytedanceXingTuTask task);
+
+    void insertReport(List<BytedanceXingTuReport> reports);
+
+    void insertReportDaily(List<BytedanceXingTuReportDaily> dailyReports);
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/CPSReportMapper.java

@@ -0,0 +1,10 @@
+package cn.com.ctop.job.bytedance.data.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface CPSReportMapper {
+
+    boolean cleanCPSPayDailyReports(@Param("nowDate") Integer nowDate);
+
+    boolean cleanCPSIaaDailyReports(@Param("nowDate") Integer nowDate);
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/BytedanceXingTuMapper.xml

@@ -0,0 +1,138 @@
+<?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.bytedance.data.mapper.BytedanceXingTuMapper">
+    <insert id="insertTaskId" parameterType="java.util.List">
+        INSERT ignore INTO media_api.bytedance_xingtu_task_list (challenge_task_id,advertiser_id)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.challengeTaskId},#{item.advertiserId})
+        </foreach>
+    </insert>
+
+    <insert id="insertReport"  parameterType="java.util.List">
+        replace INTO media_api.bytedance_xingtu_task_report (
+        challenge_task_id,advertiser_id,
+        android_activate_cnt, author_id, author_nickname, comment_cnt, component_click_cnt,
+        est_ad_cost_value, est_ad_cost_time, est_sales_value, est_sales_time,
+        iaa_cost_hour, iap_cost_hour, ios_activate_cnt, item_id,
+        like_cnt, link, play_value, play_time, play_vv, promote_cnt,
+        provider_id, release_time, relevance_audit_result, reward_amount, reward_level,
+        settle_ad_share_value, settle_ad_share_time, settle_cps_value, settle_cps_time,
+        share_cnt, title, uid, valid_like_cnt, valid_play_vv
+        )
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.challengeTaskId}, #{item.advertiserId},
+            #{item.androidActivateCnt}, #{item.authorId}, #{item.authorNickname},
+            #{item.commentCnt}, #{item.componentClickCnt},
+            #{item.estAdCostValue}, #{item.estAdCostTime},
+            #{item.estSalesValue}, #{item.estSalesTime},
+            #{item.iaaCostHour}, #{item.iapCostHour}, #{item.iosActivateCnt}, #{item.itemId},
+            #{item.likeCnt}, #{item.link}, #{item.playValue}, #{item.playTime}, #{item.playVv},
+            #{item.promoteCnt}, #{item.providerId}, #{item.releaseTime}, #{item.relevanceAuditResult},
+            #{item.rewardAmount}, #{item.rewardLevel},
+            #{item.settleAdShareValue}, #{item.settleAdShareTime},
+            #{item.settleCpsValue}, #{item.settleCpsTime},
+            #{item.shareCnt}, #{item.title}, #{item.uid},
+            #{item.validLikeCnt}, #{item.validPlayVv}
+            )
+        </foreach>
+    </insert>
+
+    <insert id="insertReportDaily" parameterType="java.util.List">
+        replace INTO media_api.bytedance_xingtu_task_report_daily (
+        challenge_task_id,advertiser_id,author_id,
+        item_id, p_date, est_sales, settle_cps, est_ad_cost, settle_ad_share
+        )
+        VALUES
+        <foreach collection="list" item="daily" separator=",">
+            (
+            #{daily.challengeTaskId}, #{daily.advertiserId}, #{daily.authorId},
+            #{daily.itemId}, #{daily.pDate}, #{daily.estSales},
+            #{daily.settleCps}, #{daily.estAdCost}, #{daily.settleAdShare}
+            )
+        </foreach>
+    </insert>
+
+    <update id="updateTaskInfo" parameterType="cn.com.ctop.job.bytedance.data.entity.BytedanceXingTuTask">
+        UPDATE media_api.bytedance_xingtu_task_list
+        <set>
+            <if test="accountDivideDay != null">account_divide_day = #{accountDivideDay},</if>
+            <if test="anchorTitle != null">anchor_title = #{anchorTitle},</if>
+            <if test="authorList != null">author_list = #{authorList},</if>
+            <if test="authorScope != null">author_scope = #{authorScope},</if>
+            <if test="authorTaskName != null">author_task_name = #{authorTaskName},</if>
+            <if test="budget != null">budget = #{budget},</if>
+            <if test="commissionInfo != null">commission_info = #{commissionInfo},</if>
+            <if test="commissionRate != null">commission_rate = #{commissionRate},</if>
+            <if test="commissionType != null">commission_type = #{commissionType},</if>
+            <if test="demandDesc != null">demand_desc = #{demandDesc},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="maxUploadItemCnt != null">max_upload_item_cnt = #{maxUploadItemCnt},</if>
+            <if test="microAppId != null">micro_app_id = #{microAppId},</if>
+            <if test="omTaskStatus != null">om_task_status = #{omTaskStatus},</if>
+            <if test="omTaskTag != null">om_task_tag = #{omTaskTag},</if>
+            <if test="participateAuthorRange != null">participate_author_range = #{participateAuthorRange},</if>
+            <if test="providerScope != null">provider_scope = #{providerScope},</if>
+            <if test="sampleDelivery != null">sample_delivery = #{sampleDelivery},</if>
+            <if test="settlementInfo != null">settlement_info = #{settlementInfo},</if>
+            <if test="startPage != null">start_page = #{startPage},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="taskHeadImage != null">task_head_image = #{taskHeadImage},</if>
+            <if test="taskIcon != null">task_icon = #{taskIcon},</if>
+            <if test="demandName != null">demand_name = #{demandName},</if>
+            <if test="attachments != null">attachments = #{attachments},</if>
+        </set>
+        WHERE challenge_task_id = #{challengeTaskId}
+        and advertiser_id = #{advertiserId}
+    </update>
+
+    <select id="queryXingTuAccount" resultType="com.alibaba.fastjson.JSONObject">
+        select x.advertiser_id, access_token
+        from deepthink.bytedance_xingtu_advertiser_list x
+        join deepthink.bytedance_auth_list a on x.admin_advertiser_id = a.admin_advertiser_id
+        <if test="advertiserId != null">
+            where x.advertiser_id = ${advertiserId}
+        </if>
+    </select>
+
+    <select id="queryXingTuActiveTask" resultType="com.alibaba.fastjson.JSONObject">
+        select t.advertiser_id,challenge_task_id task_id,access_token
+        from media_api.bytedance_xingtu_task_list t
+        join deepthink.bytedance_xingtu_advertiser_list x
+        on t.advertiser_id = x.advertiser_id
+        join deepthink.bytedance_auth_list a
+        on x.admin_advertiser_id = a.admin_advertiser_id
+        where t.om_task_status is null or t.om_task_status not in (4,6,7,8)
+        <if test="advertiserId != null">
+            and t.advertiser_id = ${advertiserId}
+        </if>
+    </select>
+
+    <select id="queryXingTuReportTask" resultType="com.alibaba.fastjson.JSONObject">
+        select t.advertiser_id,challenge_task_id task_id,access_token
+        from media_api.bytedance_xingtu_task_list t
+        join deepthink.bytedance_xingtu_advertiser_list x
+        on t.advertiser_id = x.advertiser_id
+        join deepthink.bytedance_auth_list a
+        on x.admin_advertiser_id = a.admin_advertiser_id
+        where t.om_task_status not in (1,2,6)
+        and (t.end_time is null or t.end_time >= unix_timestamp(date_add(now(),Interval -65 day)))
+        <if test="advertiserId != null">
+            and t.advertiser_id = ${advertiserId}
+        </if>
+    </select>
+
+
+    <select id="queryXingTuRetryJob" resultType="com.alibaba.fastjson.JSONObject">
+        select is_send AS 'isSend', id AS 'id', start_date AS 'startDate', end_date AS 'endDate',l.msg,
+                l.advertiser_id AS 'advertiserId',data_dimension AS 'dataDimension', data_type AS 'dataType',access_token AS 'accessToken'
+        from media_api.bytedance_error_log l
+         join deepthink.bytedance_xingtu_advertiser_list x
+              on l.advertiser_id = x.advertiser_id
+         join deepthink.bytedance_auth_list a
+              on x.admin_advertiser_id = a.admin_advertiser_id
+        where data_dimension like 'xingtu_task_%'
+    </select>
+</mapper>

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/CPSReportMapper.xml

@@ -0,0 +1,207 @@
+<?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.bytedance.data.mapper.CPSReportMapper">
+
+    <insert id="cleanCPSPayDailyReports">
+        replace
+        into thirtpart.cps_link_data_report
+        (stat_date,
+        official_account_id,
+        responsibility_person_id,
+        ma_appid,
+        link_id,
+        new_users,
+        new_pay_users,
+        new_pay_counts,
+        new_order_counts,
+        new_pay_amount,
+        new_xn_pay_amount,
+        pay_amount,
+        xn_pay_amount,
+        pay_users,
+        pay_counts,
+        order_counts
+        )
+        SELECT
+            t3.date,
+            t0.official_account_id,
+            t0.responsibility_person_id,
+            t2.app_id,
+            t0.id,
+            t3.new_users,
+            t1.new_pay_users,
+            t1.new_pay_counts,
+            t1.new_order_counts,
+            t1.new_pay_amount,
+            t1.new_xn_pay_amount,
+            t1.pay_amount,
+            t1.xn_pay_amount,
+            t1.pay_users,
+            t1.pay_counts,
+            t1.order_counts
+        FROM
+            (
+                SELECT
+                    DATE_FORMAT( activation_time, '%Y%m%d' ) as 'date',
+                        link_id,
+                    count( DISTINCT uid ) AS 'new_users'
+                FROM
+                    thirtpart.ly_user_activation_info
+                WHERE
+                    DATE_FORMAT( activation_time, '%Y%m%d' ) = #{nowDate}
+                GROUP BY
+                    link_id
+            ) t3
+                LEFT JOIN	thirtpart.ly_link t0 ON t0.id = t3.link_id
+                LEFT JOIN (
+                SELECT
+                    consume_date,
+
+                    link_id,
+
+                    count( DISTINCT CASE WHEN t1.consume_date = DATE_FORMAT( t1.activation_time, '%Y%m%d' ) THEN t1.uid END ) AS 'new_pay_users',
+
+                        SUM(IF( t1.consume_date = DATE_FORMAT( t1.activation_time, '%Y%m%d' ) AND t1.STATUS = 1, 1, 0 )) AS 'new_pay_counts',
+
+                        SUM(IF( t1.consume_date = DATE_FORMAT( t1.activation_time, '%Y%m%d' ), 1, 0 )) AS 'new_order_counts',
+
+                        IFNULL(	ROUND( SUM( IF ( t1.consume_date = DATE_FORMAT( t1.activation_time, '%Y%m%d' ), t1.total_fee, 0 )), 2 ),0.00 ) AS 'new_pay_amount',
+
+                        IFNULL(ROUND(SUM(IF(t1.consume_date = DATE_FORMAT( t1.activation_time, '%Y%m%d') AND ( t1.pay_merchant = 15 OR pay_type = 20 ),	total_fee,0 )),	2 ),0.00 ) AS 'new_xn_pay_amount',
+
+                        IFNULL( ROUND( SUM( t1.total_fee ), 2 ), 0.00 ) AS 'pay_amount',
+
+                        IFNULL( ROUND( SUM( IF ( t1.pay_merchant = 15 OR pay_type = 20, total_fee, 0 )), 2 ), 0.00 ) AS 'xn_pay_amount',
+
+                        count( DISTINCT t1.uid ) AS 'pay_users',
+
+                        SUM(IF( t1.STATUS = 1, 1, 0 )) AS 'pay_counts',
+
+                        count( t1.order_no ) AS 'order_counts'
+
+                FROM
+                    thirtpart.ly_pay_record t1
+                WHERE
+                    consume_date = #{nowDate}
+                GROUP BY
+                    link_id
+            ) t1 ON  t3.link_id = t1.link_id
+                LEFT JOIN thirtpart.ly_official_accounts t2 ON t0.official_account_id = t2.id
+        WHERE official_account_id is not null
+        GROUP BY
+            t3.link_id
+    </insert>
+
+    <insert id="cleanCPSIaaDailyReports">
+        replace into thirtpart.cps_link_data_report
+        (
+                stat_date,
+                official_account_id,
+                responsibility_person_id,
+                ma_appid,
+                link_id,
+                new_users,
+                new_pay_users,
+                new_pay_counts,
+                new_order_counts,
+                new_pay_amount,
+                new_xn_pay_amount,
+                pay_amount,
+                xn_pay_amount,
+                pay_users,pay_counts,
+                order_counts,
+                new_iaa_users,
+                new_iaa_counts,
+                new_iaa_amount,
+                iaa_users,
+                iaa_counts,
+                iaa_amount,
+				active_users
+                )
+        select
+            t.date,
+            t.official_account_id,
+            t.responsibility_person_id,
+            t.app_id,
+            t.link_id,
+            t1.new_users,
+            t3.new_pay_users,
+            t3.new_pay_counts,
+            t3.new_order_counts,
+            t3.new_pay_amount,
+            t3.new_xn_pay_amount,
+            t3.pay_amount,
+            t3.xn_pay_amount,
+            t3.pay_users,
+            t3.pay_counts,
+            t3.order_counts,
+            t0.new_iaa_users,
+            t0.new_iaa_counts,
+            t0.new_iaa_amount,
+            t0.iaa_users,
+            t0.iaa_counts,
+            t0.iaa_amount,
+            t.active_users
+        FROM
+            (
+                SELECT
+                    t.date,
+                    t.link_id,
+                    t.official_account_id,
+                    t0.responsibility_person_id,
+                    t2.app_id,
+                    COUNT( DISTINCT t.uid) as 'active_users'
+                FROM thirtpart.ly_user_login_record t
+                         LEFT JOIN  thirtpart.ly_link t0 ON t0.id = t.link_id
+                         LEFT JOIN thirtpart.ly_official_accounts t2 ON t.official_account_id = t2.id
+                where date = #{nowDate}
+                  AND link_id >0
+                  AND t0.responsibility_person_id is not null
+                GROUP BY link_id
+                ) t
+                LEFT JOIN
+                (
+                SELECT
+                    t.link_id,
+                    count(distinct case when SUBSTR(dying_time,1,10) = SUBSTR(event_time,1,10) then uid end) 'new_iaa_users',
+                        sum(if(SUBSTR(dying_time,1,10) = SUBSTR(event_time,1,10) ,1,0)) 'new_iaa_counts',
+                        IFNULL(ROUND(sum(if(SUBSTR(dying_time,1,10) = SUBSTR(event_time,1,10) ,cost/100000,0)),2),0.00) 'new_iaa_amount',
+                        count(distinct uid) 'iaa_users',
+                        sum(1) 'iaa_counts',
+                        IFNULL(ROUND(sum(cost/100000),2),0.00)  'iaa_amount'
+                FROM
+                    media_api.bytedance_webhook_ma_ecpm t
+                where t.stat_date = #{nowDate}
+                GROUP BY t.link_id
+            ) t0 ON t.link_id = t0.link_id
+                LEFT JOIN (
+                SELECT
+                    t0.id,
+                    t0.official_account_id,
+                    t0.responsibility_person_id,
+                    count(DISTINCT t.uid) AS 'new_users'
+                FROM thirtpart.ly_user_activation_info t
+                         LEFT JOIN thirtpart.ly_link t0 ON t.link_id = t0.id
+                WHERE DATE_FORMAT(t.activation_time, '%Y%m%d') =#{nowDate}
+                GROUP BY t0.id
+            ) t1 ON t.link_id = t1.id
+                LEFT JOIN
+            (
+                SELECT
+                    link_id,
+                    new_pay_users,
+                    new_pay_counts,
+                    new_order_counts,
+                    new_pay_amount,
+                    new_xn_pay_amount,
+                    pay_amount,
+                    xn_pay_amount,
+                    pay_users,
+                    pay_counts,order_counts
+                FROM thirtpart.cps_link_data_report WHERE
+                    stat_date = #{nowDate}
+            ) t3 ON t3.link_id = t.link_id
+        GROUP BY t.link_id
+    </insert>
+
+</mapper>

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/IBytedanceXingTuService.java

@@ -0,0 +1,16 @@
+package cn.com.ctop.job.bytedance.data.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+
+public interface IBytedanceXingTuService {
+    List<JSONObject> getXingTuAccount(Long advertiserId);
+    List<JSONObject> getXingTuActiveTask(Long advertiserId);
+    List<JSONObject> getXingTuReportTask(Long advertiserId);
+    List<JSONObject> getXingTuRetryJob();
+    void getXingTuTaskList(Long advertiserId, String accessToken, String startDate, String endDate, Integer page,
+                           Long errorId, Integer isLog, Integer isSend);
+    void getXingTuTaskInfo(Long advertiserId, Long taskId, String accessToken, Long errorId, Integer isLog, Integer isSend);
+    void getXingTuTaskReport(Long advertiserId, Long taskId, String accessToken, Integer page, Long errorId, Integer isLog, Integer isSend);
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/ICPSReportService.java

@@ -0,0 +1,6 @@
+package cn.com.ctop.job.bytedance.data.service;
+
+public interface ICPSReportService {
+
+    void cleanCPSDailyReports(Integer nowDate);
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/BytedanceXingTuServiceImpl.java

@@ -0,0 +1,306 @@
+package cn.com.ctop.job.bytedance.data.service.impl;
+
+import cn.com.ctop.job.bytedance.data.entity.BytedanceErrorLog;
+import cn.com.ctop.job.bytedance.data.entity.BytedanceXingTuReport;
+import cn.com.ctop.job.bytedance.data.entity.BytedanceXingTuReportDaily;
+import cn.com.ctop.job.bytedance.data.entity.BytedanceXingTuTask;
+import cn.com.ctop.job.bytedance.data.mapper.BytedancePromoterReportMapper;
+import cn.com.ctop.job.bytedance.data.mapper.BytedanceXingTuMapper;
+import cn.com.ctop.job.bytedance.data.service.IBytedanceXingTuService;
+import cn.com.ctop.job.bytedance.data.utils.AlertUtils;
+import cn.com.ctop.job.bytedance.data.utils.Check;
+import cn.com.ctop.job.bytedance.data.utils.DateUtils;
+import cn.com.ctop.job.bytedance.data.utils.HttpUtils;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * https://bytedance.larkoffice.com/docx/Jr8bdA6yvocOqRxRL1LcBDi8nJb
+ */
+@Service
+@Slf4j
+public class BytedanceXingTuServiceImpl implements IBytedanceXingTuService {
+    @Autowired
+    private BytedanceXingTuMapper bytedanceXingTuMapper;
+
+    @Autowired
+    private BytedancePromoterReportMapper promoterReportMapper;
+
+    @Override
+    public List<JSONObject> getXingTuAccount(Long advertiserId) {
+        return bytedanceXingTuMapper.queryXingTuAccount(advertiserId);
+    }
+
+    public List<JSONObject> getXingTuActiveTask(Long advertiserId) {
+        return bytedanceXingTuMapper.queryXingTuActiveTask(advertiserId);
+    }
+
+    public List<JSONObject> getXingTuReportTask(Long advertiserId) {
+        return bytedanceXingTuMapper.queryXingTuReportTask(advertiserId);
+    }
+
+    public List<JSONObject> getXingTuRetryJob() {
+        return bytedanceXingTuMapper.queryXingTuRetryJob();
+    }
+
+    public void getXingTuTaskList(Long advertiserId, String accessToken, String startDate, String endDate, Integer page,
+                                  Long errorId, Integer isLog, Integer isSend) {
+        try {
+            String url = "https://api.oceanengine.com/open_api/2/star/demand/om_get_demand_list/";
+            Map<String, Object> paramsMap = new HashMap<>();
+            paramsMap.put("star_id", advertiserId);
+            paramsMap.put("page_no", page);
+            int pageSize = 100;
+            paramsMap.put("page_size", pageSize);
+            Long startT = DateUtils.getTimestampFormat("yyyy-MM-dd HH:mm:ss", startDate + " 00:00:00");
+            Long endT = DateUtils.getTimestampFormat("yyyy-MM-dd HH:mm:ss", endDate + " 23:59:59");
+            paramsMap.put("create_start_time", startT);
+            paramsMap.put("create_end_time", endT);
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Access-Token", accessToken);
+            headers.put("Content-Type", "application/json");
+            String s = HttpUtils.httpGet(url, paramsMap, headers);
+            JSONObject result = JSONObject.parseObject(s);
+            if (Check.isNull(result)) {
+                log.info("账户id:{}，星图任务列表请求结果返回为空", advertiserId);
+                insertErrorLog(isLog, advertiserId, startDate, endDate, "xingtu_task_list", "请求结果返回为空");
+                return;
+            }
+            List<BytedanceXingTuTask> tasks = new ArrayList<>();
+            Integer code = result.getInteger("code");
+            boolean hasMore = false;
+            if (code == 0) {
+                JSONObject data = result.getJSONObject("data");
+                if (!Check.isNull(data)) {
+                    JSONArray rows = data.getJSONArray("demands");
+                    if (!Check.isNull(rows)) {
+                        hasMore = rows.size() == pageSize;
+                        for (int i = 0; i < rows.size(); i++) {
+                            JSONObject rowJson = rows.getJSONObject(i);
+                            Long demandId = rowJson.getLong("demand_id");
+                            BytedanceXingTuTask task = new BytedanceXingTuTask();
+                            task.setChallengeTaskId(demandId);
+                            task.setAdvertiserId(advertiserId);
+                            tasks.add(task);
+                        }
+                    }
+                }
+            } else {
+                log.info("账户id:{}，日期:{}星图任务列表请求结果失败，返回数据:{}", advertiserId, startDate, result);
+                insertErrorLog(isLog, advertiserId, startDate, endDate, "xingtu_task_list", result.getString("message"));
+                return;
+            }
+            if (!Check.isNull(tasks)) {
+                bytedanceXingTuMapper.insertTaskId(tasks);
+                log.info("账户ID：{}，星图任务列表请求成功,开始日期：{}，结束日期：{}，page:{}", advertiserId, startDate, endDate, page);
+            }
+            if (hasMore) {
+                getXingTuTaskList(advertiserId, accessToken, startDate, endDate, page + 1, errorId, isLog, isSend);
+            } else {
+                log.info("账户ID：{}，日期:{}~{},星图任务列表请求成功", advertiserId, startDate, endDate);
+                if (errorId != null) {
+                    promoterReportMapper.deleteInfoByErrorId(errorId);
+                }
+                if (isSend != null && 1 == isSend) {
+                    AlertUtils.sendMessage(advertiserId, startDate, endDate, 1, "xingtu_task_list", 1, null);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void getXingTuTaskInfo(Long advertiserId, Long taskId, String accessToken, Long errorId, Integer isLog, Integer isSend) {
+        try {
+            String url = "https://api.oceanengine.com/open_api/2/star/demand/om_get_challenge/";
+            Map<String, Object> paramsMap = new HashMap<>();
+            paramsMap.put("star_id", advertiserId);
+            paramsMap.put("challenge_task_id", taskId);
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Access-Token", accessToken);
+            headers.put("Content-Type", "application/json");
+            String s = HttpUtils.httpGet(url, paramsMap, headers);
+            JSONObject result = JSONObject.parseObject(s);
+            if (Check.isNull(result)) {
+                log.info("账户id:{} {}，星图任务详情请求结果返回为空", advertiserId, taskId);
+                insertErrorLog(isLog, advertiserId, DateUtils.getNowDate("yyyy-MM-dd"), DateUtils.getNowDate("yyyy-MM-dd"), "xingtu_task_info",
+                        new JSONObject().fluentPut("msg", "请求结果返回为空").fluentPut("taskId", taskId).toJSONString());
+                return;
+            }
+            Integer code = result.getInteger("code");
+            if (code == 0) {
+                JSONObject data = result.getJSONObject("data");
+                if (!Check.isNull(data)) {
+                    JSONObject taskInfo = data.getJSONObject("task_info");
+                    if (!Check.isNull(taskInfo)) {
+                        JSONObject challengeInfo = taskInfo.getJSONObject("challenge_info");
+                        JSONObject demandInfo = taskInfo.getJSONObject("demand_info");
+                        String challengeTaskId = taskInfo.getString("challenge_task_id");
+                        JSONObject taskJson = new JSONObject();
+                        taskJson.put("challenge_task_id", challengeTaskId);
+                        taskJson.put("advertiser_id", advertiserId);
+                        taskJson.putAll(challengeInfo);
+                        taskJson.putAll(demandInfo);
+                        BytedanceXingTuTask task = taskJson.toJavaObject(BytedanceXingTuTask.class);
+                        bytedanceXingTuMapper.updateTaskInfo(task);
+                    }
+                }
+            } else {
+                log.info("账户id:{} {}，星图任务详情请求结果失败，返回数据:{}", advertiserId, taskId, result);
+                insertErrorLog(isLog, advertiserId, DateUtils.getNowDate("yyyy-MM-dd"), DateUtils.getNowDate("yyyy-MM-dd"), "xingtu_task_info",
+                        new JSONObject().fluentPut("msg", result.getString("message")).fluentPut("taskId", taskId).toJSONString()
+                );
+                return;
+            }
+
+            log.info("账户ID：{} {},星图任务详情请求成功", advertiserId, taskId);
+            if (errorId != null) {
+                promoterReportMapper.deleteInfoByErrorId(errorId);
+            }
+            if (isSend != null && 1 == isSend) {
+                AlertUtils.sendMessage(advertiserId, DateUtils.getNowDate("yyyy-MM-dd"), DateUtils.getNowDate("yyyy-MM-dd"), 1, "xingtu_task_info", 1, null);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void getXingTuTaskReport(Long advertiserId, Long taskId, String accessToken, Integer page, Long errorId, Integer isLog, Integer isSend) {
+        try {
+            String url = "https://api.oceanengine.com/open_api/2/star/demand/om_get_challenge_items_data/";
+            Map<String, Object> paramsMap = new HashMap<>();
+            paramsMap.put("star_id", advertiserId);
+            paramsMap.put("challenge_task_id", taskId);
+            paramsMap.put("page", page);
+            int limit = 30;
+            paramsMap.put("limit", limit);
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Access-Token", accessToken);
+            headers.put("Content-Type", "application/json");
+            String s = HttpUtils.httpGet(url, paramsMap, headers);
+            JSONObject result = JSONObject.parseObject(s);
+            if (Check.isNull(result)) {
+                log.info("账户id:{} {}，星图任务结算数据请求结果返回为空", advertiserId, taskId);
+                insertErrorLog(isLog, advertiserId, DateUtils.getNowDate("yyyy-MM-dd"), DateUtils.getNowDate("yyyy-MM-dd"), "xingtu_task_report",
+                        new JSONObject().fluentPut("msg", "请求结果返回为空").fluentPut("taskId", taskId).toJSONString());
+                return;
+            }
+            Integer code = result.getInteger("code");
+            boolean hasMore = false;
+            List<BytedanceXingTuReport> reports = new ArrayList<>();
+            List<BytedanceXingTuReportDaily> dailyReports = new ArrayList<>();
+            if (code == 0) {
+                JSONObject data = result.getJSONObject("data");
+                if (!Check.isNull(data)) {
+                    JSONArray dataList = data.getJSONArray("data_list");
+                    JSONObject pageInfo = data.getJSONObject("page_info");
+                    if (!Check.isNull(pageInfo)) {
+                        hasMore = pageInfo.getBoolean("has_more");
+                    }
+                    if (!Check.isNull(dataList)) {
+                        for (Object o : dataList) {
+                            JSONObject item = (JSONObject) o;
+                            item.put("challenge_task_id", taskId);
+                            item.put("advertiser_id", advertiserId);
+                            BytedanceXingTuReport report = item.toJavaObject(BytedanceXingTuReport.class);
+                            JSONObject estAdCost = item.getJSONObject("est_ad_cost");
+                            if (!Check.isNull(estAdCost)) {
+                                Long value = estAdCost.getLong("value");
+                                Long time = estAdCost.getLong("time");
+                                report.setEstAdCostValue(value);
+                                report.setEstAdCostTime(time);
+                            }
+                            JSONObject estSales = item.getJSONObject("est_sales");
+                            if (!Check.isNull(estSales)) {
+                                Long value = estSales.getLong("value");
+                                Long time = estSales.getLong("time");
+                                report.setEstSalesValue(value);
+                                report.setEstSalesTime(time);
+                            }
+                            JSONObject play = item.getJSONObject("play");
+                            if (!Check.isNull(play)) {
+                                Long value = play.getLong("value");
+                                Long time = play.getLong("time");
+                                report.setPlayValue(value);
+                                report.setPlayTime(time);
+                            }
+                            JSONObject settleAdShare = item.getJSONObject("settle_ad_share");
+                            if (!Check.isNull(settleAdShare)) {
+                                Long value = settleAdShare.getLong("value");
+                                Long time = settleAdShare.getLong("time");
+                                report.setSettleAdShareValue(value);
+                                report.setSettleAdShareTime(time);
+                            }
+                            JSONObject settleCps = item.getJSONObject("settle_cps");
+                            if (!Check.isNull(settleCps)) {
+                                Long value = settleCps.getLong("value");
+                                Long time = settleCps.getLong("time");
+                                report.setSettleCpsValue(value);
+                                report.setSettleCpsTime(time);
+                            }
+                            List<BytedanceXingTuReportDaily> itemInfoDailyList = report.getItemInfoDailyList();
+                            if (!Check.isNull(itemInfoDailyList)) {
+                                itemInfoDailyList.forEach(daily -> {
+                                    daily.setAdvertiserId(advertiserId);
+                                    daily.setChallengeTaskId(taskId);
+                                    daily.setAuthorId(report.getAuthorId());
+                                    daily.setItemId(report.getItemId());
+                                });
+                                dailyReports.addAll(itemInfoDailyList);
+                            }
+                            reports.add(report);
+                        }
+                    }
+                }
+            } else {
+                log.info("账户id:{} {}，星图任务结算数据请求结果失败，返回数据:{}", advertiserId, taskId, result);
+                insertErrorLog(isLog, advertiserId, DateUtils.getNowDate("yyyy-MM-dd"), DateUtils.getNowDate("yyyy-MM-dd"), "xingtu_task_report",
+                        new JSONObject().fluentPut("msg", result.getString("message")).fluentPut("taskId", taskId).toJSONString()
+                );
+                return;
+            }
+
+            if (!Check.isNull(reports)) {
+                bytedanceXingTuMapper.insertReport(reports);
+            }
+            if (!Check.isNull(dailyReports)) {
+                bytedanceXingTuMapper.insertReportDaily(dailyReports);
+            }
+
+            if (hasMore) {
+                getXingTuTaskReport(advertiserId, taskId, accessToken, page + 1, errorId, isLog, isSend);
+            }
+
+            log.info("账户ID：{} {},星图任务结算数据请求成功", advertiserId, taskId);
+            if (errorId != null) {
+                promoterReportMapper.deleteInfoByErrorId(errorId);
+            }
+            if (isSend != null && 1 == isSend) {
+                AlertUtils.sendMessage(advertiserId, DateUtils.getNowDate("yyyy-MM-dd"), DateUtils.getNowDate("yyyy-MM-dd"), 1, "xingtu_task_report", 1, null);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void insertErrorLog(Integer isLog, Long advertiserId, String startDate, String endDate, String dataDimension, String msg) {
+        if (isLog != null && 1 == isLog) {
+            BytedanceErrorLog errorInfo = new BytedanceErrorLog();
+            errorInfo.setAdvertiserId(advertiserId);
+            errorInfo.setStartDate(startDate);
+            errorInfo.setEndDate(endDate);
+            errorInfo.setMsg(msg);
+            errorInfo.setDataDimension(dataDimension);
+            errorInfo.setDataType("daily");
+            promoterReportMapper.replaceErrorInfo(errorInfo);
+        }
+    }
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/CPSReportServiceImpl.java

@@ -0,0 +1,26 @@
+package cn.com.ctop.job.bytedance.data.service.impl;
+
+import cn.com.ctop.job.bytedance.data.mapper.CPSReportMapper;
+import cn.com.ctop.job.bytedance.data.service.ICPSReportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class CPSReportServiceImpl implements ICPSReportService {
+    @Autowired
+    private CPSReportMapper cpsReportMapper;
+
+    @Override
+    public void cleanCPSDailyReports(Integer nowDate) {
+        try {
+            if (cpsReportMapper.cleanCPSPayDailyReports(nowDate))
+                if (cpsReportMapper.cleanCPSIaaDailyReports(nowDate))
+                    log.info("CPS数据清洗完成-:{}", nowDate);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("CPS数据清洗完成");
+        }
+    }
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceReportRetryJob.java

@@ -1,7 +1,6 @@
 package cn.com.ctop.job.bytedance.handler;
 
 
-import cn.com.ctop.job.bytedance.data.service.*;
 import cn.com.ctop.job.bytedance.data.enums.AccountTypeEnum;
 import cn.com.ctop.job.bytedance.data.service.*;
 import cn.com.ctop.job.bytedance.data.utils.Check;
@@ -42,6 +41,9 @@ public class BytedanceReportRetryJob {
     @Autowired
     private IByteDanceFlowDetailsReportService byteDanceFlowDetailsReportService;
 
+    @Autowired
+    private IBytedanceXingTuService bytedanceXingTuService;
+
 
     private static ExecutorService hourAccountRetrExecutorService = Executors.newFixedThreadPool(2);
     private static ExecutorService dailyAccountRetrExecutorService = Executors.newFixedThreadPool(2);
@@ -180,6 +182,31 @@ public class BytedanceReportRetryJob {
             log.info("抖小IAA重试列表为空");
         }
 
+        List<JSONObject> xingTuRetryJob = bytedanceXingTuService.getXingTuRetryJob();
+        if (!Check.isNull(xingTuRetryJob)) {
+            for (int i = 0; i < xingTuRetryJob.size(); i++) {
+                JSONObject jsonObject = xingTuRetryJob.get(i);
+                Long id = jsonObject.getLong("id");
+                Long advertiserId = jsonObject.getLong("advertiserId");
+                String startDate = jsonObject.getString("startDate");
+                String endDate = jsonObject.getString("endDate");
+                String dataDimension = jsonObject.getString("dataDimension");
+                Integer isSend = jsonObject.getInteger("isSend");
+                String accessToken = jsonObject.getString("accessToken");
+                Long taskId = jsonObject.getJSONObject("msg").getLong("taskId");
+
+                if ("xingtu_task_list".equalsIgnoreCase(dataDimension)) {
+                    bytedanceXingTuService.getXingTuTaskList(advertiserId, accessToken, startDate, endDate, 1, id, null, isSend);
+                } else if ("xingtu_task_info".equalsIgnoreCase(dataDimension)) {
+                    bytedanceXingTuService.getXingTuTaskInfo(advertiserId, taskId, accessToken, id, null, isSend);
+                } else if ("xingtu_task_report".equalsIgnoreCase(dataDimension)) {
+                    bytedanceXingTuService.getXingTuTaskReport(advertiserId, taskId, accessToken, 1, id, null, isSend);
+                }
+            }
+        } else {
+            log.info("巨量星图重试列表为空");
+        }
+
     }
 
 

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceXingTuJob.java

@@ -0,0 +1,60 @@
+package cn.com.ctop.job.bytedance.handler;
+
+
+import cn.com.ctop.job.bytedance.data.service.IBytedanceXingTuService;
+import cn.com.ctop.job.bytedance.data.utils.DateUtils;
+import com.alibaba.fastjson.JSONObject;
+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 org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+
+@Slf4j
+@Component
+public class BytedanceXingTuJob {
+    @Autowired
+    private IBytedanceXingTuService bytedanceXingTuService;
+
+    @XxlJob("xingTuTaskList")
+    public void taskList() {
+        String startDate = DateUtils.getNowAddDate("yyyy-MM-dd", -1);
+        String endDate = DateUtils.getNowDate("yyyy-MM-dd");
+        List<JSONObject> xingTuAccount = bytedanceXingTuService.getXingTuAccount(null);
+        for (JSONObject jsonObject : xingTuAccount) {
+            Long advId = jsonObject.getLong("advertiser_id");
+            String accessToken = jsonObject.getString("access_token");
+            bytedanceXingTuService.getXingTuTaskList(advId, accessToken, startDate, endDate, 1, null, 1, null);
+        }
+
+    }
+
+    @XxlJob("xingTuTaskInfo")
+    public void taskInfo() {
+        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuActiveTask(null);
+        for (JSONObject taskJson : xingTuTasks) {
+            Long advId = taskJson.getLong("advertiser_id");
+            Long taskId = taskJson.getLong("task_id");
+            String accessToken = taskJson.getString("access_token");
+            bytedanceXingTuService.getXingTuTaskInfo(advId, taskId, accessToken, null, 1, null);
+        }
+
+    }
+
+    @XxlJob("xingTuTaskReport")
+    public void taskReport() {
+        List<JSONObject> xingTuTasks = bytedanceXingTuService.getXingTuReportTask(null);
+        for (JSONObject taskJson : xingTuTasks) {
+            Long advId = taskJson.getLong("advertiser_id");
+            Long taskId = taskJson.getLong("task_id");
+            String accessToken = taskJson.getString("access_token");
+            bytedanceXingTuService.getXingTuTaskReport(advId, taskId, accessToken, 1, null, 1, null);
+        }
+
+    }
+
+
+}

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/CPSReportJob.java

@@ -0,0 +1,54 @@
+package cn.com.ctop.job.bytedance.handler;
+
+
+import cn.com.ctop.job.bytedance.data.service.ICPSReportService;
+import cn.com.ctop.job.bytedance.data.utils.DateUtils;
+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;
+
+
+/**
+ * thirtpart.cps_link_data_report
+ */
+@Slf4j
+@Component
+public class CPSReportJob {
+    @Autowired
+    private ICPSReportService cpsReportService;
+
+    /**
+     * 清洗CPS报表
+     */
+    @XxlJob("dayCleanCPSDailyReports")
+    public void dayCleanCPSDailyReports() throws Exception {
+        log.info("[dayCleanCPSDailyReports] 任务启动...");
+        try {
+            String nowDate = DateUtils.getNowDate("yyyyMMdd");
+            cpsReportService.cleanCPSDailyReports(Integer.valueOf(nowDate));
+            log.info("[dayCleanCPSDailyReports] 任务完成");
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 清洗CPS报表
+     */
+    @XxlJob("yesCleanCPSDailyReports")
+    public void yesCleanCPSDailyReports() throws Exception {
+        log.info("[yesCleanCPSDailyReports] 任务启动...");
+        try {
+            String nowDate = DateUtils.getNowDate("yyyyMMdd");
+            String yesterday = DateUtils.getNowAddDate("yyyyMMdd", -1);
+            cpsReportService.cleanCPSDailyReports(Integer.valueOf(yesterday));
+            log.info("[yesCleanCPSDailyReports] 任务完成");
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+    }
+
+}