From 15c04036044836b34f22b5c98ecb82b6f2d4ad86 Mon Sep 17 00:00:00 2001
From: "hukekuan@163.com" <hukekuan@163.com>
Date: Mon, 12 Feb 2018 17:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/gis3c/ol/dao/LayerDao.java  |  5 +++-
 .../com/gis3c/ol/service/LayerService.java    |  2 +-
 .../ol/service/impl/LayerServiceImpl.java     |  9 +++----
 src/test/java/com/gis3c/spatial/App.java      | 25 +++++++++++++------
 src/test/resources/mappings/ol/LayerDao.xml   |  4 +++
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/gis3c/ol/dao/LayerDao.java b/src/main/java/com/gis3c/ol/dao/LayerDao.java
index 50c5410..46a775c 100644
--- a/src/main/java/com/gis3c/ol/dao/LayerDao.java
+++ b/src/main/java/com/gis3c/ol/dao/LayerDao.java
@@ -21,8 +21,11 @@ public interface LayerDao {
     public Layer findeLayerByName(String layerName);
 
     public Integer insertLayer(Layer layer);
+
     public Integer bindSource(
             @Param("layerId") String layerId,
-            @Param("sourceId") String sourceId);
+            @Param("sourceId") String sourceId,
+            @Param("options") java.util.Map<String,Object> options
+    );
     public Integer deleteLayersById(Set<String> layerIds);
 }
diff --git a/src/main/java/com/gis3c/ol/service/LayerService.java b/src/main/java/com/gis3c/ol/service/LayerService.java
index d9c17f2..aec856d 100644
--- a/src/main/java/com/gis3c/ol/service/LayerService.java
+++ b/src/main/java/com/gis3c/ol/service/LayerService.java
@@ -17,6 +17,6 @@ public interface LayerService {
     public Layer findeLayerByName(String layerName);
 
     public Integer insertLayer(Layer layer);
-    public Integer bindSource(String layerId,String sourceId);
+    public Integer bindSource(String layerId,String sourceId,java.util.Map<String,Object> options);
     public Integer deleteLayersById(Set<String> layerIds);
 }
diff --git a/src/main/java/com/gis3c/ol/service/impl/LayerServiceImpl.java b/src/main/java/com/gis3c/ol/service/impl/LayerServiceImpl.java
index 3003611..86a2f42 100644
--- a/src/main/java/com/gis3c/ol/service/impl/LayerServiceImpl.java
+++ b/src/main/java/com/gis3c/ol/service/impl/LayerServiceImpl.java
@@ -7,10 +7,7 @@ import com.gis3c.ol.service.LayerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Created by hukekuan on 2017/12/15.
@@ -56,8 +53,8 @@ public class LayerServiceImpl implements LayerService {
     }
 
     @Override
-    public Integer bindSource(String layerId, String sourceId) {
-        return layerDao.bindSource(layerId,sourceId);
+    public Integer bindSource(String layerId, String sourceId, Map<String, Object> options) {
+        return layerDao.bindSource(layerId,sourceId,options);
     }
 
     @Override
diff --git a/src/test/java/com/gis3c/spatial/App.java b/src/test/java/com/gis3c/spatial/App.java
index 8b76383..d81ccd7 100644
--- a/src/test/java/com/gis3c/spatial/App.java
+++ b/src/test/java/com/gis3c/spatial/App.java
@@ -29,6 +29,17 @@ public class App {
         MapService mapService = context.getBean(MapService.class);
         TestService testService = context.getBean(TestService.class);
 
+//        java.util.Map<String,Object> layerOptions = new HashMap<>();
+//        layerOptions.put("a","aaaaaaaa");
+//        layerOptions.put("b","bbbbbbbb");
+//        layerOptions.put("c","cccccccc");
+//        layerService.bindVectorSource(
+//                "9e3a9812-5921-45c9-9043-e52d81fff1bb",
+//                "4f21a864-3e81-4ee1-97b7-6d18a876b5c1",
+//                layerOptions);
+//        System.out.println("更新成功");
+
+
 //        Integer result = layerService.bindSource("aabb842e-239e-491d-9c70-a2cec1f65886","d67de989-d351-4ba2-b3ac-021130ae19d4");
 //        System.out.println(result);
 
@@ -113,13 +124,13 @@ public class App {
 //        System.out.println("插入成功");
 
         //图层接口
-        Layer layer = new Layer();
-        layer.setLayerName("sdkqbigdata");
-        layer.setAliasName("大屏行政区");
-        layer.setType("ol.layer.Tile");
-        layer.setProjection("EPSG:3857");
-        layerService.insertLayer(layer);
-        System.out.println("插入成功");
+//        Layer layer = new Layer();
+//        layer.setLayerName("sdkqbigdata");
+//        layer.setAliasName("大屏行政区");
+//        layer.setType("ol.layer.Tile");
+//        layer.setProjection("EPSG:3857");
+//        layerService.insertLayer(layer);
+//        System.out.println("插入成功");
 
 
 //资源接口
diff --git a/src/test/resources/mappings/ol/LayerDao.xml b/src/test/resources/mappings/ol/LayerDao.xml
index 9d07673..5160d43 100644
--- a/src/test/resources/mappings/ol/LayerDao.xml
+++ b/src/test/resources/mappings/ol/LayerDao.xml
@@ -94,9 +94,13 @@
 			, #{description}
 		);
 	</insert>
+
 	<update id="bindSource">
 		UPDATE c3gis_ol_layer
 		SET source = #{sourceId, javaType=java.lang.String}
+		<if test="options != null">
+			, options = #{options, javaType=ObjectJSON}::jsonb
+		</if>
 		WHERE layerid = #{layerId, javaType=java.lang.String}
 	</update>