yumeng 10 miesięcy temu
rodzic
commit
83c9fe0762

+ 31 - 29
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -169,46 +169,48 @@ public class TestController {
     @Autowired
     private IKuaishouSupplyChainService ikuaishouSupplyChainService;
 
+    @Autowired
+    private YufuSupplyChainService yufuSupplyChainService;
+
 
     @GetMapping(value = "/getData")
     public void getDate() throws Exception {
 
-        log.info("-------------------------获取快分销订单当天当小时数据开始--------------------------");
-        List<JSONObject> cookies = ikuaishouSupplyChainService.getCookie();
+        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+        String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -4);
+        String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
+        List<String> days = DateUtils.getDays(startDate, endDate);
+
+        List<JSONObject> cookies = yufuSupplyChainService.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 hourList = KuaishouHourEnum.getHourList();
         JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
-        Map<Long, Long> itemMap = activityItemListService.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");
-                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+        Map<Long, Long> itemMap = activityItemListService.getYufuItemList();
+        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;
+                    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");
+                        yufuSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
+
+                    }
                 }
             }
+
         }
     }
 

+ 0 - 10
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouOrderLIstGetJob.java

@@ -133,16 +133,6 @@ public class KuaishouOrderLIstGetJob {
                         JSONObject cookieJson = cookies.get(p);
                         String cookie = cookieJson.getString("cookie");
                         ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
-                        fxService.submit(new Runnable() {
-                            @Override
-                            public void run() {
-                                try {
-                                    ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd, itemMap);
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        });
 
 
                     }

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/YufuSupplyChainMapper.java

@@ -29,5 +29,5 @@ public interface YufuSupplyChainMapper extends BaseMapper<KuaishouSupplyChain> {
 
     void replaceRocketSupplyChains(@Param(value = "adds") List<KuaishouSupplyChain> rocketSupplyChains);
 
-    void replaceYufuSupplyChains(List<KuaishouSupplyChain> yufuSupplyChains);
+    void replaceYufuSupplyChains(@Param(value = "adds") List<KuaishouSupplyChain> yufuSupplyChains);
 }

+ 6 - 6
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/YufuSupplyChainServiceImpl.java

@@ -52,7 +52,7 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
     @Override
     public void getOrderList(String cookie, Integer offset, Long orderCreateTimeStart, Long orderCreateTimeEnd, Map<Long, Long> itemMap) throws Exception {
         Thread.sleep(1000);
-        log.info("rocket团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
+        log.info("yufu团长抓取订单数据入参,开始时间:{},结束时间:{},数据:{}", DateUtils.tempToLongDateStr(orderCreateTimeStart), DateUtils.tempToLongDateStr(orderCreateTimeEnd), offset);
         Map<String, Object> params = new HashMap<>();
         if (!Check.isNull(orderCreateTimeStart)) {
             params.put("orderCreateTimeStart", orderCreateTimeStart);
@@ -76,21 +76,21 @@ public class YufuSupplyChainServiceImpl extends ServiceImpl<YufuSupplyChainMappe
         }
         Integer code = result.getInteger("result");
         if (code != 1) {
-            log.info("rocket快分销数据返回异常:", resultStr);
-            sendMessageService.sendMessage("113dee46c7df464da78c07a985e92cd1", "rocketcookie失效,请及时更新。媒体返回信息:" + resultStr);
+            log.info("yufu快分销数据返回异常:", resultStr);
+            sendMessageService.sendMessage("113dee46c7df464da78c07a985e92cd1", "yufucookie失效,请及时更新。媒体返回信息:" + resultStr);
             return;
         }
         JSONObject dataJson = result.getJSONObject("data");
         if (Check.isNull(dataJson)) {
-            log.error("rocket数据返回为data数据为空");
+            log.error("yufu数据返回为data数据为空");
             return;
         }
         JSONArray list = dataJson.getJSONArray("list");
         if (Check.isNull(list)) {
-            log.error("rocket数据返回为list数据为空");
+            log.error("yufu数据返回为list数据为空");
             return;
         }
-        log.info("rocket当前数据条数:{}", list.size());
+        log.info("yufu当前数据条数:{}", list.size());
         List<KuaishouSupplyChain> ruixuanSupplyChains = new ArrayList<>();
         List<KuaishouSupplyChain> mgsSupplyChains = new ArrayList<>();
         List<KuaishouSupplyChain> rocketSupplyChains = new ArrayList<>();