1.运行监盘省份左侧数据接入

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -179,6 +179,7 @@ public class CommonConstans {
     public static final String YEAR_GEN_HOURS = "年利用小时数";
     public static final String WIND_SPEED_THIRTY_SECONDS = "30秒平均风速";
     public static final String TOTAL_RADIATION = "辐照度";
+    public static final String ACTIVE_POWER = "有功功率";
 
 
     //------------------监盘服务改造新增常量结束------------------------------

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -517,7 +517,8 @@ public class DemoController extends BaseController {
 	public List<CoreValuesDto> testFeignCall() {
          List<CoreValuesDto> coreValuesDtos =coreCommonService.getValuesByStationNamesAndPointsNames(null,null);
 //		 monitorService.getTotalData();
-		monitorService.getNationWideInfo("江西省","gis");
+//		monitorService.getNationWideInfo("江西省","gis");
+		monitorService.getCompletionOfPowerIndicatorsByProvinceName(1,20,"陕西省");
 //		Double sum  = coreCommonService.getSumOfByPointName(coreValuesDtos, CommonConstans.DAY_POWER_GENERATION);
 //		Double avg  = coreCommonService.getAverageOfByPointName(coreValuesDtos, CommonConstans.DAY_POWER_GENERATION);
 		return coreValuesDtos;

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service;
 
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
 
 import java.util.List;
 
 public interface MonitorService {
     public void getTotalData();
     public List<RegionNationWideDto> getNationWideInfo(String provinceName, String type);
+    public ResultsData getCompletionOfPowerIndicatorsByProvinceName(int current, int size, String provinceName);
 }