1.24-优化地图坐标算法，优化首页报警查询，优化config回复判断

src/main/java/com/example/tdl/domain/vo/HomePageDataABBVo.java

@@ -12,7 +12,7 @@ public class HomePageDataABBVo {
 
     private  Integer bump;//颠簸异常
 
-    private List<AlarmLogVo> alarmLogVos;
+//    private List<AlarmLogVo> alarmLogVos;
 
     private List<CircuitABBVo> circuitABBVos;
 
@@ -52,13 +52,13 @@ public class HomePageDataABBVo {
         this.bump = bump;
     }
 
-    public List<AlarmLogVo> getAlarmLogVos() {
-        return alarmLogVos;
-    }
-
-    public void setAlarmLogVos(List<AlarmLogVo> alarmLogVos) {
-        this.alarmLogVos = alarmLogVos;
-    }
+//    public List<AlarmLogVo> getAlarmLogVos() {
+//        return alarmLogVos;
+//    }
+//
+//    public void setAlarmLogVos(List<AlarmLogVo> alarmLogVos) {
+//        this.alarmLogVos = alarmLogVos;
+//    }
 
     public List<CircuitABBVo> getCircuitABBVos() {
         return circuitABBVos;

src/main/java/com/example/tdl/mqtt/MqttListener.java

@@ -7,15 +7,16 @@ import com.example.tdl.domain.vo.CheckInVo;
 import com.example.tdl.domain.vo.ConfigCMDVo;
 import com.example.tdl.domain.vo.ConfigVo;
 import com.example.tdl.service.ConfigService;
+import com.example.tdl.web.AlarmController;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.jdbc.Null;
 import org.eclipse.paho.client.mqttv3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.expression.spel.ast.NullLiteral;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
@@ -37,6 +38,8 @@ import java.util.concurrent.TimeUnit;
 
 @Component
 public class MqttListener implements MqttCallback {
+
+    private Logger logger = LoggerFactory.getLogger(MqttListener.class);
     private static final int INIT_DELAY_DEFAULT = 1000; // unit:ms
     private static final int SCH_PERIOD_DEFAULT = 10 * INIT_DELAY_DEFAULT; // unit:ms
     private static final String CHECKIN_TOPIC = "TDL/+/+/CheckIn";
@@ -159,6 +162,7 @@ public class MqttListener implements MqttCallback {
                 String ConfigData;
                 Future<String> result = null;
                 GWConfigWorker gcconfig = null;
+               logger.info(topic+"-----"+ flag);
                 if(flag == 0){
                     ConfigCMDVo configCMDVo = new ConfigCMDVo();
                     configCMDVo.setAction("sleep");
@@ -218,19 +222,19 @@ public class MqttListener implements MqttCallback {
         ConfigVo configVo = configService.getConfig(SN,Type);
         //网关不存在
         if(configVo == null){
-            return 0;//休眠
+            return 10;//无返回值
         }
         CheckInVo checkInVo = new Gson().fromJson(message,CheckInVo.class);
         if(configVo.getUntie() && StringUtils.isEmpty(configVo.getMessage())  ){
             return 2;//解绑
         }
         if(StringUtils.isEmpty(configVo.getMessage()) && configVo.getUntie() == false){
-            return 0;//休眠
+            return 10;//无返回值
         }
         JsonObject returnData = new JsonParser().parse(message).getAsJsonObject();
         ConfigCMDVo configCMDVo = new Gson().fromJson(configVo.getMessage(),ConfigCMDVo.class);
         if(configCMDVo == null){
-            return 0;//休眠
+            return 10;//无返回值
         }
         if(returnData.has("tempL")
                 &&returnData.has("tempH")

src/main/java/com/example/tdl/util/MapUtils.java

@@ -45,12 +45,12 @@ public class MapUtils {
 //            if((lng1+"") .contains("110.")){
 //                System.out.println("lng:" + lng1  +" ----lat:" +lat1 +" ----speed:" + speed  +" ---time :" +time +" -----distance:"+s);
 //            }
-//            System.out.println("speed:"+speed);
+//            System.out.println("lng:" + lng1  +" ----lat:" +lat1 +" ----speed:" + speed  +" ---time :" +time +" -----distance:"+s);
             if(s <1000 || s> 10000){
                 //计算速度
                 if(speed>250 || speed <sppeed){
 //                    if((lng1+"") .contains("110.")){
-//                        System.out.println("lng:" + lng1  +" ----lat:" +lat1 +" ----speed:" + speed  +" ---time :" +time +" -----distance:"+s);
+//                    System.out.println("lng:" + lng1  +" ----lat:" +lat1 +" ----speed:" + speed  +" ---time :" +time +" -----distance:"+s);
 //                    }
                     return  0;
                 }

src/main/java/com/example/tdl/web/BaiduController.java

@@ -41,7 +41,7 @@ public class BaiduController {
         JSONObject jsonObject= JSON.parseObject(keyword);
         keyword=jsonObject.getString("keyword");
         logger.info(keyword);
-        return  HttpRequester.get("http://api.map.baidu.com/place_abroad/v1/search?query=" + keyword + "&page_size=1&page_num=0&scope=1&region=%E5%85%A8%E5%9B%BD&output=json&ak=rzjXpeDvGDDaBkuZxaSChdztTFc4NfC7");
+        return  HttpRequester.get("http://api.map.baidu.com/place_abroad/v1/search?query=" + keyword + "&page_size=1&page_num=0&scope=1&coord_type=3&region=%E5%85%A8%E5%9B%BD&output=json&ak=rzjXpeDvGDDaBkuZxaSChdztTFc4NfC7");
     }
 
 }

src/main/java/com/example/tdl/web/HomePageController.java

@@ -240,7 +240,7 @@ public class HomePageController {
         dataVo.setOnRoute(circuitABBService.getOnRoute(user.getCompanyNo()));//在途数量
         dataVo.setAlarmed(alarmLogServcie.getCount(time,user.getCompanyNo()));//报警数量
         dataVo.setBump(alarmLogServcie.getBumpCount(time,user.getCompanyNo())); //获取颠簸数量
-        dataVo.setAlarmLogVos(alarmLogServcie.getAlarmLog(time,user.getCompanyNo()));//报警列表
+//        dataVo.setAlarmLogVos(alarmLogServcie.getAlarmLog(time,user.getCompanyNo()));//报警列表
         dataVo.setWarehouseVoList(warehouseService.getAll(user.getCompanyNo()));
 
         //获取设备的当前位置
@@ -261,12 +261,12 @@ public class HomePageController {
                 String sql =  "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\" where  \"data_type\" = 'location' and  time >= " + startTime + " ORDER BY time desc limit 1";
                 QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
                 if (queryResult.getResults().get(0).getSeries() != null) {
-                    circuitVos.get(i).setTime(parseTime(queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString()));
+//                    circuitVos.get(i).setTime(parseTime(queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString()));
                     circuitVos.get(i).setLng(queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString());
                     circuitVos.get(i).setLat(queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(2).toString());
                 }
             }else {
-                circuitVos.get(i).setTime(null);
+//                circuitVos.get(i).setTime(null);
                 circuitVos.get(i).setLng(null);
                 circuitVos.get(i).setLat(null);
             }

src/main/resources/application-docker.properties

-spring.datasource.url=jdbc:mysql://witcloud-mariadb:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=37774020
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-server.port=8092
-
-#spring.datasource.url=jdbc:mysql://witcloud-mysql:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url=jdbc:mysql://witcloud-mariadb:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username=root
 #spring.datasource.password=37774020
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
+server.port=8092
+
+spring.datasource.url=jdbc:mysql://witcloud-mysql:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=37774020
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
 tdl.redis.host = witcloud-redis
 #tdl.redis.password=witium
 
@@ -22,10 +22,10 @@ tdl.mqtt.port = 8883
 tdl.mqtt.username = logistics
 tdl.mqtt.password = logistics37774020
 
-#tdl.core.add =http://logisticscore-java:8079/witium/addMount
-#tdl.core.delete =http://logisticscore-java:8079/witium/delMount
-tdl.core.add =http://abb-herocore:8079/witium/addMount
-tdl.core.delete =http://abb-herocore:8079/witium/delMount
+tdl.core.add =http://logisticscore-java:8079/witium/addMount
+tdl.core.delete =http://logisticscore-java:8079/witium/delMount
+#tdl.core.add =http://abb-herocore:8079/witium/addMount
+#tdl.core.delete =http://abb-herocore:8079/witium/delMount
 
 mqtt.userName = wtlogistics
 mqtt.password = wtlogistics
\ No newline at end of file

src/main/resources/application.properties

-spring.datasource.url=jdbc:mysql://192.168.1.14:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://47.110.153.44:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url=jdbc:mysql://192.168.1.14:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=37774020
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
@@ -7,7 +8,9 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 threadpool.corepoolsize = 30
 threadpool.maxpoolsize = 50
 
-server.port=8888
+
+#server.port=9092
+server.port=8092
 management.security.enabled=false
 
 
@@ -52,7 +55,8 @@ tdl.mqtt.clientcrt = witcd.crt
 # InfluxDB
 spring.influxdb.username=admin
 spring.influxdb.password=37774020
-spring.influxdb.url=http://47.97.184.225:8086
+#spring.influxdb.url=http://47.97.184.225:8086
+spring.influxdb.url=http://47.110.153.44:8086
 spring.influxdb.database=original
 spring.influxdb.retentionPolicy = tdl_policy
 spring.influxdb.connent-timeout=10