ソースを参照

去除replace 增加删除逻辑

yumeng 4 年 前
コミット
c5a566c298

+ 12 - 11
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDailyReportTaskServiceImpl.java

@@ -14,7 +14,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xxl.job.core.log.XxlJobLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -68,7 +67,6 @@ public class KuaiShouDailyReportTaskServiceImpl extends ServiceImpl<KuaiShouDail
         taskQueryWrapper.eq("task_status", 0);
         taskQueryWrapper.eq("account_id", accountId);
         taskQueryWrapper.eq("stat_date", statDate);
-       // taskQueryWrapper.eq("view_type", 7);
         taskQueryWrapper.orderByDesc("create_time");
         List<KuaiShouDailyReportTask> dailyTaskList = this.list(taskQueryWrapper);
         if (!Check.isNull(dailyTaskList)) {
@@ -127,38 +125,41 @@ public class KuaiShouDailyReportTaskServiceImpl extends ServiceImpl<KuaiShouDail
             requestMap.put("task_id", task.getTaskId());
             String localPath = LoadFileUtil.downloadByUrl(requestMap, downloadPath + task.getStatDate() + "//", url, token, fileName);
             if (!Check.isNull(localPath)) {
+                Map<String, Object> deleteMap = new HashMap<>();
+                deleteMap.put("account_id", task.getAccountId());
+                deleteMap.put("stat_date", task.getStatDate());
                 if (task.getViewType() == 2) {
+                    reportDailyCampaignMapper.deleteByMap(deleteMap);
                     reportDailyCampaignMapper.loadCampaignDailyReport(task.getAccountId(), localPath);
                 } else if (task.getViewType() == 3) {
+                    reportDailyGroupMapper.deleteByMap(deleteMap);
                     reportDailyGroupMapper.loadGroupDailyReport(task.getAccountId(), localPath);
-
                 } else if (task.getViewType() == 4) {
+                    reportDailyCreativeMapper.deleteByMap(deleteMap);
                     reportDailyCreativeMapper.loadCreativeDailyReport(task.getAccountId(), localPath);
-                  /*  Thread.sleep(1 * 1000);
-                    reportDailyCreativeMapper.formatCreativeDailyReportData(task.getAccountId(), task.getStatDate());*/
                 } else if (task.getViewType() == 10) {
-                    XxlJobLogger.log("下载文件,accountId:{}", task.getAccountId());
+                    reportDailyCreativeMapper.deleteByAccountIdAndStatDate(task.getAccountId(), task.getStatDate());
                     reportDailyCreativeMapper.loadProgramCreativeDailyReport(task.getAccountId(), localPath);
-                    XxlJobLogger.log("下载结束,accountId:{}", task.getAccountId());
                 } else if (task.getViewType() == 5) {
+                    kuaishouReportDailyMaterialMapper.deleteByMap(deleteMap);
                     kuaishouReportDailyMaterialMapper.loadMaterialDailyReport(task.getAccountId(), localPath);
                     Thread thread = new Thread() {
                         @Override
                         public void run() {
                             try {
-                                Thread.sleep(1 * 1000L);
+                                Thread.sleep(1 * 500L);
                                 kuaiShouHistoryReportTaskService.getMd5(task.getStatDate(), task.getAccountId());
                             } catch (InterruptedException e) {
                                 e.printStackTrace();
                             }
-
                         }
 
                     };
                     thread.start();
-                }else if(task.getViewType() == 7){
+                } else if (task.getViewType() == 7) {
                     //封面报表
-                    kuaishouReportDailyImageMapper.loadImageDailyReport(task.getAccountId(),localPath);
+                    kuaishouReportDailyImageMapper.deleteByMap(deleteMap);
+                    kuaishouReportDailyImageMapper.loadImageDailyReport(task.getAccountId(), localPath);
                     //清洗数据
                     kuaishouReportDailyImageMapper.updateImageReportCode();
                     kuaishouReportDailyImageMapper.updateImageReportUserId();

+ 17 - 11
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouHistoryReportTaskServiceImpl.java

@@ -215,42 +215,48 @@ public class KuaiShouHistoryReportTaskServiceImpl extends ServiceImpl<KuaiShouHi
             requestMap.put("task_id", task.getTaskId());
             String localPath = LoadFileUtil.downloadByUrl(requestMap, downloadPath, url, token, fileName);
             if (!Check.isNull(localPath)) {
+                Map<String, Object> deleteMap = new HashMap<>();
+                deleteMap.put("account_id", task.getAccountId());
+
                 if (task.getViewType() == 1) {
+                    reportDailyAccountMapper.deleteByMap(deleteMap);
                     reportDailyAccountMapper.loadAccountDailyReport(task.getAccountId(), localPath);
                 } else if (task.getViewType() == 2) {
+                    reportDailyCampaignMapper.deleteByMap(deleteMap);
                     reportDailyCampaignMapper.loadCampaignDailyReport(task.getAccountId(), localPath);
 
                 } else if (task.getViewType() == 3) {
+                    reportDailyGroupMapper.deleteByMap(deleteMap);
                     reportDailyGroupMapper.loadGroupDailyReport(task.getAccountId(), localPath);
 
                 } else if (task.getViewType() == 4) {
+                    reportDailyCreativeMapper.deleteByMap(deleteMap);
                     reportDailyCreativeMapper.loadCreativeDailyReport(task.getAccountId(), localPath);
-                    // reportDailyCreativeMapper.formatCreativeDailyReportData(task.getAccountId(), null);
+
                 } else if (task.getViewType() == 10) {
-                    XxlJobLogger.log("下载文件,accountId:{}", task.getAccountId());
+                    reportDailyCreativeMapper.deleteByAccountId(task.getAccountId());
                     reportDailyCreativeMapper.loadProgramCreativeDailyReport(task.getAccountId(), localPath);
-                    XxlJobLogger.log("下载结束,accountId:{}", task.getAccountId());
-                    // 程序化报表
+
                 } else if (task.getViewType() == 5) {
+                    kuaishouReportDailyMaterialMapper.deleteByMap(deleteMap);
                     kuaishouReportDailyMaterialMapper.loadMaterialDailyReport(task.getAccountId(), localPath);
-
                     Thread thread = new Thread() {
                         @Override
                         public void run() {
                             try {
-                                Thread.sleep(1 * 1000L);
+                                Thread.sleep(1 * 500L);
                                 getMd5(null, task.getAccountId());
                             } catch (InterruptedException e) {
                                 e.printStackTrace();
                             }
-
                         }
 
                     };
                     thread.start();
-                }else if (task.getViewType() == 7){
+                } else if (task.getViewType() == 7) {
+                    kuaishouReportDailyImageMapper.deleteByMap(deleteMap);
                     //封面报表
-                    kuaishouReportDailyImageMapper.loadImageDailyReport(task.getAccountId(),localPath);
+                    kuaishouReportDailyImageMapper.loadImageDailyReport(task.getAccountId(), localPath);
                     //清洗数据
                     kuaishouReportDailyImageMapper.updateImageReportCode();
                     kuaishouReportDailyImageMapper.updateImageReportUserId();
@@ -277,12 +283,12 @@ public class KuaiShouHistoryReportTaskServiceImpl extends ServiceImpl<KuaiShouHi
 
         historyTypeList = new ArrayList<>();
         historyTypeList.add(1);
-       /* historyTypeList.add(2);
+        historyTypeList.add(2);
         historyTypeList.add(3);
         historyTypeList.add(4);
         historyTypeList.add(5);
         historyTypeList.add(7);
-        historyTypeList.add(10);*/
+        historyTypeList.add(10);
 
 
     }

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

@@ -22,4 +22,8 @@ public interface KuaishouReportDailyCreativeMapper extends BaseMapper<KuaishouRe
     void loadProgramCreativeDailyReport(@Param("accountId") Long accountId, @Param("localPath") String localPath);
 
     List<JSONObject> checkZombieProject(@Param("date") String date);
+
+    void deleteByAccountId(@Param("accountId") Long accountId);
+
+    void deleteByAccountIdAndStatDate(@Param("accountId") Long accountId, @Param("statDate") String statDate);
 }

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml

@@ -429,8 +429,8 @@
 
     <insert id="loadAccountDailyReport">
 		LOAD DATA local INFILE  #{localPath}
-		REPLACE INTO TABLE ctop_kuaishou_report_daily_account CHARACTER SET utf8mb4
-		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\n'
+		INTO TABLE ctop_kuaishou_report_daily_account
+		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\r\n'
 		IGNORE 1 LINES
 		(@ad_scene,
         charge,

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

@@ -5,7 +5,7 @@
 
     <insert id="loadCampaignDailyReport">
 		LOAD DATA local INFILE  #{localPath}
-	    REPLACE INTO TABLE ctop_kuaishou_report_daily_campaign CHARACTER SET utf8mb4
+	    INTO TABLE ctop_kuaishou_report_daily_campaign CHARACTER SET utf8mb4
 		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\n'
 		IGNORE 1 LINES
 		(campaign_id,

+ 15 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyCreativeMapper.xml

@@ -5,7 +5,7 @@
 
     <insert id="loadProgramCreativeDailyReport">
 		LOAD DATA local INFILE  #{localPath}
-		REPLACE INTO TABLE ctop_kuaishou_report_daily_program_creative CHARACTER SET utf8mb4
+		INTO TABLE ctop_kuaishou_report_daily_program_creative CHARACTER SET utf8mb4
 		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\n'
 		IGNORE 1 LINES
 		(
@@ -116,7 +116,7 @@
 
     <insert id="loadCreativeDailyReport">
 		LOAD DATA local INFILE  #{localPath}
-		REPLACE INTO TABLE ctop_kuaishou_report_daily_creative CHARACTER SET utf8mb4
+		INTO TABLE ctop_kuaishou_report_daily_creative CHARACTER SET utf8mb4
 		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\n'
 		IGNORE 1 LINES
 		(
@@ -305,4 +305,17 @@
         GROUP BY t1.account_id,t1.creative_id) as t
       WHERE t.dates = 5 and t.charge = 0
     </select>
+    <delete id="deleteByAccountId">
+   delete  from ctop_kuaishou_report_daily_program_creative
+   where  account_id = #{accountId}
+
+    </delete>
+    <delete id="deleteByAccountIdAndStatDate">
+   delete  from ctop_kuaishou_report_daily_program_creative
+   where account_id = #{accountId}
+   and stat_date = #{statDate}
+
+    </delete>
+
+
 </mapper>

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

@@ -4,7 +4,7 @@
 
     <insert id="loadGroupDailyReport">
 		LOAD DATA local INFILE  #{localPath}
-		REPLACE INTO TABLE ctop_kuaishou_report_daily_group CHARACTER SET utf8mb4
+	    INTO TABLE ctop_kuaishou_report_daily_group CHARACTER SET utf8mb4
 		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\n'
 		IGNORE 1 LINES
 		(

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

@@ -4,7 +4,7 @@
 
     <insert id="loadImageDailyReport">
         LOAD DATA local INFILE  #{localPath}
-	    REPLACE INTO TABLE ctop_kuaishou_report_daily_image CHARACTER SET utf8mb4
+	     INTO TABLE ctop_kuaishou_report_daily_image CHARACTER SET utf8mb4
 		FIELDS TERMINATED BY ',' enclosed by '"' LINES TERMINATED BY '\n'
 		IGNORE 1 LINES
 		(