运行监盘接口-全国地图接口调整支持gis,station切换

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

@@ -47,11 +47,17 @@ public class MonitoringMapController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(value = "获取监盘全国地图数据")
     @GetMapping("/nationwide")
-    public ResponseModel<List<RegionNationWideDto>> getNationWideInfo(@RequestParam (value = "provinceName", required = false)String provinceName) {
-      return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo(provinceName));
+    public ResponseModel<List<RegionNationWideDto>> getNationWideInfo(@RequestParam (value = "provinceName", required = false)String provinceName,@RequestParam (value = "type", required = false)String type) {
+      return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo(provinceName,type));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "获取监盘全国地图-发电量数据")
+    @GetMapping("/getNationalPowerGenerationData")
+    public ResponseModel<List<HashMap<String,Object>>> getNationalPowerGenerationData() {
+        return ResponseHelper.buildResponse(monitoringServiceImpl.getNationalPowerGenerationData());
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(value = "获取区域电量指标完成情况")
     @GetMapping("/getCompletionOfPowerIndicatorsByProvinceName")
     public ResponseModel<ResultsData> getCompletionOfPowerIndicatorsByProvinceName(@RequestParam(required = true) int current, @RequestParam(required = true) int size, @RequestParam(required = true) String provinceName) {