会议版本-添加高德获坐标

pom.xml

@@ -61,6 +61,9 @@
       <version>${commons-net.version}</version>
     </dependency>
 
+
+
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>

src/main/java/com/hywa/map/controller/common/WeatherController.java

@@ -3,6 +3,7 @@ package com.hywa.map.controller.common;
 import com.hywa.map.representation.ResponseBase;
 import com.hywa.map.representation.TempHour;
 import com.hywa.map.representation.WeatherForecast;
+import com.hywa.map.representation.amap.AmapEntity;
 import com.hywa.map.service.common.WeatherService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -59,5 +60,18 @@ public class WeatherController{
             throw e;
         }
     }
+
+    @ResponseBody
+    @RequestMapping(value = "/log", method = RequestMethod.GET)
+    public ResponseEntity<ResponseBase> addressLagLat(String cityName,String key) {
+        try {
+            ResponseBase<AmapEntity> responseBase = new ResponseBase<>();
+            responseBase.success().setRetBody(weatherService.getAddressDetail(cityName,key));
+            return new ResponseEntity<>(responseBase, HttpStatus.OK);
+        } catch (Exception e) {
+            log.error("查询城市的经纬度，城市：" + cityName +"|"+ key+"|查询异常：" + e);
+            throw e;
+        }
+    }
 }
 

src/main/java/com/hywa/map/controller/map/MapStatisController.java

@@ -13,6 +13,8 @@ import com.hywa.map.dao.mapper.AreaDataMapper;
 import com.hywa.map.dao.mapper.ExpertInfoMapper;
 import com.hywa.map.dao.mapper.TopicInfoMapper;
 import com.hywa.map.representation.*;
+import com.hywa.map.representation.amap.AmapEntity;
+import com.hywa.map.service.common.WeatherService;
 import com.hywa.map.service.dict.DictService;
 import com.hywa.map.service.expert.AreaDataService;
 import com.hywa.map.service.expert.DamService;
@@ -63,6 +65,9 @@ public class MapStatisController {
     @Autowired
     private AreaDataMapper areaDataMapper;
 
+    @Autowired
+    private WeatherService weatherService;
+
     public static String[] areaArrays = {"冠山街道", "龙山镇", "醒狮镇", "谷脚镇", "湾滩河镇", "洗马镇", "龙里县"};
     public static DecimalFormat decimalFormat = new DecimalFormat("###################.###########");
 
@@ -968,11 +973,42 @@ public class MapStatisController {
                             }
                             String posAliasName = name.replaceAll("省", "").replaceAll("市", "");
                             SysArea sysArea = areaDataMapper.selectPosByName(name, posAliasName, porvinceName, cityName, countyName);
+
+
+
                             lon = sysArea.getPosLon();
                             lat = sysArea.getPosLat();
+                            if (lon== null||lat == null){
+                                AmapEntity detail = weatherService.getAddressDetail(cityName, name);
+                                String location = detail.getLocation();
+                                if (!StringUtils.isEmpty(location)){
+                                    String[] split = location.split(",");
+                                    lon = split[0];
+                                    lat = split[1];
+                                }
+                            }
                             break;
                         }
                     } catch (Exception e) {
+                        AmapEntity detail = weatherService.getAddressDetail(cityName, name);
+                        if (detail != null){
+                            String location = detail.getLocation();
+                            if (!StringUtils.isEmpty(location)){
+                                String[] split = location.split(",");
+                                lon = split[0];
+                                lat = split[1];
+                            }
+                        }else {
+                            AmapEntity ss = weatherService.getAddressDetail(cityName, cityName);
+                            if (ss != null){
+                                String location = ss.getLocation();
+                                if (!StringUtils.isEmpty(location)){
+                                    String[] split = location.split(",");
+                                    lon = split[0];
+                                    lat = split[1];
+                                }
+                            }
+                        }
 
                     }
                 }

src/main/java/com/hywa/map/representation/amap/AmapEntity.java

@@ -0,0 +1,150 @@
+package com.hywa.map.representation.amap;
+
+import java.io.Serializable;
+
+public class AmapEntity implements Serializable {
+    private String formattedAddress;
+    private String country;
+    private String province;
+    private String citycode;
+    private String city;
+    private String district;
+    private String township;
+    private String neighborhood;
+    private String building;
+    private String name;
+    private String type;
+    private String adcode;
+    private String street;
+    private String number;
+    private String location;
+    private String level;
+
+    public String getFormattedAddress() {
+        return formattedAddress;
+    }
+
+    public void setFormattedAddress(String formattedAddress) {
+        this.formattedAddress = formattedAddress;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCitycode() {
+        return citycode;
+    }
+
+    public void setCitycode(String citycode) {
+        this.citycode = citycode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getTownship() {
+        return township;
+    }
+
+    public void setTownship(String township) {
+        this.township = township;
+    }
+
+    public String getNeighborhood() {
+        return neighborhood;
+    }
+
+    public void setNeighborhood(String neighborhood) {
+        this.neighborhood = neighborhood;
+    }
+
+    public String getBuilding() {
+        return building;
+    }
+
+    public void setBuilding(String building) {
+        this.building = building;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getAdcode() {
+        return adcode;
+    }
+
+    public void setAdcode(String adcode) {
+        this.adcode = adcode;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+}

src/main/java/com/hywa/map/service/common/WeatherService.java

@@ -2,6 +2,7 @@ package com.hywa.map.service.common;
 
 import com.hywa.map.representation.TempHour;
 import com.hywa.map.representation.WeatherForecast;
+import com.hywa.map.representation.amap.AmapEntity;
 
 /**
 * dap_weather  对应ServiceInterface 接口类
@@ -21,5 +22,15 @@ public interface WeatherService {
      * @return 天气温度信息
      */
     TempHour getHourWeather(String cityCode);
+
+    /**
+     * 获取坐标
+     * @param cityName
+     * @param key
+     * @return
+     */
+    AmapEntity getAddressDetail(String cityName,String key);
+
+
 }
 

src/main/java/com/hywa/map/service/common/impl/WeatherServiceImpl.java

@@ -8,6 +8,7 @@ import com.hywa.map.common.exception.GlobalException;
 import com.hywa.map.common.utils.*;
 import com.hywa.map.dao.mapper.WeatherMapper;
 import com.hywa.map.representation.*;
+import com.hywa.map.representation.amap.AmapEntity;
 import com.hywa.map.service.common.WeatherService;
 import com.hywa.map.service.orchard.impl.OrchardServiceImpl;
 import org.apache.commons.logging.Log;
@@ -35,6 +36,10 @@ public class WeatherServiceImpl implements WeatherService {
     private String lbsDevKey;
     @Value("${lbs.amap.com.dev.url}")
     private String lbsDevUrl;
+
+    @Value("${lbs.amap.com.dev.address}")
+    private String addUrl;
+
     private static Log log = LogFactory.getLog(WeatherServiceImpl.class);
 
     @Override
@@ -171,6 +176,36 @@ public class WeatherServiceImpl implements WeatherService {
         return tempHour;
     }
 
+    @Override
+    public AmapEntity getAddressDetail(String cityName, String key) {
+        if (StringUtils.isEmpty(cityName)){
+            return null;
+        }
+        if (StringUtils.isEmpty(key)){
+            return null;
+        }
+        String s = sendAddress(cityName, key);
+        log.info("返回地址信息"+s);
+        JSONObject object = JSON.parseObject(s);
+
+        String status = object.getString("status");
+        if ("1".equals(status)){
+            String count = object.getString("count");
+            if (Integer.valueOf(count)<1){
+                return null;
+            }
+            JSONArray weatherArray = JSON.parseArray(object.getString("geocodes"));
+            for (Object json :weatherArray) {
+                AmapEntity amapEntity = JSONObject.parseObject(JSONObject.toJSONString(json), AmapEntity.class);
+                return amapEntity;
+            }
+        }
+
+
+
+        return null;
+    }
+
     /**
      * 发送高德http接口获取天气信息
      *
@@ -192,5 +227,20 @@ public class WeatherServiceImpl implements WeatherService {
         }
         return weatherInfo;
     }
+
+
+    public String sendAddress(String city, String key) {
+        Map<String, String> queryParas = new HashMap<String, String>();
+        queryParas.put("address", key);
+        queryParas.put("key", lbsDevKey);
+        queryParas.put("city", city);
+        String weatherInfo = null;
+        try {
+            weatherInfo = HttpUtils.get(addUrl, queryParas);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return weatherInfo;
+    }
 }
 

src/main/resources/application.properties

@@ -28,6 +28,7 @@ spring.profiles.active=dev
 #高德开发key 用于查询天气信息
 lbs.amap.com.dev.key=52277a894c1855d8917634177809169a
 lbs.amap.com.dev.url=https://restapi.amap.com/v3/weather/weatherInfo
+lbs.amap.com.dev.address=https://restapi.amap.com/v3/geocode/geo
 #萤石开放平台appKey
 ys.open.appKey=494fb3983aae4b49823ce0f47ef45ddd
 #萤石开放平台secret