update...

panzh
1 parent 8186365c
Showing 2 changed files with 20 additions and 8 deletions
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
src/main/java/com/bsth/data/history/entity/StationConsumeTime.java
@@ -119,11 +119,13 @@ public class HistoryConsumeTimeDataHandler {
         long timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 60) - System.currentTimeMillis();
         if (timeDiff < 0)
             timeDiff += (1000 * 60 * 60 * 24);
+
         //从数据库加载上周的数据，做当天的预测用
+        logger.info(timeDiff / 1000 / 60 + "分钟之后加载历史数据");
         Application.mainServices.scheduleAtFixedRate(consumeTimeLoadThread
-                , timeDiff, 60 * 60 * 24, TimeUnit.SECONDS);
+                , timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  
-        if (timeDiff > 1000 * 60 * 30)
+        if (timeDiff > 1000 * 60 * 10)
             consumeTimeLoadThread.run();
     }
  
@@ -236,12 +238,12 @@ public class HistoryConsumeTimeDataHandler {
                  */
                 Collection<Line> ls = BasicCacheData.code2LineMap.values();
                 for (Line line : ls) {
-                    multimap.putAll(line.getLineCode() + "_0_0", new ArrayList<>());
-                    multimap.putAll(line.getLineCode() + "_0_1", new ArrayList<>());
-                    multimap.putAll(line.getLineCode() + "_0_2", new ArrayList<>());
-                    multimap.putAll(line.getLineCode() + "_1_0", new ArrayList<>());
-                    multimap.putAll(line.getLineCode() + "_1_1", new ArrayList<>());
-                    multimap.putAll(line.getLineCode() + "_1_2", new ArrayList<>());
+                    multimap.put(line.getLineCode() + "_0_0", StationConsumeTime.getPlaceholder(line.getLineCode(), 0));
+                    multimap.put(line.getLineCode() + "_0_1", StationConsumeTime.getPlaceholder(line.getLineCode(), 0));
+                    multimap.put(line.getLineCode() + "_0_2", StationConsumeTime.getPlaceholder(line.getLineCode(), 0));
+                    multimap.put(line.getLineCode() + "_1_0", StationConsumeTime.getPlaceholder(line.getLineCode(), 1));
+                    multimap.put(line.getLineCode() + "_1_1", StationConsumeTime.getPlaceholder(line.getLineCode(), 1));
+                    multimap.put(line.getLineCode() + "_1_2", StationConsumeTime.getPlaceholder(line.getLineCode(), 1));
                 }
  
                 //按线路、走向、早晚高峰分组
@@ -292,6 +294,8 @@ public class HistoryConsumeTimeDataHandler {
             //按 key 分组数据
             ArrayListMultimap<String, StationConsumeTime> multimap = ArrayListMultimap.create();
             for (StationConsumeTime sct : list) {
+                if (sct.getRq() == 0)
+                    continue;
                 multimap.put(sct.getKey1(), sct);
             }
  
@@ -88,6 +88,14 @@ public class StationConsumeTime {
         return sct;
     }
  
+    public static StationConsumeTime getPlaceholder(String lineCode, int upDown) {
+        StationConsumeTime sct = new StationConsumeTime();
+        sct.setRq(0);
+        sct.setLineCode(lineCode);
+        sct.setUpDown(upDown);
+        return sct;
+    }
+
     public String getLineCode() {
         return lineCode;
     }