账单经纬度修改

common/src/main/java/com/jpsoft/bus/modules/bus/callback/GpsDataCallbackImpl.java

@@ -153,11 +153,11 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
                         }
 
                         //判断车辆和当前站点的位置关系
-                        int radius = 0;
+                        int radius = 100;
                         StationInfo currentStation = stationInfoService.get(stationId);
 
-                        if (currentStation.getRadius() == null){
-                            radius = 100;
+                        if (currentStation.getRadius() != null){
+                            radius = currentStation.getRadius();
                         }
 
                         double distance1 = gpsService.calculateDistance(lastLongitude,lastLatitude,currentStation.getLongitude(),currentStation.getLatitude());

web/src/main/resources/application-dev.yml

@@ -7,28 +7,26 @@ spring:
   datasource:
 
     #开发环境
-#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft2016
+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: jpsoft2016
 
     #测试环境
-    url: jdbc:log4jdbc:mysql://47.92.161.104:3336/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: jpsoft8121234
+#     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft8121234
 
     #正式环境
-#     url: jdbc:log4jdbc:mysql://122.189.98.152:3336/jp_housekeeper?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 #     username: root
 #     password: jpsoft8121234
 
-
-
   devtools:
     add-properties: false
     restart:
       enabled: true
   rabbitmq:
-    host: 127.0.0.1
+    host: 192.168.33.20
     virtual-host: tomatozq
 
 logger: