From 8dbbc6981e91231455273ae25bd8b25bef534a0d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 25 Aug 2020 15:25:56 +0800
Subject: [PATCH] 根据城市获取数据增加海拔,植被,水系

---
 src/main/resources/mapper/ShAreaMapper.xml                   |    4 ++--
 src/main/java/com/moral/mapper/ShAreaMapper.java             |    2 +-
 src/main/java/com/moral/service/impl/WeatherServiceImpl.java |    5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/mapper/ShAreaMapper.java b/src/main/java/com/moral/mapper/ShAreaMapper.java
index ae691c8..481ffcb 100644
--- a/src/main/java/com/moral/mapper/ShAreaMapper.java
+++ b/src/main/java/com/moral/mapper/ShAreaMapper.java
@@ -7,6 +7,6 @@
 
 public interface ShAreaMapper extends BaseMapper<Area> {
 
-    Map<String,Object> getLngAndLat(String name);
+    Map<String,Object> getgeography(String name);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index d7bef3b..072c542 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -709,12 +709,15 @@
             }
         }
 
-        Map<String, Object> point = shAreaMapper.getLngAndLat(name);
+        Map<String, Object> point = shAreaMapper.getgeography(name);
         for (Map<String, Object> map : resultList) {
             double longitude = Double.valueOf(point.get("lng").toString());
             double latitude = Double.valueOf(point.get("lat").toString());
             map.put("longitude",df.format(longitude));
             map.put("latitude",df.format(latitude));
+            map.put("altitude",point.get("altitude").toString());
+            map.put("vegetation",point.get("vegetation").toString());
+            map.put("river",point.get("river").toString());
         }
         return resultList;
     }
diff --git a/src/main/resources/mapper/ShAreaMapper.xml b/src/main/resources/mapper/ShAreaMapper.xml
index a382b01..90bbc12 100644
--- a/src/main/resources/mapper/ShAreaMapper.xml
+++ b/src/main/resources/mapper/ShAreaMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.moral.mapper.ShAreaMapper" >
-  <select id="getLngAndLat" resultType="java.util.Map">
-    select lng,lat from sh_area
+  <select id="getgeography" resultType="java.util.Map">
+    select lng,lat,altitude,vegetation,river from sh_area
     where name=#{name}
   </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0