运行监盘、首页监盘现场数据源切换后问题修改。

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/BuDunGenDto.java

@@ -4,11 +4,13 @@ import lombok.Data;
 
 @Data
 public class BuDunGenDto {
-private Double day;
-private Double month;
-private Double year;
-private Double month_complete;
-private Double year_complete;
-private Double year_hour_number;
-private Double cumulative;
+    private String station_name;
+    private Double actual_installed_capacity;
+    private Double day;
+    private Double month;
+    private Double year;
+    private Double month_complete;
+    private Double year_complete;
+    private Double year_hour_number;
+    private Double cumulative;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CoreCommonServiceImpl.java

@@ -39,7 +39,7 @@ public class CoreCommonServiceImpl implements CoreCommonService {
         });
         }catch (Exception e){
             e.printStackTrace();
-            return result;
+            return new ArrayList<>();
         }
         return result;
     }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorServiceImpl.java

@@ -361,7 +361,7 @@ public class MonitorServiceImpl implements MonitorService {
         AtomicReference<Double> fdzannualPower = new AtomicReference<>(0.0);
         AtomicReference<Double> gfzannualPower = new AtomicReference<>(0.0);
         List<CoreValuesDto> coreValuesDtos = coreCommonService.getValuesByStationNamesAndPointsNames(null, null);
-        String requestUrl = Constants.BASE_URL + "?" + Constants.get_province_station_item + "&provinceName" + provinceName;
+        String requestUrl = Constants.BASE_URL + "?" + Constants.get_province_station_item + "&provinceName=" + provinceName;
         List<BuDunStationDetailInfo> buDunStationDetailInfos = httpRequestUtil.getResPonse(requestUrl, Constants.REQUEST_GET, "", Constants.resovleRule_data, BuDunStationDetailInfo.class);
         if (buDunStationDetailInfos.size() > 0) {
             buDunStationDetailInfos.forEach(buDunStationDetailInfo -> {
@@ -487,7 +487,7 @@ public class MonitorServiceImpl implements MonitorService {
         String requestUrl = Constants.BASE_URL + "?" + Constants.get_area_item_url;
         if (!ObjectUtils.isEmpty(areaName)) {
             if (!areaName.contains(Constants.areaChinese)) {
-                areaName = Constants.areaChinese;
+                areaName =areaName+ Constants.areaChinese;
             }
             requestUrl = requestUrl + "&areaName=" + areaName;
         }
@@ -579,7 +579,7 @@ public class MonitorServiceImpl implements MonitorService {
         List<HashMap<String, String>> mapList = new ArrayList<>();
         String requestUrl = Constants.BASE_URL + "?" + Constants.get_month_top_url + "&topValue=5";
         if (!ObjectUtils.isEmpty(areaName)) {
-            if (areaName.contains(Constants.areaChinese)) {
+            if (!areaName.contains(Constants.areaChinese)) {
                 areaName = areaName + Constants.areaChinese;
             }
             requestUrl = requestUrl + "&areaName=" + areaName;
@@ -646,7 +646,7 @@ public class MonitorServiceImpl implements MonitorService {
         List<StationBasic> gfdzlist = new ArrayList<>();
         String requestUrl = Constants.BASE_URL + "?" + Constants.get_hours_num_top + "&topValue=3&tabValue=" + tabValue;
         if (!ObjectUtils.isEmpty(areaName)) {
-            if (areaName.contains(Constants.areaChinese)) {
+            if (!areaName.contains(Constants.areaChinese)) {
                 areaName = areaName + Constants.areaChinese;
             }
             requestUrl = requestUrl + "&areaName=" + areaName;