1.加入导航点位信息接口(常规、绕改道)

王通
1 parent fe89d111
Showing 5 changed files with 76 additions and 8 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/entity/Point.java
src/main/java/com/bsth/server_rs/base_info/station/buffer/StationRefreshThread.java
src/main/java/com/bsth/server_rs/base_info/station/entity/Station.java
src/main/java/com/bsth/server_rs/base_info/station/entity/StationRotue.java
@@ -5,6 +5,7 @@ import com.bsth.server_rs.AuthorizeInterceptor_IN;
 import com.bsth.server_rs.base_info.car.CarRestService;
 import com.bsth.server_rs.base_info.carpark.CarparkRestService;
 import com.bsth.server_rs.base_info.line.LineRestService;
+import com.bsth.server_rs.base_info.navigation.NavigationRestService;
 import com.bsth.server_rs.base_info.person.PersonRestService;
 import com.bsth.server_rs.base_info.section.LD_RoadSpeedRestService;
 import com.bsth.server_rs.base_info.section.LD_SectionRestService;
@@ -152,6 +153,9 @@ public class CXFConfig {
     @Autowired
     private StationPassengerService stationPassengerService;
+    @Autowired
+    private NavigationRestService navigationRestService;
+
     @Bean
     public Server rsServer() {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
@@ -183,7 +187,8 @@ public class CXFConfig {
                 manHoursRestService,
                 bxRestService,
                 externalRestService,
-                stationPassengerService));
+                stationPassengerService,
+                navigationRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(authorizeInterceptorIn);
+package com.bsth.entity;
+
+public class Point {
+
+	/**
+	 * 是否为站点
+	 */
+	private boolean isStation;
+
+	/**
+	 * 纬度
+	 */
+	private double lat;
+
+	/**
+	 * 经度
+	 */
+	private double lon;
+
+	public boolean isStation() {
+		return isStation;
+	}
+
+	public void setStation(boolean station) {
+		isStation = station;
+	}
+
+	public double getLat() {
+		return lat;
+	}
+
+	public void setLat(double lat) {
+		this.lat = lat;
+	}
+
+	public double getLon() {
+		return lon;
+	}
+
+	public void setLon(double lon) {
+		this.lon = lon;
+	}
+}
@@ -35,7 +35,7 @@ public class StationRefreshThread extends Thread{
             StationBufferData.replaceAll(stationList);
             //站点路由信息
-            List<StationRotue> routeList = jdbcTemplate.query("select id, line, station_route_code, line_code,station_code,station_mark,distances, to_time,directions,station_name,shaped_type as shapes_type,radius,ST_AsText(buffer_polygon_wgs) AS polygon_grid from bsth_c_stationroute where destroy=0",
+            List<StationRotue> routeList = jdbcTemplate.query("select id, line, station_route_code, line_code,station_code,station_mark,distances, to_time,directions,station_name,shaped_type as shapes_type,radius,ST_AsText(buffer_polygon_wgs) AS polygon_grid,ST_X(center_point_wgs) AS lon,ST_Y(center_point_wgs) AS lat from bsth_c_stationroute where destroy=0",
                     BeanPropertyRowMapper.newInstance(StationRotue.class));
             for(StationRotue sr : routeList){
@@ -13,10 +13,10 @@ public class Station {
     private String stationName;
     /** WGS 经度 */
-    private Float lon;
+    private Double lon;
     /** WGS 纬度 */
-    private Float lat;
+    private Double lat;
     /** 版本号 */
     private Integer versions;
@@ -46,19 +46,19 @@ public class Station {
         this.stationCode = stationCode;
     }
-    public Float getLon() {
+    public Double getLon() {
         return lon;
     }
-    public void setLon(Float lon) {
+    public void setLon(Double lon) {
         this.lon = lon;
     }
-    public Float getLat() {
+    public Double getLat() {
         return lat;
     }
-    public void setLat(Float lat) {
+    public void setLat(Double lat) {
         this.lat = lat;
     }
 }
@@ -59,6 +59,10 @@ public class StationRotue {
     /** 多边形 WGS 坐标 */
     private String polygonGrid;
+    private Double lon;
+
+    private Double lat;
+
     public String getLineCode() {
         return lineCode;
     }
@@ -178,4 +182,20 @@ public class StationRotue {
     public void setPolygonGrid(String polygonGrid) {
         this.polygonGrid = polygonGrid;
     }
+
+    public Double getLon() {
+        return lon;
+    }
+
+    public void setLon(Double lon) {
+        this.lon = lon;
+    }
+
+    public Double getLat() {
+        return lat;
+    }
+
+    public void setLat(Double lat) {
+        this.lat = lat;
+    }
 }