Merge branch 'pudong_jdk8' of http://192.168.168.245:8888/panzhaov5/bsth_control into pudong_jdk8

徐烜
2 parents 7f6f961e 4498a52a
Showing 3 changed files with 17 additions and 1 deletions
src/main/java/com/bsth/controller/GeoPremiseController.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
src/main/java/com/bsth/entity/GeoPremise.java
@@ -3,6 +3,7 @@ package com.bsth.controller;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.GeoPremise;
 import com.bsth.service.GeoPremiseService;
+import com.bsth.util.GeoConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,6 +27,8 @@ public class GeoPremiseController extends BaseController&lt;GeoPremise, Integer&gt; {
     public Map<String, Object> save(GeoPremise geoPremise) {
         Map<String, Object> result = new HashMap<>();
         try {
+            String coords = geoPremise.getCoords();
+            geoPremise.setCoordsWgs(GeoConverter.polygonBd2wgs(String.format("POLYGON((%s))", coords)).toString().replace("POLYGON((", "").replace("))", ""));
             result.putAll(geoPremiseService.save(geoPremise));
             result.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
@@ -233,7 +233,7 @@ public class GeoCacheData {
     private void loadPremiseGeoData() {
         ArrayListMultimap<String, PreconditionGeo> premiseGeoMapCopy = ArrayListMultimap.create();
-        String sql = "select * from  bsth_f_geo_premise";
+        String sql = "SELECT name, station_code, line_code, up_down, coords_wgs AS coords FROM  bsth_f_geo_premise";
         List<PreconditionGeo> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(PreconditionGeo.class));
         List<String> coordList;
@@ -37,6 +37,11 @@ public class GeoPremise {
 	 */
 	private String coords;
+	/**
+	 * wgs84坐标
+	 */
+	private String coordsWgs;
+
 	public Integer getId() {
 		return id;
 	}
@@ -84,4 +89,12 @@ public class GeoPremise {
 	public void setCoords(String coords) {
 		this.coords = coords;
 	}
+
+	public String getCoordsWgs() {
+		return coordsWgs;
+	}
+
+	public void setCoordsWgs(String coordsWgs) {
+		this.coordsWgs = coordsWgs;
+	}
 }