Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempLineWarnController.java

@@ -78,13 +78,18 @@ public class TempLineWarnController {
 
         if (feignAddressVO.getSendAddress()!=null
                 && StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
-            String weather = gdUtils.getWeather(feignAddressVO.getSendAddress().getCityCode());
+            String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
+                    feignAddressVO.getSendAddress().getLatitude());
+
+            String weather = gdUtils.getWeather(cityCode);
             result.put("send", weather);
         }
 
         if (feignAddressVO.getReceiveAddress()!=null
                 && StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
-            String weather = gdUtils.getWeather(feignAddressVO.getReceiveAddress().getCityCode());
+            String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
+                    feignAddressVO.getReceiveAddress().getLatitude());
+            String weather = gdUtils.getWeather(cityCode);
             result.put("receive", weather);
 
         }

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnWeatherWarnServiceImpl.java

@@ -72,7 +72,10 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic
 
         if (feignAddressVO.getSendAddress()!=null
                 && StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
-            String weather = gdUtils.getWeather(feignAddressVO.getSendAddress().getCityCode());
+            String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
+                    feignAddressVO.getSendAddress().getLatitude());
+
+            String weather = gdUtils.getWeather(cityCode);
             if (weatherCheck(weather)){
                 // 更新
                 lineWarnCommonService.lineWarnInfoUpdate(orderGoods, lineWarnInfo, lineWarnConfig, weather);
@@ -80,7 +83,9 @@ public class LineWarnWeatherWarnServiceImpl implements LineWarnWeatherWarnServic
         }
         if (feignAddressVO.getReceiveAddress()!=null
                 && StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
-            String weather = gdUtils.getWeather(feignAddressVO.getReceiveAddress().getCityCode());
+            String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
+                    feignAddressVO.getReceiveAddress().getLatitude());
+            String weather = gdUtils.getWeather(cityCode);
             if (weatherCheck(weather)){
                 // 更新
                 lineWarnCommonService.lineWarnInfoUpdate(orderGoods, lineWarnInfo, lineWarnConfig, weather);

performance-web/src/main/java/com/clx/performance/utils/gd/GdService.java

@@ -35,6 +35,7 @@ public class GdService {
 
     private static final String WEATHER_API = "https://restapi.amap.com/v3/weather/weatherInfo?parameters";//天气
 
+    private static final String CITY_API = "https://restapi.amap.com/v3/geocode/regeo?parameters";//城市
 
     private String gaodeKey = "b2550e16bbc7bf9f6cd168e0f21709fc";
 
@@ -405,4 +406,50 @@ public class GdService {
         return weather;
     }
 
+    public String getCity(BigDecimal longitude, BigDecimal latitude){
+        return getCity(gaodeKey, longitude, latitude);
+    }
+
+    public static String getCity(String key, BigDecimal longitude, BigDecimal latitude) {
+
+        String url = CITY_API+"?output=json&location=" +longitude+","+latitude+"&key="+key;
+
+        String resultStr;
+        try {
+            resultStr = HttpUtils.httpGetRequest(url);
+        } catch (Exception e) {
+            throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德地理编码接口异常");
+        }
+
+        if (StringUtils.isBlank(resultStr)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 返回结果空");}
+
+        JSONObject retJSONObject = JSONObject.parseObject(resultStr);
+        if (Objects.isNull(retJSONObject)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 返回结果转换异常, result:"+resultStr);}
+
+        Integer status = retJSONObject.getInteger("status");
+        if (!Objects.equals(1, status)) {
+            if (Objects.equals(10001, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 无效key, result:"+resultStr);}
+            else if (Objects.equals(10002, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 没有权限使用相应的服务或者请求接口的路径拼写错误, result:"+resultStr);}
+            else if (Objects.equals(10003, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 访问已超出日访问量, result:"+resultStr);}
+            else if (Objects.equals(10004, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 单位时间内访问过于频繁, result:"+resultStr);}
+            else if (Objects.equals(10010, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, IP访问超限, result:"+resultStr);}
+            else if (Objects.equals(10044, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 账号维度日调用量超出限制, result:"+resultStr);}
+
+            else if (Objects.equals(40000, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 余额耗尽, result:"+resultStr);}
+            else if (Objects.equals(40002, status)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 购买服务到期, result:"+resultStr);}
+
+            else if (Objects.equals(20802, status)) { throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 路线计算失败, result:"+resultStr); }
+            else if (Objects.equals(20803, status)) { throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 起点终点距离过长, result:"+resultStr); }
+            else {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德天气接口异常, 状态异常, result:"+resultStr);}
+        }
+
+        // 解析
+        String adcode = retJSONObject.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");
+
+        if (StringUtils.isBlank(adcode)) {throw new ServiceSystemException(ResultCodeEnum.FAIL, "调用高德城市编码接口异常, result:"+resultStr);}
+
+
+        return adcode;
+    }
+
 }

performance-web/src/main/java/com/clx/performance/utils/gd/GdUtils.java

@@ -89,6 +89,12 @@ public class GdUtils {
 
         return gdService.getWeather(city);
     }
+    /**
+     * 天气
+     */
+    public String getCity(BigDecimal longitude, BigDecimal latitude){
+        return gdService.getCity(longitude,latitude);
+    }
 
     /**
      * 获取线路