监盘获取全国场站分类信息、获取区域长场站信息接口编写

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

@@ -31,6 +31,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @Api(tags = "监盘地图接口")
@@ -61,9 +62,22 @@ public class MonitoringMapController extends BaseController {
         return ResponseHelper.buildResponse(monitoringServiceImpl.getTabsByStationBasicId(stationBasicId));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @ApiOperation(value = "监盘首页地图")
+    @ApiOperation(value = "监盘首页地图-全国")
     @GetMapping("/getAreaInfo")
-    public ResponseModel<List<MapAreaInfoDto>> getAreaInfo(@RequestParam(required = false)String areaName) {
-        return ResponseHelper.buildResponse(monitoringServiceImpl.getAreaInfo(areaName));
+    public ResponseModel<List<MapAreaInfoDto>> getAreaInfo() {
+        return ResponseHelper.buildResponse(monitoringServiceImpl.getAreaInfo());
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "监盘首页地图-片区")
+    @GetMapping("/getStaitonListInfoByAreaName")
+    public ResponseModel<List<HomeMapStationInfoDto>> getStaitonListInfoByAreaName(@RequestParam(required = true)String areaName) {
+        return ResponseHelper.buildResponse(monitoringServiceImpl.getStaitonListInfoByAreaName(areaName));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "监盘首页-场站分类信息")
+    @GetMapping("/getStaionCategoryInfo")
+    public ResponseModel<List<Map<String,String>>> getStaionCategoryInfo(@RequestParam(required = false)String areaName) {
+    return  ResponseHelper.buildResponse(monitoringServiceImpl.getStaionCategoryInfo(areaName));
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/HomeMapStationInfoDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class HomeMapStationInfoDto {
+    //场站id
+    String stationId;
+    //当前功率
+    String currentPower = "0";
+    //风速辐照度
+    String speendOrirradiate;
+    //场站类型
+    String stationType;
+    //场站装机容量
+    String stationInstalledCapacity;
+    //场站经纬度
+    List<String> stationPosition;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/MapAreaInfoDto.java

@@ -27,14 +27,4 @@ public class MapAreaInfoDto {
     String installedCapacity = "0";
     //当日发电量
     String electricityGenerationOfDay = "0";
-    //当前功率
-    String currentPower = "0";
-    //风速辐照度
-    String speendOrirradiate;
-    //场站类型
-    String stationType;
-    //场站装机容量
-    String stationInstalledCapacity;
-    //场站经纬度
-    Map<String, String> stationPosition;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application.properties

-spring.application.name=AMOS-JXIOP-MONITOR
+spring.application.name=AMOS-JXIOP-MONITOR-CT
 server.servlet.context-path=/jxiop-monitor
 server.port=33200
 server.uri-encoding=UTF-8