Browse Source

浙江小时数据接入全部市 区还是只接入镇海区

xiaowang 2 months ago
parent
commit
134e8e66f1
1 changed files with 7 additions and 8 deletions
  1. 7 8
      src/main/java/com/example/getweather/service/GetWeatherXmo.java

+ 7 - 8
src/main/java/com/example/getweather/service/GetWeatherXmo.java

@@ -111,7 +111,7 @@ public class GetWeatherXmo {
             for (String code : areaCodes) {
                 //只有甘肃爬全省
                 if (code.equals("620000")) {
-                    if (isApiQuotaExhausted) break; // 检查标志变量
+                   /* if (isApiQuotaExhausted) break; // 检查标志变量
                     List<DistrictCodeDO> shiList = districtCodeDOList.stream().filter(item -> item.getPid().toString().equals(code)).collect(Collectors.toList());
                     //市
                     for (DistrictCodeDO d : shiList) {
@@ -135,9 +135,9 @@ public class GetWeatherXmo {
                         if (isApiQuotaExhausted) break; // 检查标志变量
                         isApiQuotaExhausted = analysis(xmoUrl, d.getCode(), d.getName(), conn); // 传递标志变量
                         if (isApiQuotaExhausted) break; // 检查标志变量
-                    }
+                    }*/
                 } else if (code.equals("230000")) {
-                    if (isApiQuotaExhausted) break; // 检查标志变量
+                    /*if (isApiQuotaExhausted) break; // 检查标志变量
                     List<DistrictCodeDO> shiList = districtCodeDOList.stream().filter(item -> item.getPid().toString().equals(code)).collect(Collectors.toList());
                     //市
                     for (DistrictCodeDO d : shiList) {
@@ -155,11 +155,9 @@ public class GetWeatherXmo {
                             isApiQuotaExhausted = analysis(xmoUrl, q.getCode(), q.getName(), conn); // 传递标志变量
                             if (isApiQuotaExhausted) break; // 检查标志变量
                         }
-                    }
+                    }*/
                 } else {
-                    //浙江 只爬宁波、杭州、嘉兴、湖州
                     List<DistrictCodeDO> shiList = districtCodeDOList.stream().filter(item -> item.getPid().toString().equals(code)).collect(Collectors.toList());
-                    shiList = shiList.stream().filter(item -> item.getCode().equals("330200") || item.getCode().equals("330100") || item.getCode().equals("330400") || item.getCode().equals("330500")).collect(Collectors.toList());
                     for (DistrictCodeDO d : shiList) {
                         if (isApiQuotaExhausted) break; // 检查标志变量
                         String xmoUrl;
@@ -168,8 +166,9 @@ public class GetWeatherXmo {
                         isApiQuotaExhausted = analysis(xmoUrl, d.getCode(), d.getName(), conn); // 传递标志变量
                         if (isApiQuotaExhausted) break; // 检查标志变量
                         //区 2025-07-14 只爬镇海区
-                        if (d.getCode() == "330200") {
-                            xmoUrl = "https://weather-api.xm-opt.com/v1/forecast15Minutes?latitude=" + d.getLat() + "&longitude=" + d.getLng() + "&minutely_15=weather_code,temperature_2m,surface_pressure,relative_humidity_2m,precipitation,cloud_cover,wind_speed_10m,wind_direction_10m,shortwave_radiation&timezone=Asia%2FShanghai&start_date=" + startDate + "&end_date=" + endDate;
+                        if (Objects.equals(d.getCode(), "330200")) {
+                            List<DistrictCodeDO> quList = districtCodeDOList.stream().filter(item -> item.getCode().equals("330211")).collect(Collectors.toList());
+                            xmoUrl = "https://weather-api.xm-opt.com/v1/forecast15Minutes?latitude=" + quList.get(0).getLat() + "&longitude=" + quList.get(0).getLng() + "&minutely_15=weather_code,temperature_2m,surface_pressure,relative_humidity_2m,precipitation,cloud_cover,wind_speed_10m,wind_direction_10m,shortwave_radiation&timezone=Asia%2FShanghai&start_date=" + startDate + "&end_date=" + endDate;
                             isApiQuotaExhausted = analysis(xmoUrl, "330211", "镇海区", conn); // 传递标志变量
                             if (isApiQuotaExhausted) break; // 检查标志变量
                         }