From e866eca211c524bd5224492406a457f53fa51bbb Mon Sep 17 00:00:00 2001
From: "hukekuan@163.com" <husd31kews86kuan>
Date: Fri, 12 May 2017 14:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  8 ++++++++
 src/main/java/com/gis3c/App.java                      |  1 -
 src/main/java/com/gis3c/dao/PostGISDao.java           |  2 +-
 src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java  | 11 ++++++++---
 .../com/gis3c/service/impl/PostGISServiceImpl.java    |  2 +-
 src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml     |  9 +--------
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb4c449..cceb445 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,14 @@
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**/*.xml</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
   <packaging>jar</packaging>
 
diff --git a/src/main/java/com/gis3c/App.java b/src/main/java/com/gis3c/App.java
index 6a5dae0..44cf38c 100644
--- a/src/main/java/com/gis3c/App.java
+++ b/src/main/java/com/gis3c/App.java
@@ -2,7 +2,6 @@ package com.gis3c;
 
 import com.gis3c.service.HelloService;
 import com.gis3c.service.PostGISService;
-import org.apache.commons.collections.map.HashedMap;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import java.io.IOException;
diff --git a/src/main/java/com/gis3c/dao/PostGISDao.java b/src/main/java/com/gis3c/dao/PostGISDao.java
index ca0074e..04cdb13 100644
--- a/src/main/java/com/gis3c/dao/PostGISDao.java
+++ b/src/main/java/com/gis3c/dao/PostGISDao.java
@@ -4,5 +4,5 @@ import java.util.Map;
 
 public interface PostGISDao {
     public void CommonCreateTable(Map<String,Object> tableStructure);
-    public void CreateSpatialIndex(String tableName);
+    public void CreateSpatialIndex(String tableName,String geometryColumn);
 }
diff --git a/src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java b/src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java
index af2b7c5..a2f0cc7 100644
--- a/src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java
+++ b/src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java
@@ -4,9 +4,9 @@ import com.gis3c.dao.PostGISDao;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.support.SqlSessionDaoSupport;
 import org.springframework.stereotype.Repository;
-
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.Map;
 
 @Repository
@@ -20,10 +20,15 @@ public class PostGISDaoImpl extends SqlSessionDaoSupport implements PostGISDao {
 
     @Override
     public void CommonCreateTable(Map<String,Object> tableStructure){
+        System.out.println(tableStructure);
         getSqlSession().update("PostGISSql.commonCreateTable",tableStructure);
     }
     @Override
-    public void CreateSpatialIndex(String tableName){
-        getSqlSession().update("PostGISSql.createSpatialIndex",tableName);
+    public void CreateSpatialIndex(String tableName,String geometryColumn){
+        Map<String,Object> param = new HashMap<>();
+        param.put("tableName",tableName);
+        param.put("geometryColumn",geometryColumn);
+        param.put("spatialIndexName","sidx_" + tableName +"_" + geometryColumn);
+        getSqlSession().update("PostGISSql.createSpatialIndex",param);
     }
 }
diff --git a/src/main/java/com/gis3c/service/impl/PostGISServiceImpl.java b/src/main/java/com/gis3c/service/impl/PostGISServiceImpl.java
index 3c8ff26..2922e21 100644
--- a/src/main/java/com/gis3c/service/impl/PostGISServiceImpl.java
+++ b/src/main/java/com/gis3c/service/impl/PostGISServiceImpl.java
@@ -30,6 +30,6 @@ public class PostGISServiceImpl implements PostGISService {
         SpatialIndexParam.put("geometryColumn",geometryColumn);
 
         postGISDao.CommonCreateTable(tableStructure);
-        postGISDao.CreateSpatialIndex(tableName);
+        postGISDao.CreateSpatialIndex(tableName,geometryColumn);
     }
 }
diff --git a/src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml b/src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml
index dd342c7..577b204 100644
--- a/src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml
+++ b/src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml
@@ -46,7 +46,7 @@
     	CREATE INDEX ${spatialIndexName}
   			ON ${tableName}
   			USING gist
-  			($(geometryColumn));
+  			(${geometryColumn});
     </update>
     
     <!--查询表是否存在，返回表个数-->
@@ -114,18 +114,11 @@
     </delete>
     
     <select id="allCity" resultMap="GeoCityResultMap">
-    <!--
-    	select t.name,t.code,t.geom as geom from geocity t
-    	
-    	select t.name,t.code,ST_AsText(t.geom) as geom from geocountry t 
-    		where ST_Within(ST_GeometryFromText(#{geom,javaType=Geometry}),t.geom);
-    -->
     	select t.stationid,t.subtype,t.geom as geom from station t where ST_Intersects(
 			ST_Buffer(
 				Geography(#{geom,javaType=Geometry}),1000
 			),
 			t.geom
 		)
-		
     </select>
 </mapper>
\ No newline at end of file