From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 13 三月 2019 12:02:16 +0800 Subject: [PATCH] 正式数据库修改 --- fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java | 66 +++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 16 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java index ffe5d56..f676450 100644 --- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java +++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java @@ -1,5 +1,8 @@ package com.yeshi.fanli.job; +import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -18,7 +21,7 @@ import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; -import com.yeshi.fanli.util.taobao.TaoKeApiUtil; +import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil; /** * 娣樺疂娓犻亾璁㈠崟鏇存柊 @@ -35,18 +38,26 @@ @Resource private RedisManager redisManager; - private void updateRelationOrder(long startTime) { - String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss"); - List<TaoBaoOrder> orderList = TaoKeApiUtil.getTaoBaoRelationOrder(startTimeStr, Constant.TAOBAO_AUTH_APPKEY, - Constant.TAOBAO_AUTH_APPSECRET); - addRelationAndSpecialOrder(orderList); - } - - private void updateSpecialOrder(long startTime) { - String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss"); - List<TaoBaoOrder> orderList = TaoKeApiUtil.getTaoBaoSpecialOrder(startTimeStr, Constant.TAOBAO_AUTH_APPKEY, - Constant.TAOBAO_AUTH_APPSECRET); - addRelationAndSpecialOrder(orderList); + /** + * 鏇存柊娓犻亾璁㈠崟 + * + * @param fromPage + * 寮�濮嬮〉鐮� + * @param toPage + * 缁撴潫椤电爜锛堟瘡椤�100鏉℃暟鎹級 + */ + private void updateRelationAndSpecialOrder(long startTime, long endTime) { + List<TaoBaoOrder> list = TaoKeOrderApiUtil.getSpecialOrder(startTime, endTime); + List<TaoBaoOrder> list1 = TaoKeOrderApiUtil.getThirdSpecialOrder(startTime, endTime); + List<TaoBaoOrder> list2 = TaoKeOrderApiUtil.getRelationOrder(startTime, endTime); + List<TaoBaoOrder> list3 = TaoKeOrderApiUtil.getThirdRelationOrder(startTime, endTime); + if (list1 != null && list1.size() > 0) + list.addAll(list1); + if (list2 != null && list2.size() > 0) + list.addAll(list2); + if (list3 != null && list3.size() > 0) + list.addAll(list3); + addRelationAndSpecialOrder(list); } private void addRelationAndSpecialOrder(List<TaoBaoOrder> orderList) { @@ -102,9 +113,32 @@ public void doJob1() { if (!Constant.IS_TASK) return; - long currentTime = System.currentTimeMillis(); - updateRelationOrder(currentTime); - updateSpecialOrder(currentTime); + // 鐖彇杩�20鍒嗛挓鐨勬暟鎹� + long endTime = System.currentTimeMillis(); + updateRelationAndSpecialOrder(endTime - 1000 * 60 * 20L, endTime); + } + + // 姣�5鍒嗛挓鏇存柊锛堣繎1澶╂暟鎹級 + @Scheduled(cron = "0 0/5 * * * ? ") + public void doJob2() { + if (!Constant.IS_TASK) + return; + long endTime = System.currentTimeMillis(); + updateRelationAndSpecialOrder(endTime - 1000 * 60 * 60 * 24L, endTime); + } + + // 姣忎釜灏忔椂鏇存柊 + @Scheduled(cron = "0 0 0/1 * * ? ") + public void doJob3() { + if (!Constant.IS_TASK) + return; +// Calendar calendar = Calendar.getInstance(); +// int h = calendar.get(Calendar.HOUR_OF_DAY); +// // 姣忎釜灏忔椂鏇存柊100椤垫暟鎹� +// int fromPage = h * 100; +// if (fromPage <= 0) +// fromPage = 11; +// int toPage = h * 100 + 100; } } -- Gitblit v1.8.0