Explorar el Código

添加try-catch 捕获异常日志

zhaoxian hace 1 año
padre
commit
330798a80a
Se han modificado 38 ficheros con 915 adiciones y 730 borrados
  1. 5 1
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/AccountAttributionInfoJob.java
  2. 7 3
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckKuaishouActivityInfoJob.java
  3. 6 2
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckPromoterJob.java
  4. 6 2
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckPromoterStatusJob.java
  5. 12 8
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckSupplyChainJob.java
  6. 8 4
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/ExternalMaterialCollectionJob.java
  7. 21 17
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/HostingCreateJob.java
  8. 248 225
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/JiaoYangFenXiaoJob.java
  9. 8 6
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KFXAccessTokenJob.java
  10. 24 21
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouBudgetJob.java
  11. 6 2
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshAgentTokenJob.java
  12. 6 2
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshLiveTokenJob.java
  13. 6 2
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshTokenJob.java
  14. 10 5
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouYesterdayAgentReportJob.java
  15. 7 3
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouCampaignJob.java
  16. 20 16
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouCleanNews.java
  17. 17 9
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyAccountReportLoadEtlJob.java
  18. 32 24
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyAccountReportLoadJob.java
  19. 14 11
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyCampaignReportLoadJob.java
  20. 8 4
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyFlowsJob.java
  21. 8 4
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDingPanCleanJob.java
  22. 13 8
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouGroupJob.java
  23. 2 2
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouHourlyAccountReportLoadEtlJob.java
  24. 19 15
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouHourlyAccountReportLoadJob.java
  25. 16 12
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouHourlyAccountWarningLoadJob.java
  26. 10 6
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouNowDateGroupJob.java
  27. 100 88
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java
  28. 97 88
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/MgsOrderLIstGetJob.java
  29. 13 10
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/NewMonitorJob.java
  30. 13 9
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/NewMonitorOneDayJob.java
  31. 12 9
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataAccountCleanJob.java
  32. 11 7
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataPlanCleanJob.java
  33. 11 7
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataTargetCleanJob.java
  34. 11 7
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataUnitCleanJob.java
  35. 53 42
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/SettlementJob.java
  36. 12 13
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/SyncMaterialUploadJob.java
  37. 11 12
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/SynchronousAccountTransactionJob.java
  38. 32 24
      job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/TrackWarningJob.java

+ 5 - 1
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/AccountAttributionInfoJob.java

