update...

panzh
1 parent 08fe0ea4
Showing 11 changed files with 371 additions and 27 deletions
src/main/java/com/bsth/controller/XmlInfoPublishController.java
src/main/java/com/bsth/controller/dto/CarMonitorEntity.java
src/main/java/com/bsth/data/charts_data/AccuracyDataHandler.java
src/main/java/com/bsth/data/history/HistoryConsumeTimeDataHandler.java
src/main/java/com/bsth/entity/Accuracy.java
src/main/java/com/bsth/util/IpUtils.java
src/main/resources/static/index.html
src/main/resources/static/pages/charts_data/accuracy.html
src/main/resources/static/pages/geo_data/map.html
src/main/resources/static/pages/h_consume/list.html
src/main/resources/static/pages/real/main.html
 package com.bsth.controller;
  
+import com.bsth.controller.dto.CarMonitorEntity;
 import com.bsth.controller.dto.DispatchScreen;
 import com.bsth.data.BasicCacheData;
+import com.bsth.data.charts_data.AccuracyDataHandler;
 import com.bsth.data.geo.GeoCacheData;
 import com.bsth.data.gps.GpsCacheData;
 import com.bsth.data.history.HistoryConsumeTimeDataHandler;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
 import java.util.*;
  
@@ -33,6 +36,9 @@ public class XmlInfoPublishController {
     @Autowired
     JdbcTemplate jdbcTemplate;
  
+    @Autowired
+    AccuracyDataHandler accuracyDataHandler;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     static DecimalFormat df = new DecimalFormat("#.00");
@@ -131,7 +137,8 @@ public class XmlInfoPublishController {
     }
  
     @RequestMapping("carMonitor")
-    public String carMonitor(@RequestParam String lineid, @RequestParam String stopid, @RequestParam String direction, String t) {
+    public String carMonitor(@RequestParam String lineid, @RequestParam String stopid
+            , @RequestParam String direction, String t, HttpServletRequest request) {
         StringBuilder sb = new StringBuilder();
  
         try {
@@ -196,36 +203,49 @@ public class XmlInfoPublishController {
  
  
             Map<String, Integer> forecast = HistoryConsumeTimeDataHandler.forecastEnd(vs, stopid);
-
-            //to xml
-
-            sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            sb.append("<result>");
-            sb.append("<cars lineid=\"" + lineid + "\">");
-
+            List<CarMonitorEntity> reals = new ArrayList<>();
+            CarMonitorEntity cme;
             for (GpsEntity v : vs) {
                 if (v.getStationCode().equals(stopid)
                         && v.getInOut() != 1)
                     continue; //已出当前站
  
-                sb.append("<car>");
-                sb.append("<terminal>" + BasicCacheData.device2plateMap.get(v.getDeviceId()) + "</terminal>");
-
-                //当前站 缓冲区内 的车（进站时间不超过 40秒的，可以发布）
+                cme = new CarMonitorEntity();
+                cme.setGps(v);
+                cme.setPlate(BasicCacheData.device2plateMap.get(v.getDeviceId()));
                 if (v.getStationCode().equals(stopid)
                         && 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>");
+
+                    cme.setStopdis(0);
+                    cme.setDistance("0");
+                    cme.setTime(0);
                 } else {
-                    sb.append("<stopdis>" + snMap.get(v.getDeviceId()) + "</stopdis>");
-                    sb.append("<distance>" + df.format((disMap.get(v.getDeviceId()) + v.getDistance())) + "</distance>");
-                    sb.append("<time>" + forecast.get(v.getDeviceId()) + "</time>");
+                    cme.setStopdis(snMap.get(v.getDeviceId()));
+                    cme.setDistance(df.format((disMap.get(v.getDeviceId()) + v.getDistance())));
+                    cme.setTime(forecast.get(v.getDeviceId()));
                 }
+
+                reals.add(cme);
+            }
+            //to xml
+
+            sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+            sb.append("<result>");
+            sb.append("<cars lineid=\"" + lineid + "\">");
+
+            for (CarMonitorEntity obj : reals) {
+                sb.append("<car>");
+                sb.append("<terminal>" + obj.getPlate() + "</terminal>");
+                sb.append("<stopdis>" + obj.getStopdis() + "</stopdis>");
+                sb.append("<distance>" + obj.getDistance() + "</distance>");
+                sb.append("<time>" + obj.getTime() + "</time>");
                 sb.append("</car>");
             }
  
+            //预测准确性分析
+            accuracyDataHandler.mark(reals, stopid, request);
+
             sb.append("</cars>");
             sb.append("</result>");
         } catch (Exception e) {
+package com.bsth.controller.dto;
+
+import com.bsth.entity.GpsEntity;
+
+public class CarMonitorEntity {
+
+    private String plate;
+    private int stopdis;
+    private String distance;
+    private int time;
+    private GpsEntity gps;
+
+    public int getStopdis() {
+        return stopdis;
+    }
+
+    public void setStopdis(int stopdis) {
+        this.stopdis = stopdis;
+    }
+
+    public String getDistance() {
+        return distance;
+    }
+
+    public void setDistance(String distance) {
+        this.distance = distance;
+    }
+
+    public int getTime() {
+        return time;
+    }
+
+    public void setTime(int time) {
+        this.time = time;
+    }
+
+    public GpsEntity getGps() {
+        return gps;
+    }
+
+    public void setGps(GpsEntity gps) {
+        this.gps = gps;
+    }
+
+    public String getPlate() {
+        return plate;
+    }
+
+    public void setPlate(String plate) {
+        this.plate = plate;
+    }
+}
+package com.bsth.data.charts_data;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.controller.dto.CarMonitorEntity;
+import com.bsth.entity.Accuracy;
+import com.bsth.entity.GpsEntity;
+import com.bsth.util.IpUtils;
+import com.google.common.collect.*;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 发布预测准确性 数据
+ */
+@Component
+public class AccuracyDataHandler {
+
+    private static ListMultimap<String, Accuracy> multimap;
+
+    static {
+        multimap = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
+    }
+
+    private static String getHeaders(HttpServletRequest request) {
+        Map<String, List<String>> headers = Maps.newHashMap();
+        Enumeration<String> namesEnumeration = request.getHeaderNames();
+        while (namesEnumeration.hasMoreElements()) {
+            String name = namesEnumeration.nextElement();
+            Enumeration<String> valueEnumeration = request.getHeaders(name);
+            List<String> values = Lists.newArrayList();
+            while (valueEnumeration.hasMoreElements()) {
+                values.add(valueEnumeration.nextElement());
+            }
+            headers.put(name, values);
+        }
+        return JSON.toJSONString(headers);
+    }
+
+    /**
+     * 标记一条发布消息，待gps到站后校验准确性
+     *
+     * @param request
+     */
+    public void mark(List<CarMonitorEntity> list, String station, HttpServletRequest request) {
+        CarMonitorEntity near = null;
+
+        for (CarMonitorEntity cme : list) {
+            if (null == near
+                    || cme.getStopdis() < near.getStopdis()
+                    || cme.getTime() < near.getTime())
+                near = cme;
+        }
+
+        GpsEntity gps = near.getGps();
+
+        Accuracy accuracy = new Accuracy();
+        //request info
+        accuracy.setIp(IpUtils.getIpAddr(request));
+        accuracy.setUserAgent(request.getHeader("User-Agent"));
+        accuracy.setHeaders(getHeaders(request));
+        //params
+        accuracy.setLineCode(gps.getLineId());
+        accuracy.setUpDown(gps.getUpDown());
+        accuracy.setStation(station);
+        accuracy.setT1(gps.getTimestamp());
+        accuracy.setNbbm(gps.getNbbm());
+        accuracy.setPlate(near.getPlate());
+        accuracy.setStopDis(near.getStopdis());
+        accuracy.setSeconds(near.getTime());
+
+        multimap.put(gps.getNbbm() + "_" + station, accuracy);
+    }
+
+    /**
+     * 校验发布准确性
+     * @param gps
+     */
+    public void check(GpsEntity gps) {
+
+    }
+}
@@ -209,8 +209,9 @@ public class HistoryConsumeTimeDataHandler {
         if (gps.getUpDown().intValue() != prev.getUpDown().intValue()
                 || null == lastInGps
                 || !lastInGps.getStationCode().equals(prev.getStationCode())
-                || prev.getTimestamp() - lastInGps.getTimestamp() > 1000 * 60 * 60)
+                || prev.getTimestamp() - lastInGps.getTimestamp() > 1000 * 60 * 60) {
             return;
+        }
  
         StationConsumeTime sct = StationConsumeTime.getInstance(lastInGps, gps);
         pstQueue.add(sct);
+package com.bsth.entity;
+
+public class Accuracy {
+
+    private String userAgent;
+
+    private String headers;
+
+    private String ip;
+
+    private String lineCode;
+
+    private int upDown;
+
+    private String station;
+
+    /**
+     * 预测信息
+     */
+    private String nbbm;
+
+    private String plate;
+
+    private int stopDis;
+
+    private double distance;
+
+    private int seconds;
+
+    private long t1;
+
+
+    //实际 到站用时
+    private int realSeconds;
+
+    private long t2;
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public String getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(String headers) {
+        this.headers = headers;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getStation() {
+        return station;
+    }
+
+    public void setStation(String station) {
+        this.station = station;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getPlate() {
+        return plate;
+    }
+
+    public void setPlate(String plate) {
+        this.plate = plate;
+    }
+
+    public double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(double distance) {
+        this.distance = distance;
+    }
+
+    public int getSeconds() {
+        return seconds;
+    }
+
+    public void setSeconds(int seconds) {
+        this.seconds = seconds;
+    }
+
+
+    public int getRealSeconds() {
+        return realSeconds;
+    }
+
+    public void setRealSeconds(int realSeconds) {
+        this.realSeconds = realSeconds;
+    }
+
+    public long getT1() {
+        return t1;
+    }
+
+    public void setT1(long t1) {
+        this.t1 = t1;
+    }
+
+    public long getT2() {
+        return t2;
+    }
+
+    public void setT2(long t2) {
+        this.t2 = t2;
+    }
+
+    public int getStopDis() {
+        return stopDis;
+    }
+
+    public void setStopDis(int stopDis) {
+        this.stopDis = stopDis;
+    }
+}
+package com.bsth.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class IpUtils {
+
+	public static String getIpAddr(HttpServletRequest request) {
+		if (request == null) {
+			return "unknown";
+		}
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("X-Forwarded-For");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("X-Real-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		return ip;
+	}
+}
@@ -38,27 +38,33 @@
                 <li class="nav-item ">
                     <a class="nav-link" title="切割处理后的路段和原始路段" href="/pages/geo_data/map.html">
                         <i class="material-icons">location_ons</i>
-                        <p>路段空间数据</p>
+                        <p>站间距</p>
                     </a>
                 </li>
                 <li class="nav-item ">
-                    <a class="nav-link" title="站点间行驶耗时（GPS）" href="/pages/h_consume/list.html">
+                    <a class="nav-link" title="线路上站点间行驶耗时（GPS）" href="/pages/h_consume/list.html">
                         <i class="material-icons">timer_3</i>
-                        <p>历史到站时间</p>
+                        <p>站点间运送时间</p>
                     </a>
                 </li>
                 <li class="nav-item ">
                     <a class="nav-link" title="实时信息发布预览" href="/pages/real/main.html">
                         <i class="material-icons">voicemail</i>
-                        <p>实时预览</p>
+                        <p>实时GPS</p>
                     </a>
                 </li>
                 <li class="nav-item ">
                     <a class="nav-link" href="/pages/interface_test/iTest.html">
-                        <i class="material-icons">info</i>
+                        <i class="material-icons">build</i>
                         <p>信息发布接口测试</p>
                     </a>
                 </li>
+                <li class="nav-item ">
+                    <a class="nav-link" title="所有通过 “carMonitor” 接口发布的预测，事后与实际GPS到站匹配" href="/pages/charts_data/accuracy.html">
+                        <i class="material-icons">spellcheck</i>
+                        <p>信息发布准确性</p>
+                    </a>
+                </li>
  
                 <li class="nav-item disabled">
                     <a class="nav-link" >
+aaaa
 \ No newline at end of file
@@ -8,7 +8,7 @@
                     <div class="row">
                         <div class="col-md-8" style="padding-right: 0;">
                             <div class="form-group">
-                                <label class="bmd-label-floating">选择线路</label>
+                                <label class="bmd-label-floating">输入线路</label>
                                 <div class="ct_auto_wrap line_autocompleter">
                                     <input type="text" class="form-control">
                                 </div>
@@ -76,7 +76,7 @@
                         </div>
                         <div class="col-md-2">
                             <div class="form-group">
-                                <label class="bmd-label-floating">选择线路</label>
+                                <label class="bmd-label-floating">输入线路</label>
                                 <div class="ct_auto_wrap line_autocompleter">
                                     <input type="text" name="lineName" required class="form-control" autocomplete="off">
                                 </div>
@@ -7,7 +7,7 @@
                     <div class="row">
                         <div class="col-md-7" style="padding-right: 0;">
                             <div class="form-group">
-                                <label class="bmd-label-floating">选择线路</label>
+                                <label class="bmd-label-floating">输入线路</label>
                                 <div class="ct_auto_wrap line_autocompleter">
                                     <input type="text" class="form-control">
                                 </div>