Merge remote-tracking branch 'origin/dev' into dev

common/common_utils/pom.xml

@@ -9,10 +9,4 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common_utils</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-    </dependencies>
 </project>
\ No newline at end of file

common/common_utils/src/main/java/com/founder/commonutils/publicEntity/GeographicInfo.java

 package com.founder.commonutils.publicEntity;
 
 import java.util.List;
+import org.elasticsearch.common.geo.GeoPoint;
 
 public class GeographicInfo {
     private   String field; //空间检索字段

common/pom.xml

@@ -21,6 +21,7 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <scope>provided </scope>
         </dependency>
+
         <!--spring切面aop依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -64,7 +65,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-
+        <!-- 引入spring-data-elasticsearch-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
         <!-- spring2.X集成redis所需common-pool2
         <dependency>
             <groupId>org.apache.commons</groupId>

pom.xml

@@ -224,6 +224,22 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
+            <resources>
+                <resource>
+                    <directory>src/main/java</directory>
+                    <includes>
+                        <include>**/*.xml</include>
+                    </includes>
+                    <filtering>false</filtering>
+                </resource>
+                <resource>
+                    <directory>src/main/resources</directory>
+                    <includes>
+                        <include>**/*</include>
+                    </includes>
+                    <filtering>true</filtering>
+                </resource>
+            </resources>
     </build>
 
 </project>

service/es/src/main/java/com/founder/eszy/controller/EsQueryController.java

 package com.founder.eszy.controller;
 
-
 import com.founder.commonutils.publicEntity.*;
 import com.founder.eszy.esSearch.EsTbZyJzxxTranslationQuery;
 import io.swagger.annotations.ApiOperation;
+import org.elasticsearch.common.geo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,20 +31,19 @@ public class EsQueryController {
       String distance=geographicInfo.getDistance();
       //判断是否是圆
       if(distance!=null&&distance!=""){
-        GeoPoint point=geographicInfo.getPoint();
+        org.elasticsearch.common.geo.GeoPoint point=geographicInfo.getPoint();
         if (distance == null || point == null){
           return null;
         }
         try {
-          //result = esTbZyJzxxTranslationQuery.searchGeoDistance(bean.getIndex(),bean.getType(),geographicInfo.getField(),distance,point);
+          result = esTbZyJzxxTranslationQuery.searchGeoDistance(bean.getIndex(),bean.getType(),geographicInfo.getField(),distance,point);
         }catch (Exception e){
          e.printStackTrace();
         }
         return MapRestResult.ok().count(result.size()).data(result);
-                //XzxtRestResult.build(200,result.size()+"",result);
       }else{
         try {
-         // result = esTbZyJzxxTranslationQuery.searchGeoPolygon(bean.getIndex(),bean.getType(),geographicInfo.getField(),geographicInfo.getPoints());
+          result = esTbZyJzxxTranslationQuery.searchGeoPolygon(bean.getIndex(),bean.getType(),geographicInfo.getField(),geographicInfo.getPoints());
         }catch (Exception e){
           e.printStackTrace();
         }

service/es/src/main/java/com/founder/eszy/esExtract/TbZyJzxxEs.java

@@ -69,7 +69,7 @@ public class TbZyJzxxEs {
                     .startObject("xzqhDz").field("type", "keyword").endObject()
                     .startObject("province").field("type", "keyword").endObject()
                     .startObject("city").field("type", "keyword").endObject()
-                    .startObject("district").field("type", "geo_point").endObject()
+                    .startObject("district").field("type", "keyword").endObject()
                     //更新时间
                    // .startObject("updatedtime").field("type", "keyword").endObject()//修改时间
 
@@ -126,7 +126,7 @@ public class TbZyJzxxEs {
                 map.put("district",e.getDistrict());
 
                 //es 特需
-                map.put("xy",e.getX()+","+e.getY());
+                map.put("xy",e.getY()+","+e.getX());
                 bulkRequest.add(esClient.prepareIndex(indexName, "pointdata",e.getCid()).setSource(map));
                 bulkRequest.execute().actionGet();
             } catch (Exception e1 ) {

service/es/src/main/resources/application.properties

@@ -19,7 +19,7 @@ mybatis-plus.mapper-locations=classpath:com/founder/eszy/mapper/xml/*.xml
 #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 #基站--------------
-jz_count=600000
+jz_count=10
 jz_limit=10000
 jz_begin=0
 jz_index=jizhan

service/pom.xml

@@ -153,15 +153,4 @@
             <version>4.12</version>
         </dependency>
     </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-    </build>
 </project>
\ No newline at end of file