@@ -12,6 +12,10 @@ public class AccountAttributionInfoJob {
 
     @XxlJob("reloadAccountAttributionInfo")
     public void execute() throws Exception {
-        commonService.reloadData();
+        try {
+            commonService.reloadData();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 7 - 3
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckKuaishouActivityInfoJob.java

@@ -14,8 +14,12 @@ public class CheckKuaishouActivityInfoJob {
 
     @XxlJob("checkKuaishouActivityInfoJob")
     public void execute() throws Exception {
-        //昨天
-        HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/isv/supply_chain/addListKuaishouActivityInfo", null, null);
-        XxlJobHelper.log(" --------团长查询招商活动列表,执行完成-------- ");
+        try {
+            //昨天
+            HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/isv/supply_chain/addListKuaishouActivityInfo", null, null);
+            XxlJobHelper.log(" --------团长查询招商活动列表,执行完成-------- ");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 6 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckPromoterJob.java

@@ -14,7 +14,11 @@ public class CheckPromoterJob {
 
     @XxlJob("checkPromoterJob")
     public void execute() throws Exception {
-        HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/kuaishou/promoter/supplementInfo", null, null);
-        XxlJobHelper.log(" --------达人补全,执行完成-------- ");
+        try {
+            HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/kuaishou/promoter/supplementInfo", null, null);
+            XxlJobHelper.log(" --------达人补全,执行完成-------- ");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 6 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckPromoterStatusJob.java

@@ -14,7 +14,11 @@ public class CheckPromoterStatusJob {
 
     @XxlJob("checkPromoterStatusJob")
     public void execute() throws Exception {
-        HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/updateStatusToApproved", null, null);
-        XxlJobHelper.log(" --------申样达人单品出单大于等于50单 定时任务直接审核通过,无需上传作业-------- ");
+        try {
+            HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/updateStatusToApproved", null, null);
+            XxlJobHelper.log(" --------申样达人单品出单大于等于50单 定时任务直接审核通过,无需上传作业-------- ");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 12 - 8
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/CheckSupplyChainJob.java

@@ -18,13 +18,17 @@ public class CheckSupplyChainJob {
 
     @XxlJob("checkSupplyChainJob")
     public void execute() throws Exception {
-        String today = DateUtils.getNowDateStr();
-        //昨天
-        String yesterday = DateUtils.getLastDay(today, 1);
-        Map<String, Object> paramMap = new HashMap<String, Object>();
-        paramMap.put("endDate", today);
-        paramMap.put("beginDate", yesterday);
-        HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/isv/supply_chain/addList", paramMap, null);
-        XxlJobHelper.log(" --------供应链-快分销数据,执行完成-------- " + paramMap.toString());
+        try {
+            String today = DateUtils.getNowDateStr();
+            //昨天
+            String yesterday = DateUtils.getLastDay(today, 1);
+            Map<String, Object> paramMap = new HashMap<String, Object>();
+            paramMap.put("endDate", today);
+            paramMap.put("beginDate", yesterday);
+            HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/isv/supply_chain/addList", paramMap, null);
+            XxlJobHelper.log(" --------供应链-快分销数据,执行完成-------- " + paramMap.toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 8 - 4
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/ExternalMaterialCollectionJob.java

@@ -18,12 +18,16 @@ public class ExternalMaterialCollectionJob {
      */
     @XxlJob("externalMaterialCollectionJob")
     public void execute() {
-        String url = "http://api.tjyourong.com.cn/jeecg-boot/external/materialCollection/createInternalMaterial";
-        log.info("请求地址:{}", url);
         try {
-            HttpUtils.httpGet(url, null, null);
+            String url = "http://api.tjyourong.com.cn/jeecg-boot/external/materialCollection/createInternalMaterial";
+            log.info("请求地址:{}", url);
+            try {
+                HttpUtils.httpGet(url, null, null);
+            } catch (Exception e) {
+                XxlJobHelper.log(e.getMessage());
+            }
         } catch (Exception e) {
-            XxlJobHelper.log(e.getMessage());
+            e.printStackTrace();
         }
     }
 }

+ 21 - 17
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/HostingCreateJob.java

@@ -24,25 +24,29 @@ public class HostingCreateJob {
      */
     @XxlJob("createHosting")
     public void createHosting() {
-        String url = "http://api.tjyourong.com.cn/jeecg-boot/task/kuaishouHostingTask/createHosting";
-        List<Long> idList = commonService.getHostingIdList();
-        if (Check.isNull(idList)) {
-            log.error("没有待创建的智能托管定时任务");
-            return;
-        }
-        for (int i = 0; i < idList.size(); i++) {
-            Long tableId = idList.get(i);
-            Map<String, Object> requestMap = new HashMap<>();
-            requestMap.put("id", tableId);
-            String s = HttpUtils.httpGet(url, requestMap, null);
-            JSONObject result = JSONObject.parseObject(s);
-            if (!Check.isNull(result)) {
-                if (result.getInteger("code") != 0) {
-                    log.error("任务提交失败,id:{}", tableId);
+        try {
+            String url = "http://api.tjyourong.com.cn/jeecg-boot/task/kuaishouHostingTask/createHosting";
+            List<Long> idList = commonService.getHostingIdList();
+            if (Check.isNull(idList)) {
+                log.error("没有待创建的智能托管定时任务");
+                return;
+            }
+            for (int i = 0; i < idList.size(); i++) {
+                Long tableId = idList.get(i);
+                Map<String, Object> requestMap = new HashMap<>();
+                requestMap.put("id", tableId);
+                String s = HttpUtils.httpGet(url, requestMap, null);
+                JSONObject result = JSONObject.parseObject(s);
+                if (!Check.isNull(result)) {
+                    if (result.getInteger("code") != 0) {
+                        log.error("任务提交失败,id:{}", tableId);
+                    }
+                } else {
+                    log.error("任务提交返回结果为空,id:{}", tableId);
                 }
-            } else {
-                log.error("任务提交返回结果为空,id:{}", tableId);
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

+ 248 - 225
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/JiaoYangFenXiaoJob.java

@@ -30,20 +30,24 @@ public class JiaoYangFenXiaoJob {
      * @throws Exception
      */
     @XxlJob("jyTopItem")
-    public void jyTopItem() throws Exception {
-        String cookie = commonService.getCookieById(341063986L);
-        if (Check.isNull(cookie)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDateStr();
-        Long statDate = Long.valueOf(nowDate.replace("-", ""));
-        List<JSONObject> accountList = commonService.getAccountList();
-        for (int i = 0; i < accountList.size(); i++) {
-            JSONObject jsonObject = accountList.get(i);
-            Long id = jsonObject.getLong("id");
-            String name = jsonObject.getString("name");
-            commonService.getItemTop(cookie, statDate, id, name, 0);
+    public void jyTopItem() {
+        try {
+            String cookie = commonService.getCookieById(341063986L);
+            if (Check.isNull(cookie)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String nowDate = DateUtils.getNowDateStr();
+            Long statDate = Long.valueOf(nowDate.replace("-", ""));
+            List<JSONObject> accountList = commonService.getAccountList();
+            for (int i = 0; i < accountList.size(); i++) {
+                JSONObject jsonObject = accountList.get(i);
+                Long id = jsonObject.getLong("id");
+                String name = jsonObject.getString("name");
+                commonService.getItemTop(cookie, statDate, id, name, 0);
+            }
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
         }
     }
 
@@ -54,30 +58,32 @@ public class JiaoYangFenXiaoJob {
      * @throws Exception
      */
     @XxlJob("jyClipCooperation")
-    public void jyClipCooperation() throws Exception {
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        Long statDate = Long.valueOf(date.replace("-", ""));
-        List<Integer> statusList = new ArrayList();
-
-        statusList.add(1);
-
-        for (int p = 0; p < cookies.size(); p++) {
-            JSONObject cookieJson = cookies.get(p);
-            String cookie = cookieJson.getString("cookie");
-            for (int i = 0; i < statusList.size(); i++) {
-                Integer status = statusList.get(i);
-                commonService.getClipCooperation(cookie, 0, statDate, status);
+    public void jyClipCooperation() {
+        try {
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
             }
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            Long statDate = Long.valueOf(date.replace("-", ""));
+            List<Integer> statusList = new ArrayList();
+
+            statusList.add(1);
+
+            for (int p = 0; p < cookies.size(); p++) {
+                JSONObject cookieJson = cookies.get(p);
+                String cookie = cookieJson.getString("cookie");
+                for (int i = 0; i < statusList.size(); i++) {
+                    Integer status = statusList.get(i);
+                    commonService.getClipCooperation(cookie, 0, statDate, status);
+                }
 
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-
-
     }
 
 
@@ -87,105 +93,64 @@ public class JiaoYangFenXiaoJob {
      * @throws Exception
      */
     @XxlJob("jyClipCooperationV2")
-    public void jyClipCooperationV2() throws Exception {
-
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        Long statDate = Long.valueOf(date.replace("-", ""));
-        List<Integer> statusList = new ArrayList();
-
-        statusList.add(1);
+    public void jyClipCooperationV2() {
 
-        for (int p = 0; p < cookies.size(); p++) {
-            JSONObject cookieJson = cookies.get(p);
-            String cookie = cookieJson.getString("cookie");
-            for (int i = 0; i < statusList.size(); i++) {
-                Integer status = statusList.get(i);
-                commonService.getClipCooperationV2(cookie, 0, statDate, status);
+        try {
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
             }
-
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            Long statDate = Long.valueOf(date.replace("-", ""));
+            List<Integer> statusList = new ArrayList();
+
+            statusList.add(1);
+
+            for (int p = 0; p < cookies.size(); p++) {
+                JSONObject cookieJson = cookies.get(p);
+                String cookie = cookieJson.getString("cookie");
+                for (int i = 0; i < statusList.size(); i++) {
+                    Integer status = statusList.get(i);
+                    commonService.getClipCooperationV2(cookie, 0, statDate, status);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-
-
     }
 
     /**
      * 当前小时数据获取
      **/
     @XxlJob("jyNowHourOrderGet")
-    public void jyNowHourOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单当天当小时数据开始--------------------------");
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String date = DateUtils.getNowDate("yyyy-MM-dd");
-        Integer nowHour = DateUtils.getNowHour();
-        JSONArray hours = new JSONArray();
-        hours.add(nowHour);
-        if (nowHour >= 1) {
-            hours.add(nowHour - 1);
-        }
-
-
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        for (int i = 0; i < hours.size(); i++) {
-            Integer hour = hours.getInteger(i);
-            for (int j = 0; j < minSecList.size(); j++) {
-                JSONObject minSecJson = minSecList.getJSONObject(j);
-                String startTime = minSecJson.getString("startTime");
-                String endTime = minSecJson.getString("endTime");
-                String start = date + " " + hour + ":" + startTime;
-                String end = date + " " + hour + ":" + endTime;
-                System.err.println("开始时间:" + start);
-                System.err.println("结束时间:" + end);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Long orderCreateTimeStart = sdf.parse(start).getTime();
-                Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                for (int p = 0; p < cookies.size(); p++) {
-                    JSONObject cookieJson = cookies.get(p);
-                    String cookie = cookieJson.getString("cookie");
-                    commonService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
-                }
+    public void jyNowHourOrderGet() {
+        try {
+            log.info("-------------------------获取快分销订单当天当小时数据开始--------------------------");
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String date = DateUtils.getNowDate("yyyy-MM-dd");
+            Integer nowHour = DateUtils.getNowHour();
+            JSONArray hours = new JSONArray();
+            hours.add(nowHour);
+            if (nowHour >= 1) {
+                hours.add(nowHour - 1);
             }
-        }
-    }
-
 
-    /**
-     * 当天前前小时数据获取
-     **/
-    /**
-     * 当天数据获取
-     **/
-    @XxlJob("jyFrontHourOrderGet")
-    public void frontHourOrderGet() throws Exception {
 
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String date = DateUtils.getNowDate("yyyy-MM-dd");
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Integer nowHour = DateUtils.getNowHour();
-        for (int i = 0; i < hourList.size(); i++) {
-            String hour = hourList.getString(i);
-            Integer integer = Integer.valueOf(hour.replace(":", "").replace(" ", ""));
-            if (integer <= nowHour) {
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            for (int i = 0; i < hours.size(); i++) {
+                Integer hour = hours.getInteger(i);
                 for (int j = 0; j < minSecList.size(); j++) {
                     JSONObject minSecJson = minSecList.getJSONObject(j);
                     String startTime = minSecJson.getString("startTime");
                     String endTime = minSecJson.getString("endTime");
-                    String start = date + hour + startTime;
-                    String end = date + hour + endTime;
+                    String start = date + " " + hour + ":" + startTime;
+                    String end = date + " " + hour + ":" + endTime;
                     System.err.println("开始时间:" + start);
                     System.err.println("结束时间:" + end);
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -198,107 +163,76 @@ public class JiaoYangFenXiaoJob {
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-
-
     }
 
 
     /**
-     * 昨日快分销数据获取
+     * 当天前前小时数据获取
      **/
-    @XxlJob("jyYesterdayOrderGet")
-    public void jyYesterdayOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        for (int i = 0; i < hourList.size(); i++) {
-            String hour = hourList.getString(i);
-            for (int j = 0; j < minSecList.size(); j++) {
-                JSONObject minSecJson = minSecList.getJSONObject(j);
-                String startTime = minSecJson.getString("startTime");
-                String endTime = minSecJson.getString("endTime");
-                String start = date + hour + startTime;
-                String end = date + hour + endTime;
-                System.err.println("开始时间:" + start);
-                System.err.println("结束时间:" + end);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Long orderCreateTimeStart = sdf.parse(start).getTime();
-                Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                for (int p = 0; p < cookies.size(); p++) {
-                    JSONObject cookieJson = cookies.get(p);
-                    String cookie = cookieJson.getString("cookie");
-                    commonService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
-                }
-            }
-        }
-    }
-
-
     /**
-     * 前日日快分销数据获取
+     * 当天数据获取
      **/
-    @XxlJob("jyBeforeYesterdayOrderGet")
-    public void jyBeforeYesterdayOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单前日数据开始数据开始--------------------------");
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        for (int i = 0; i < hourList.size(); i++) {
-            String hour = hourList.getString(i);
-            for (int j = 0; j < minSecList.size(); j++) {
-                JSONObject minSecJson = minSecList.getJSONObject(j);
-                String startTime = minSecJson.getString("startTime");
-                String endTime = minSecJson.getString("endTime");
-                String start = date + hour + startTime;
-                String end = date + hour + endTime;
-                System.err.println("开始时间:" + start);
-                System.err.println("结束时间:" + end);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Long orderCreateTimeStart = sdf.parse(start).getTime();
-                Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                for (int p = 0; p < cookies.size(); p++) {
-                    JSONObject cookieJson = cookies.get(p);
-                    String cookie = cookieJson.getString("cookie");
-                    commonService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
-                }
+    @XxlJob("jyFrontHourOrderGet")
+    public void frontHourOrderGet() {
 
+        try {
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
             }
+            String date = DateUtils.getNowDate("yyyy-MM-dd");
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            Integer nowHour = DateUtils.getNowHour();
+            for (int i = 0; i < hourList.size(); i++) {
+                String hour = hourList.getString(i);
+                Integer integer = Integer.valueOf(hour.replace(":", "").replace(" ", ""));
+                if (integer <= nowHour) {
+                    for (int j = 0; j < minSecList.size(); j++) {
+                        JSONObject minSecJson = minSecList.getJSONObject(j);
+                        String startTime = minSecJson.getString("startTime");
+                        String endTime = minSecJson.getString("endTime");
+                        String start = date + hour + startTime;
+                        String end = date + hour + endTime;
+                        System.err.println("开始时间:" + start);
+                        System.err.println("结束时间:" + end);
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        Long orderCreateTimeStart = sdf.parse(start).getTime();
+                        Long orderCreateTimeEnd = sdf.parse(end).getTime();
+                        for (int p = 0; p < cookies.size(); p++) {
+                            JSONObject cookieJson = cookies.get(p);
+                            String cookie = cookieJson.getString("cookie");
+                            commonService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
 
     /**
-     * 快分销-当前月所有数据
+     * 昨日快分销数据获取
      **/
-    @XxlJob("jyNowMonthyOrderGet")
-    public void jyNowMonthyOrderGet() throws Exception {
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -3);
-        String monthFirstDay = DateUtils.getMonthFirstDay();
-        List<String> days = DateUtils.getDays(monthFirstDay, endDate);
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        for (int z = 0; z < days.size(); z++) {
-            String date = days.get(z);
+    @XxlJob("jyYesterdayOrderGet")
+    public void jyYesterdayOrderGet() {
+        try {
+            log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
             for (int i = 0; i < hourList.size(); i++) {
                 String hour = hourList.getString(i);
                 for (int j = 0; j < minSecList.size(); j++) {
@@ -319,33 +253,28 @@ public class JiaoYangFenXiaoJob {
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
 
     /**
-     * 上个月数据获取
-     *
-     * @throws Exception
-     */
-    @XxlJob("jyAllOrderGet")
-    public void jyAllOrderGet() throws Exception {
-        //   List<String> dateList = new ArrayList<>();
-        Map<String, String> monthStartAndEnd = DateUtils.getMonthStartAndEnd();
-        String firstDay = monthStartAndEnd.get("firstDay");
-        String lastDay = monthStartAndEnd.get("lastDay");
-        List<String> days = DateUtils.getDays(firstDay, lastDay);
-        List<JSONObject> cookies = commonService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-
-
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        for (int z = 0; z < days.size(); z++) {
-            String date = days.get(z);
+     * 前日日快分销数据获取
+     **/
+    @XxlJob("jyBeforeYesterdayOrderGet")
+    public void jyBeforeYesterdayOrderGet() {
+        try {
+            log.info("-------------------------获取快分销订单前日数据开始数据开始--------------------------");
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
             for (int i = 0; i < hourList.size(); i++) {
                 String hour = hourList.getString(i);
                 for (int j = 0; j < minSecList.size(); j++) {
@@ -366,9 +295,103 @@ public class JiaoYangFenXiaoJob {
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
+
+    /**
+     * 快分销-当前月所有数据
+     **/
+    @XxlJob("jyNowMonthyOrderGet")
+    public void jyNowMonthyOrderGet() {
+        try {
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -3);
+            String monthFirstDay = DateUtils.getMonthFirstDay();
+            List<String> days = DateUtils.getDays(monthFirstDay, endDate);
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            for (int z = 0; z < days.size(); z++) {
+                String date = days.get(z);
+                for (int i = 0; i < hourList.size(); i++) {
+                    String hour = hourList.getString(i);
+                    for (int j = 0; j < minSecList.size(); j++) {
+                        JSONObject minSecJson = minSecList.getJSONObject(j);
+                        String startTime = minSecJson.getString("startTime");
+                        String endTime = minSecJson.getString("endTime");
+                        String start = date + hour + startTime;
+                        String end = date + hour + endTime;
+                        System.err.println("开始时间:" + start);
+                        System.err.println("结束时间:" + end);
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        Long orderCreateTimeStart = sdf.parse(start).getTime();
+                        Long orderCreateTimeEnd = sdf.parse(end).getTime();
+                        for (int p = 0; p < cookies.size(); p++) {
+                            JSONObject cookieJson = cookies.get(p);
+                            String cookie = cookieJson.getString("cookie");
+                            commonService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
 
+    /**
+     * 上个月数据获取
+     *
+     * @throws Exception
+     */
+    @XxlJob("jyAllOrderGet")
+    public void jyAllOrderGet() {
+        try {
+            //   List<String> dateList = new ArrayList<>();
+            Map<String, String> monthStartAndEnd = DateUtils.getMonthStartAndEnd();
+            String firstDay = monthStartAndEnd.get("firstDay");
+            String lastDay = monthStartAndEnd.get("lastDay");
+            List<String> days = DateUtils.getDays(firstDay, lastDay);
+            List<JSONObject> cookies = commonService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            for (int z = 0; z < days.size(); z++) {
+                String date = days.get(z);
+                for (int i = 0; i < hourList.size(); i++) {
+                    String hour = hourList.getString(i);
+                    for (int j = 0; j < minSecList.size(); j++) {
+                        JSONObject minSecJson = minSecList.getJSONObject(j);
+                        String startTime = minSecJson.getString("startTime");
+                        String endTime = minSecJson.getString("endTime");
+                        String start = date + hour + startTime;
+                        String end = date + hour + endTime;
+                        System.err.println("开始时间:" + start);
+                        System.err.println("结束时间:" + end);
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        Long orderCreateTimeStart = sdf.parse(start).getTime();
+                        Long orderCreateTimeEnd = sdf.parse(end).getTime();
+                        for (int p = 0; p < cookies.size(); p++) {
+                            JSONObject cookieJson = cookies.get(p);
+                            String cookie = cookieJson.getString("cookie");
+                            commonService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

+ 8 - 6
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KFXAccessTokenJob.java

@@ -9,11 +9,13 @@ public class KFXAccessTokenJob {
 
     @XxlJob("refreshAccessToken")
     public void refreshAccessToken() {
-        String url = "http://ruixuan.api.tjyourong.com.cn/item/accessToken";
-        HttpUtils.httpGet(url, null, null);
-        String mgsUrl = "http://mgs.api.tjyourong.com.cn/item/accessToken";
-        HttpUtils.httpGet(mgsUrl, null, null);
-
+        try {
+            String url = "http://ruixuan.api.tjyourong.com.cn/item/accessToken";
+            HttpUtils.httpGet(url, null, null);
+            String mgsUrl = "http://mgs.api.tjyourong.com.cn/item/accessToken";
+            HttpUtils.httpGet(mgsUrl, null, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
-
 }

+ 24 - 21
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouBudgetJob.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.ParseException;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -29,30 +30,32 @@ public class KuaiShouBudgetJob {
 
     /**
      * 定时更新快手账户余额和预算
-     *
-     * @throws
      */
     @XxlJob("kuaiShouBudgetJob")
-    public void execute() throws Exception {
-        if (DateUtils.getNowHour() == 2) {
-            //每日凌晨2点将预算全部置为无效,避免已关闭的账户留有僵尸数据。
-            commonService.updateAllIsInvalidState();
-        }
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        tokens.forEach(token -> executorService.submit(() -> {
-            KuaishouAccountBalanceBudget budget = new KuaishouAccountBalanceBudget();
-            JSONObject fundJson = commonService.fundGet(token);
-            JSONObject accountBudget = commonService.getAccountBudget(token);
-            if (!Check.isNull(accountBudget) && !Check.isNull(fundJson)) {
-                budget.setBalance(fundJson.getBigDecimal("balance"));
-                budget.setDayBudget(accountBudget.getBigDecimal("day_budget").divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_UP));
-                budget.setDayBudgetSchedule(accountBudget.getString("day_budget_schedule"));
-                budget.setAccountId(token.getAccountId());
-                budget.setState(1);
-                commonService.replaceBudget(budget);
+    public void execute() {
+        try {
+            if (DateUtils.getNowHour() == 2) {
+                //每日凌晨2点将预算全部置为无效,避免已关闭的账户留有僵尸数据。
+                commonService.updateAllIsInvalidState();
             }
-        }));
-        XxlJobHelper.log("定时更新快手账户余额和预算完成");
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            tokens.forEach(token -> executorService.submit(() -> {
+                KuaishouAccountBalanceBudget budget = new KuaishouAccountBalanceBudget();
+                JSONObject fundJson = commonService.fundGet(token);
+                JSONObject accountBudget = commonService.getAccountBudget(token);
+                if (!Check.isNull(accountBudget) && !Check.isNull(fundJson)) {
+                    budget.setBalance(fundJson.getBigDecimal("balance"));
+                    budget.setDayBudget(accountBudget.getBigDecimal("day_budget").divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_UP));
+                    budget.setDayBudgetSchedule(accountBudget.getString("day_budget_schedule"));
+                    budget.setAccountId(token.getAccountId());
+                    budget.setState(1);
+                    commonService.replaceBudget(budget);
+                }
+            }));
+            XxlJobHelper.log("定时更新快手账户余额和预算完成");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
     }
 }
 

+ 6 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshAgentTokenJob.java

@@ -14,8 +14,12 @@ public class KuaiShouRefreshAgentTokenJob {
      * 代理商刷新token
      */
     @XxlJob("kuaiShouRefreshAgentTokenJob")
-    public void execute() throws Exception {
-        tokenService.getKuaiShouAgentRefresh();
+    public void execute() {
+        try {
+            tokenService.getKuaiShouAgentRefresh();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }
 

+ 6 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshLiveTokenJob.java

@@ -14,8 +14,12 @@ public class KuaiShouRefreshLiveTokenJob {
      * 刷新快手直播token(ruixuan)
      */
     @XxlJob("kuaiShouLiveRefreshTokenJob")
-    public void execute() throws Exception {
-        tokenService.getLiveKuaiShouAgentRefresh();
+    public void execute() {
+        try {
+            tokenService.getLiveKuaiShouAgentRefresh();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 }

+ 6 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshTokenJob.java

@@ -14,8 +14,12 @@ public class KuaiShouRefreshTokenJob {
      * 快手刷新token
      */
     @XxlJob("kuaiShouRefreshTokenJob")
-    public void execute() throws Exception {
-        tokenService.getKuaiShouRefresh();
+    public void execute() {
+        try {
+            tokenService.getKuaiShouRefresh();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }
 

+ 10 - 5
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouYesterdayAgentReportJob.java

@@ -10,15 +10,20 @@ import org.springframework.stereotype.Component;
 public class KuaiShouYesterdayAgentReportJob {
     @Autowired
     private AccountInfoService accountInfoService;
+
     /**
      * 代理商t-1数据获取
      */
     @XxlJob("kuaiShouYesterdayAgentReportJob")
-    public void execute() throws Exception {
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
-        accountInfoService.getAgentReportByPage(startDate, endDate);
+    public void execute() {
+        try {
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
+            accountInfoService.getAgentReportByPage(startDate, endDate);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }
 

+ 7 - 3
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouCampaignJob.java

@@ -26,8 +26,12 @@ public class KuaishouCampaignJob {
      */
     @XxlJob("kuaishouCampaignJob")
     public void execute() {
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        tokens.forEach(token -> executorService.submit(() -> commonService.getCampaignList(token, null, null)));
-        XxlJobHelper.log("快手物料数据同步完成");
+        try {
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            tokens.forEach(token -> executorService.submit(() -> commonService.getCampaignList(token, null, null)));
+            XxlJobHelper.log("快手物料数据同步完成");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 20 - 16
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouCleanNews.java

@@ -30,24 +30,28 @@ public class KuaishouCleanNews {
 
     @XxlJob("cleanNews")
     public void cleanNews() {
-        String nowDate = DateUtils.getDate("yyyy-MM-dd");
-        String statDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        Date startDate = DateUtils.getStartDate(statDate);
-        Date endDate = DateUtils.getEndDate(statDate);
-        List<UserAllocation> userAllocations = commonService.listByMediaId("2", 0);
-        if (!Check.isNull(userAllocations)) {
-            for (UserAllocation allocation : userAllocations) {
-                cleanService.submit(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            commonService.cleanCreateDetail(allocation.getProjectId(), allocation.getUserId(), allocation.getUserName(), allocation.getAccountId(), statDate, startDate, endDate);
-                        } catch (Exception e) {
-                            e.printStackTrace();
+        try {
+            String nowDate = DateUtils.getDate("yyyy-MM-dd");
+            String statDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            Date startDate = DateUtils.getStartDate(statDate);
+            Date endDate = DateUtils.getEndDate(statDate);
+            List<UserAllocation> userAllocations = commonService.listByMediaId("2", 0);
+            if (!Check.isNull(userAllocations)) {
+                for (UserAllocation allocation : userAllocations) {
+                    cleanService.submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                commonService.cleanCreateDetail(allocation.getProjectId(), allocation.getUserId(), allocation.getUserName(), allocation.getAccountId(), statDate, startDate, endDate);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

+ 17 - 9
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyAccountReportLoadEtlJob.java

@@ -23,12 +23,16 @@ public class KuaishouDailyAccountReportLoadEtlJob {
      * 清洗账户维度-每日盯盘数据
      */
     @XxlJob("kuaishouDailyAccountReportLoadEtl")
-    public void execute() throws Exception {
+    public void execute() {
         try {
-            commonService.queryEveryDayDataForAccount();
-            XxlJobHelper.log("queryEveryDayDataForAccount success");
+            try {
+                commonService.queryEveryDayDataForAccount();
+                XxlJobHelper.log("queryEveryDayDataForAccount success");
+            } catch (Exception e) {
+                XxlJobHelper.log(e.getMessage());
+            }
         } catch (Exception e) {
-            XxlJobHelper.log(e.getMessage());
+            e.printStackTrace();
         }
     }
 
@@ -36,13 +40,17 @@ public class KuaishouDailyAccountReportLoadEtlJob {
      * 快手账户素材数据清洗任务
      */
     @XxlJob("etlKuaishouAccountMaterialReportDailyData")
-    public void etlKuaishouAccountMaterialReportDailyData() throws Exception {
+    public void etlKuaishouAccountMaterialReportDailyData() {
         try {
-            commonService.etlKuaishouAccountMaterialReportDailyData(DateUtils.formatDate());
-            commonService.etlKuaishouAccountMaterialReportDailyData(DateUtils.formatDate(DateUtils.addDay(new Date(), -1)));
-            XxlJobHelper.log("queryEveryDayDataForAccount success");
+            try {
+                commonService.etlKuaishouAccountMaterialReportDailyData(DateUtils.formatDate());
+                commonService.etlKuaishouAccountMaterialReportDailyData(DateUtils.formatDate(DateUtils.addDay(new Date(), -1)));
+                XxlJobHelper.log("queryEveryDayDataForAccount success");
+            } catch (Exception e) {
+                XxlJobHelper.log(e.getMessage());
+            }
         } catch (Exception e) {
-            XxlJobHelper.log(e.getMessage());
+            e.printStackTrace();
         }
     }
 }

+ 32 - 24
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyAccountReportLoadJob.java

@@ -33,19 +33,23 @@ public class KuaishouDailyAccountReportLoadJob {
      * 快手广告主日报
      */
     @XxlJob("kuaishouDailyAccountReport")
-    public void execute() throws Exception {
-        Date getDate = new Date();
-        Date getDate2 = DateUtils.addDay(new Date(), -2);
-        //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        if (null == tokens || tokens.isEmpty()) {
-            XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
-            XxlJobHelper.handleFail();
-            return;
+    public void execute() {
+        try {
+            Date getDate = new Date();
+            Date getDate2 = DateUtils.addDay(new Date(), -2);
+            //1:查询当日数据
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            if (null == tokens || tokens.isEmpty()) {
+                XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
+                XxlJobHelper.handleFail();
+                return;
+            }
+            tokens.forEach(token -> executorService.submit(() -> {
+                commonService.getAdvertiserReportDaily(token, getDate2, getDate, null);
+            }));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        tokens.forEach(token -> executorService.submit(() -> {
-            commonService.getAdvertiserReportDaily(token, getDate2, getDate, null);
-        }));
     }
 
     /**
@@ -53,19 +57,23 @@ public class KuaishouDailyAccountReportLoadJob {
      * @throws Exception
      */
     @XxlJob("kuaishouDailyAccountAdSceneReport")
-    public void kuaishouDailyAccountAdSceneReport() throws Exception {
-        Date getDate = DateUtils.addDay(new Date(), -1);
-        Date getDate2 = DateUtils.addDay(new Date(), -2);
-        //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        if (null == tokens || tokens.isEmpty()) {
-            XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
-            XxlJobHelper.handleFail();
-            return;
+    public void kuaishouDailyAccountAdSceneReport() {
+        try {
+            Date getDate = DateUtils.addDay(new Date(), -1);
+            Date getDate2 = DateUtils.addDay(new Date(), -2);
+            //1:查询当日数据
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            if (null == tokens || tokens.isEmpty()) {
+                XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
+                XxlJobHelper.handleFail();
+                return;
+            }
+            tokens.forEach(token -> adSceneExecutorService.submit(() -> {
+                commonService.getAdvertiserReportDaily(token, getDate2, getDate, "adScene");
+            }));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        tokens.forEach(token -> adSceneExecutorService.submit(() -> {
-            commonService.getAdvertiserReportDaily(token, getDate2, getDate, "adScene");
-        }));
     }
 
 }

+ 14 - 11
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyCampaignReportLoadJob.java

@@ -34,18 +34,21 @@ public class KuaishouDailyCampaignReportLoadJob {
      * @throws Exception
      */
     @XxlJob("kuaishouDailyCampaignReport")
-    public void execute() throws Exception {
-        Date getDate = DateUtils.addDay(new Date(), -2);
-        Date endDate = DateUtils.addDay(new Date(), -1);
-        //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        if (null == tokens || tokens.isEmpty()) {
-            XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
-            XxlJobHelper.handleFail();
-            return;
+    public void execute() {
+        try {
+            Date getDate = DateUtils.addDay(new Date(), -2);
+            Date endDate = DateUtils.addDay(new Date(), -1);
+            //1:查询当日数据
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            if (null == tokens || tokens.isEmpty()) {
+                XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
+                XxlJobHelper.handleFail();
+                return;
+            }
+            tokens.forEach(token -> executorService.submit(() -> commonService.getAdvertiserCampaignReportDaily(token, getDate, endDate)));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-
-        tokens.forEach(token -> executorService.submit(() -> commonService.getAdvertiserCampaignReportDaily(token, getDate, endDate)));
     }
 
 

+ 8 - 4
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDailyFlowsJob.java

@@ -21,11 +21,15 @@ public class KuaishouDailyFlowsJob {
      */
     @XxlJob("kuaishouDailyFlowsJob")
     public void execute() {
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        if (!Check.isNull(tokens)) {
-            for (CtopOauthToken ctopOauthToken : tokens) {
-                commonService.getDailyFlows(ctopOauthToken);
+        try {
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            if (!Check.isNull(tokens)) {
+                for (CtopOauthToken ctopOauthToken : tokens) {
+                    commonService.getDailyFlows(ctopOauthToken);
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

+ 8 - 4
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouDingPanCleanJob.java

@@ -26,10 +26,14 @@ public class KuaishouDingPanCleanJob {
      */
     @XxlJob("cleanNewlyData")
     public void cleanNewlyData() {
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String yesterdayDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        commonService.cleanNewlyData(yesterdayDate);
-        XxlJobHelper.log("快手清洗上新计划数据完成");
+        try {
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String yesterdayDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            commonService.cleanNewlyData(yesterdayDate);
+            XxlJobHelper.log("快手清洗上新计划数据完成");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 }

+ 13 - 8
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouGroupJob.java

@@ -10,6 +10,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -29,14 +30,18 @@ public class KuaishouGroupJob {
      * 快手广告组物料
      */
     @XxlJob("kuaishouGroup")
-    public void execute() throws Exception {
-        Date endDate = new Date();
-        String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
-        SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
-        Date parse = sim.parse(anotherDay);
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        tokens.forEach(token -> executorService.submit(() -> accountInfoService.getGroupList(token, parse, parse)));
-        XxlJobHelper.log("快手物料数据同步完成");
+    public void execute() {
+        try {
+            Date endDate = new Date();
+            String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
+            SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
+            Date parse = sim.parse(anotherDay);
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            tokens.forEach(token -> executorService.submit(() -> accountInfoService.getGroupList(token, parse, parse)));
+            XxlJobHelper.log("快手物料数据同步完成");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
     }
 
 }

+ 2 - 2
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouHourlyAccountReportLoadEtlJob.java

@@ -20,12 +20,12 @@ public class KuaishouHourlyAccountReportLoadEtlJob {
      * 清洗账户维度-盯盘小时数据
      */
     @XxlJob("kuaishouHourlyAccountReportLoadEtl")
-    public void execute() throws Exception {
+    public void execute() {
         try {
             accountInfoService.queryEveryhourlyDataForAccount();
             XxlJobHelper.log("queryEveryhourlyDataForAccount success");
         } catch (Exception e) {
-            XxlJobHelper.log(e.getMessage());
+            e.printStackTrace();
         }
     }
 }

+ 19 - 15
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouHourlyAccountReportLoadJob.java

@@ -33,21 +33,25 @@ public class KuaishouHourlyAccountReportLoadJob {
      * 快手广告主时报
      */
     @XxlJob("kuaishouHourlyAccountReport")
-    public void execute() throws Exception {
-        Date getDate = new Date();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
-        String hour = simpleDateFormat.format(getDate);
-        if ("00".equals(hour)) {
-            getDate = DateUtils.addDay(getDate, -1);
+    public void execute() {
+        try {
+            Date getDate = new Date();
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
+            String hour = simpleDateFormat.format(getDate);
+            if ("00".equals(hour)) {
+                getDate = DateUtils.addDay(getDate, -1);
+            }
+            //1:查询当日数据
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            if (null == tokens || tokens.size() <= 0) {
+                XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
+                XxlJobHelper.handleFail();
+                return;
+            }
+            Date finalGetDate = getDate;
+            tokens.forEach(token -> executorService.submit(() -> accountInfoService.getAdvertiserReportHourly(token, finalGetDate, finalGetDate)));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        //1:查询当日数据
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        if (null == tokens || tokens.size() <= 0) {
-            XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
-            XxlJobHelper.handleFail();
-            return;
-        }
-        Date finalGetDate = getDate;
-        tokens.forEach(token -> executorService.submit(() -> accountInfoService.getAdvertiserReportHourly(token, finalGetDate, finalGetDate)));
     }
 }

+ 16 - 12
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouHourlyAccountWarningLoadJob.java

@@ -28,18 +28,22 @@ public class KuaishouHourlyAccountWarningLoadJob {
      * 快手时段消耗预警
      */
     @XxlJob("kuaishouHourlyAccountWarning")
-    public void execute() throws Exception {
-        XxlJobHelper.log("开始时段消耗预警定时任务");
-        long l = System.currentTimeMillis();
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        if (null == tokens || tokens.size() <= 0) {
-            XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
-            XxlJobHelper.handleFail();
-            return ;
+    public void execute() {
+        try {
+            XxlJobHelper.log("开始时段消耗预警定时任务");
+            long l = System.currentTimeMillis();
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            if (null == tokens || tokens.size() <= 0) {
+                XxlJobHelper.log("定时获取快手数据异常:未获取到可用的token");
+                XxlJobHelper.handleFail();
+                return ;
+            }
+            String statDate = DateUtils.getDate("yyyy-MM-dd");
+            String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", statDate, -1);
+            tokens.forEach(token -> executorService.submit(() -> accountInfoService.kuaiShouAccountWarning(token.getAccountId(), statDate, anotherDay)));
+            XxlJobHelper.log("异步时段消耗预警定时任务执行完毕,耗时:{} ms", System.currentTimeMillis() - l);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        String statDate = DateUtils.getDate("yyyy-MM-dd");
-        String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", statDate, -1);
-        tokens.forEach(token -> executorService.submit(() -> accountInfoService.kuaiShouAccountWarning(token.getAccountId(), statDate, anotherDay)));
-        XxlJobHelper.log("异步时段消耗预警定时任务执行完毕,耗时:{} ms", System.currentTimeMillis() - l);
     }
 }

+ 10 - 6
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouNowDateGroupJob.java

@@ -25,12 +25,16 @@ public class KuaishouNowDateGroupJob {
      * 快手当日广告组物料数据
      */
     @XxlJob("kuaishouNowDateGroup")
-    public void execute() throws Exception {
-        //查询当日数据
-        Date nowDate = new Date();
-        List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
-        tokens.forEach(token -> executorService.submit(() -> accountInfoService.getGroupList(token, nowDate, nowDate)));
-        XxlJobHelper.log("快手物料数据同步完成");
+    public void execute()  {
+        try {
+            //查询当日数据
+            Date nowDate = new Date();
+            List<CtopOauthToken> tokens = tokenService.getAllKuaiShouTokens();
+            tokens.forEach(token -> executorService.submit(() -> accountInfoService.getGroupList(token, nowDate, nowDate)));
+            XxlJobHelper.log("快手物料数据同步完成");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 }

+ 100 - 88
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java

@@ -35,37 +35,41 @@ public class KuaishouOrderLIstGetJob {
      * 昨日快分销数据获取
      **/
     @XxlJob("yesterdayOrderGet")
-    public void yesterdayOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
-        List<JSONObject> cookies = ruixuanService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Map<Long, Long> itemMap = ruixuanService.getItemMap();
-        for (int i = 0; i < hourList.size(); i++) {
-            String hour = hourList.getString(i);
-            for (int j = 0; j < minSecList.size(); j++) {
-                JSONObject minSecJson = minSecList.getJSONObject(j);
-                String startTime = minSecJson.getString("startTime");
-                String endTime = minSecJson.getString("endTime");
-                String start = date + hour + startTime;
-                String end = date + hour + endTime;
-                System.err.println("开始时间:" + start);
-                System.err.println("结束时间:" + end);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Long orderCreateTimeStart = sdf.parse(start).getTime();
-                Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                for (int p = 0; p < cookies.size(); p++) {
-                    JSONObject cookieJson = cookies.get(p);
-                    String cookie = cookieJson.getString("cookie");
-                    ruixuanService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+    public void yesterdayOrderGet() {
+        try {
+            log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
+            List<JSONObject> cookies = ruixuanService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            Map<Long, Long> itemMap = ruixuanService.getItemMap();
+            for (int i = 0; i < hourList.size(); i++) {
+                String hour = hourList.getString(i);
+                for (int j = 0; j < minSecList.size(); j++) {
+                    JSONObject minSecJson = minSecList.getJSONObject(j);
+                    String startTime = minSecJson.getString("startTime");
+                    String endTime = minSecJson.getString("endTime");
+                    String start = date + hour + startTime;
+                    String end = date + hour + endTime;
+                    System.err.println("开始时间:" + start);
+                    System.err.println("结束时间:" + end);
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    Long orderCreateTimeStart = sdf.parse(start).getTime();
+                    Long orderCreateTimeEnd = sdf.parse(end).getTime();
+                    for (int p = 0; p < cookies.size(); p++) {
+                        JSONObject cookieJson = cookies.get(p);
+                        String cookie = cookieJson.getString("cookie");
+                        ruixuanService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                    }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -73,71 +77,32 @@ public class KuaishouOrderLIstGetJob {
      * 当前小时数据获取
      **/
     @XxlJob("nowHourOrderGet")
-    public void nowHourOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单当天当小时数据开始--------------------------");
-        List<JSONObject> cookies = ruixuanService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String date = DateUtils.getNowDate("yyyy-MM-dd");
-        Integer nowHour = DateUtils.getNowHour();
-        JSONArray hours = new JSONArray();
-        hours.add(nowHour);
-        if (nowHour >= 1) {
-            hours.add(nowHour - 1);
-        }
-
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Map<Long, Long> itemMap = ruixuanService.getItemMap();
-        for (int i = 0; i < hours.size(); i++) {
-            Integer hour = hours.getInteger(i);
-            for (int j = 0; j < minSecList.size(); j++) {
-                JSONObject minSecJson = minSecList.getJSONObject(j);
-                String startTime = minSecJson.getString("startTime");
-                String endTime = minSecJson.getString("endTime");
-                String start = date + " " + hour + ":" + startTime;
-                String end = date + " " + hour + ":" + endTime;
-                System.err.println("开始时间:" + start);
-                System.err.println("结束时间:" + end);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Long orderCreateTimeStart = sdf.parse(start).getTime();
-                Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                for (int p = 0; p < cookies.size(); p++) {
-                    JSONObject cookieJson = cookies.get(p);
-                    String cookie = cookieJson.getString("cookie");
-                    ruixuanService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
-                }
+    public void nowHourOrderGet() {
+        try {
+            log.info("-------------------------获取快分销订单当天当小时数据开始--------------------------");
+            List<JSONObject> cookies = ruixuanService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String date = DateUtils.getNowDate("yyyy-MM-dd");
+            Integer nowHour = DateUtils.getNowHour();
+            JSONArray hours = new JSONArray();
+            hours.add(nowHour);
+            if (nowHour >= 1) {
+                hours.add(nowHour - 1);
             }
-        }
-    }
 
-    /**
-     * 当天数据获取
-     **/
-    @XxlJob("frontHourOrderGet")
-    public void frontHourOrderGet() throws Exception {
-        log.info("-------------------------获取快分销订单当天数据开始--------------------------");
-        List<JSONObject> cookies = ruixuanService.getCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String date = DateUtils.getNowDate("yyyy-MM-dd");
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Map<Long, Long> itemMap = ruixuanService.getItemMap();
-        Integer nowHour = DateUtils.getNowHour();
-        for (int i = 0; i < hourList.size(); i++) {
-            String hour = hourList.getString(i);
-            Integer integer = Integer.valueOf(hour.replace(":", "").replace(" ", ""));
-            if (integer <= nowHour) {
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            Map<Long, Long> itemMap = ruixuanService.getItemMap();
+            for (int i = 0; i < hours.size(); i++) {
+                Integer hour = hours.getInteger(i);
                 for (int j = 0; j < minSecList.size(); j++) {
                     JSONObject minSecJson = minSecList.getJSONObject(j);
                     String startTime = minSecJson.getString("startTime");
                     String endTime = minSecJson.getString("endTime");
-                    String start = date + hour + startTime;
-                    String end = date + hour + endTime;
+                    String start = date + " " + hour + ":" + startTime;
+                    String end = date + " " + hour + ":" + endTime;
                     System.err.println("开始时间:" + start);
                     System.err.println("结束时间:" + end);
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -150,6 +115,53 @@ public class KuaishouOrderLIstGetJob {
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 当天数据获取
+     **/
+    @XxlJob("frontHourOrderGet")
+    public void frontHourOrderGet() {
+        try {
+            log.info("-------------------------获取快分销订单当天数据开始--------------------------");
+            List<JSONObject> cookies = ruixuanService.getCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String date = DateUtils.getNowDate("yyyy-MM-dd");
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            Map<Long, Long> itemMap = ruixuanService.getItemMap();
+            Integer nowHour = DateUtils.getNowHour();
+            for (int i = 0; i < hourList.size(); i++) {
+                String hour = hourList.getString(i);
+                Integer integer = Integer.valueOf(hour.replace(":", "").replace(" ", ""));
+                if (integer <= nowHour) {
+                    for (int j = 0; j < minSecList.size(); j++) {
+                        JSONObject minSecJson = minSecList.getJSONObject(j);
+                        String startTime = minSecJson.getString("startTime");
+                        String endTime = minSecJson.getString("endTime");
+                        String start = date + hour + startTime;
+                        String end = date + hour + endTime;
+                        System.err.println("开始时间:" + start);
+                        System.err.println("结束时间:" + end);
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        Long orderCreateTimeStart = sdf.parse(start).getTime();
+                        Long orderCreateTimeEnd = sdf.parse(end).getTime();
+                        for (int p = 0; p < cookies.size(); p++) {
+                            JSONObject cookieJson = cookies.get(p);
+                            String cookie = cookieJson.getString("cookie");
+                            ruixuanService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 

+ 97 - 88
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/MgsOrderLIstGetJob.java

@@ -36,36 +36,40 @@ public class MgsOrderLIstGetJob {
      * 昨日快分销数据获取
      **/
     @XxlJob("mgsYesterdayOrderGet")
-    public void mgsYesterdayOrderGet() throws Exception {
-        List<JSONObject> cookies = mgsService.getMgsCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Map<Long, Long> itemMap = ruixuanService.getItemMap();
-        for (int i = 0; i < hourList.size(); i++) {
-            String hour = hourList.getString(i);
-            for (int j = 0; j < minSecList.size(); j++) {
-                JSONObject minSecJson = minSecList.getJSONObject(j);
-                String startTime = minSecJson.getString("startTime");
-                String endTime = minSecJson.getString("endTime");
-                String start = date + hour + startTime;
-                String end = date + hour + endTime;
-                System.err.println("开始时间:" + start);
-                System.err.println("结束时间:" + end);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Long orderCreateTimeStart = sdf.parse(start).getTime();
-                Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                for (int p = 0; p < cookies.size(); p++) {
-                    JSONObject cookieJson = cookies.get(p);
-                    String cookie = cookieJson.getString("cookie");
-                    mgsService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+    public void mgsYesterdayOrderGet() {
+        try {
+            List<JSONObject> cookies = mgsService.getMgsCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            Map<Long, Long> itemMap = ruixuanService.getItemMap();
+            for (int i = 0; i < hourList.size(); i++) {
+                String hour = hourList.getString(i);
+                for (int j = 0; j < minSecList.size(); j++) {
+                    JSONObject minSecJson = minSecList.getJSONObject(j);
+                    String startTime = minSecJson.getString("startTime");
+                    String endTime = minSecJson.getString("endTime");
+                    String start = date + hour + startTime;
+                    String end = date + hour + endTime;
+                    System.err.println("开始时间:" + start);
+                    System.err.println("结束时间:" + end);
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    Long orderCreateTimeStart = sdf.parse(start).getTime();
+                    Long orderCreateTimeEnd = sdf.parse(end).getTime();
+                    for (int p = 0; p < cookies.size(); p++) {
+                        JSONObject cookieJson = cookies.get(p);
+                        String cookie = cookieJson.getString("cookie");
+                        mgsService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                    }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -74,71 +78,30 @@ public class MgsOrderLIstGetJob {
      * 当前小时数据获取
      **/
     @XxlJob("mgsNowHourOrderGet")
-    public void mgsNowHourOrderGet() throws Exception {
-        List<JSONObject> cookies = mgsService.getMgsCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String date = DateUtils.getNowDate("yyyy-MM-dd");
-        Integer nowHour = DateUtils.getNowHour();
-        JSONArray hours = new JSONArray();
-        hours.add(nowHour);
-        if (nowHour >= 1) {
-            hours.add(nowHour - 1);
-        }
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Map<Long, Long> itemMap = ruixuanService.getItemMap();
-        for (int i = 0; i < hours.size(); i++) {
-            Integer hour = hours.getInteger(i);
-            for (int j = 0; j < minSecList.size(); j++) {
-                JSONObject minSecJson = minSecList.getJSONObject(j);
-                String startTime = minSecJson.getString("startTime");
-                String endTime = minSecJson.getString("endTime");
-                String start = date + " " + hour + ":" + startTime;
-                String end = date + " " + hour + ":" + endTime;
-                System.err.println("开始时间:" + start);
-                System.err.println("结束时间:" + end);
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Long orderCreateTimeStart = sdf.parse(start).getTime();
-                Long orderCreateTimeEnd = sdf.parse(end).getTime();
-                for (int p = 0; p < cookies.size(); p++) {
-                    JSONObject cookieJson = cookies.get(p);
-                    String cookie = cookieJson.getString("cookie");
-                    mgsService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
-                }
+    public void mgsNowHourOrderGet() {
+        try {
+            List<JSONObject> cookies = mgsService.getMgsCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
             }
-        }
-    }
-
-    /**
-     * 当天所有数据获取
-     **/
-    /**
-     * 当天数据获取
-     **/
-    @XxlJob("mgsFrontHourOrderGet")
-    public void mgsFrontHourOrderGet() throws Exception {
-        List<JSONObject> cookies = mgsService.getMgsCookie();
-        if (Check.isNull(cookies)) {
-            log.error("cookie数据为空");
-            return;
-        }
-        String date = DateUtils.getNowDate("yyyy-MM-dd");
-        JSONArray hourList = KuaishouHourEnum.getHourList();
-        JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Map<Long, Long> itemMap = ruixuanService.getItemMap();
-        Integer nowHour = DateUtils.getNowHour();
-        for (int i = 0; i < hourList.size(); i++) {
-            String hour = hourList.getString(i);
-            Integer integer = Integer.valueOf(hour.replace(":", "").replace(" ", ""));
-            if (integer <= nowHour) {
+            String date = DateUtils.getNowDate("yyyy-MM-dd");
+            Integer nowHour = DateUtils.getNowHour();
+            JSONArray hours = new JSONArray();
+            hours.add(nowHour);
+            if (nowHour >= 1) {
+                hours.add(nowHour - 1);
+            }
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            Map<Long, Long> itemMap = ruixuanService.getItemMap();
+            for (int i = 0; i < hours.size(); i++) {
+                Integer hour = hours.getInteger(i);
                 for (int j = 0; j < minSecList.size(); j++) {
                     JSONObject minSecJson = minSecList.getJSONObject(j);
                     String startTime = minSecJson.getString("startTime");
                     String endTime = minSecJson.getString("endTime");
-                    String start = date + hour + startTime;
-                    String end = date + hour + endTime;
+                    String start = date + " " + hour + ":" + startTime;
+                    String end = date + " " + hour + ":" + endTime;
                     System.err.println("开始时间:" + start);
                     System.err.println("结束时间:" + end);
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -151,6 +114,52 @@ public class MgsOrderLIstGetJob {
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 当天数据获取
+     **/
+    @XxlJob("mgsFrontHourOrderGet")
+    public void mgsFrontHourOrderGet() {
+        try {
+            List<JSONObject> cookies = mgsService.getMgsCookie();
+            if (Check.isNull(cookies)) {
+                log.error("cookie数据为空");
+                return;
+            }
+            String date = DateUtils.getNowDate("yyyy-MM-dd");
+            JSONArray hourList = KuaishouHourEnum.getHourList();
+            JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
+            Map<Long, Long> itemMap = ruixuanService.getItemMap();
+            Integer nowHour = DateUtils.getNowHour();
+            for (int i = 0; i < hourList.size(); i++) {
+                String hour = hourList.getString(i);
+                Integer integer = Integer.valueOf(hour.replace(":", "").replace(" ", ""));
+                if (integer <= nowHour) {
+                    for (int j = 0; j < minSecList.size(); j++) {
+                        JSONObject minSecJson = minSecList.getJSONObject(j);
+                        String startTime = minSecJson.getString("startTime");
+                        String endTime = minSecJson.getString("endTime");
+                        String start = date + hour + startTime;
+                        String end = date + hour + endTime;
+                        System.err.println("开始时间:" + start);
+                        System.err.println("结束时间:" + end);
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        Long orderCreateTimeStart = sdf.parse(start).getTime();
+                        Long orderCreateTimeEnd = sdf.parse(end).getTime();
+                        for (int p = 0; p < cookies.size(); p++) {
+                            JSONObject cookieJson = cookies.get(p);
+                            String cookie = cookieJson.getString("cookie");
+                            mgsService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 

+ 13 - 10
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/NewMonitorJob.java

@@ -1,7 +1,6 @@
 package cn.com.ctop.job.kuaishou.handler;
 
 import cn.com.ctop.job.kuaishou.service.AccountInfoService;
-import cn.com.ctop.job.kuaishou.service.TokenService;
 import cn.com.ctop.job.kuaishou.service.UserService;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
@@ -24,18 +23,22 @@ public class NewMonitorJob {
      * @author ZZY
      */
     @XxlJob("synchronousMonitor")
-    public void execute() throws Exception {
+    public void execute() {
         try {
-            List<Long> kuaiShouallAccountId = userService.getAccountIdsByMedia("2");
-            List<Long> touTiaoAccountId = userService.getAccountIdsByMedia("1");
-            for (Long aLong : kuaiShouallAccountId) {
-                accountInfoService.synchronousKuaiShouMonitor("0", aLong);
-            }
-            for (Long aLong : touTiaoAccountId) {
-                accountInfoService.synchronousTouTiaoMonitor("0", aLong);
+            try {
+                List<Long> kuaiShouallAccountId = userService.getAccountIdsByMedia("2");
+                List<Long> touTiaoAccountId = userService.getAccountIdsByMedia("1");
+                for (Long aLong : kuaiShouallAccountId) {
+                    accountInfoService.synchronousKuaiShouMonitor("0", aLong);
+                }
+                for (Long aLong : touTiaoAccountId) {
+                    accountInfoService.synchronousTouTiaoMonitor("0", aLong);
+                }
+            } catch (Exception e) {
+                log.info("清理完成完成");
             }
         } catch (Exception e) {
-            log.info("清理完成完成");
+            e.printStackTrace();
         }
     }
 }

+ 13 - 9
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/NewMonitorOneDayJob.java

@@ -23,18 +23,22 @@ public class NewMonitorOneDayJob {
      * @author ZZY
      */
     @XxlJob("synchronousMonitorOneDay")
-    public void execute() throws Exception {
+    public void execute() {
         try {
-            List<Long> kuaiShouallAccountId = userService.getAccountIdsByMedia("2");
-            List<Long> touTiaoAccountId = userService.getAccountIdsByMedia("1");
-            for (Long aLong : kuaiShouallAccountId) {
-                accountInfoService.synchronousKuaiShouMonitor("1", aLong);
-            }
-            for (Long aLong : touTiaoAccountId) {
-                accountInfoService.synchronousTouTiaoMonitor("1", aLong);
+            try {
+                List<Long> kuaiShouallAccountId = userService.getAccountIdsByMedia("2");
+                List<Long> touTiaoAccountId = userService.getAccountIdsByMedia("1");
+                for (Long aLong : kuaiShouallAccountId) {
+                    accountInfoService.synchronousKuaiShouMonitor("1", aLong);
+                }
+                for (Long aLong : touTiaoAccountId) {
+                    accountInfoService.synchronousTouTiaoMonitor("1", aLong);
+                }
+            } catch (Exception e) {
+                log.info("清理完成完成");
             }
         } catch (Exception e) {
-            log.info("清理完成完成");
+            e.printStackTrace();
         }
     }
 }

+ 12 - 9
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataAccountCleanJob.java

@@ -8,9 +8,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -27,15 +25,20 @@ public class RuleKuaiShouDataAccountCleanJob {
 
     /**
      * 快手规则引擎账户数据
+     *
      * @throws Exception
      */
     @XxlJob("ruleKuaiShouDataAccountCleanJob")
-    public void execute() throws Exception {
-        XxlJobHelper.log("规则预警账户维度数据开始清洗");
-        List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
-        tokens.forEach(token -> executorService.submit(()->{
-            commonService.deleteRuleAccountId(token.getAccountId());
-            commonService.cleanRuleDataAccount(token.getAccountId());
-        }));
+    public void execute() {
+        try {
+            XxlJobHelper.log("规则预警账户维度数据开始清洗");
+            List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
+            tokens.forEach(token -> executorService.submit(() -> {
+                commonService.deleteRuleAccountId(token.getAccountId());
+                commonService.cleanRuleDataAccount(token.getAccountId());
+            }));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 11 - 7
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataPlanCleanJob.java

@@ -28,12 +28,16 @@ public class RuleKuaiShouDataPlanCleanJob {
      * 快手规则引擎计划数据
      */
     @XxlJob("ruleKuaiShouDataPlanCleanJob")
-    public void execute() throws Exception {
-        XxlJobHelper.log("规则预警计划维度数据开始清洗");
-        List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
-        tokens.forEach(token -> executorService.submit(()->{
-            commonService.deleteRulePlan(token.getAccountId());
-            commonService.cleanRuleDataPlan(token.getAccountId(),1);
-        }));
+    public void execute() {
+        try {
+            XxlJobHelper.log("规则预警计划维度数据开始清洗");
+            List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
+            tokens.forEach(token -> executorService.submit(() -> {
+                commonService.deleteRulePlan(token.getAccountId());
+                commonService.cleanRuleDataPlan(token.getAccountId(), 1);
+            }));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 11 - 7
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataTargetCleanJob.java

@@ -26,13 +26,17 @@ public class RuleKuaiShouDataTargetCleanJob {
      * 快手规则引擎定向数据
      */
     @XxlJob("ruleKuaiShouDataTargetCleanJob")
-    public void execute() throws Exception {
-        XxlJobHelper.log("规则预警定向维度数据开始清洗");
-        List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
-        tokens.forEach(token -> executorService.submit(() -> {
-            commonService.deleteRuleTarge(token.getAccountId());
-            commonService.cleanRuleDataTarget(token.getAccountId(), token.getAccessToken(), 1);
-        }));
+    public void execute() {
+        try {
+            XxlJobHelper.log("规则预警定向维度数据开始清洗");
+            List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
+            tokens.forEach(token -> executorService.submit(() -> {
+                commonService.deleteRuleTarge(token.getAccountId());
+                commonService.cleanRuleDataTarget(token.getAccountId(), token.getAccessToken(), 1);
+            }));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 }

+ 11 - 7
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuleKuaiShouDataUnitCleanJob.java

@@ -29,13 +29,17 @@ public class RuleKuaiShouDataUnitCleanJob {
      * @throws Exception
      */
     @XxlJob("ruleKuaiShouDataUnitCleanJob")
-    public void execute() throws Exception {
-        XxlJobHelper.log("规则预警组维度数据开始清洗");
-        List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
-        tokens.forEach(token -> executorService.submit(() -> {
-            commonService.deleteRuleUnit(token.getAccountId());
-            commonService.cleanRuleDataUnit(token.getAccountId(), token.getAccessToken(), DateUtils.date2Str(), DateUtils.date2Str(), 1);
-        }));
+    public void execute() {
+        try {
+            XxlJobHelper.log("规则预警组维度数据开始清洗");
+            List<CtopOauthToken> tokens = tokenService.queryKsValidRuleAccountsToken();
+            tokens.forEach(token -> executorService.submit(() -> {
+                commonService.deleteRuleUnit(token.getAccountId());
+                commonService.cleanRuleDataUnit(token.getAccountId(), token.getAccessToken(), DateUtils.date2Str(), DateUtils.date2Str(), 1);
+            }));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 }

+ 53 - 42
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/SettlementJob.java

@@ -1,6 +1,5 @@
 package cn.com.ctop.job.kuaishou.handler;
 
-import cn.com.ctop.job.kuaishou.service.CommonService;
 import cn.com.ctop.job.kuaishou.service.RuixuanService;
 import cn.com.ctop.job.kuaishou.service.TokenService;
 import cn.com.ctop.job.kuaishou.utils.Check;
@@ -26,29 +25,33 @@ public class SettlementJob {
 
 
     @XxlJob("refreshCourierNumber")
-    public void refreshCourierNumber() throws Exception {
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -31);
-        List<JSONObject> list = ruixuanService.getSamplesData(startDate);
-        if (Check.isNull(list)) {
-            return;
-        }
-        for (JSONObject jsonObject : list) {
-            Long id = jsonObject.getLong("id");
-            String courierNumber = jsonObject.getString("courierNumber");
-            if (Check.isNull(courierNumber)) {
-                continue;
+    public void refreshCourierNumber() {
+        try {
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -31);
+            List<JSONObject> list = ruixuanService.getSamplesData(startDate);
+            if (Check.isNull(list)) {
+                return;
             }
-            String companyCode = jsonObject.getString("companyCode");
-            if (Check.isNull(companyCode)) {
-                continue;
+            for (JSONObject jsonObject : list) {
+                Long id = jsonObject.getLong("id");
+                String courierNumber = jsonObject.getString("courierNumber");
+                if (Check.isNull(courierNumber)) {
+                    continue;
+                }
+                String companyCode = jsonObject.getString("companyCode");
+                if (Check.isNull(companyCode)) {
+                    continue;
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", id);
+                map.put("courierNumber", courierNumber);
+                map.put("companyCode", companyCode);
+                HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/refreshCourierNumber", map, null);
+                Thread.sleep(1000L);
             }
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", id);
-            map.put("courierNumber", courierNumber);
-            map.put("companyCode", companyCode);
-            HttpUtils.httpGet("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/refreshCourierNumber", map, null);
-            Thread.sleep(1000L);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
     }
 
@@ -58,32 +61,40 @@ public class SettlementJob {
      */
     @XxlJob("cleanSettlementData")
     public void cleanSettlementData() {
-        String url = "http://ruixuan.api.tjyourong.com.cn/settlement/data";
-        String date = DateUtils.getLastDay(DateUtils.date2Str(), 1);
-        Long statDate = Long.valueOf(date.replace("-", ""));
-        List<JSONObject> list = ruixuanService.getDataList(statDate);
-        if (Check.isNull(list)) {
-            return;
-        }
-        List<List<JSONObject>> partition = Lists.partition(list, 1000);
-        for (int i = 0; i < partition.size(); i++) {
-            List<JSONObject> jsonObjects = partition.get(i);
-            Map<String, Object> param = new HashMap<>();
-            param.put("statDate", statDate);
-            param.put("data", jsonObjects);
-            HttpUtils.httpPostRequest(url, param, null);
+        try {
+            String url = "http://ruixuan.api.tjyourong.com.cn/settlement/data";
+            String date = DateUtils.getLastDay(DateUtils.date2Str(), 1);
+            Long statDate = Long.valueOf(date.replace("-", ""));
+            List<JSONObject> list = ruixuanService.getDataList(statDate);
+            if (Check.isNull(list)) {
+                return;
+            }
+            List<List<JSONObject>> partition = Lists.partition(list, 1000);
+            for (int i = 0; i < partition.size(); i++) {
+                List<JSONObject> jsonObjects = partition.get(i);
+                Map<String, Object> param = new HashMap<>();
+                param.put("statDate", statDate);
+                param.put("data", jsonObjects);
+                HttpUtils.httpPostRequest(url, param, null);
+            }
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
         }
     }
 
 
     @XxlJob("cleanPromoterBindChannel")
     public void cleanPromoterBindChannel() {
-        Long date = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
-        ruixuanService.deletePromoterBindChannelByDate(date);
-        ruixuanService.cleanKuaiShouPromoterBindChannel(date);
-        ruixuanService.cleanBytedancePromoterBindChannel(date);
-        ruixuanService.deleteMgsPromoterBindChannelByDate(date);
-        ruixuanService.cleanMgsKuaiShouPromoterBindChannel(date);
+        try {
+            Long date = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
+            ruixuanService.deletePromoterBindChannelByDate(date);
+            ruixuanService.cleanKuaiShouPromoterBindChannel(date);
+            ruixuanService.cleanBytedancePromoterBindChannel(date);
+            ruixuanService.deleteMgsPromoterBindChannelByDate(date);
+            ruixuanService.cleanMgsKuaiShouPromoterBindChannel(date);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
     }
 
 

+ 12 - 13
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/SyncMaterialUploadJob.java

@@ -35,16 +35,16 @@ public class SyncMaterialUploadJob {
      */
     @XxlJob("syncMaterialUpload")
     public void syncMaterialUpload() {
-        List<String> md5List = commonService.getMd5List();
-        if (Check.isNull(md5List)) {
-            log.error("没有待上传的素材");
-            return;
-        }
-        for (int i = 0; i < md5List.size(); i++) {
-            String signature = md5List.get(i);
-            Map<String, Object> requestMap = new HashMap<>();
-            requestMap.put("signature", signature);
-            try {
+        try {
+            List<String> md5List = commonService.getMd5List();
+            if (Check.isNull(md5List)) {
+                log.error("没有待上传的素材");
+                return;
+            }
+            for (int i = 0; i < md5List.size(); i++) {
+                String signature = md5List.get(i);
+                Map<String, Object> requestMap = new HashMap<>();
+                requestMap.put("signature", signature);
                 commonService.updateBySignature(signature);
                 String s = HttpUtils.httpGet(uploadUrl, requestMap, null);
                 if (!Check.isNull(s)) {
@@ -54,10 +54,9 @@ public class SyncMaterialUploadJob {
                         log.info("素材同步任务提交成功");
                     }
                 }
-            } catch (Exception e) {
-                log.error("请求同步素材服务失败,signature:{}", signature);
-                e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 

+ 11 - 12
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/SynchronousAccountTransactionJob.java

@@ -24,20 +24,19 @@ public class SynchronousAccountTransactionJob {
      * @author ZZY
      */
     @XxlJob("synchronousAccountTransaction")
-    public void execute() throws Exception {
-        SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar ca = Calendar.getInstance();//得到一个Calendar的实例
-        ca.setTime(new Date()); //设置时间为当前时间
-        ca.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
-        String date = sd.format(ca.getTime());
+    public void execute() {
         try {
+            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar ca = Calendar.getInstance();//得到一个Calendar的实例
+            ca.setTime(new Date()); //设置时间为当前时间
+            ca.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+            String date = sd.format(ca.getTime());
             commonService.synchronousAccount();
             commonService.synchronousAccountTransactionDay(date, date);
             commonService.synchronousAccountTransactionDetails(date, date);
         } catch (Exception e) {
             log.info("同步完成");
         }
-
     }
 
     /**
@@ -45,12 +44,12 @@ public class SynchronousAccountTransactionJob {
      * 获取前3天数据
      */
     @XxlJob("synchronousAccountTransactionNew")
-    public void synchronousAccountTransactionNew() throws Exception {
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-        String yesterda1 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
-        String yesterda2 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
-        String yesterda3 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -3);
+    public void synchronousAccountTransactionNew() {
         try {
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String yesterda1 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+            String yesterda2 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -2);
+            String yesterda3 = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -3);
 //            commonService.synchronousAccount();
             commonService.insertAccountTransactionDay(yesterda1, yesterda1);
             commonService.insertAccountTransactionDay(yesterda2, yesterda2);

+ 32 - 24
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/TrackWarningJob.java

@@ -26,18 +26,22 @@ public class TrackWarningJob {
      */
     @XxlJob("monitorCreative")
     public void monitorCreative() {
-        String url = "http://api.tjyourong.com.cn/jeecg-boot/monitor/trackMonitorLogs/monitorCreative";
-        System.err.println("请求地址为:" + url);
-        List<Long> idList = commonService.getAccountIds();
-        if (Check.isNull(idList)) {
-            XxlJobHelper.log("自定义创意监测链接预警");
-            return;
-        }
-        for (int i = 0; i < idList.size(); i++) {
-            Long id = idList.get(i);
-            Map<String, Object> requestMap = new HashMap<>();
-            requestMap.put("accountId", id);
-            HttpUtils.httpGet(url, requestMap, null);
+        try {
+            String url = "http://api.tjyourong.com.cn/jeecg-boot/monitor/trackMonitorLogs/monitorCreative";
+            System.err.println("请求地址为:" + url);
+            List<Long> idList = commonService.getAccountIds();
+            if (Check.isNull(idList)) {
+                XxlJobHelper.log("自定义创意监测链接预警");
+                return;
+            }
+            for (int i = 0; i < idList.size(); i++) {
+                Long id = idList.get(i);
+                Map<String, Object> requestMap = new HashMap<>();
+                requestMap.put("accountId", id);
+                HttpUtils.httpGet(url, requestMap, null);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -46,18 +50,22 @@ public class TrackWarningJob {
      */
     @XxlJob("monitorProgramCreative")
     public void monitorProgramCreative() {
-        String url = "http://api.tjyourong.com.cn/jeecg-boot/monitor/trackMonitorLogs/monitorProgramCreative";
-        System.err.println("请求地址为:" + url);
-        List<Long> idList = commonService.getAccountIds();
-        if (Check.isNull(idList)) {
-            XxlJobHelper.log("自定义创意监测链接预警");
-            return;
-        }
-        for (int i = 0; i < idList.size(); i++) {
-            Long id = idList.get(i);
-            Map<String, Object> requestMap = new HashMap<>();
-            requestMap.put("accountId", id);
-            HttpUtils.httpGet(url, requestMap, null);
+        try {
+            String url = "http://api.tjyourong.com.cn/jeecg-boot/monitor/trackMonitorLogs/monitorProgramCreative";
+//            System.out.println("请求地址为:" + url);
+            List<Long> idList = commonService.getAccountIds();
+            if (Check.isNull(idList)) {
+                XxlJobHelper.log("自定义创意监测链接预警");
+                return;
+            }
+            for (int i = 0; i < idList.size(); i++) {
+                Long id = idList.get(i);
+                Map<String, Object> requestMap = new HashMap<>();
+                requestMap.put("accountId", id);
+                HttpUtils.httpGet(url, requestMap, null);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }