diff --git a/pom.xml b/pom.xml
index f173e7f..ff7e2de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
net.sf.json-lib
json-lib
+ jdk15
${json-lib.version}
diff --git a/src/main/java/com/gis3c/common/persistence/annotation/C3SpatialDao.java b/src/main/java/com/gis3c/common/persistence/annotation/C3SpatialDao.java
new file mode 100644
index 0000000..a164622
--- /dev/null
+++ b/src/main/java/com/gis3c/common/persistence/annotation/C3SpatialDao.java
@@ -0,0 +1,21 @@
+package com.gis3c.common.persistence.annotation;
+
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.*;
+
+/**
+ * Created by hukekuan on 2017/12/14.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Documented
+@Component
+public @interface C3SpatialDao {
+ /**
+ * The value may indicate a suggestion for a logical component name,
+ * to be turned into a Spring bean in case of an autodetected component.
+ * @return the suggested component name, if any
+ */
+ String value() default "";
+}
diff --git a/src/main/java/com/gis3c/common/persistence/annotation/C3BatisDao.java b/src/main/java/com/gis3c/common/persistence/annotation/C3olDao.java
similarity index 94%
rename from src/main/java/com/gis3c/common/persistence/annotation/C3BatisDao.java
rename to src/main/java/com/gis3c/common/persistence/annotation/C3olDao.java
index 5f9f31a..7dc0cac 100644
--- a/src/main/java/com/gis3c/common/persistence/annotation/C3BatisDao.java
+++ b/src/main/java/com/gis3c/common/persistence/annotation/C3olDao.java
@@ -11,7 +11,7 @@ import java.lang.annotation.*;
@Target(ElementType.TYPE)
@Documented
@Component
-public @interface C3BatisDao {
+public @interface C3olDao {
/**
* The value may indicate a suggestion for a logical component name,
* to be turned into a Spring bean in case of an autodetected component.
diff --git a/src/main/java/com/gis3c/ol/dao/LayerDao.java b/src/main/java/com/gis3c/ol/dao/LayerDao.java
index ccb1675..27c585b 100644
--- a/src/main/java/com/gis3c/ol/dao/LayerDao.java
+++ b/src/main/java/com/gis3c/ol/dao/LayerDao.java
@@ -1,13 +1,13 @@
package com.gis3c.ol.dao;
-import com.gis3c.common.persistence.annotation.C3BatisDao;
+import com.gis3c.common.persistence.annotation.C3olDao;
import com.gis3c.ol.entity.layer.TileLayer;
import com.gis3c.ol.entity.layer.VectorLayer;
/**
* Created by hukekuan on 2017/12/15.
*/
-@C3BatisDao
+@C3olDao
public interface LayerDao {
public TileLayer findeTileLayerById(String layerId);
public TileLayer findeTileLayerByName(String layerName);
diff --git a/src/main/java/com/gis3c/ol/dao/MapDao.java b/src/main/java/com/gis3c/ol/dao/MapDao.java
index f7dec7b..0b73924 100644
--- a/src/main/java/com/gis3c/ol/dao/MapDao.java
+++ b/src/main/java/com/gis3c/ol/dao/MapDao.java
@@ -1,13 +1,13 @@
package com.gis3c.ol.dao;
-import com.gis3c.common.persistence.annotation.C3BatisDao;
+import com.gis3c.common.persistence.annotation.C3olDao;
import com.gis3c.ol.entity.Map;
import java.util.List;
/**
* Created by hukekuan on 2017/12/14.
*/
-@C3BatisDao
+@C3olDao
public interface MapDao {
public List findAllList();
diff --git a/src/main/java/com/gis3c/ol/dao/SourceDao.java b/src/main/java/com/gis3c/ol/dao/SourceDao.java
index 6e5e5d4..7e4bb0a 100644
--- a/src/main/java/com/gis3c/ol/dao/SourceDao.java
+++ b/src/main/java/com/gis3c/ol/dao/SourceDao.java
@@ -1,6 +1,6 @@
package com.gis3c.ol.dao;
-import com.gis3c.common.persistence.annotation.C3BatisDao;
+import com.gis3c.common.persistence.annotation.C3olDao;
import com.gis3c.ol.entity.source.TileArcGISRest;
import com.gis3c.ol.entity.source.TileSuperMapRest;
import com.gis3c.ol.entity.source.Vector;
@@ -9,7 +9,7 @@ import com.gis3c.ol.entity.source.Wmts;
/**
* Created by hukekuan on 2017/12/15.
*/
-@C3BatisDao
+@C3olDao
public interface SourceDao {
public TileArcGISRest findTileArcGISRestById(String sourceId);
public TileArcGISRest findTileArcGISRestByName(String sourceName);
diff --git a/src/main/java/com/gis3c/ol/dao/ViewDao.java b/src/main/java/com/gis3c/ol/dao/ViewDao.java
index b26f334..3082db2 100644
--- a/src/main/java/com/gis3c/ol/dao/ViewDao.java
+++ b/src/main/java/com/gis3c/ol/dao/ViewDao.java
@@ -1,12 +1,12 @@
package com.gis3c.ol.dao;
-import com.gis3c.common.persistence.annotation.C3BatisDao;
+import com.gis3c.common.persistence.annotation.C3olDao;
import com.gis3c.ol.entity.View;
/**
* Created by hukekuan on 2017/12/15.
*/
-@C3BatisDao
+@C3olDao
public interface ViewDao {
public View findeViewById(String viewId);
public View findeViewByName(String viewName);
diff --git a/src/main/java/com/gis3c/spatial/entity/C3Layer.java b/src/main/java/com/gis3c/spatial/entity/C3Layer.java
deleted file mode 100644
index 9b8dc9b..0000000
--- a/src/main/java/com/gis3c/spatial/entity/C3Layer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.gis3c.spatial.entity;
-
-import org.geotools.data.FeatureSource;
-import org.geotools.map.FeatureLayer;
-import org.geotools.styling.Style;
-
-public class C3Layer extends FeatureLayer {
- public C3Layer(FeatureSource featureSource,Style style){
- super(featureSource,style);
- }
-
-
-}
-
-
-
-
-
-
-
-
diff --git a/src/main/java/com/gis3c/spatial/entity/C3Map.java b/src/main/java/com/gis3c/spatial/entity/C3Map.java
deleted file mode 100644
index 104dd46..0000000
--- a/src/main/java/com/gis3c/spatial/entity/C3Map.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.gis3c.spatial.entity;
-
-import com.sun.media.jai.codec.ImageCodec;
-import com.sun.media.jai.codec.ImageEncoder;
-import com.sun.media.jai.codec.PNGEncodeParam;
-import org.geotools.geometry.jts.ReferencedEnvelope;
-import org.geotools.map.MapContent;
-import org.geotools.map.MapViewport;
-import org.geotools.renderer.GTRenderer;
-import org.geotools.renderer.lite.StreamingRenderer;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-public class C3Map extends MapContent {
- public C3Map(){
- super();
- }
-
- public void ExportImg(double x1,double y1,double x2,double y2,int width,int height)
- throws IOException {
- //设置出图范围
- ReferencedEnvelope mapArea
- = new ReferencedEnvelope(x1,x2,y1,y2,this.getCoordinateReferenceSystem());
-
- //初始化渲染器
- StreamingRenderer sr = new StreamingRenderer();
- sr.setMapContent(this);
- //初始化输出图像
- BufferedImage bi = new BufferedImage(width,height,BufferedImage.TYPE_INT_BGR);
- Graphics g = bi.getGraphics();
- ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
- Rectangle rect = new Rectangle(0,0,width,height);
-
- //绘制地图
- sr.paint((Graphics2D) g,rect,mapArea);
-
- //编码图像
- PNGEncodeParam encodeParam = PNGEncodeParam.getDefaultEncodeParam(bi);
- if(encodeParam instanceof PNGEncodeParam.Palette){
- PNGEncodeParam.Palette p = (PNGEncodeParam.Palette) encodeParam;
- byte[] b = new byte[]{-127};
- p.setPaletteTransparency(b);
- }
-
- //输出图像
- ImageEncoder encode = ImageCodec.createImageEncoder("PNG",null,encodeParam);
- encode.encode(bi.getData(),bi.getColorModel());
- }
-
- public void saveImage(final String file,final int imageWidth) throws IOException {
- GTRenderer renderer = new StreamingRenderer();
- renderer.setMapContent(this);
- MapViewport mapViewport = this.getViewport();
- ReferencedEnvelope mapBounds
- = new ReferencedEnvelope(
- 118.02532161784,
- 118.08394386082,
- 36.846653667618,
- 36.818458342844,
- this.getCoordinateReferenceSystem()
- );
-// = this.getMaxBounds();
-
- mapViewport.setBounds(mapBounds);
- double heightToWidth = mapBounds.getSpan(1)/mapBounds.getSpan(0);
- Rectangle imageBounds
-// = new Rectangle(0,0,imageWidth, (int) Math.round(imageWidth*heightToWidth));
- = new Rectangle(0,0,256, 256);
-
- BufferedImage image = new BufferedImage(imageBounds.width,imageBounds.height,BufferedImage.TYPE_INT_RGB);
-
- Graphics2D gr = image.createGraphics();
- gr.setPaint(Color.WHITE);
- gr.fill(imageBounds);
-
- renderer.paint(gr,imageBounds,mapBounds);
- File fileToSave = new File(file);
- ImageIO.write(image,"jpeg",fileToSave);
- }
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/GeoCity.java b/src/main/java/com/gis3c/spatial/entity/GeoCity.java
deleted file mode 100644
index d44e2db..0000000
--- a/src/main/java/com/gis3c/spatial/entity/GeoCity.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.gis3c.spatial.entity;
-
-import com.gis3c.spatial.entity.feature.BaseFeature;
-import com.vividsolutions.jts.geom.Geometry;
-
-public class GeoCity extends BaseFeature {
- private String code;
- private String name;
- private Geometry geometry;
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/Test.java b/src/main/java/com/gis3c/spatial/entity/Test.java
new file mode 100644
index 0000000..d53aa34
--- /dev/null
+++ b/src/main/java/com/gis3c/spatial/entity/Test.java
@@ -0,0 +1,38 @@
+package com.gis3c.spatial.entity;
+
+import com.gis3c.spatial.entity.feature.BaseFeature;
+import com.gis3c.spatial.entity.geometry.C3Point;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * Created by hukekuan on 2018/1/16.
+ */
+public class Test extends BaseFeature {
+ private Integer id;
+ private String name;
+ private String direction;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDirection() {
+ return direction;
+ }
+
+ public void setDirection(String direction) {
+ this.direction = direction;
+ }
+}
diff --git a/src/main/java/com/gis3c/spatial/entity/feature/BaseFeature.java b/src/main/java/com/gis3c/spatial/entity/feature/BaseFeature.java
index 942d378..bdee39f 100644
--- a/src/main/java/com/gis3c/spatial/entity/feature/BaseFeature.java
+++ b/src/main/java/com/gis3c/spatial/entity/feature/BaseFeature.java
@@ -24,7 +24,7 @@ import java.util.List;
* @Description 具有空间字段的基类
* @date 2017-07-10 下午3:43
*/
-public class BaseFeature {
+public class BaseFeature implements IFeature {
private Geometry geometry;
public Geometry getGeometry() {
@@ -38,7 +38,8 @@ public class BaseFeature {
/**
* 获取所有字段信息
*/
- private List AllFieldes(){
+ @Override
+ public List AllFieldes(){
List fieldList = new ArrayList<>();
Class superClass = BaseFeature.class;
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/C3LineString.java b/src/main/java/com/gis3c/spatial/entity/geometry/C3LineString.java
deleted file mode 100644
index 1ebd3ec..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/C3LineString.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gis3c.spatial.entity.geometry;/**
- * Created by hukekuan on 17-7-10.
- */
-
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-/**
- * @author hukekuan
- * @Description 折线数据
- * @date 2017-07-10 下午4:21
- */
-public class C3LineString extends LineString implements ILineString {
- public C3LineString(CoordinateSequence points, GeometryFactory factory) {
- super(points, factory);
- }
-
- @Override
- public CoordinateReferenceSystem GetCRS() {
- return null;
- }
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/C3Point.java b/src/main/java/com/gis3c/spatial/entity/geometry/C3Point.java
deleted file mode 100644
index 7e0daa6..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/C3Point.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gis3c.spatial.entity.geometry;/**
- * Created by hukekuan on 17-7-10.
- */
-
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-/**
- * @author hukekuan
- * @Description 自定义点数据
- * @date 2017-07-10 下午4:19
- */
-public class C3Point extends Point implements IPoint {
- public C3Point(CoordinateSequence coordinates, GeometryFactory factory) {
- super(coordinates, factory);
- }
-
- @Override
- public CoordinateReferenceSystem GetCRS() {
- return null;
- }
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/C3Polygon.java b/src/main/java/com/gis3c/spatial/entity/geometry/C3Polygon.java
deleted file mode 100644
index 13c7474..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/C3Polygon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gis3c.spatial.entity.geometry;/**
- * Created by hukekuan on 17-7-10.
- */
-
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Polygon;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-/**
- * @author hukekuan
- * @Description 单面数据
- * @date 2017-07-10 下午4:23
- */
-public class C3Polygon extends Polygon implements IPolygon {
- public C3Polygon(LinearRing shell, LinearRing[] holes, GeometryFactory factory) {
- super(shell, holes, factory);
- }
-
- @Override
- public CoordinateReferenceSystem GetCRS() {
- return null;
- }
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/IGeometry.java b/src/main/java/com/gis3c/spatial/entity/geometry/IGeometry.java
deleted file mode 100644
index 8cd7c59..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/IGeometry.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gis3c.spatial.entity.geometry;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-/**
- * Created by hukekuan on 17-7-10.
- */
-public interface IGeometry {
- public CoordinateReferenceSystem GetCRS();
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/ILineString.java b/src/main/java/com/gis3c/spatial/entity/geometry/ILineString.java
deleted file mode 100644
index 5e049d5..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/ILineString.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gis3c.spatial.entity.geometry;
-
-/**
- * Created by hukekuan on 17-7-10.
- */
-public interface ILineString extends IGeometry {
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/IMultiLineString.java b/src/main/java/com/gis3c/spatial/entity/geometry/IMultiLineString.java
deleted file mode 100644
index 694a495..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/IMultiLineString.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gis3c.spatial.entity.geometry;
-
-/**
- * Created by hukekuan on 17-7-10.
- */
-public interface IMultiLineString extends IGeometry {
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/IMultiPoint.java b/src/main/java/com/gis3c/spatial/entity/geometry/IMultiPoint.java
deleted file mode 100644
index 719a46e..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/IMultiPoint.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gis3c.spatial.entity.geometry;
-
-/**
- * Created by hukekuan on 17-7-10.
- */
-public interface IMultiPoint extends IGeometry {
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/IMultiPolygon.java b/src/main/java/com/gis3c/spatial/entity/geometry/IMultiPolygon.java
deleted file mode 100644
index 7cbdc6e..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/IMultiPolygon.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gis3c.spatial.entity.geometry;
-
-/**
- * Created by hukekuan on 17-7-10.
- */
-public interface IMultiPolygon extends IGeometry {
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/IPoint.java b/src/main/java/com/gis3c/spatial/entity/geometry/IPoint.java
deleted file mode 100644
index 85d093d..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/IPoint.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gis3c.spatial.entity.geometry;
-
-/**
- * Created by hukekuan on 17-7-10.
- */
-public interface IPoint extends IGeometry {
-}
diff --git a/src/main/java/com/gis3c/spatial/entity/geometry/IPolygon.java b/src/main/java/com/gis3c/spatial/entity/geometry/IPolygon.java
deleted file mode 100644
index d2e2813..0000000
--- a/src/main/java/com/gis3c/spatial/entity/geometry/IPolygon.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gis3c.spatial.entity.geometry;
-
-
-/**
- * Created by hukekuan on 17-7-10.
- */
-public interface IPolygon extends IGeometry {
-}
diff --git a/src/main/java/com/gis3c/spatial/postgis/PostGISHandler.java b/src/main/java/com/gis3c/spatial/postgis/PostGISHandler.java
index 85e6a06..5741614 100644
--- a/src/main/java/com/gis3c/spatial/postgis/PostGISHandler.java
+++ b/src/main/java/com/gis3c/spatial/postgis/PostGISHandler.java
@@ -6,6 +6,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import com.gis3c.spatial.entity.geometry.C3Point;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.MappedTypes;
import org.apache.ibatis.type.TypeHandler;
diff --git a/src/main/resources/resources.properties b/src/main/resources/resources.properties
deleted file mode 100644
index 4c6c3a4..0000000
--- a/src/main/resources/resources.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-
-sys.driverClassName=org.postgresql.Driver
-sys.url=jdbc:postgresql:gisdata
-sys.username=gis
-sys.password=gis
\ No newline at end of file
diff --git a/src/main/resources/spring-config.xml b/src/main/resources/spring-config.xml
deleted file mode 100644
index 233e892..0000000
--- a/src/main/resources/spring-config.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
- classpath:resources.properties
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/sql-map-config-mybatis.xml b/src/main/resources/sql-map-config-mybatis.xml
deleted file mode 100644
index 36bd73d..0000000
--- a/src/main/resources/sql-map-config-mybatis.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2b24169..0000000
--- a/src/test/java/com/c3gis/spatial/App.java
+++ /dev/null
@@ -1,7 +0,0 @@
-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/main/java/com/gis3c/App.java b/src/test/java/com/gis3c/spatial/App.java
similarity index 86%
rename from src/main/java/com/gis3c/App.java
rename to src/test/java/com/gis3c/spatial/App.java
index 60b4706..439a59c 100644
--- a/src/main/java/com/gis3c/App.java
+++ b/src/test/java/com/gis3c/spatial/App.java
@@ -1,17 +1,17 @@
-package com.gis3c;
+package com.gis3c.spatial;
-import com.gis3c.ol.entity.View;
-import com.gis3c.ol.entity.layer.TileLayer;
-import com.gis3c.ol.entity.source.Wmts;
+import com.gis3c.ol.entity.Map;
import com.gis3c.ol.service.LayerService;
import com.gis3c.ol.service.MapService;
import com.gis3c.ol.service.SourceService;
import com.gis3c.ol.service.ViewService;
+import com.gis3c.spatial.entity.Test;
+import com.gis3c.spatial.entity.feature.IFeature;
+import com.gis3c.spatial.service.TestService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import com.gis3c.ol.entity.Map;
-import java.util.UUID;
+import java.util.List;
/**
* Created by hukekuan on 2017/12/14.
@@ -27,10 +27,18 @@ public class App {
LayerService layerService = context.getBean(LayerService.class);
MapService mapService = context.getBean(MapService.class);
+ TestService testService = context.getBean(TestService.class);
+
+
+ List result = testService.allList();
+ Test test = result.get(0);
+
+ System.out.println(test.AllFieldes());
+
+// //地图接口
+// Map map = mapService.findMapById("fc813a1f-6a31-4202-9419-8d125ba203c9");
+// System.out.println(map.getLayers()[0][1]);
- //地图接口
- Map map = mapService.findMapById("fc813a1f-6a31-4202-9419-8d125ba203c9");
- System.out.println(map.getLayers()[0][1]);
// Map map = new Map();
// map.setMapId(UUID.randomUUID().toString());
// map.setMapName("综合GIS系统");
diff --git a/src/test/java/com/gis3c/spatial/dao/TestDao.java b/src/test/java/com/gis3c/spatial/dao/TestDao.java
new file mode 100644
index 0000000..d4028f8
--- /dev/null
+++ b/src/test/java/com/gis3c/spatial/dao/TestDao.java
@@ -0,0 +1,14 @@
+package com.gis3c.spatial.dao;
+
+import com.gis3c.common.persistence.annotation.C3SpatialDao;
+import com.gis3c.spatial.entity.Test;
+
+import java.util.List;
+
+/**
+ * Created by hukekuan on 2018/1/16.
+ */
+@C3SpatialDao
+public interface TestDao {
+ public List allList();
+}
diff --git a/src/test/java/com/gis3c/spatial/service/TestService.java b/src/test/java/com/gis3c/spatial/service/TestService.java
new file mode 100644
index 0000000..8a98664
--- /dev/null
+++ b/src/test/java/com/gis3c/spatial/service/TestService.java
@@ -0,0 +1,12 @@
+package com.gis3c.spatial.service;
+
+import com.gis3c.spatial.entity.Test;
+
+import java.util.List;
+
+/**
+ * Created by hukekuan on 2018/1/16.
+ */
+public interface TestService {
+ public List allList();
+}
diff --git a/src/test/java/com/gis3c/spatial/service/impl/TestServiceImpl.java b/src/test/java/com/gis3c/spatial/service/impl/TestServiceImpl.java
new file mode 100644
index 0000000..db0e1cb
--- /dev/null
+++ b/src/test/java/com/gis3c/spatial/service/impl/TestServiceImpl.java
@@ -0,0 +1,22 @@
+package com.gis3c.spatial.service.impl;
+
+import com.gis3c.spatial.dao.TestDao;
+import com.gis3c.spatial.entity.Test;
+import com.gis3c.spatial.service.TestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by hukekuan on 2018/1/16.
+ */
+@Service
+public class TestServiceImpl implements TestService {
+ @Autowired private TestDao testDao;
+
+ @Override
+ public List allList() {
+ return testDao.allList();
+ }
+}
diff --git a/src/test/resources/init.sql b/src/test/resources/init.sql
new file mode 100644
index 0000000..540414a
--- /dev/null
+++ b/src/test/resources/init.sql
@@ -0,0 +1,154 @@
+--地图表
+create table c3gis_ol_map(
+ mapid varchar(50) not null PRIMARY KEY,
+ mapname varchar(50) not null,
+ view varchar(50) not null,
+ controls varchar(50) [2][],
+ pixelRatio integer,
+ interactions varchar(50) [2][],
+ layers varchar(50) [2][],
+ logo boolean,
+ overlays varchar(50) [2][],
+ description varchar(50)
+);
+
+--视图图层
+create table c3gis_ol_view(
+ viewid varchar(50) not null PRIMARY KEY,
+ viewname varchar(50) not null,
+ center double precision ARRAY[2],
+ extent double precision ARRAY[4],
+ maxresolution varchar(50),
+ minresolution varchar(50),
+ maxzoom int,
+ minzoom int,
+ zoom int,
+ projection varchar(50),
+ resolution varchar(50),
+ resolutions varchar(50) ARRAY,
+ rotation NUMERIC(7,4),
+ description varchar(50)
+);
+
+--样式类型枚举值
+CREATE TYPE c3gis_ol_vectorstyletype AS ENUM('entity', 'function');
+
+
+--矢量图层表
+create table c3gis_ol_layer_vector(
+ layerid varchar(50) not null PRIMARY KEY,
+ layername varchar(50) not null,
+ opacity real,
+ visible boolean,
+ extent decimal ARRAY[4],
+ zIndex integer,
+ minResolution decimal,
+ maxResolution decimal,
+
+ source varchar(50) not null,
+ styletype c3gis_ol_vectorstyletype not null,,
+ stylevalue varchar(50) not null,
+
+ description varchar(50)
+);
+
+
+--切片图层表
+create table c3gis_ol_layer_tile(
+ layerid varchar(50) not null PRIMARY KEY,
+ layername varchar(50) not null,
+ opacity real,
+ visible boolean,
+ extent decimal ARRAY[4],
+ minResolution decimal,
+ maxResolution decimal,
+ source varchar(50) ARRAY[2] not null,
+ description varchar(50)
+);
+
+--ArcGIS切片服务
+create table c3gis_ol_source_tilearcgisrest(
+ sourceid varchar(50) not null PRIMARY KEY,
+ sourcename varchar(50) not null,
+ crossOrigin varchar(50),
+ projection varchar(20),
+ url varchar(100) not null,
+ wrapX boolean,
+ description varchar(50)
+);
+
+--SuperMap切片服务
+create table c3gis_ol_source_tilesupermaprest(
+ sourceid varchar(50) not null PRIMARY KEY,
+ sourcename varchar(50) not null,
+ url varchar(100) not null,
+ wrapX boolean,
+ opaque boolean,
+ description varchar(50)
+);
+
+--矢量数据
+create table c3gis_ol_source_vector(
+ sourceid varchar(50) not null PRIMARY KEY,
+ sourcename varchar(50) not null,
+ logo boolean,
+ url varchar(50),
+ useSpatialIndex boolean,
+ wrapX boolean,
+ description varchar(50)
+);
+
+--wmts服务
+create table c3gis_ol_source_wmts(
+ sourceid varchar(50) not null PRIMARY KEY,
+ sourcename varchar(50) not null,
+ url varchar(50) not null,
+ layer varchar(50) not null,
+ style varchar(50) not null,
+ format varchar(50) not null,
+ matrixSet varchar(50) not null,
+ description varchar(50)
+);
+
+--样式表
+create table c3gis_ol_style_style(
+ styleid varchar(50) not null,
+ stylename varchar(50) not null,
+ fill varchar(50),
+ image varchar(50),
+ stroke varchar(50),
+ text varchar(50),
+ description varchar(50)
+);
+
+--填充面样式
+create table c3gis_ol_style_fill(
+ styleid varchar(50) not null,
+ stylename varchar(50) not null,
+ color varchar(50) not null,
+ description varchar(50)
+);
+
+--边框样式
+create table c3gis_ol_style_stroke(
+ styleid varchar(50) not null,
+ stylename varchar(50) not null,
+ color varchar(50) not null,
+ width integer,
+ lineCap varchar(50),
+ lineJoin varchar(50),
+ description varchar(50)
+);
+
+--图标样式
+create table c3gis_ol_style_icon(
+ styleid varchar(50) not null,
+ stylename varchar(50) not null,
+ anchor real ARRAY,
+ anchorOrigin varchar(20),
+ anchorXUnits varchar(20),
+ anchorYUnits varchar(20),
+ color varchar(20),
+ crossOrigin real,
+ description varchar(50)
+);
\ No newline at end of file
diff --git a/src/main/resources/mappings/ol/LayerDao.xml b/src/test/resources/mappings/ol/LayerDao.xml
similarity index 100%
rename from src/main/resources/mappings/ol/LayerDao.xml
rename to src/test/resources/mappings/ol/LayerDao.xml
diff --git a/src/main/resources/mappings/ol/MapDao.xml b/src/test/resources/mappings/ol/MapDao.xml
similarity index 100%
rename from src/main/resources/mappings/ol/MapDao.xml
rename to src/test/resources/mappings/ol/MapDao.xml
diff --git a/src/main/resources/mappings/ol/SourceDao.xml b/src/test/resources/mappings/ol/SourceDao.xml
similarity index 100%
rename from src/main/resources/mappings/ol/SourceDao.xml
rename to src/test/resources/mappings/ol/SourceDao.xml
diff --git a/src/main/resources/mappings/ol/ViewDao.xml b/src/test/resources/mappings/ol/ViewDao.xml
similarity index 100%
rename from src/main/resources/mappings/ol/ViewDao.xml
rename to src/test/resources/mappings/ol/ViewDao.xml
diff --git a/src/test/resources/mappings/spatial/TestDao.xml b/src/test/resources/mappings/spatial/TestDao.xml
new file mode 100644
index 0000000..fd2a918
--- /dev/null
+++ b/src/test/resources/mappings/spatial/TestDao.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+ SELECT id,name,direction,geom
+ FROM roadpoint;
+
+
\ No newline at end of file
diff --git a/src/test/resources/resources.properties b/src/test/resources/resources.properties
index aa53626..2fb6cb7 100644
--- a/src/test/resources/resources.properties
+++ b/src/test/resources/resources.properties
@@ -1,10 +1,10 @@
-gis.driverClassName=oracle.jdbc.driver.OracleDriver
-gis.url=jdbc:oracle:thin:@172.16.6.13:1521:orcl
-gis.username=spatial
-gis.password=spatial
+sys.driverClassName=org.postgresql.Driver
+sys.url=jdbc:postgresql:gisdata
+sys.username=gis
+sys.password=gis
-postgis.driverClassName=org.postgresql.Driver
-postgis.url=jdbc:postgresql://localhost:5432/gisdb
-postgis.username=postgres
-postgis.password=postgres
\ No newline at end of file
+spatial.driverClassName=org.postgresql.Driver
+spatial.url=jdbc:postgresql:postgis
+spatial.username=postgres
+spatial.password=postgres
\ No newline at end of file
diff --git a/src/test/resources/spring-config.xml b/src/test/resources/spring-config.xml
index d40846c..818bef5 100644
--- a/src/test/resources/spring-config.xml
+++ b/src/test/resources/spring-config.xml
@@ -28,15 +28,41 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/resources/sql-map-config-mybatis.xml b/src/test/resources/sql-map-config-mybatis.xml
index a50eff3..1adbdfb 100644
--- a/src/test/resources/sql-map-config-mybatis.xml
+++ b/src/test/resources/sql-map-config-mybatis.xml
@@ -2,13 +2,54 @@
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file