12.21-优化压力计算海拔数据

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

 package com.example.tdl.util;
 
+import java.text.DecimalFormat;
+
 public class MapUtils {
 
         private static double EARTH_RADIUS = 6371.393;
@@ -60,17 +62,11 @@ public class MapUtils {
         }
 
         public static void main(String[] args) {
-            double f = 44300*(1-(Math.pow((1016/1013.25), (float)1/5.256)));
-            double h = 44300*(1-(Math.pow((1012/1013.25), (float)1/5.256)));
-            double f1 = 44300*(1-(Math.pow((795/1013.25), (float)1/5.256)));
-            double f2 = 44300*(1-(Math.pow((616/1013.25), (float)1/5.256)));
-            double f3 = 44300*(1-(Math.pow((1013/1013.25), (float)1/5.256)));
-            double f4 = 44300*(1-(Math.pow((1013/1013.25), (float)1/5.256)));
-            double f5 = 44300*(1-(Math.pow((1013/1013.25), (float)1/5.256)));
-
-            System.out.println(f);
-            System.out.println(f1);
-            System.out.println(h);
+            DecimalFormat df = new DecimalFormat("0.0000");
+           double  d =  (double)37/44300;
+           System.out.println("d:" + df.format(d));
+            double p=1013.25* Math.pow((1 - Double.valueOf(df.format(d))),5.256);
+             System.out.println("pressure: "+ p);
 
 
         }

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

@@ -395,6 +395,7 @@ public class DataController {
             if (queryResults.getResults().get(0).getSeries() != null) {
                 count = Double.valueOf(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()).intValue();
             } else {
+                historyDataVo.setTDLSN(TDLSN);
                 historyDataVoList.add(historyDataVo);
                 continue;
             }
@@ -929,7 +930,8 @@ public class DataController {
             HistoryData altitudeData = new HistoryData();
             altitudeData.setTime(time);
             //大气压力（kPa A) =101.325*(1-0.02257*海拔)^5.256
-            Double height = 44300*(1-(Math.pow((Double.parseDouble(df.format(Float.valueOf(press)))/1013.25), (float)1/5.256)));
+//            Double height = 44300*(1-(Math.pow((Double.parseDouble(df.format(Float.valueOf(press)))/1013.25), (float)1/5.256)));
+            Double height = 44300*(1-(Math.pow((Double.parseDouble(df.format(Float.valueOf(press)-10f))/1013.25), (float)1/5.256))); //气压临时减去10
             altitudeData.setValue(df.format(height).toString());
             pressureDataList.add(pressureData);
             altitudeDataList.add(altitudeData);

src/main/resources/application.properties

@@ -40,14 +40,14 @@ logging.config=classpath:logback.xml
 
 
 # Mqtt
-#tdl.mqtt.url = ssl://192.168.1.11
-#tdl.mqtt.port = 8883
-#tdl.mqtt.username = ugen
-#tdl.mqtt.password = ugen
-tdl.mqtt.url = ssl://47.96.128.181
+tdl.mqtt.url = ssl://192.168.1.11
 tdl.mqtt.port = 8883
-tdl.mqtt.username = logistics
-tdl.mqtt.password = logistics37774020
+tdl.mqtt.username = ugen
+tdl.mqtt.password = ugen
+#tdl.mqtt.url = ssl://47.96.128.181
+#tdl.mqtt.port = 8883
+#tdl.mqtt.username = logistics
+#tdl.mqtt.password = logistics37774020
 tdl.mqtt.qos = 1
 tdl.mqtt.timeout = 20
 # SSL Keys