update

潘钊
1 parent 0cf6e342
Showing 14 changed files with 333 additions and 77 deletions
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/GeoUtils.java
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/line_panel.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/js/data/gps_abnormal.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
src/main/resources/static/real_control_v2/js/utils/svg_chart_tooltip.js
@@ -67,16 +67,10 @@ public class GpsEntity {
 	/** 当前执行班次ID */
 	private Long schId;
-	/** 是否异常数据 */
-	private boolean abnormal;
-/*
-	private int valid;*/
-	
-	private int version;
+	/** 是否是不完整的数据 */
+	private boolean incomplete;
-	/** 是否起终点站
-	private boolean sEPoint;
-	 */
+	private int version;
 	/** 0： 站外 1：站内 2：场内 */
 	private int instation;
@@ -88,6 +82,12 @@ public class GpsEntity {
 	/** 状态 */
 	private String signalState = "normal";
+	/** 异常状态 */
+	private String abnormalStatus;
+
+	/** 越界距离 */
+	private double outOfBoundDistance;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -241,14 +241,6 @@ public class GpsEntity {
 		this.station = station;
 	}
-	public boolean isAbnormal() {
-		return abnormal;
-	}
-
-	public void setAbnormal(boolean abnormal) {
-		this.abnormal = abnormal;
-	}
-
 	public String getSignalState() {
 		return signalState;
 	}
@@ -264,4 +256,28 @@ public class GpsEntity {
 	public void setInstation(int instation) {
 		this.instation = instation;
 	}
+
+	public String getAbnormalStatus() {
+		return abnormalStatus;
+	}
+
+	public void setAbnormalStatus(String abnormalStatus) {
+		this.abnormalStatus = abnormalStatus;
+	}
+
+	public boolean isIncomplete() {
+		return incomplete;
+	}
+
+	public void setIncomplete(boolean incomplete) {
+		this.incomplete = incomplete;
+	}
+
+	public double getOutOfBoundDistance() {
+		return outOfBoundDistance;
+	}
+
+	public void setOutOfBoundDistance(double outOfBoundDistance) {
+		this.outOfBoundDistance = outOfBoundDistance;
+	}
 }
@@ -122,7 +122,7 @@ public class GpsRealData implements CommandLineRunner {
         for (String device : set) {
             gps = gpsMap.get(device);
             //过滤异常GPS数据
-            if (gps == null || gps.isAbnormal())
+            if (gps == null || gps.isIncomplete())
                 continue;
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
@@ -220,7 +220,7 @@ public class GpsRealData implements CommandLineRunner {
                         nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
                         if (StringUtils.isBlank(nbbm))
-                            gps.setAbnormal(true);//标记为异常数据
+                            gps.setIncomplete(true);//标记为异常数据
                         else
                             gps.setNbbm(nbbm);
                         //有更新的点位
@@ -45,6 +45,9 @@ public class GeoCacheData {
     //停车场
     public static Map<String, Polygon> tccMap;
+    //线路限速信息
+    private static Map<String, Double> speedLimitMap;
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -94,6 +97,14 @@ public class GeoCacheData {
         return null;
     }
+    public static Double speedLimit(String lineCode){
+        return speedLimitMap.get(lineCode);
+    }
+
+    public static List<LineString> getLineStringList(GpsEntity gps){
+        return sectionCacheMap.get(gps.getLineId() + "_" + gps.getUpDown());
+    }
+
     public static List<StationRoute> midwayStation(String lineCode, int directions, String sCode, String eCode) {
         List<StationRoute> list = getStationRoute(lineCode, directions), rs = new ArrayList<>();
@@ -113,8 +124,72 @@ public class GeoCacheData {
         return tccMap.get(code);
     }
+    GeometryFactory geometryFactory = new GeometryFactory();
     public void loadData() {
-        final GeometryFactory geometryFactory = new GeometryFactory();
+        loadStationRoutesData();
+        loadTccMapData();
+        loadSpeedLimit();
+
+        //加载路段信息
+        loadRoadsData();
+    }
+
+    private void loadRoadsData() {
+        String sql = "select r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) as GSECTION_VECTOR, r.DIRECTIONS from bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section=s.id where r.destroy=0 and GSECTION_VECTOR is not null order by line_code,directions,sectionroute_code";
+        List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
+
+        String polygonStr, key;
+        String[] coords;
+        int i, len;
+
+        ArrayListMultimap<String, LineString> sectionCacheTempMap = ArrayListMultimap.create();
+        Coordinate[] cds;
+        String[] temps1, temps2;
+        for (Map<String, Object> tMap : secList) {
+            polygonStr = tMap.get("GSECTION_VECTOR").toString();
+            key = tMap.get("LINE_CODE") + "_" + tMap.get("DIRECTIONS");
+
+            coords = polygonStr.substring(11, polygonStr.length() - 1).split(",");
+            len = coords.length - 1;
+            //每2个点连一条线
+            for(i = 0; i < len; i ++){
+                temps1 = coords[i].split(" ");
+                temps2 = coords[i + 1].split(" ");
+
+                cds = new Coordinate[2];
+                cds[0] = new Coordinate(Float.parseFloat(temps1[1]), Float.parseFloat(temps1[0]));
+                cds[1] = new Coordinate(Float.parseFloat(temps2[1]), Float.parseFloat(temps2[0]));
+
+                sectionCacheTempMap.put(key, geometryFactory.createLineString(cds));
+            }
+        }
+
+        if(sectionCacheTempMap.size() > 0)
+            sectionCacheMap = sectionCacheTempMap;
+    }
+
+    private void loadTccMapData(){
+        //加载停车场数据
+        String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
+        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
+        Map<String, Polygon> tccTempMap = new HashMap<>();
+
+        Polygon polygon;
+        for (Map<String, Object> tMap : tccList) {
+
+            try {
+                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
+                tccTempMap.put(tMap.get("PARK_CODE").toString()
+                        , polygon);
+            } catch (Exception e) {
+                logger.error("停车场：" + tMap.get("PARK_CODE"), e);
+            }
+        }
+        if (tccTempMap.size() > 0)
+            tccMap = tccTempMap;
+    }
+
+    private void loadStationRoutesData(){
         //加载站点路由
         String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE,s.STATION_NAME from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
         List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper<StationRoute>() {
@@ -159,26 +234,17 @@ public class GeoCacheData {
             stationCacheMap = tempMap;
             routeCodeMap = codeMap;
         }
+    }
-        //加载停车场数据
-        sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
-        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
-        Map<String, Polygon> tccTempMap = new HashMap<>();
-
-        Polygon polygon;
-        for (Map<String, Object> tMap : tccList) {
-
-            try {
-                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
-                tccTempMap.put(tMap.get("PARK_CODE").toString()
-                        , polygon);
-            } catch (Exception e) {
-                logger.error("停车场：" + tMap.get("PARK_CODE"), e);
-            }
+    private void loadSpeedLimit(){
+        //加载线路限速信息
+        String sql = "select l.LINE_CODE,i.SPEED_LIMIT from bsth_c_line_information i left join bsth_c_line l on i.line=l.id where i.speed_limit is not null";
+        List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
+        Map<String, Double> speedTempMap = new HashMap<>();
+        for (Map<String, Object> tMap : speedMap) {
+            speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEED_LIMIT").toString()));
         }
-
-        if (tccTempMap.size() > 0)
-            tccMap = tccTempMap;
+        speedLimitMap = speedTempMap;
     }
     private void connectStationRoute(List<StationRoute> list) {
@@ -209,6 +275,7 @@ public class GeoCacheData {
     /**
      * 是不是终点站
+     *
      * @param lineId
      * @param upDown
      * @param stationCode
@@ -33,6 +33,8 @@ public class GpsRealAnalyse {
     InOutStationSignalHandle inOutStationSignalHandle;
     @Autowired
     ReverseSignalHandle reverseSignalHandle;
+    @Autowired
+    AbnormalStateHandle abnormalStateHandle;
     @Autowired
     GpsRealData gpsRealData;
@@ -72,14 +74,21 @@ public class GpsRealAnalyse {
         public void run() {
             try {
+                //是否有任务
+                boolean task;
                 CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
                 //掉线处理
                 offlineSignalHandle.handle(gps, prevs);
                 //状态处理
-                if(!correctSignalHandle.handle(gps, prevs))
-                    return;
+                task = correctSignalHandle.handle(gps, prevs);
                 //场，站内外判断
                 stationInsideHandle.handle(gps, prevs);
+                //异常判定（越界/超速）
+                abnormalStateHandle.handle(gps, prevs);
+
+                if(!task)
+                    return; //无任务的，到这里就结束
+
                 //反向处理
                 reverseSignalHandle.handle(gps, prevs);
                 //进出站动作处理
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Point;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * GPS异常状态判定 （越界/超速）
+ * Created by panzhao on 2017/1/10.
+ */
+@Component
+public class AbnormalStateHandle extends SignalHandle{
+
+    //默认限速
+    private static final double DEFAULT_SPEED_LIMIT = 60;
+    //越界阈值
+    private static final double OUT_BOUNDS_THRESHOLD = 100;
+
+    GeometryFactory geometryFactory = new GeometryFactory();
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+
+        if(overspeed(gps))
+            return true;
+
+        if(outOfBounds((gps)))
+            return true;
+
+        return false;
+    }
+
+    /**
+     * 是否超速
+     * @param gps
+     * @return
+     */
+    public boolean overspeed(GpsEntity gps){
+        double maxSpeed = DEFAULT_SPEED_LIMIT;
+        if(GeoCacheData.speedLimit(gps.getLineId()) != null)
+            maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
+
+        if(gps.getSpeed() > maxSpeed){
+            gps.setAbnormalStatus("overspeed");
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 是否越界
+     * @param gps
+     * @return
+     */
+    public boolean outOfBounds(GpsEntity gps){
+        //场内的车不处理
+        if(gps.getInstation() == 2){
+            return false;
+        }
+
+        List<LineString> list = GeoCacheData.getLineStringList(gps);
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        double min = -1, distance;
+
+        for(LineString lineString : list){
+            distance = GeoUtils.getDistanceFromLine(lineString, point);
+
+            if(min == -1 || min > distance)
+                min = distance;
+        }
+
+        gps.setOutOfBoundDistance(min);
+        if(min > OUT_BOUNDS_THRESHOLD){
+            gps.setAbnormalStatus("outBounds");
+            return true;
+        }
+        return false;
+    }
+}
@@ -3,10 +3,7 @@ package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import com.vividsolutions.jts.geom.*;
 import java.util.List;
 import java.util.Map;
@@ -90,6 +87,36 @@ public class GeoUtils {
         return Math.PI * degree / 180;
     }
+    /**
+     * 计算点 到 线的距离
+     * @param line
+     * @param p
+     * @return
+     */
+    public static double getDistanceFromLine(LineString line, Point p){
+        Point s = line.getStartPoint();
+        Point e = line.getEndPoint();
+
+        double d1 = getDistance(s, p);
+        double d2 = getDistance(p, e);
+        double d3 = getDistance(s, e);
+        double distance = 0;
+
+        double alpha = Math.acos((d1*d1 + d3*d3 - d2*d2)/(2*d1*d3));
+        double beta = Math.acos((d2*d2 + d3*d3 - d1*d1)/(2*d2*d3));
+
+        if(alpha>Math.PI/2) {
+            distance = d1;
+        }
+        else if(beta > Math.PI/2) {
+            distance = d2;
+        }
+        else {
+            distance = Math.sin(alpha) * d1;
+        }
+        return distance;
+    }
+
     /**
      * gps 是否在某个停车场内
@@ -79,7 +79,7 @@
 }
 .home-gps-table dl dt:nth-of-type(4), .home-gps-table dl dd:nth-of-type(4) {
-    width: 9%
+    width: 8%;
 }
 .home-gps-table dl dt:nth-of-type(5), .home-gps-table dl dd:nth-of-type(5) {
@@ -248,6 +248,13 @@ span.signal-state-outbounds{
     font-size: 11px;
 }
+span.signal-state-speed-limit{
+    color: red;
+    padding: 2px 3px;
+    border-radius: 3px;
+    font-size: 11px;
+}
+
 .home-svg-edit-icon{
     position: absolute;
     right: 10px;
@@ -265,4 +272,10 @@ span.signal-state-outbounds{
 .home-svg-edit-icon:before{
     font-family: FontAwesome;
     content: "\f040";
+}
+
+.carpark-icon{
+    color: #4dc24d;
+    font-size: 14px;
+    margin-left: 5px;
 }
 \ No newline at end of file
@@ -180,10 +180,10 @@ svg.line-chart g.item:nth-last-child(3)&gt;text.down {
 }
 svg.line-chart g.gps-wrap>rect {
-    width: 34px;
+    width: 30px;
     height: 15px;
-    /*fill: #fff;*/
-    rx: 4px;
+    /* fill: #fff; */
+    rx: 2px;
     cursor: pointer;
 }
@@ -202,8 +202,8 @@ svg.line-chart g.gps-wrap&gt;rect.hover {
 }
 svg.line-chart g.gps-wrap>text {
-    font-size: 13px;
-    transform: translate(2px, 12px);
+    font-size: 12px;
+    transform: translate(0, 12px);
     pointer-events: none;
 }
@@ -220,8 +220,8 @@ svg.line-chart .merge_hide {
 }
 svg.line-chart g.merge-item rect {
-    width: 24px;
-    height: 24px;
+    width: 22px;
+    height: 22px;
     rx: 15px;
     fill: #19a53a;
     cursor: pointer;
@@ -30,12 +30,16 @@
         <dd>{{speed}}</dd>
         <dd>{{expectStopTime}}</dd>
         <dd>
-            {{if abnormal != null}}
-                {{if abnormal == 'outBounds'}}
-                    越界
+            {{if abnormalStatus != null}}
+                {{if abnormalStatus == 'outBounds'}}
+                <span class="signal-state-outbounds">越界</span>
+                {{else if abnormalStatus == 'overspeed'}}
+                <span class="signal-state-speed-limit">超速</span>
                 {{/if}}
-            {{else}}
-                正常
+            {{/if}}
+
+            {{if instation == 2}}
+                <i class="uk-icon-product-hunt carpark-icon"></i>
             {{/if}}
         </dd>
         <dd title="{{stationName}}">{{stationName}}</dd>
@@ -46,12 +50,16 @@
     </script>
     <script id="home-gps-abnormal-temp" type="text/html">
-        {{if abnormal != null}}
-            {{if abnormal == 'outBounds'}}
+        {{if abnormalStatus != null}}
+            {{if abnormalStatus == 'outBounds'}}
                 <span class="signal-state-outbounds">越界</span>
+            {{else if abnormalStatus == 'overspeed'}}
+                <span class="signal-state-speed-limit">超速</span>
             {{/if}}
-        {{else}}
-            正常
+        {{/if}}
+
+        {{if instation == 2}}
+            <i class="uk-icon-product-hunt carpark-icon"></i>
         {{/if}}
     </script>
 </div>
@@ -135,6 +135,9 @@ var gb_data_basic = (function () {
             return nbbm2deviceMap;
         },
         getLineInformation: getLineInformation,
+        allInformations: function () {
+            return lineInformations;
+        },
         stationRoutes: function (lineCode) {
             return stationRoutes[lineCode]
         },
@@ -3,7 +3,7 @@
 var gb_data_gps = (function() {
     //fixed time refresh delay
-    var delay = 1000 * 5;
+    var delay = 1000 * 7;
     //deviceId ——> gps
     var realData = {};
     //refresh after callback
@@ -38,11 +38,13 @@ var gb_data_gps = (function() {
         $.each(rs, function() {
             old = realData[this.deviceId];
             if (old) {
-                if (old.timestamp < this.timestamp)
+                if (this.timestamp > old.timestamp){
                     if (old.upDown != this.upDown)
                         upDownChange.push(this);
                     else
                         upArr.push(this);
+                }
+
             } else
                 addArr.push(this);
@@ -55,8 +57,6 @@ var gb_data_gps = (function() {
             //时间格式化
             this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
-            //异常检测
-            gb_gps_abnormal.check(this);
             realData[this.deviceId] = this;
         });
-/** gps 信号异常状态，无效 | 越界 | 超速 */
+/** gps 信号异常状态，无效 | 越界 | 超速
+ *
+ *
+ *  前端计算略微有点卡顿， 交由后端计算
+ * */
 var gb_gps_abnormal = (function () {
@@ -11,7 +15,12 @@ var gb_gps_abnormal = (function () {
     };
     //越界
+    var threshold = 120;
     var gpsOutOfBounds = function (gps) {
+        //进场班次不管
+        if (gps.sch && gps.sch.bcType == 'in')
+            return;
+
         var roads = allRoads[gps.lineId + '_' + gps.upDown];
         if (!roads)
             return;
@@ -25,15 +34,19 @@ var gb_gps_abnormal = (function () {
         });
         //越界阈值 120米
-        var threshold = 120;
-        if (gps.sch && gps.sch.bcType == 'in')
-            return;
-
         if (min > threshold) {
             gps.abnormal = 'outBounds';
             gps.outBoundsDistance = min;
+            return true;
         }
-        //console.log('最短距离', min, gps.nbbm);
+    };
+
+
+    //线路限速数据
+    var lineSpeedLimit = {};
+    //超速
+    var overspeed = function (gps) {
+
     };
     /**
@@ -56,6 +69,14 @@ var gb_gps_abnormal = (function () {
             //按线路_走向 分组数据
             allRoads = groupByLineAndUpdown(list);
         });
+
+        //线路限速数据
+        var infos = gb_data_basic.allInformations();
+        for (var lineCode in infos) {
+            lineSpeedLimit[lineCode] = infos[lineCode].speedLimit == null ? 70 : infos[lineCode].speedLimit;
+        }
+
+        console.log('lineSpeedLimit', lineSpeedLimit);
     };
     function minDistanceFromRoad(pos, gps) {
@@ -69,6 +90,9 @@ var gb_gps_abnormal = (function () {
             if (!min || min > distance)
                 min = distance;
+
+            if (distance <= threshold)
+                return threshold;
         }
         return min;
@@ -104,10 +128,11 @@ var gb_gps_abnormal = (function () {
     return {
         initData: initData,
         check: function (gps) {
-            if (!allRoads) {
+            if (!allRoads || gps.instation == 2) {
                 return;
             }
+            //越界判定
             gpsOutOfBounds(gps);
         }
     }
@@ -183,7 +183,7 @@ var gb_svg_chart = (function () {
             var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
-            return circle.attr('cx') - 17.5;
+            return circle.attr('cx') - 16.5;
         },
         gy = function (gps, svg) {
             var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
@@ -322,14 +322,14 @@ var gb_svg_chart = (function () {
                 'merge-item': true
             });
         //merge rect
-        mergerG.append('rect').attr('x', x - 12)
+        mergerG.append('rect').attr('x', x - 11)
             .attr('y', function () {
-                return isDown ? y + 7 : y - 32;
+                return isDown ? y + 8 : y - 31;
             });
         //merge text
         var len = gpsArr.length;
         mergerG.append('text').text(len)
-            .attr('x', x - ((len + '').length * 4))
+            .attr('x', x - ((len + '').length * 4.5))
             .attr('y', isDown ? y + 24 : y - 14);
     };
@@ -13,7 +13,6 @@ var gb_svg_tooltip = (function () {
         if (rect.attr('aria-describedby'))
             return;
         var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
-        console.log('gps', gps);
         $(this).qtip({
             show: {
                 ready: true,