添加Es服务器配置

src/main/java/com/elephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java

@@ -11,9 +11,12 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import javax.sound.midi.Soundbank;
+import javax.validation.Valid;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.net.InetAddress;
@@ -32,7 +35,6 @@ import java.util.*;
  * @Date:
  */
 @Component
-@ConfigurationProperties(prefix = "connect")
 public class EsUtil_fanshe {
     public static TransportClient transportClient;
     public static Gson gson = new Gson();
@@ -40,6 +42,24 @@ public class EsUtil_fanshe {
     public static String host2;
     public static String host3;
     public static int port;
+    @Value("${connect.host_1}")
+    public  void setHost1(String host_1){
+        host1 =host_1;
+    }
+    @Value("${connect.host_2}")
+    public  void setHost2(String host_2){
+        host2 =host_2;
+    }
+
+    @Value("${connect.host_3}")
+    public  void setHost3(String hos_t3){
+        host3 =hos_t3;
+    }
+
+    @Value("${connect.port_net}")
+    public  void setPort(int port_net){
+        port =port_net;
+    }
 
     /**
      * @Description: 创建连接

src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglController.java

@@ -41,7 +41,6 @@ public class SzglController {
         Baseindexdata ql = baseindexdataService.selectLatesByTableName("basebridgealldata");
         Baseindexdata lx = baseindexdataService.selectLatesByTableName("basehighwayalldata");
         Baseindexdata sd = baseindexdataService.selectLatesByTableName("basetunnelalldata");
-
         long total = 0;
         // 路线
 

src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglGsdSpdwController.java

 package com.elephant.framework.galaxy.aroad.module.szgl.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.response.R;
@@ -26,17 +27,19 @@ public class SzglGsdSpdwController extends BaseController  {
 
     /**
      * 分页查询
+     *
      * @param page 数字公路-视频点
      * @return
      */
     @GetMapping("/page")
-  public R getSzglGsdSpdwPage(Page page,SzglGsdSpdw szglGsdSpdw) {
-    return  new R<>(szglGsdSpdwService.page(page,Wrappers.query(szglGsdSpdw)));
+    public R getSzglGsdSpdwPage(Page page, SzglGsdSpdw szglGsdSpdw) {
+        return new R<>(szglGsdSpdwService.page(page, Wrappers.query(szglGsdSpdw)));
     }
 
 
     /**
      * 分页查询
+     *
      * @param szglGsdSpdw 数字公路-视频点
      * @return
      */
@@ -47,13 +50,44 @@ public class SzglGsdSpdwController extends BaseController  {
 
     /**
      * 通过id查询数字公路-视频点
+     *
      * @param id id
      * @return R
      */
     @GetMapping("/{id}")
-  public R getById(@PathVariable("id") Integer id){
+    public R getById(@PathVariable("id") Integer id) {
         return new R<>(szglGsdSpdwService.getById(id));
     }
 
 
+    /**
+     * 根据经纬度获取半径范围内周边监控点
+     *
+     * @param radius 半径
+     * @param lng    经度
+     * @param lat    维度
+     * @return
+     */
+    @GetMapping("getZbjk/{radius}/{lng}/{lat}")
+    public R getZbjkForQS(@PathVariable double radius, @PathVariable double lng, @PathVariable double lat) {
+
+        //先计算查询点的经纬度范围  
+        double r = 6371; //地球半径，千米
+        double dlng =  2*Math.asin(Math.sin(radius/(2*r))/Math.cos(lat*Math.PI/180));
+        dlng = dlng*180/Math.PI;//角度转为弧度
+        double dlat = radius/r;
+        dlat = dlat*180/Math.PI;//角度转为弧度
+        double minlat =lat-dlat;
+        double maxlat = lat+dlat;
+        double minlng = lng -dlng;
+        double maxlng = lng + dlng;
+        QueryWrapper<SzglGsdSpdw> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.lambda()
+//                    .ge("jd",minlng);
+
+
+
+        return null;
+    }
+
 }

src/main/resources/application-dev.yml

@@ -51,3 +51,8 @@ fdfs:
     height: 60
   tracker-list: # tracker地址
   - 47.105.47.32:22122
+connect:
+  host_1: 192.168.7.200
+  host_2: 192.168.7.210
+  host_3: 192.168.7.220
+  port_net: 9300

src/main/resources/application.yml

@@ -2,8 +2,3 @@
 spring:
   profiles:
     active: dev
-connect:
-  host1: 192.168.7.200
-  host2: 192.168.7.210
-  host3: 192.168.7.220
-  port: 9300