解决冲突代码

tile-web/src/main/java/cn/com/taiji/web/controller/TileWebController.java

@@ -44,28 +44,6 @@ public class TileWebController {
     @Autowired
     private IGeoDataSourceService geoDataSourceService;
 
-    @PostConstruct
-    public void initData(){
-        try {
-            List<String> layerCodeList = new ArrayList<String>();
-            layerCodeList.add("socialManagementElement");
-            List<LayerGroupDsView> layerGroupDsViewList = geoDataSourceService.layerCodeGeoDataSource(layerCodeList);
-
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-    @ApiOperation("面向瓦片的点击查询")
-    @GetMapping("/queryElements")
-    public Result queryElements(String bbox,Integer type,String layerName){
-        List<?> list=tileService.queryElements(bbox,type,layerName);
-
-        return Result.of(list, 0, "操作成功");
-    }
-
 
     @RequestMapping(value = {"/queryTile"}, method = {RequestMethod.GET, RequestMethod.POST})
     public void queryTile(HttpServletRequest request, HttpServletResponse response) {