update...

panzh
1 parent aff94c8c
Showing 7 changed files with 81 additions and 34 deletions
src/main/java/com/bsth/data/charts_data/AccuracyDataHandler.java
src/main/java/com/bsth/data/geo/GeoCacheData.java
src/main/java/com/bsth/data/gps/process/chains/ForecastProcess.java
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
src/main/resources/static/index.html
src/main/resources/static/pages/charts_data/accuracy.html
src/main/resources/static/pages/m/m.html
@@ -9,7 +9,8 @@ import com.bsth.entity.GpsEntity;
 import com.bsth.entity.StationRoute;
 import com.bsth.util.IpUtils;
 import com.bsth.util.db_utils.DBUtils_InfoPublish;
-import com.google.common.collect.*;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -22,11 +23,10 @@ import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletRequest;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
  
 /**
@@ -35,11 +35,12 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class AccuracyDataHandler {
  
-    private static ListMultimap<String, Accuracy> multimap;
+    private static ConcurrentMap<String, Accuracy> map;
  
     private static ConcurrentLinkedQueue<Accuracy> pstQueue;
  
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyyMMdd");
+    private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyyMMddHHmm");
  
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
@@ -47,7 +48,7 @@ public class AccuracyDataHandler {
     AccuracyPstThread accuracyPstThread;
  
     static {
-        multimap = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
+        map = new ConcurrentHashMap<>();
         pstQueue = new ConcurrentLinkedQueue();
     }
  
@@ -77,6 +78,13 @@ public class AccuracyDataHandler {
  
         GpsEntity gps = near.getGps();
  
+        long t = System.currentTimeMillis();
+        String timeStr = fmtyyyyMMddHHmm.print(t);
+        String key = gps.getNbbm() + "_" + station + "_" + timeStr;
+
+        if (map.containsKey(key))
+            return;
+
         Accuracy accuracy = new Accuracy();
         accuracy.setRq(Integer.parseInt(fmtyyyyMMdd.print(gps.getTimestamp())));
         //request info
@@ -95,7 +103,7 @@ public class AccuracyDataHandler {
         accuracy.setDistance(Double.parseDouble(near.getDistance()));
         accuracy.setSeconds(near.getTime());
  
-        multimap.put(gps.getNbbm() + "_" + station, accuracy);
+        map.put(key, accuracy);
     }
  
     /**
@@ -107,21 +115,22 @@ public class AccuracyDataHandler {
         if (gps.getInOut() != 1)
             return;
  
-        String k = gps.getNbbm() + "_" + gps.getStationCode();
-        List<Accuracy> list = multimap.get(k);
+        String p = gps.getNbbm() + "_" + gps.getStationCode() + "_";
  
-        if (null == list || list.size() == 0)
-            return;
+        Set<String> ks = map.keySet();
  
-        for (Accuracy a : list) {
-            a.setT2(gps.getServerTimestamp());
-            a.setRealSeconds((int) ((a.getT2() - a.getT1()) / 1000));
-            a.setD2(gps.getInStationDistance());
+        for (String k : ks) {
+            if (k.startsWith(p)) {
+                Accuracy a = map.get(k);
+                a.setT2(gps.getServerTimestamp());
+                a.setRealSeconds((int) ((a.getT2() - a.getT1()) / 1000));
+                a.setD2(gps.getInStationDistance());
  
-            pstQueue.add(a);
-        }
+                pstQueue.add(a);
  
-        multimap.removeAll(k);
+                map.remove(k);
+            }
+        }
     }
  
     private static String getHeaders(HttpServletRequest request) {
@@ -149,6 +149,8 @@ public class GeoCacheData {
     }
  
     public static StationRoute findByCode(GpsEntity gps) {
+        if(null == gps.getStationCode())
+            return null;
         return codeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStationCode());
     }
  
@@ -16,7 +16,7 @@ import java.util.List;
 @Component
 public class ForecastProcess {
  
-    private final static int OFFLINE_TIME = 1000 * 60 * 3;
+    private final static int OFFLINE_TIME = 1000 * 30;
     private final static int OUT_BOUNDS = 80;
  
     public void process(GpsEntity gps) {
@@ -32,19 +32,49 @@ public class ForecastProcess {
             double avgSpeed = sumDist / seconds;//均速
             gps.setSeconds((int) (gps.getDistance() / avgSpeed) + 30);//到下一站的时间（30 秒 尝试稀疏一下红绿灯）
         } else {
+            jiMinusSj(gps);
+        }
+    }
+
+    /**
+     * 用计划时间 - 当前实际已行驶时间
+     *
+     * @param gps
+     */
+    private void jiMinusSj(GpsEntity gps) {
+        GpsEntity pi = HistoryConsumeTimeDataHandler.prevIn(gps.getDeviceId());
+        if (pi != null && pi.getStationCode().equals(gps.getStationCode())) {
+            Integer time = HistoryConsumeTimeDataHandler.findConsume(gps);
+
+            if (null != time)
+                gps.setSeconds((int) (time - ((gps.getTimestamp() - pi.getTimestamp()) / 1000)));
  
-            //用行驶距离 的比例 取计划时间
-            StationRoute s = GeoCacheData.findByCode(gps);
-            if (null != s && null != gps.getDistance()) {
-                double scale = gps.getDistance() / s.getLength();
-                Integer time = HistoryConsumeTimeDataHandler.findConsume(gps);
+            if (gps.getSeconds() < 0) {
  
-                if (null != time)
-                    gps.setSeconds((int) (time * scale));
+                if (null != gps.getDistance() && gps.getDistance() < 150)
+                    gps.setSeconds(0);
+
+                byDistanceScale(gps);
             }
         }
     }
  
+    /**
+     * 用行驶距离 的比例 取计划时间
+     *
+     * @param gps
+     */
+    private void byDistanceScale(GpsEntity gps) {
+        StationRoute s = GeoCacheData.findByCode(gps);
+        if (null != s && null != gps.getDistance()) {
+            double scale = gps.getDistance() / s.getLength();
+            Integer time = HistoryConsumeTimeDataHandler.findConsume(gps);
+
+            if (null != time)
+                gps.setSeconds((int) (time * scale));
+        }
+    }
+
     private boolean isValidSignal(List<GpsEntity> list) {
         if (list.size() <= 1)
             return false;
@@ -102,6 +102,10 @@ public class HistoryConsumeTimeDataHandler {
         return rs;
     }
  
+    public static GpsEntity prevIn(String device){
+        return lastInStationMap.get(device);
+    }
+
     private static Integer forecastEnd(GpsEntity gps, int peakVal, String eCode) {
         int sum = 0;
         Integer[] ns = findConsumeArray(gps, peakVal, eCode);
@@ -190,7 +190,8 @@
  
  
     var flatpickrDateConfig = {
-        "locale": "zh"
+        "locale": "zh",
+        defaultDate: new Date()
     };
  
     var flatpickrTimeConfig = {
@@ -70,8 +70,7 @@
                         <div class="col-md-2">
                             <div class="form-group">
                                 <label class="bmd-label-floating">日期</label>
-                                <input type="text" name="rq" required class="form-control flatpickr_date"
-                                       value="2018-07-02">
+                                <input type="text" name="rq" required class="form-control flatpickr_date">
                             </div>
                         </div>
                         <div class="col-md-2">
@@ -91,7 +90,7 @@
                         <div class="col-md-2" style="padding-left: 0">
                             <div class="form-group">
                                 <label class="bmd-label-floating">至</label>
-                                <input type="time" name="et" required class="form-control flatpickr_time" value="23:00">
+                                <input type="time" name="et" required class="form-control flatpickr_time" value="09:30">
                             </div>
                         </div>
                         <div class="col-md-2">
@@ -69,6 +69,7 @@
             font-size: 20px;
             top: 2px;
             color: #6565ff;
+            cursor: pointer;
         }
  
         .top_form .form-group > label,
@@ -190,11 +191,12 @@
         }
  
         rect.station_text_rect{
-            width: 250px;
+            width: 100%;
             height: 30px;
-            transform: translate(-9px, -11px);
+            transform: translate(-9px, -18px);
             fill: #fff0;
             opacity: 0;
+            cursor: pointer;
         }
     </style>
 </head>
@@ -372,7 +374,7 @@
         var line = d3.svg.line().x(cx).y(yScale);
  
         $('svg', wrap).empty();
-        var svg = d3.select('svg', wrap).style('height', h);
+        var svg = d3.select('svg', wrap).style('height', h).style('width', '100%');
         //add item g
         var items = svg.selectAll('g.item').data(data)
             .enter().append('g').classed({