update...

潘钊
1 parent caaf2960
Showing 7 changed files with 230 additions and 48 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/service/realcontrol/RealMapService.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/real_control_v2/js/data/data_gps.js
@@ -45,8 +45,8 @@ public class RealMapController {
      * @Description: TODO(获取线路的站点，路段路由)
      */
     @RequestMapping(value = "/findRouteByLine")
-    public Map<String, Object> findRouteByLine(@RequestParam String lineCode) {
-        return realMapService.findRouteByLine(lineCode);
+    public Map<String, Object> findRouteByLine(@RequestParam String idx) {
+        return realMapService.findRouteByLine(idx);
     }
     @RequestMapping(value = "/multiRouteByLine")
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES);
     }
     @Override
@@ -3,10 +3,11 @@ package com.bsth.security.filter;
 import com.alibaba.fastjson.JSON;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
-import com.bsth.filter.BaseFilter;
 import com.bsth.util.RequestUtils;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -23,40 +24,67 @@ import java.util.Map;
  * @date 2016年3月24日 上午11:49:20 
  *
  */
-public class LoginInterceptor extends BaseFilter {
+public class LoginInterceptor implements Filter {
+
+	private final PathMatcher pathMatcher = new AntPathMatcher();
+
+	/**
+	 * 白名单
+	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
+	 */
+	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES };
+
 	@Override
 	public void destroy() {
 	}
+
 	@Override
 	public void init(FilterConfig filterConfig) throws ServletException {
 	}
 	@Override
-	public void doFilter(HttpServletRequest request,
-						 HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
-		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-
-		if(null == authentication){
-			//没有登录
-
-			if(RequestUtils.isAjaxRequest(request)){
-				Map<String, Object> map = new HashMap<>();
-				map.put("status",
-						ResponseCode.NO_AUTHENTICATION);
-				response.getWriter().print(JSON.toJSONString(map));
-			}
-			else
-				response.sendRedirect(Constants.LOGIN_PAGE);
+	public void doFilter(ServletRequest request, ServletResponse response,
+						 FilterChain chain) throws IOException, ServletException {
+
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+		String currentURL = httpRequest.getServletPath();
+
+		if (!isWhiteURL(currentURL)) {
+			Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-			return;
+			if(null == authentication){
+				//没有登录
+
+				if(RequestUtils.isAjaxRequest(httpRequest)){
+					Map<String, Object> map = new HashMap<>();
+					map.put("status",
+							ResponseCode.NO_AUTHENTICATION);
+					response.getWriter().print(JSON.toJSONString(map));
+				}
+				else
+					httpResponse.sendRedirect(Constants.LOGIN_PAGE);
+
+				return;
+			}
 		}
 		chain.doFilter(request, response);
 	}
+	private boolean isWhiteURL(String currentURL) {
+		for (String whiteURL : whiteListURLs) {
+			if (pathMatcher.match(whiteURL, currentURL)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 }
@@ -10,7 +10,7 @@ public interface RealMapService {
     Map<String,Object> carParkSpatialData();
-    Map<String,Object> findRouteByLine(String lineCode);
+    Map<String, Object> findRouteByLine(String idx);
     Map<String,Object> findRouteAndStationByLine(String lineCode);
@@ -2,11 +2,14 @@ package com.bsth.service.realcontrol.impl;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.StationSpatialData;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
 import com.bsth.entity.CarPark;
 import com.bsth.service.realcontrol.RealMapService;
 import com.bsth.service.realcontrol.dto.SectionRouteCoords;
 import com.bsth.util.TransGPS;
 import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
+import com.vividsolutions.jts.geom.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,10 +77,17 @@ public class RealMapServiceImpl implements RealMapService {
     }
     @Override
-    public Map<String, Object> findRouteByLine(String lineCode) {
+    public Map<String, Object> findRouteByLine(String idx) {
         Map<String, Object> rs = new HashMap<>();
-        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code=? and r.destroy=0 order by sectionroute_code";
-        List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class), lineCode);
+        StringBuilder inCond = new StringBuilder("(");
+        List<String> codeList = Splitter.on(",").splitToList(idx);
+        for(String lineCode : codeList){
+            inCond.append("'" + lineCode + "',");
+        }
+        inCond.deleteCharAt(inCond.length() - 1).append(")");
+
+        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
+        List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class));
         //排序
         Collections.sort(list, new Comparator<SectionRouteCoords>() {
@@ -87,28 +97,40 @@ public class RealMapServiceImpl implements RealMapService {
             }
         });
-        List<String> upList = new ArrayList<>(),
-                downList = new ArrayList<>();
-
-        String vectorStr = "";
+        ArrayListMultimap<String, SectionRouteCoords> listMultimap = ArrayListMultimap.create();
         for (SectionRouteCoords sr : list) {
-            vectorStr = sr.getGsectionVector();
-            vectorStr = vectorStr.substring(11, vectorStr.length() - 2);
-
-            if (sr.getDirections() == 0)
-                upList.add(vectorStr);
-            else
-                downList.add(vectorStr);
+            //按lineCode 分组
+            listMultimap.put(sr.getLineCode(), sr);
+        }
+        //坐标转换
+        Map<String, Object> subMap;
+        Set<String> ks = listMultimap.keySet();
+        List<SectionRouteCoords> sublist;
+        List<String> upList,downList;
+        String vectorStr = "";
+        for(String k : ks){
+            subMap = new HashMap<>();
+            sublist = listMultimap.get(k);
+            upList = new ArrayList<>();
+            downList = new ArrayList<>();
+            for(SectionRouteCoords sr : sublist){
+                vectorStr = sr.getGsectionVector();
+                vectorStr = vectorStr.substring(11, vectorStr.length() - 2);
+                if (sr.getDirections() == 0)
+                    upList.add(vectorStr);
+                else
+                    downList.add(vectorStr);
+            }
+            subMap.put("up", upList);
+            //subMap.put("upJoins", jointCoords(upList));
+            subMap.put("down", downList);
+            subMap.put("up_bd", multiWgsToBd(upList));
+            subMap.put("down_bd", multiWgsToBd(downList));
+            subMap.put("up_gcj", multiWgsToGcj(upList));
+            subMap.put("down_gcj", multiWgsToGcj(downList));
+
+            rs.put(k, subMap);
         }
-
-        rs.put("up", upList);
-        rs.put("down", downList);
-        rs.put("up_bd", multiWgsToBd(upList));
-        rs.put("down_bd", multiWgsToBd(downList));
-        rs.put("up_gcj", multiWgsToGcj(upList));
-        rs.put("down_gcj", multiWgsToGcj(downList));
-
-        rs.put("lineId", lineCode);
         return rs;
     }
@@ -227,4 +249,115 @@ public class RealMapServiceImpl implements RealMapService {
         }
         return gcjList;
     }
+
+    /**
+     * 将相连的路段拼接起来，去掉接口覆盖区域。
+     * 主要因为前端地图绘制时，过多的路段会带来性能消耗。在这里提前拼接好以减少路段数量
+     * @param list
+     * @return
+     */
+    private List<String> jointCoords(List<String> list){
+        List<String> rs = new ArrayList<>();
+        int len = list.size();
+        if(len == 0)
+            return rs;
+
+        StringBuilder joinstr = new StringBuilder(list.get(0));
+        String str;
+        for(int i = 1; i < len; i ++){
+            str = jointCoords(joinstr.toString(), list.get(i));
+            if(str != null)
+                joinstr.append("," + str);
+            else{
+                rs.add(joinstr.toString());
+                joinstr = new StringBuilder(list.get(i));
+            }
+        }
+        rs.add(joinstr.toString());
+        return rs;
+    }
+
+    static GeometryFactory geometryFactory = new GeometryFactory();
+    private String jointCoords(String c1, String c2){
+        String rs=null;
+        LineString s1 = createLineString(c1);
+        LineString s2 = createLineString(c2);
+
+        if(s1.intersects(s2)){
+            Geometry g = s1.intersection(s2);
+            Point inPoint = geometryFactory.createPoint(g.getCoordinates()[0]);//第一个交点
+
+            //第一条线截断至交点
+            rs = truncationEnd(s1, inPoint);
+            //第二条线从交点开始
+            rs += ("," + truncationStart(s2, inPoint));
+        }
+        return rs;
+    }
+
+    private LineString createLineString(String c){
+        List<String> list = Splitter.on(",").splitToList(c);
+
+        Coordinate[] cds = new Coordinate[list.size()];
+        String[] strs;
+        for(int i = 0; i < list.size(); i ++){
+            strs = list.get(i).split(" ");
+            cds[i] = new Coordinate(Float.parseFloat(strs[1]), Float.parseFloat(strs[0]));
+        }
+        return geometryFactory.createLineString(cds);
+    }
+
+    private String truncationEnd(LineString lineString, Point p){
+        Coordinate[] all = lineString.getCoordinates();
+        LineString sl;
+
+        Coordinate[] cs;
+        StringBuilder sb = new StringBuilder("");
+        double threshold = 0.1,distance;
+        for(int i = 0; i < all.length - 1; i ++){
+            cs = new Coordinate[2];
+            cs[0] = all[i];
+            cs[1] = all[i + 1];
+            sl = geometryFactory.createLineString(cs);
+
+            sb.append("," + cs[0].y + " " + cs[0].x);
+            distance = GeoUtils.getDistanceFromLine(sl, p);
+            if(distance < threshold){
+                sb.append("," + p.getY() + " " + p.getX());
+                break;
+            }
+            else
+                sb.append("," + cs[1].y + " " + cs[1].x);
+        }
+        sb.deleteCharAt(0);
+        return sb.toString();
+    }
+
+    private String truncationStart(LineString lineString, Point p){
+        Coordinate[] all = lineString.getCoordinates();
+        LineString sl;
+
+        Coordinate[] cs;
+        StringBuilder sb = new StringBuilder("");
+        double threshold = 0.1,distance;
+        for(int i = 0; i < all.length - 1; i ++){
+            cs = new Coordinate[2];
+            cs[0] = all[i];
+            cs[1] = all[i + 1];
+            sl = geometryFactory.createLineString(cs);
+
+            distance = GeoUtils.getDistanceFromLine(sl, p);
+            if(distance < threshold){
+                sb.append("," + p.getY() + " " + p.getX());
+                sb.append("," + cs[1].y + " " + cs[1].x);
+                break;
+            }
+            else{
+                sb.append("," + cs[0].y + " " + cs[0].x);
+                sb.append("," + cs[1].y + " " + cs[1].x);
+            }
+        }
+        sb.deleteCharAt(0);
+        return sb.toString();
+    }
 }
@@ -421,7 +421,22 @@
         function cacheRoute(lsData, cb) {
             //showLoad('缓存线路路由信息...');
-            var i = 0, cacheData = {};
+            //拼接线路编码
+            var idx='';
+            $.each(lsData, function () {
+                idx+=(this.lineCode + ',');
+            });
+            idx=idx.substr(0, idx.length - 1);
+            $.get('/realMap/findRouteByLine', {idx: idx}, function (rs) {
+                if (rs) {
+                    //cacheData[item.lineCode] = rs;
+                    for(var lineCode in rs){
+                        storage.setItem(lineCode + '_route', JSON.stringify(rs[lineCode]));
+                    }
+                    cb && cb();
+                }
+            });
+/*            var i = 0, cacheData = {};
             (function () {
                 if (i >= lsData.length) {
                     //写入localStorage
@@ -442,7 +457,7 @@
                         f();
                     }
                 });
-            })();
+            })();*/
         }
         //历史纪录
@@ -18,7 +18,13 @@ var gb_data_gps = (function () {
         $.ajax({
             url: '/gps/real/line',
             data: {lineCodes: gb_data_basic.line_idx},
+            dataType: 'json',
             success: function (rs) {
+                //用定时的gps来检测session断开
+                if(rs.status && rs.status==407){
+                    location.href = '/login.html';
+                    return;
+                }
                 refreshData(rs);
                 cb();
             },