Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 48ce81c7 bd2f6353
Showing 4 changed files with 31 additions and 10 deletions
src/main/java/com/bsth/repository/SectionRepository.java
src/main/java/com/bsth/repository/StationRepository.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
@@ -58,7 +58,7 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 			"VALUES (?1 , ?2 , ?3 , ?4 , ?5 , "+
-					"?6 , GEOMFROMTEXT(?7) , GEOMFROMTEXT(?8) , ?9 , ?10 ,"+
+					"?6 , ST_GeomFromText(?7) , ST_GeomFromText(?8) , ?9 , ?10 ,"+
 					"?11 , ?12 , ?13 , ?14 , ?15 ,"+
@@ -83,8 +83,8 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 	@Transactional
     @Modifying
 	@Query(value="UPDATE bsth_c_section SET " +
-				"gsection_vector = GEOMFROMTEXT(?2) , " +
-				"bsection_vector = GEOMFROMTEXT(?3)," +
+				"gsection_vector = ST_GeomFromText(?2) , " +
+				"bsection_vector = ST_GeomFromText(?3)," +
 				"section_code = ?4," +
 				"section_name = ?5," +
 				"croses_road = ?6," +
@@ -61,7 +61,7 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
     			 "create_by,update_by,id) " +
     			 " VALUES(" +
     			 "?1 , ?2 , ?3 , ?4 , ?5," +
-    			 "?6 , ?7 , ?8 , ?9 , GeomFromText(?10),GeomFromText(?11)," +
+    			 "?6 , ?7 , ?8 , ?9 , ST_GeomFromText(?10),ST_GeomFromText(?11)," +
     			 "?12 ,?13, ?14, ?15, ?16," +
     			 "?17,?18,?19)", nativeQuery=true)
 	public void stationSave(String stationCode,String stationName,String roadCoding,String dbType,String bJwpoints,
@@ -93,8 +93,8 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
     		"g_laty =  ?7  , " +
     		"x =  ?8  , " +
     		"y = ?9  , " +
-    		"b_polygon_grid = GeomFromText(?10)  , " +
-    		"g_polygon_grid = GeomFromText(?11)  , " +
+    		"b_polygon_grid = ST_GeomFromText(?10)  , " +
+    		"g_polygon_grid = ST_GeomFromText(?11)  , " +
     		"destroy = ?12  , " +
     		"radius = ?13  , " +
     		"shapes_type = ?14  , " +
@@ -181,10 +181,14 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
 			// WGS坐标点集合
-			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+			String gsectionVector = null;
+			if(!sectionsWJPpoints.equals(""))
+				gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
 			// 原坐标点集合
-			String bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+			String bsectionVectorS = null;
+			if(!sectionsBpoints.equals(""))
+				 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
@@ -1029,6 +1029,16 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			}
+			if(bPloygonGrid.equals(""))
+				bPloygonGrid = null;
+			else
+				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+				
+			if(gPloygonGrid.equals(""))
+				gPloygonGrid = null;
+			else
+				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
+			
 			// 保存站点
 			repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
@@ -1219,9 +1229,16 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			}
-			bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+			if(bPloygonGrid.equals(""))
+				bPloygonGrid = null;
+			else
+				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+				
+			if(gPloygonGrid.equals(""))
+				gPloygonGrid = null;
+			else
+				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-			gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());