From 2aa4dc51f09d2591ef62efc1596d583a52a8d712 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 09 三月 2019 16:29:02 +0800
Subject: [PATCH] 订单爬取规则再次修改
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
index 495afa7..cfe149d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -105,9 +105,10 @@
}
return orderList;
}
-
+
/**
* 鑾峰彇绗笁鏂规櫘閫氳鍗�
+ *
* @param startTime
* @param span
* @return
@@ -129,13 +130,14 @@
/**
* 鑾峰彇鏌愪釜鍖洪棿娈电殑璁㈠崟
+ *
* @param startTime
* @param endTime
* @return
*/
public static List<TaoBaoOrder> getCommonOrder(long startTime, long endTime) {
List<TaoBaoOrder> orderList = new ArrayList<>();
- long span =(endTime - startTime)%1000==0? (endTime - startTime)/1000:(endTime - startTime)/1000+1;
+ long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
int count = (int) (span / 1200);
if (span % 1200 != 0)
count++;
@@ -153,17 +155,17 @@
}
return orderList;
}
-
-
+
/**
* 鐖彇涓夋柟璁㈠崟
+ *
* @param startTime
* @param endTime
* @return
*/
public static List<TaoBaoOrder> getThirdCommonOrder(long startTime, long endTime) {
List<TaoBaoOrder> orderList = new ArrayList<>();
- long span =(endTime - startTime)%1000==0? (endTime - startTime)/1000:(endTime - startTime)/1000+1;
+ long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
int count = (int) (span / 1200);
if (span % 1200 != 0)
count++;
@@ -200,36 +202,38 @@
}
public void updateOrder(long startTime, long endTime) {
-// 鑰佺増鏈鐞嗘柟寮�
- List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
- List<TaoBaoOrder> orderList = new ArrayList<>();
- try {
- orderList = TaoBaoOrderUtil.getOrderList(startTime, endTime, configList.get(0));
- } catch (TaoBaoOrderException e2) {
- try {
- LogHelper.errorDetailInfo(e2);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- List<TaoBaoOrder> thirdOrderList = new ArrayList<>();
- try {
- thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(startTime, endTime, configList.get(0));
- } catch (TaoBaoOrderException e2) {
- try {
- LogHelper.errorDetailInfo(e2);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- if (thirdOrderList != null && thirdOrderList.size() > 0)
- orderList.addAll(thirdOrderList);
-//鏂扮増鏈鐞嗘柟寮�
-// List<TaoBaoOrder> orderList= getCommonOrder(startTime, endTime);
-// List<TaoBaoOrder> tempOrderList2=getThirdCommonOrder(startTime, endTime);
-// if(tempOrderList2!=null&&tempOrderList2.size()>0)
-// orderList.addAll(tempOrderList2);
-
+ // 鑰佺増鏈鐞嗘柟寮�
+ // List<TaoBaoUnionConfig> configList =
+ // taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
+ // List<TaoBaoOrder> orderList = new ArrayList<>();
+ // try {
+ // orderList = TaoBaoOrderUtil.getOrderList(startTime, endTime,
+ // configList.get(0));
+ // } catch (TaoBaoOrderException e2) {
+ // try {
+ // LogHelper.errorDetailInfo(e2);
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // }
+ // }
+ // List<TaoBaoOrder> thirdOrderList = new ArrayList<>();
+ // try {
+ // thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(startTime,
+ // endTime, configList.get(0));
+ // } catch (TaoBaoOrderException e2) {
+ // try {
+ // LogHelper.errorDetailInfo(e2);
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // }
+ // }
+ // if (thirdOrderList != null && thirdOrderList.size() > 0)
+ // orderList.addAll(thirdOrderList);
+ // 鏂扮増鏈鐞嗘柟寮�
+ List<TaoBaoOrder> orderList = getCommonOrder(startTime, endTime);
+ List<TaoBaoOrder> tempOrderList2 = getThirdCommonOrder(startTime, endTime);
+ if (tempOrderList2 != null && tempOrderList2.size() > 0)
+ orderList.addAll(tempOrderList2);
LogHelper.orderInfo("姝ｅ湪鎵ц璁㈠崟鐖彇缁撴潫锛屽叡鏈夎鍗�:" + orderList.size());
addOrder(orderList);
@@ -348,10 +352,10 @@
}
// 姣�15鍒嗛挓鐖彇涓�娆�
-// @Scheduled(cron = "0 0/15 * * * ? ")
+ // @Scheduled(cron = "0 0/15 * * * ? ")
public void doJob1() {
-// if (!Constant.IS_TASK)
-// return;
+ // if (!Constant.IS_TASK)
+ // return;
long currentTime = System.currentTimeMillis();
String h = TimeUtil.getGernalTime(currentTime, "HH");
String m = TimeUtil.getGernalTime(currentTime, "mm");
@@ -371,8 +375,8 @@
public void doJob6() {
if (!Constant.IS_TASK)
return;
- long endTime=System.currentTimeMillis();
- updateOrder(endTime-1000*60*20L, endTime);
+ long endTime = System.currentTimeMillis();
+ updateOrder(endTime - 1000 * 60 * 20L, endTime);
}
// 杩斿埄
--
Gitblit v1.8.0