diff --git a/src/main/java/com/gis3c/ol/dao/LayerDao.java b/src/main/java/com/gis3c/ol/dao/LayerDao.java index 46a775c..b06746d 100644 --- a/src/main/java/com/gis3c/ol/dao/LayerDao.java +++ b/src/main/java/com/gis3c/ol/dao/LayerDao.java @@ -12,7 +12,7 @@ import java.util.Set; */ @C3olDao public interface LayerDao { - public List findAllList(); + public List findLayerList(); public List findLayersByPage( @Param("pageSize") Integer pageSize, @Param("currentPage") Integer currentPage); diff --git a/src/main/java/com/gis3c/ol/dao/MapDao.java b/src/main/java/com/gis3c/ol/dao/MapDao.java index f1abd50..4d001de 100644 --- a/src/main/java/com/gis3c/ol/dao/MapDao.java +++ b/src/main/java/com/gis3c/ol/dao/MapDao.java @@ -22,4 +22,6 @@ public interface MapDao { public Integer insertMap(Map map); public Integer deleteMapsById(Set mapIds); + + public Integer bindLayer(@Param("mapId")String mapId, @Param("layerIds")String[] layerIds); } diff --git a/src/main/java/com/gis3c/ol/entity/Map.java b/src/main/java/com/gis3c/ol/entity/Map.java index ab8ade6..eaab684 100644 --- a/src/main/java/com/gis3c/ol/entity/Map.java +++ b/src/main/java/com/gis3c/ol/entity/Map.java @@ -7,12 +7,12 @@ public class Map { private String mapId; private String mapName; private java.util.Map view; - private String[][] controls; + private String[] controls; private Integer pixelRatio; - private String[][] interactions; - private String[][] layers; + private String[] interactions; + private String[] layers; private Boolean logo = Boolean.FALSE; - private String[][] overlays; + private String[] overlays; private String description; public String getMapId() { @@ -39,11 +39,11 @@ public class Map { this.view = view; } - public String[][] getControls() { + public String[] getControls() { return controls; } - public void setControls(String[][] controls) { + public void setControls(String[] controls) { this.controls = controls; } @@ -55,19 +55,19 @@ public class Map { this.pixelRatio = pixelRatio; } - public String[][] getInteractions() { + public String[] getInteractions() { return interactions; } - public void setInteractions(String[][] interactions) { + public void setInteractions(String[] interactions) { this.interactions = interactions; } - public String[][] getLayers() { + public String[] getLayers() { return layers; } - public void setLayers(String[][] layers) { + public void setLayers(String[] layers) { this.layers = layers; } @@ -79,11 +79,11 @@ public class Map { this.logo = logo; } - public String[][] getOverlays() { + public String[] getOverlays() { return overlays; } - public void setOverlays(String[][] overlays) { + public void setOverlays(String[] overlays) { this.overlays = overlays; } diff --git a/src/main/java/com/gis3c/ol/service/LayerService.java b/src/main/java/com/gis3c/ol/service/LayerService.java index aec856d..464eced 100644 --- a/src/main/java/com/gis3c/ol/service/LayerService.java +++ b/src/main/java/com/gis3c/ol/service/LayerService.java @@ -10,7 +10,7 @@ import java.util.Set; * Created by hukekuan on 2017/12/15. */ public interface LayerService { - public List findAllList(); + public List findLayerList(); public List> findLayersByPage(Integer pageSize,Integer currentPage); public Layer findeLayerById(String layerId); diff --git a/src/main/java/com/gis3c/ol/service/MapService.java b/src/main/java/com/gis3c/ol/service/MapService.java index 3e2b1b1..d298da3 100644 --- a/src/main/java/com/gis3c/ol/service/MapService.java +++ b/src/main/java/com/gis3c/ol/service/MapService.java @@ -17,4 +17,6 @@ public interface MapService { public Integer insertMap(Map map); public Integer deleteMapsById(Set mapIds); + + public Integer bindLayer(String mapId,String[] layerIds); } diff --git a/src/main/java/com/gis3c/ol/service/impl/MapServiceImpl.java b/src/main/java/com/gis3c/ol/service/impl/MapServiceImpl.java index 2eb80ff..d1bb782 100644 --- a/src/main/java/com/gis3c/ol/service/impl/MapServiceImpl.java +++ b/src/main/java/com/gis3c/ol/service/impl/MapServiceImpl.java @@ -57,4 +57,9 @@ public class MapServiceImpl implements MapService { public Integer deleteMapsById(Set mapIds) { return mapDao.deleteMapsById(mapIds); } + + @Override + public Integer bindLayer(String mapId, String[] layerIds) { + return mapDao.bindLayer(mapId,layerIds); + } } diff --git a/src/main/resources/init.sql b/src/main/resources/init.sql index 07b436a..23c249a 100644 --- a/src/main/resources/init.sql +++ b/src/main/resources/init.sql @@ -2,14 +2,13 @@ create table c3gis_ol_map( mapid varchar(50) not null PRIMARY KEY, mapname varchar(50) not null, - --view varchar(50) not null, view jsonb not null, - controls varchar(50) [2][], + controls varchar(50) [], pixelRatio integer, - interactions varchar(50) [2][], - layers varchar(50) [2][], + interactions varchar(50) [], + layers varchar(50) [], logo boolean, - overlays varchar(50) [2][], + overlays varchar(50) [], description varchar(50) ); diff --git a/src/test/java/com/gis3c/spatial/App.java b/src/test/java/com/gis3c/spatial/App.java index d81ccd7..46c1bcd 100644 --- a/src/test/java/com/gis3c/spatial/App.java +++ b/src/test/java/com/gis3c/spatial/App.java @@ -114,15 +114,23 @@ public class App { // view.put("zoom",9); // map.setView(view); // map.setLogo(false); -// map.setLayers(new String[][]{ -// {"TileLayer","182a8b18-d26f-43da-9b3a-6f90af4825ed"}, -// {"TileLayer","8c396460-9995-4387-8aa1-bb16c2595bba"}, -// {"TileLayer","ad433664-3b2c-4b1b-b271-519b7f647a11"} +// map.setLayers(new String[]{ +// "182a8b18-d26f-43da-9b3a-6f90af4825ed", +// "8c396460-9995-4387-8aa1-bb16c2595bba", +// "ad433664-3b2c-4b1b-b271-519b7f647a11" // }); // mapService.insertMap(map); // // System.out.println("插入成功"); + mapService.bindLayer("15a67947-8dc7-46f4-bc06-5c2fc51609d9",new String[]{ + "e8819b8e-9397-4609-8b23-9f18c9588d6b", + "9e3a9812-5921-45c9-9043-e52d81fff1bb", + "ea6444b3-710f-4516-af9a-aa8270276883", + "aabb842e-239e-491d-9c70-a2cec1f65886" + }); + System.out.println("修改成功"); + //图层接口 // Layer layer = new Layer(); // layer.setLayerName("sdkqbigdata"); diff --git a/src/test/resources/mappings/ol/LayerDao.xml b/src/test/resources/mappings/ol/LayerDao.xml index 5160d43..f1bf857 100644 --- a/src/test/resources/mappings/ol/LayerDao.xml +++ b/src/test/resources/mappings/ol/LayerDao.xml @@ -35,7 +35,7 @@ , description - SELECT FROM c3gis_ol_layer; diff --git a/src/test/resources/mappings/ol/MapDao.xml b/src/test/resources/mappings/ol/MapDao.xml index b1e535b..92ed32f 100644 --- a/src/test/resources/mappings/ol/MapDao.xml +++ b/src/test/resources/mappings/ol/MapDao.xml @@ -84,4 +84,10 @@ #{item, javaType=java.lang.String} + + + UPDATE c3gis_ol_map + SET layers = #{layerIds, javaType=ObjectArray} + WHERE mapid = #{mapId, javaType=java.lang.String} + \ No newline at end of file