diff --git a/pom.xml b/pom.xml index b009c3f..da23d1d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.gis3c - gis3c - 1.0-SNAPSHOT + com.c3gis + c3gis + 1.0.1 @@ -16,6 +16,23 @@ 1.8 + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + src/test/** + + + + true + + + + + + @@ -37,98 +54,20 @@ 3.3.1 1.7.18 1.2.16 - 17.0 - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-oxm - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - junit - junit - 3.8.1 - test - org.mybatis mybatis ${mybatis.version} - - org.mybatis - mybatis-spring - 1.2.3 - org.postgresql postgresql 42.1.0 - - com.oracle - ojdbc14 - 10.2.0.4.0 - - - com.fasterxml.jackson.core - jackson-core - 2.7.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.7.2 - - - com.fasterxml.jackson.core - jackson-annotations - 2.7.2 - - - commons-dbcp - commons-dbcp - 1.4 - - org.geotools gt-opengis diff --git a/src/main/java/com/gis3c/common/CRSUtil.java b/src/main/java/com/c3gis/spatial/common/CRSUtil.java similarity index 96% rename from src/main/java/com/gis3c/common/CRSUtil.java rename to src/main/java/com/c3gis/spatial/common/CRSUtil.java index 3859a1a..84c8111 100644 --- a/src/main/java/com/gis3c/common/CRSUtil.java +++ b/src/main/java/com/c3gis/spatial/common/CRSUtil.java @@ -1,4 +1,4 @@ -package com.gis3c.common;/** +package com.c3gis.spatial.common;/** * Created by hukekuan on 17-7-10. */ diff --git a/src/main/java/com/gis3c/entity/spatial/BaseFeature.java b/src/main/java/com/c3gis/spatial/entity/BaseFeature.java similarity index 99% rename from src/main/java/com/gis3c/entity/spatial/BaseFeature.java rename to src/main/java/com/c3gis/spatial/entity/BaseFeature.java index 7c810cc..1cf399c 100644 --- a/src/main/java/com/gis3c/entity/spatial/BaseFeature.java +++ b/src/main/java/com/c3gis/spatial/entity/BaseFeature.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; import com.vividsolutions.jts.geom.Geometry; import org.geotools.data.DataUtilities; diff --git a/src/main/java/com/gis3c/entity/C3Layer.java b/src/main/java/com/c3gis/spatial/entity/C3Layer.java similarity index 88% rename from src/main/java/com/gis3c/entity/C3Layer.java rename to src/main/java/com/c3gis/spatial/entity/C3Layer.java index 4676a91..8d4fda2 100644 --- a/src/main/java/com/gis3c/entity/C3Layer.java +++ b/src/main/java/com/c3gis/spatial/entity/C3Layer.java @@ -1,4 +1,4 @@ -package com.gis3c.entity; +package com.c3gis.spatial.entity; import org.geotools.data.FeatureSource; import org.geotools.map.FeatureLayer; diff --git a/src/main/java/com/gis3c/entity/spatial/C3LineString.java b/src/main/java/com/c3gis/spatial/entity/C3LineString.java similarity index 94% rename from src/main/java/com/gis3c/entity/spatial/C3LineString.java rename to src/main/java/com/c3gis/spatial/entity/C3LineString.java index fcbe390..17837c1 100644 --- a/src/main/java/com/gis3c/entity/spatial/C3LineString.java +++ b/src/main/java/com/c3gis/spatial/entity/C3LineString.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial;/** +package com.c3gis.spatial.entity;/** * Created by hukekuan on 17-7-10. */ diff --git a/src/main/java/com/gis3c/entity/C3Map.java b/src/main/java/com/c3gis/spatial/entity/C3Map.java similarity index 98% rename from src/main/java/com/gis3c/entity/C3Map.java rename to src/main/java/com/c3gis/spatial/entity/C3Map.java index 68193cc..11279e5 100644 --- a/src/main/java/com/gis3c/entity/C3Map.java +++ b/src/main/java/com/c3gis/spatial/entity/C3Map.java @@ -1,4 +1,4 @@ -package com.gis3c.entity; +package com.c3gis.spatial.entity; import com.sun.media.jai.codec.ImageCodec; import com.sun.media.jai.codec.ImageEncoder; diff --git a/src/main/java/com/gis3c/entity/spatial/C3Point.java b/src/main/java/com/c3gis/spatial/entity/C3Point.java similarity index 94% rename from src/main/java/com/gis3c/entity/spatial/C3Point.java rename to src/main/java/com/c3gis/spatial/entity/C3Point.java index df23d45..ea5c12d 100644 --- a/src/main/java/com/gis3c/entity/spatial/C3Point.java +++ b/src/main/java/com/c3gis/spatial/entity/C3Point.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial;/** +package com.c3gis.spatial.entity;/** * Created by hukekuan on 17-7-10. */ diff --git a/src/main/java/com/gis3c/entity/spatial/C3Polygon.java b/src/main/java/com/c3gis/spatial/entity/C3Polygon.java similarity index 94% rename from src/main/java/com/gis3c/entity/spatial/C3Polygon.java rename to src/main/java/com/c3gis/spatial/entity/C3Polygon.java index c964cd4..2e18c8f 100644 --- a/src/main/java/com/gis3c/entity/spatial/C3Polygon.java +++ b/src/main/java/com/c3gis/spatial/entity/C3Polygon.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial;/** +package com.c3gis.spatial.entity;/** * Created by hukekuan on 17-7-10. */ diff --git a/src/main/java/com/gis3c/entity/GeoCity.java b/src/main/java/com/c3gis/spatial/entity/GeoCity.java similarity index 78% rename from src/main/java/com/gis3c/entity/GeoCity.java rename to src/main/java/com/c3gis/spatial/entity/GeoCity.java index 7a77d28..4c2845a 100644 --- a/src/main/java/com/gis3c/entity/GeoCity.java +++ b/src/main/java/com/c3gis/spatial/entity/GeoCity.java @@ -1,8 +1,6 @@ -package com.gis3c.entity; +package com.c3gis.spatial.entity; -import com.gis3c.entity.spatial.BaseFeature; import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.MultiPolygon; public class GeoCity extends BaseFeature{ private String code; diff --git a/src/main/java/com/gis3c/entity/spatial/IFeature.java b/src/main/java/com/c3gis/spatial/entity/IFeature.java similarity index 91% rename from src/main/java/com/gis3c/entity/spatial/IFeature.java rename to src/main/java/com/c3gis/spatial/entity/IFeature.java index dfd54cc..a99d8d4 100644 --- a/src/main/java/com/gis3c/entity/spatial/IFeature.java +++ b/src/main/java/com/c3gis/spatial/entity/IFeature.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; import java.lang.reflect.Field; import java.util.List; diff --git a/src/main/java/com/gis3c/entity/spatial/IGeometry.java b/src/main/java/com/c3gis/spatial/entity/IGeometry.java similarity index 84% rename from src/main/java/com/gis3c/entity/spatial/IGeometry.java rename to src/main/java/com/c3gis/spatial/entity/IGeometry.java index c238b73..04e0ad6 100644 --- a/src/main/java/com/gis3c/entity/spatial/IGeometry.java +++ b/src/main/java/com/c3gis/spatial/entity/IGeometry.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; import org.opengis.referencing.crs.CoordinateReferenceSystem; diff --git a/src/main/java/com/gis3c/entity/spatial/ILineString.java b/src/main/java/com/c3gis/spatial/entity/ILineString.java similarity index 73% rename from src/main/java/com/gis3c/entity/spatial/ILineString.java rename to src/main/java/com/c3gis/spatial/entity/ILineString.java index 257d3b3..a64385d 100644 --- a/src/main/java/com/gis3c/entity/spatial/ILineString.java +++ b/src/main/java/com/c3gis/spatial/entity/ILineString.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; /** * Created by hukekuan on 17-7-10. diff --git a/src/main/java/com/gis3c/entity/spatial/IMultiLineString.java b/src/main/java/com/c3gis/spatial/entity/IMultiLineString.java similarity index 74% rename from src/main/java/com/gis3c/entity/spatial/IMultiLineString.java rename to src/main/java/com/c3gis/spatial/entity/IMultiLineString.java index acb88a1..072da3e 100644 --- a/src/main/java/com/gis3c/entity/spatial/IMultiLineString.java +++ b/src/main/java/com/c3gis/spatial/entity/IMultiLineString.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; /** * Created by hukekuan on 17-7-10. diff --git a/src/main/java/com/gis3c/entity/spatial/IMultiPoint.java b/src/main/java/com/c3gis/spatial/entity/IMultiPoint.java similarity index 73% rename from src/main/java/com/gis3c/entity/spatial/IMultiPoint.java rename to src/main/java/com/c3gis/spatial/entity/IMultiPoint.java index c3bd6f5..13bc30b 100644 --- a/src/main/java/com/gis3c/entity/spatial/IMultiPoint.java +++ b/src/main/java/com/c3gis/spatial/entity/IMultiPoint.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; /** * Created by hukekuan on 17-7-10. diff --git a/src/main/java/com/gis3c/entity/spatial/IMultiPolygon.java b/src/main/java/com/c3gis/spatial/entity/IMultiPolygon.java similarity index 74% rename from src/main/java/com/gis3c/entity/spatial/IMultiPolygon.java rename to src/main/java/com/c3gis/spatial/entity/IMultiPolygon.java index da74a75..0417523 100644 --- a/src/main/java/com/gis3c/entity/spatial/IMultiPolygon.java +++ b/src/main/java/com/c3gis/spatial/entity/IMultiPolygon.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; /** * Created by hukekuan on 17-7-10. diff --git a/src/main/java/com/gis3c/entity/spatial/IPoint.java b/src/main/java/com/c3gis/spatial/entity/IPoint.java similarity index 72% rename from src/main/java/com/gis3c/entity/spatial/IPoint.java rename to src/main/java/com/c3gis/spatial/entity/IPoint.java index 57cbbbe..649f2de 100644 --- a/src/main/java/com/gis3c/entity/spatial/IPoint.java +++ b/src/main/java/com/c3gis/spatial/entity/IPoint.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; /** * Created by hukekuan on 17-7-10. diff --git a/src/main/java/com/gis3c/entity/spatial/IPolygon.java b/src/main/java/com/c3gis/spatial/entity/IPolygon.java similarity index 73% rename from src/main/java/com/gis3c/entity/spatial/IPolygon.java rename to src/main/java/com/c3gis/spatial/entity/IPolygon.java index 964d5c8..caed18d 100644 --- a/src/main/java/com/gis3c/entity/spatial/IPolygon.java +++ b/src/main/java/com/c3gis/spatial/entity/IPolygon.java @@ -1,4 +1,4 @@ -package com.gis3c.entity.spatial; +package com.c3gis.spatial.entity; /** diff --git a/src/main/java/com/gis3c/postgis/PostGISHandler.java b/src/main/java/com/c3gis/spatial/postgis/PostGISHandler.java similarity index 98% rename from src/main/java/com/gis3c/postgis/PostGISHandler.java rename to src/main/java/com/c3gis/spatial/postgis/PostGISHandler.java index 958a3eb..856e482 100644 --- a/src/main/java/com/gis3c/postgis/PostGISHandler.java +++ b/src/main/java/com/c3gis/spatial/postgis/PostGISHandler.java @@ -1,4 +1,4 @@ -package com.gis3c.postgis; +package com.c3gis.spatial.postgis; import java.io.IOException; import java.sql.CallableStatement; diff --git a/src/main/java/com/gis3c/App.java b/src/main/java/com/gis3c/App.java deleted file mode 100644 index 74a9584..0000000 --- a/src/main/java/com/gis3c/App.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gis3c; - -import com.gis3c.entity.GeoCity; -import com.gis3c.service.HelloService; -import com.gis3c.service.PostGISService; -import org.opengis.feature.simple.SimpleFeature; -import org.opengis.feature.simple.SimpleFeatureType; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -public class App { - public static ApplicationContext ContextInit(){ - return new ClassPathXmlApplicationContext("classpath:spring-config.xml"); - } - - public static void main(String[] args) throws IOException, IllegalAccessException { - ApplicationContext context =ContextInit(); - PostGISService postGISService = (PostGISService) context.getBean("postGISService"); - List geoCities = postGISService.AllCities(); - List simpleFeatureList = new ArrayList<>(); - SimpleFeatureType simpleFeatureType = geoCities.get(0).createFeatureType(); - for(int i = 0,len = geoCities.size();i < len;i++){ - simpleFeatureList.add(geoCities.get(i).attribute2Feature(simpleFeatureType,Integer.toString(i))); - } - System.out.println(GeoCity.Attributes2GeoJSON(simpleFeatureList)); - } -} \ No newline at end of file diff --git a/src/main/java/com/gis3c/Main.java b/src/main/java/com/gis3c/Main.java deleted file mode 100644 index 8d7a179..0000000 --- a/src/main/java/com/gis3c/Main.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.gis3c; - -import com.gis3c.entity.C3Map; -import com.gis3c.entity.GeoCity; -import com.gis3c.service.PostGISService; -import no.ecc.vectortile.VectorTileDecoder; -import no.ecc.vectortile.VectorTileEncoder; -import org.apache.commons.collections.map.HashedMap; -import org.geotools.data.FileDataStore; -import org.geotools.data.FileDataStoreFinder; -import org.geotools.data.shapefile.ShapefileDataStore; -import org.geotools.data.simple.SimpleFeatureSource; -import org.geotools.factory.CommonFactoryFinder; -import org.geotools.map.FeatureLayer; -import org.geotools.map.Layer; -import org.geotools.styling.SLD; -import org.geotools.styling.SLDParser; -import org.geotools.styling.Style; -import org.geotools.styling.StyleFactory; -import org.geotools.swing.data.JFileDataStoreChooser; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import java.io.*; -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class Main { - public static ApplicationContext ContextInit(){ - return new ClassPathXmlApplicationContext("classpath:spring-config.xml"); - } - public static StyleFactory styleFactory = CommonFactoryFinder.getStyleFactory(); -// public static Style createStyle(File file, FeatureSource featureSource) { -// File sld = toSLDFile(file); -// if (sld != null) { -// return createFromSLD(sld); -// } -// -// SimpleFeatureType schema = (SimpleFeatureType)featureSource.getSchema(); -// return JSimpleStyleDialog.showDialog(null, schema); -// } -// public static File toSLDFile(File file) { -// String path = file.getAbsolutePath(); -// String base = path.substring(0,path.length()-4); -// String newPath = base + ".sld"; -// File sld = new File( newPath ); -// if( sld.exists() ){ -// return sld; -// } -// newPath = base + ".SLD"; -// sld = new File( newPath ); -// if( sld.exists() ){ -// return sld; -// } -// return null; -// } -// public static Style createFromSLD(File sld) { -// try { -// SLDParser stylereader = new SLDParser(styleFactory, sld.toURI().toURL()); -// Style[] style = stylereader.readXML(); -// return style[0]; -// -// } catch (Exception e) { -// JExceptionReporter.showDialog(e, "Problem creating style"); -// } -// return null; -// } - public static void StyleTest()throws IOException{ - File file = JFileDataStoreChooser.showOpenFile("shp",null); - if(file == null){ - return; - } - File sldFile = new File("D:\\f\\shp\\shijie.sld"); - SLDParser styleReader = new SLDParser(styleFactory,sldFile.toURI().toURL()); - Style[] styles = styleReader.readXML(); - Style style1 = styles[0]; - - FileDataStore store = FileDataStoreFinder.getDataStore(file); - ((ShapefileDataStore)store).setCharset(Charset.forName("GBK")); - SimpleFeatureSource featureSource = store.getFeatureSource(); - - C3Map map = new C3Map(); - map.setTitle("Quickstart"); - Style style = SLD.createSimpleStyle(featureSource.getSchema()); - - Layer layer = new FeatureLayer(featureSource,style1); - map.addLayer(layer); - map.saveImage("D://mapimage//1.jpg",256); - System.out.println("image has saved"); - } - public static void copy(Reader in,Writer out) throws IOException { - int c = -1; - while((c = in.read()) != -1) { - out.write(c); - } - } - public static void VectorTilesTest()throws IOException{ - ApplicationContext context =ContextInit(); - PostGISService postGISService = (PostGISService) context.getBean("postGISService"); - List geoCities = postGISService.AllCities(); - - VectorTileEncoder encoder = new VectorTileEncoder(); - VectorTileDecoder d = new VectorTileDecoder(); - byte[] encoded; - geoCities.forEach(city -> { - Map cityAttr = new HashMap<>(); - cityAttr.put("name",city.getName()); - cityAttr.put("code",city.getCode()); -// encoder.addFeature("city",cityAttr,city.getGeom()); - }); - encoded = encoder.encode(); - - System.out.println(new String(encoded, "utf8")); - try(FileOutputStream fos = new FileOutputStream("/home/hukekuan/0.vector.pbf",true)){ - fos.write(encoded); - fos.flush(); - } - } - public static void main(String[] args) throws IOException { - VectorTilesTest(); - } - - -} diff --git a/src/main/java/com/gis3c/dao/HelloDao.java b/src/main/java/com/gis3c/dao/HelloDao.java deleted file mode 100644 index 795b7b5..0000000 --- a/src/main/java/com/gis3c/dao/HelloDao.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.gis3c.dao; - -/** - * Created by hukekuan on 2016/12/28. - */ -public interface HelloDao { - public String SayHello(); -} diff --git a/src/main/java/com/gis3c/dao/PostGISDao.java b/src/main/java/com/gis3c/dao/PostGISDao.java deleted file mode 100644 index 23da029..0000000 --- a/src/main/java/com/gis3c/dao/PostGISDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gis3c.dao; - -import com.gis3c.entity.GeoCity; - -import java.util.List; -import java.util.Map; - -public interface PostGISDao { - public void CommonCreateTable(Map tableStructure); - public void CreateSpatialIndex(String tableName,String geometryColumn); - - public List AllCities(); -} diff --git a/src/main/java/com/gis3c/dao/impl/HelloDaoImpl.java b/src/main/java/com/gis3c/dao/impl/HelloDaoImpl.java deleted file mode 100644 index ada4a74..0000000 --- a/src/main/java/com/gis3c/dao/impl/HelloDaoImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gis3c.dao.impl; - -import com.gis3c.dao.HelloDao; -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; - -/** - * Created by hukekuan on 2016/12/28. - */ - -@Repository -public class HelloDaoImpl extends SqlSessionDaoSupport implements HelloDao { - @Resource(name="sqlSessionFactory_GIS") private SqlSessionFactory sqlSessionFactory; - - @Override - public String SayHello(){ - return "hello wold"; - } - - @PostConstruct - public void injectSessionFactory(){ - super.setSqlSessionFactory(sqlSessionFactory); - } -} diff --git a/src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java b/src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java deleted file mode 100644 index 7a426c1..0000000 --- a/src/main/java/com/gis3c/dao/impl/PostGISDaoImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gis3c.dao.impl; - -import com.gis3c.dao.PostGISDao; -import com.gis3c.entity.GeoCity; -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.List; -import java.util.Map; - -@Repository -public class PostGISDaoImpl extends SqlSessionDaoSupport implements PostGISDao { - @Resource(name="sqlSessionFactory_GIS") - private SqlSessionFactory sqlSessionFactory; - @PostConstruct - public void injectSessionFactory(){ - super.setSqlSessionFactory(sqlSessionFactory); - } - - @Override - public void CommonCreateTable(Map tableStructure){ - System.out.println(tableStructure); - getSqlSession().update("PostGISSql.commonCreateTable",tableStructure); - } - @Override - public void CreateSpatialIndex(String tableName,String geometryColumn){ - Map param = new HashMap<>(); - param.put("tableName",tableName); - param.put("geometryColumn",geometryColumn); - param.put("spatialIndexName","sidx_" + tableName +"_" + geometryColumn); - getSqlSession().update("PostGISSql.createSpatialIndex",param); - } - - @Override - public List AllCities(){ - return getSqlSession().selectList("PostGISSql.allCity"); - } -} diff --git a/src/main/java/com/gis3c/service/HelloService.java b/src/main/java/com/gis3c/service/HelloService.java deleted file mode 100644 index c5ed160..0000000 --- a/src/main/java/com/gis3c/service/HelloService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.gis3c.service; - -/** - * Created by hukekuan on 2016/12/28. - */ -public interface HelloService { - public String SayHello(); -} diff --git a/src/main/java/com/gis3c/service/PostGISService.java b/src/main/java/com/gis3c/service/PostGISService.java deleted file mode 100644 index 0653124..0000000 --- a/src/main/java/com/gis3c/service/PostGISService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gis3c.service; - -import com.gis3c.entity.GeoCity; - -import java.util.List; -import java.util.Map; - -public interface PostGISService { - public void CommonCreateTable(String tableName,String geometryColumn,List> columns); - - public List AllCities(); -} diff --git a/src/main/java/com/gis3c/service/impl/HelloServiceImpl.java b/src/main/java/com/gis3c/service/impl/HelloServiceImpl.java deleted file mode 100644 index 36a90d4..0000000 --- a/src/main/java/com/gis3c/service/impl/HelloServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.gis3c.service.impl; - -import com.gis3c.dao.HelloDao; -import com.gis3c.service.HelloService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * Created by hukekuan on 2016/12/28. - */ -@Service("helloService") -public class HelloServiceImpl implements HelloService { - @Resource private HelloDao helloDao; - - @Override - public String SayHello(){ - return helloDao.SayHello(); - } -} diff --git a/src/main/java/com/gis3c/service/impl/PostGISServiceImpl.java b/src/main/java/com/gis3c/service/impl/PostGISServiceImpl.java deleted file mode 100644 index 8077c68..0000000 --- a/src/main/java/com/gis3c/service/impl/PostGISServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gis3c.service.impl; - -import com.gis3c.dao.PostGISDao; -import com.gis3c.entity.GeoCity; -import com.gis3c.service.PostGISService; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service("postGISService") -public class PostGISServiceImpl implements PostGISService { - @Resource private PostGISDao postGISDao; - - public void CommonCreateTable( - String tableName,String geometryColumn,List> columns){ - if(tableName == null || "".equals(tableName) - || geometryColumn == null || "".equals(geometryColumn) - || columns == null || columns.size() == 0){ - throw new IllegalArgumentException("参数错误"); - } - - Map tableStructure = new HashMap<>(); - tableStructure.put("tableName",tableName); - tableStructure.put("columnList",columns); - - Map SpatialIndexParam = new HashMap<>(); - SpatialIndexParam.put("spatialIndexName","sidx_" + tableName + "_" + geometryColumn); - SpatialIndexParam.put("tableName",tableName); - SpatialIndexParam.put("geometryColumn",geometryColumn); - - postGISDao.CommonCreateTable(tableStructure); - postGISDao.CreateSpatialIndex(tableName,geometryColumn); - } - - @Override - public List AllCities(){ - return postGISDao.AllCities(); - } -} diff --git a/src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml b/src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml deleted file mode 100644 index 2b377b2..0000000 --- a/src/main/java/com/gis3c/sqlmaps/PostGISMapper.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - CREATE TABLE ${tableName} - - - - ${item.columnName} numeric - - - ${item.columnName} NUMBER - - - ${item.columnName} character varying(254) - - - ${item.columnName} geometry(POINT,4326) - - - ${item.columnName} geometry(MULTIPOINT,4326) - - - ${item.columnName} geometry(LINESTRING,4326) - - - ${item.columnName} geometry(MULTILINESTRING,4326) - - - ${item.columnName} geometry(POLYGON,4326) - - - ${item.columnName} geometry(MULTIPOLYGON,4326) - - - - ,CONSTRAINT fid_pkey PRIMARY KEY (fid)); - - - - - CREATE INDEX ${spatialIndexName} - ON ${tableName} - USING gist - (${geometryColumn}); - - - - - - - - drop table ${_parameter}; - - - - - insert into ${tableName} - - ${item} - - - - - - #{featureValue.value,jdbcType=INTEGER} - - - st_geomfromText(#{featureValue.value,jdbcType=VARCHAR},4326) - - - #{featureValue.value,jdbcType=VARCHAR} - - - - - - - - insert into ${tableName} - - ${item} - - - - - #{featureValue.value,jdbcType=INTEGER} - - - st_geomfromText(#{featureValue.value,jdbcType=VARCHAR},4326) - - - #{featureValue.value,jdbcType=VARCHAR} - - - - - - - - - - - delete from ${_parameter} - - - - \ No newline at end of file diff --git a/src/test/java/com/c3gis/spatial/App.java b/src/test/java/com/c3gis/spatial/App.java new file mode 100644 index 0000000..2b24169 --- /dev/null +++ b/src/test/java/com/c3gis/spatial/App.java @@ -0,0 +1,7 @@ +package com.c3gis.spatial; + +public class App { + public static void main(String[] args) { + System.out.println("OK"); + } +} \ No newline at end of file diff --git a/src/test/java/com/gis3c/AppTest.java b/src/test/java/com/gis3c/AppTest.java deleted file mode 100644 index 83553b4..0000000 --- a/src/test/java/com/gis3c/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gis3c; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/src/main/resources/resources.properties b/src/test/resources/resources.properties similarity index 100% rename from src/main/resources/resources.properties rename to src/test/resources/resources.properties diff --git a/src/main/resources/spring-config.xml b/src/test/resources/spring-config.xml similarity index 100% rename from src/main/resources/spring-config.xml rename to src/test/resources/spring-config.xml diff --git a/src/main/resources/sql-map-config-mybatis.xml b/src/test/resources/sql-map-config-mybatis.xml similarity index 81% rename from src/main/resources/sql-map-config-mybatis.xml rename to src/test/resources/sql-map-config-mybatis.xml index 1887544..a50eff3 100644 --- a/src/main/resources/sql-map-config-mybatis.xml +++ b/src/test/resources/sql-map-config-mybatis.xml @@ -9,6 +9,6 @@ - + \ No newline at end of file