优化项目定位空判断

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDataDisplayController.java

@@ -155,8 +155,10 @@ public class TDataDisplayController extends BaseController {
                     .map(mapGpsDto -> {
                         AjaxResult ajax = new AjaxResult();
                         List<Float> list = new ArrayList<>();
-                        list.add(mapGpsDto.getGps_long());
-                        list.add(mapGpsDto.getGps_lat());
+                        if (mapGpsDto != null && mapGpsDto.getGps_long() != null && mapGpsDto.getGps_lat() != null) {
+                            list.add(mapGpsDto.getGps_long());
+                            list.add(mapGpsDto.getGps_lat());
+                        }
                         ajax.put("lnglat", list);
                         return ajax;
                     }).filter(
@@ -285,6 +287,9 @@ public class TDataDisplayController extends BaseController {
     }
 
     public String checkDeviceType(Integer device_model) {
+        if (device_model == null) {
+            return "null";
+        }
         SysDictData date = new SysDictData();
         date.setDictType("sys_device_type");
         List<SysDictData> selectDictDataList = sysDictDataService.selectDictDataList(date);

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MapGpsDto.java

@@ -9,24 +9,24 @@ public class MapGpsDto {
     private static final long serialVersionUID = 1L;
 
     /** 经度 */
-    private float gps_long;
+    private Float gps_long;
 
     /** 纬度 */
-    private float gps_lat;
+    private Float gps_lat;
 
-    public float getGps_long() {
+    public Float getGps_long() {
         return gps_long;
     }
 
-    public void setGps_long(float gps_long) {
+    public void setGps_long(Float gps_long) {
         this.gps_long = gps_long;
     }
 
-    public float getGps_lat() {
+    public Float getGps_lat() {
         return gps_lat;
     }
 
-    public void setGps_lat(float gps_lat) {
+    public void setGps_lat(Float gps_lat) {
         this.gps_lat = gps_lat;
     }
 }