From 824762785fb717317550127684efb4f7b792cc8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Nov 2020 09:47:58 +0800
Subject: [PATCH] 剔除沧州地图页面非本公司设备图标，vue页面城市地理特征更新
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 2a64f27..0991b8c 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -827,21 +827,28 @@
//������������
Map<String, Object> geographyMap = shAreaMapper.getGeography(name);
- for (Map<String, Object> map : resultList) {
- double longitude = Double.valueOf(geographyMap.get("lng").toString());
- double latitude = Double.valueOf(geographyMap.get("lat").toString());
- map.put("longitude", df.format(longitude));
- map.put("latitude", df.format(latitude));
- if (geographyMap.get("altitude") != null) {
- map.put("altitude", geographyMap.get("altitude").toString());
- }
- if (geographyMap.get("vegetation") != null) {
- map.put("vegetation", geographyMap.get("vegetation").toString());
- }
- if (geographyMap.get("river") != null) {
- map.put("river", geographyMap.get("river").toString());
+ if (geographyMap != null) {
+ for (Map<String, Object> map : resultList) {
+ if (geographyMap.get("lng") != null) {
+ double longitude = Double.valueOf(geographyMap.get("lng").toString());
+ map.put("longitude", df.format(longitude));
+ }
+ if (geographyMap.get("lat") != null) {
+ double latitude = Double.valueOf(geographyMap.get("lat").toString());
+ map.put("latitude", df.format(latitude));
+ }
+ if (geographyMap.get("altitude") != null) {
+ map.put("altitude", geographyMap.get("altitude").toString());
+ }
+ if (geographyMap.get("vegetation") != null) {
+ map.put("vegetation", geographyMap.get("vegetation").toString());
+ }
+ if (geographyMap.get("river") != null) {
+ map.put("river", geographyMap.get("river").toString());
+ }
}
}
+
for (int i = 0; i < resultList.size(); i = i + 2) {
Map<String, Object> foreMap = resultList.get(i);
Map<String, Object> realMap = resultList.get(i + 1);
--
Gitblit v1.8.0