完成逻辑

huimv-eartag-location/src/main/java/com/huimv/location/LocationApplication.java

@@ -2,12 +2,16 @@ package com.huimv.location;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class LocationApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(LocationApplication.class, args);
+        ApplicationContext applicationContext = SpringApplication.run(LocationApplication.class, args);
+//        applicationContext.getBean(SocketServer.class).startSocketServer();
     }
 
 }

huimv-eartag-location/src/main/java/com/huimv/location/controller/BeaconController.java

@@ -1,10 +1,12 @@
 package com.huimv.location.controller;
 
+import com.huimv.location.dao.entity.BeaconEntity;
+import com.huimv.location.service.BeaconService;
 import com.huimv.location.utils.HttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @Project : huimv.shiwan
@@ -16,16 +18,23 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 @RestController
 @RequestMapping(value = "/beacon")
+@CrossOrigin
 public class BeaconController {
     @Autowired
     private HttpClient httpClient;
+    @Autowired
+    private BeaconService beaconService;
 
+//    @RequestMapping(value = "/getOneBeaconInfo",method = RequestMethod.GET)
+//    public void getOneBeaconInfo(){
+//        httpClient.doGet("http://192.168.1.17:44444/beacons/32b00ae08dfc");
+//    }
 
-    @RequestMapping(value = "/getOneBeaconInfo",method = RequestMethod.GET)
-    public void getOneBeaconInfo(){
-
-        httpClient.doGet("http://192.168.1.17:44444/beacons/32b00ae08dfc");
+    @RequestMapping(value = "/getOneBeacon",method = RequestMethod.GET)
+    public List<BeaconEntity> getOneBeaconInfo(@RequestParam(name = "id") String mac, @RequestParam(name = "startTime") String startTime, @RequestParam(name = "endTime") String endTime){
+        return beaconService.getOneBeacons(mac,startTime,endTime);
     }
 
 
+
 }

huimv-eartag-location/src/main/resources/application-test.yml

@@ -1,5 +1,16 @@
 server:
-  port: 8085
+  port: 8082
+
 spring:
   application:
     name: location
+  datasource:
+    url: jdbc:mysql://192.168.1.17:3306/huimv_location?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    show-sql: true

huimv-eartag-location/src/main/resources/application.properties

@@ -1 +1,3 @@
-spring.profiles.active=dev
+spring.profiles.active=demo
+
+host_url=http://localhost:44444