Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-10 4319627cf67d19093a18ff724c21782e34fc7a26

 screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java

@@ -209,17 +209,20 @@
                        Device device = devicesMap.get(key);
                        double getmeter1 = LongitudeAndLatitudeUtils.getmeter(point_lon, point_lat, device.getLongitude(), device.getLatitude());
                        if (getmeter1<getmeter){
                            getmeter=getmeter1;
                            near_mac = device.getMac();
                        }
                    }
                    Map<String, Object> map = historyDataMap.get(near_mac);
                    String value = map.get("value").toString();
                    JSONObject jsonObject = JSONObject.parseObject(value);
                    Double sensorValue = Double.parseDouble(jsonObject.get(sensorCode).toString());
                    resultMap.put("lon",point_lon);
                    resultMap.put("lat",point_lat);
                    resultMap.put("value",sensorValue);
                    resultList.add(resultMap);
                    if (map != null){
                        String value = map.get("value").toString();
                        JSONObject jsonObject = JSONObject.parseObject(value);
                        Double sensorValue = Double.parseDouble(jsonObject.get(sensorCode).toString());
                        resultMap.put("lon",point_lon);
                        resultMap.put("lat",point_lat);
                        resultMap.put("value",sensorValue);
                        resultList.add(resultMap);
                    }
                }
                point_lat = DoubleUtils.add(point_lat,lat_ontShare);
            }