diff --git a/src/main/java/com/gis3c/ol/service/LayerService.java b/src/main/java/com/gis3c/ol/service/LayerService.java index 4f7cb99..daf16e3 100644 --- a/src/main/java/com/gis3c/ol/service/LayerService.java +++ b/src/main/java/com/gis3c/ol/service/LayerService.java @@ -17,10 +17,9 @@ public interface LayerService { /** * 获取地图中需要设置的图层列表 - * @param layerIdList 地图中已加入的图层编号 - * @return 在图层列表基础上新增已添加标记 + * @return */ - public List findSimpleLayerList(List layerIdList); + public List findSimpleLayerList(); public List> findLayersByPage(Integer pageSize,Integer currentPage); public Layer findeLayerById(String layerId); 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 80f8e3a..19271fd 100644 --- a/src/main/java/com/gis3c/ol/service/impl/LayerServiceImpl.java +++ b/src/main/java/com/gis3c/ol/service/impl/LayerServiceImpl.java @@ -42,34 +42,8 @@ public class LayerServiceImpl implements LayerService { } @Override - public List findSimpleLayerList(List layerIdList) { - List result = new ArrayList<>(); - List layerList = layerDao.findLayerList(); - MapLayer mapLayer; - Layer queryLayer; - if(layerIdList != null && layerIdList.size() > 0){ - for(String layerId : layerIdList){ - mapLayer = new MapLayer(); - queryLayer = layerList.stream() - .filter(layer -> layer.getLayerId().equals(layerId)) - .findFirst() - .orElse(null); - if(queryLayer != null){ - mapLayer.setLayer(queryLayer); - mapLayer.setBinded(true); - result.add(mapLayer); - - layerList.remove(queryLayer); - } - } - } - for(Layer layer : layerList){ - mapLayer = new MapLayer(); - mapLayer.setLayer(layer); - result.add(mapLayer); - } - - return result; + public List findSimpleLayerList() { + return layerDao.findLayerList(); } @Override