Merge branch 'dev' into dev-1208

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/yzt/ZymlController.java

@@ -197,4 +197,20 @@ public class ZymlController extends BaseController {
     }
 
 
+    /**
+     *
+     *
+     * @return
+     */
+    @GetMapping("/GetTree/tiltedModel")
+    public RequestResult tiltedModel(String name) {
+
+        return zymlService.GetZymlShareList(name);
+    }
+
+
+
+
+
+
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/yzt/searchController.java

@@ -59,4 +59,37 @@ public class searchController extends BaseController {
     public RequestResult bookmarkDel(@RequestBody Map params) {
         return searchService.bookmarkDel(params.get("id").toString());
     }
+
+
+
+    /**
+     * 分词查询list
+     *
+     * @return
+     */
+    @PostMapping("/poiSearchList")
+    public RequestResult poiSearchList(@RequestBody PoiSearchDTO poiSearchDTO) {
+        return searchService.poi(poiSearchDTO);
+    }
+
+
+
+    /**
+     * 兴趣点查询
+     *
+     * @return
+     */
+    @GetMapping("/getPoiByName")
+    public RequestResult getPoiByName(@RequestBody PoiSearchDTO poiSearchDTO) {
+        //return searchService.poi(poiSearchDTO);
+        return RequestResult.success("查询成功！", null);
+    }
+
+
+
+
+
+
+
+
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/yzt/PoiSearchDTO.java

@@ -1,11 +1,14 @@
 package com.onemap.apply.domain.yzt;
 
+import java.util.List;
+
 /**
  * 兴趣点查询参数实体
  */
 public class PoiSearchDTO {
     private String name ;
     private String type ;
+    private List<String> childrenWord ;
     private Integer limit;
     private Integer offset ;
 
@@ -40,4 +43,12 @@ public class PoiSearchDTO {
     public void setOffset(Integer offset) {
         this.offset = offset;
     }
+
+    public List<String> getChildrenWord() {
+        return childrenWord;
+    }
+
+    public void setChildrenWord(List<String> childrenWord) {
+        this.childrenWord = childrenWord;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/yzt/SearchMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
+ *
  * 资源目录 数据层
  *
  * @author onemap
@@ -20,4 +21,10 @@ public interface SearchMapper {
     List<CollectionDTO> bookmark(@Param("name") String name, @Param("type") String type, @Param("limit") Integer limit, @Param("offset") Integer offset);
 
     Integer bookmarkcount(@Param("name") String name, @Param("type") String type);
+
+    List<PoiDTO>  getPoiByName(@Param("nameList") String nameList);
+
+    List<PoiDTO> poiLikeName(@Param("nameList") String nameList, @Param("limit") Integer limit, @Param("offset") Integer offset);
+
+
 }

onemap-modules/onemap-apply/src/main/resources/iserver_service_url_v1.json

@@ -0,0 +1,45 @@
+[
+  {
+    "id": "0",
+    "label": "三亚iservice的url",
+    "title": "三亚iservice的url",
+    "type": "",
+    "url": "",
+    "source": "",
+    "legend": "",
+    "favorite": null,
+    "disabled": false,
+    "checked": false,
+    "expand": false,
+    "children": [
+      {
+        "id": "1",
+        "label": "实景服务",
+        "title": "实景服务",
+        "type": "wms",
+        "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_ydysyxz&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
+        "source": "",
+        "legend": "",
+        "favorite": null,
+        "disabled": false,
+        "checked": false,
+        "expand": false,
+        "contextmenu": false
+      },
+      {
+        "id": "2",
+        "label": "dev",
+        "title": "dev",
+        "type": "wms",
+        "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_ydbp&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
+        "source": null,
+        "legend": null,
+        "favorite": null,
+        "disabled": false,
+        "checked": false,
+        "expand": false,
+        "contextmenu": false
+      }
+    ]
+  }
+]

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/yzt/SearchMapper.xml

@@ -32,4 +32,34 @@
         </if>
     </select>
 
+
+    <select id="getPoiByName" parameterType="java.lang.String" resultType="com.onemap.apply.domain.yzt.PoiDTO">
+        select t.name,t.adress,public.st_x ( t.geom ) x,public.st_y ( t.geom ) y
+        from  poi t  where 1=1
+         <if test="nameList != null and nameList.size()>0">
+             and t.name in
+             <foreach collection="nameList" item="name" open="(" separator="," close=")">
+                 #{name}
+             </foreach>
+        </if>
+    </select>
+
+
+    <select id="poiLikeName"  resultType="com.onemap.apply.domain.yzt.PoiDTO">
+        select t.name,t.adress,public.st_x ( t.geom ) x,public.st_y ( t.geom ) y
+        from  poi t  where 1=1
+         <if test="nameList != null and nameList.size()>0">
+             and t.name in
+             <foreach collection="nameList" item="name" open="(" separator="," close=")">
+                 #{name}
+             </foreach>
+        </if>
+        limit ${limit} offset  ${offset}
+    </select>
+
+
+
+
+
+
 </mapper>