update...

panzh
1 parent 4fbcce8d
Showing 11 changed files with 84 additions and 39 deletions
src/main/java/com/bsth/controller/XmlInfoPublishController.java
src/main/java/com/bsth/data/gps/GpsCacheData.java
src/main/java/com/bsth/data/gps/process/DataMainProcessor.java
src/main/java/com/bsth/data/gps/process/chains/ForecastProcess.java
src/main/java/com/bsth/data/gps/process/chains/InOutStationProcess.java
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
src/main/java/com/bsth/entity/GpsEntity.java
src/main/resources/static/pages/h_consume/list.html
src/main/resources/static/pages/real/js/map.js
src/main/resources/static/pages/real/js/svg.js
src/main/resources/static/pages/real/main.html
@@ -135,7 +135,7 @@ public class XmlInfoPublishController {
         StringBuilder sb = new StringBuilder();
  
         try {
-
+            long ct = System.currentTimeMillis();
             int upDown = Integer.parseInt(direction);
             List<GpsEntity> list = GpsCacheData.findList(lineid, upDown);
  
@@ -152,6 +152,11 @@ public class XmlInfoPublishController {
  
             int serialNo = es.getSerialNo();
             for (GpsEntity gps : list) {
+                if (ct - gps.getTimestamp() > 1000 * 60 * 10)
+                    continue;//掉线超过10分钟，不发布
+
+                //短时间掉线，平滑过渡
+                gps.smoothTransition(ct);
  
                 s = GeoCacheData.findByCode(gps);
                 if (null == s || s.getSerialNo() > serialNo)
@@ -206,8 +211,10 @@ public class XmlInfoPublishController {
                 sb.append("<car>");
                 sb.append("<terminal>" + BasicCacheData.device2plateMap.get(v.getDeviceId()) + "</terminal>");
  
+                //当前站 缓冲区内 的车（进站时间不超过 40秒的，可以发布）
                 if (v.getStationCode().equals(stopid)
-                        && v.getInOut() == 1) {//当前站 缓冲区内 的车
+                        && v.getInOut() == 1
+                        && (null != v.getInStationTime() && ct - v.getInStationTime() < 40)) {
                     sb.append("<stopdis>0</stopdis>");
                     sb.append("<distance>0</distance>");
                     sb.append("<time>0</time>");
@@ -111,9 +111,15 @@ public class GpsCacheData {
     public static Map<String, Object> find(String lineCode, int upDown) {
         List<String> ds = lineRealMap.get(lineCode + "_" + upDown);
  
+        long t = System.currentTimeMillis();
         List<GpsEntity> list = new ArrayList<>(ds.size());
+        GpsEntity gps;
         for (String d : ds) {
-            list.add(findOne(d));
+            gps = findOne(d);
+            if(gps.getNbbm().equals("W1F-052"))
+                System.out.println("aaaa");
+            gps.smoothTransition(t);
+            list.add(gps);
         }
  
         Map<String, Object> rs = new HashMap<>();
@@ -105,6 +105,8 @@ public class DataMainProcessor {
  
                 for (GpsEntity gps : list) {
                     gps.setNbbm(BasicCacheData.device2nbbmMap.get(gps.getDeviceId()));
+                    if (null == gps.getNbbm())
+                        continue;
                     data.put(gps.getDeviceId(), gps);
                 }
  
@@ -20,7 +20,7 @@ public class ForecastProcess {
     private final static int OUT_BOUNDS = 80;
  
     public void process(GpsEntity gps) {
-        //获取10分钟内的点位，如果不够，5分钟也行
+        //获取6分钟内的点位，如果不够，4分钟也行
         List<GpsEntity> list = GpsCacheData.prev(gps.getDeviceId(), 60 * 10, 60 * 5);
         list.add(gps);
  
@@ -28,7 +28,7 @@ public class ForecastProcess {
         if (isValidSignal(list)) {
             GpsEntity first = list.get(0);
             double sumDist = GeoUtils.getDistance(first, gps);//行驶距离
-            double seconds = (gps.getTimestamp() - first.getTimestamp()) / 1000;//耗时
+            double seconds = (gps.getTimestamp() - first.getTimestamp()) / 1000 - 30;//耗时
             double avgSpeed = sumDist / seconds;//均速
             gps.setSeconds((int) (gps.getDistance() / avgSpeed));//到下一站的时间
         } else {
@@ -45,22 +45,6 @@ public class ForecastProcess {
         }
     }
  
-/*    private Integer[] getJHTimeArray(GpsEntity gps) {
-        List<StationRoute> srs = GeoCacheData.find(gps.getLineId(), gps.getUpDown());
-        String sCode = gps.getStationCode()
-                , eCode = srs.get(srs.size() - 1).getStationCode();
-
-        ScheduleRealInfo sch = gps.getSch();
-        if (null != sch
-                && null != sch.getQdzCode()
-                && null != sch.getZdzCode()) {
-
-            eCode = sch.getZdzCode();
-        }
-
-        return HistoryConsumeTimeDataHandler.findConsumeArray(gps.getLineId(), gps.getUpDown(), sCode, eCode);
-    }*/
-
     private boolean isValidSignal(List<GpsEntity> list) {
         if (list.size() <= 1)
             return false;
@@ -80,9 +80,12 @@ public class InOutStationProcess {
             inStation(gps, prev);
  
         //进站2 从站内到另一个站内
-        if (prev.getInOut() == 1 && gps.getInOut() == 1
-                && !prev.getStationCode().equals(gps.getStationCode()))
-            inStation(gps, prev);
+        if (prev.getInOut() == 1 && gps.getInOut() == 1) {
+            if (!prev.getStationCode().equals(gps.getStationCode()))
+                inStation(gps, prev);
+            else
+                gps.setInStationTime(prev.getInStationTime());
+        }
  
         //进站3 从场内到站内
         if (prev.getInOut() == 2 && gps.getInOut() == 1)
@@ -167,6 +170,7 @@ public class InOutStationProcess {
         if (null == s)
             return;
  
+        gps.setInStationTime(gps.getTimestamp());//进站时间
         //存一份站点间耗时数据
         historyConsumeTimeData.in(gps, prev);
  
@@ -56,6 +56,12 @@ public class HistoryConsumeTimeDataHandler {
     private final static int EVENIGN_PEAK_E = 190000;
  
  
+    //稀疏进站距离时，给的默认速度
+    private final static int IN_STATION_SPEED = 15;
+
+    //按实时路段距离换算时间时，给的默认速度
+    private final static int DEFAULT_SPEED = 18;
+
     /**
      * K : lineCode_upDown
      */
@@ -106,7 +112,7 @@ public class HistoryConsumeTimeDataHandler {
             sum += ns[i];
         }
  
-        return sum + gps.getSeconds();
+        return sum + (null == gps.getSeconds2() ? gps.getSeconds() : gps.getSeconds2());
     }
  
     public void start() {
@@ -223,7 +229,7 @@ public class HistoryConsumeTimeDataHandler {
                 dt.minusDays(7);//减7天
                 String rq = dt.toString("yyyyMMdd ");
  
-                rq = "20180620";
+                rq = "20180627";
                 String sql = "select * from bsth_h_consume_time where rq=" + rq;
                 JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_InfoPublish.getDataSource());
                 List<StationConsumeTime> list =
@@ -317,7 +323,7 @@ public class HistoryConsumeTimeDataHandler {
                 s = GeoCacheData.findByCode(lineCode, upDown, code);
  
                 if (null != s)
-                    times[i] = (int) s.getLength() / 12;
+                    times[i] = (int) s.getLength() / DEFAULT_SPEED;
                 else
                     times[i] = 55;
             }
@@ -341,7 +347,7 @@ public class HistoryConsumeTimeDataHandler {
             for (StationConsumeTime sct : list) {
                 inD = sct.getInD1() + sct.getInD2();
                 if (inD > normal)
-                    sct.setSeconds((int) (sct.getSeconds() + ((inD - normal) / 10)));
+                    sct.setSeconds((int) (sct.getSeconds() + ((inD - normal) / IN_STATION_SPEED)));
  
                 ns.add(sct.getSeconds());
             }
@@ -71,6 +71,11 @@ public class GpsEntity implements Serializable {
      */
     private Double outStationDistance;
  
+    /**
+     * 进站时间
+     */
+    private Long inStationTime;
+
     private int version;
  
     /*** gps是否有效 设备端发送的状态*/
@@ -109,6 +114,11 @@ public class GpsEntity implements Serializable {
     private int seconds;
  
     /**
+     * 到下一站的时间，秒（信息发布用，离线时，该字段会被平滑过渡）
+     */
+    private Integer seconds2;
+
+    /**
      * 是否对外发布
      */
     private boolean release = true;
@@ -139,19 +149,28 @@ public class GpsEntity implements Serializable {
         return gps;
     }
  
-    public void setStationInfo(StationRoute s){
+    public void setStationInfo(StationRoute s) {
         this.stationCode = s.getStationCode();
         this.stationName = s.getName();
         this.stationNo = s.getSerialNo();
     }
  
-    public void setStationInfo(GpsEntity prev){
+    public void setStationInfo(GpsEntity prev) {
         this.stationCode = prev.stationCode;
         this.stationName = prev.stationName;
         this.stationNo = prev.stationNo;
     }
  
-    public Point getPoint(){
+    public void smoothTransition(long t) {
+        int diff = (int) (t - timestamp), newSeconds;
+        //掉线1分半的，平滑过渡一下预测时间
+        if (diff > 1000 * 60 * 1.5) {
+            newSeconds = seconds - (diff / 1000 - 15);
+            seconds2 = newSeconds < 0 ? 0 : newSeconds;
+        }
+    }
+
+    public Point getPoint() {
         return new Point(lon, lat);
     }
  
@@ -363,4 +382,19 @@ public class GpsEntity implements Serializable {
         this.release = release;
     }
  
+    public Long getInStationTime() {
+        return inStationTime;
+    }
+
+    public void setInStationTime(Long inStationTime) {
+        this.inStationTime = inStationTime;
+    }
+
+    public Integer getSeconds2() {
+        return seconds2;
+    }
+
+    public void setSeconds2(Integer seconds2) {
+        this.seconds2 = seconds2;
+    }
 }
@@ -71,7 +71,7 @@
                             <div class="form-group">
                                 <label class="bmd-label-floating">日期</label>
                                 <input type="text" name="rq" required class="form-control flatpickr_date"
-                                       value="2018-06-20">
+                                       value="2018-06-27">
                             </div>
                         </div>
                         <div class="col-md-2">
@@ -99,12 +99,11 @@ var gb_real_gps_map = (function () {
                 m.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
                 w = m._icon_width;
                 m.setIcon(new BMap.Icon(createCarIconRotation(gps, w), new BMap.Size(w, 70)));
-
-                m._data = gps;
-                if (m.infoWindow.isOpen())
-                    bdOpenWindow(m);
             }
  
+            m._data = gps;
+            if (m.infoWindow.isOpen())
+                bdOpenWindow(m);
             devices.push(gps.deviceId);
         }
  
@@ -130,6 +130,7 @@ var gb_real_gps_svg = (function () {
         //时间处理
         for (var i = 0, len = arr.length; i < len; i++) {
             arr[i].secStr = seconds2Str(arr[i].seconds);
+            arr[i].secStr2 = seconds2Str(arr[i].seconds2);
             arr[i].zdsj = seconds2Str(rs.forecast[arr[i].deviceId]);
             arr[i].timeStr = moment(arr[i].timestamp).format('YYYY-MM-DD HH:mm.ss');
         }
@@ -266,6 +267,8 @@ var gb_real_gps_svg = (function () {
     }
  
     function seconds2Str(seconds) {
+        if(!seconds)
+            return null;
         var minutes = parseInt(seconds / 60)
             , s = seconds % 60;
         return minutes + '分' + s + "秒";
@@ -95,7 +95,7 @@
         </td>
         <td>
             {{if gps.release}}
-            {{gps.secStr}}
+            {{gps.secStr2==null?gps.secStr:gps.secStr2}}
             {{/if}}
         </td>
         <td>{{gps.zdsj}}</td>
@@ -141,10 +141,10 @@
         <p>距离下一站 {{distance}} 米</p>
         <hr>
         {{if secStr!=null}}
-        <a  href="javascript:;">预计 {{secStr}} 分钟到达下一站</a>
+        <a href="javascript:;">预计 {{secStr2==null?secStr:secStr2}} 分钟到达下一站</a>
         {{/if}}
         {{if zdsj!=null}}
-        <a  href="javascript:;">预计 {{zdsj}} 分钟到达终点</a>
+        <a href="javascript:;">预计 {{zdsj}} 分钟到达终点</a>
         {{/if}}
         <hr>
         <a style="color: grey">{{timeStr}}</a>