解决冲突

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

@@ -493,10 +493,11 @@ public class MonitorFanIdxController extends BaseController {
     @GetMapping("/electricQuantity")
     public ResponseModel<ResultsData> getElectricQuantityList(@RequestParam(value = "current") int current,
                                                              @RequestParam(value = "size") int size,
-                                                             @RequestParam(value = "stationId") String stationId) {
+                                                             @RequestParam(value = "stationId") String stationId,
+                                                              @RequestParam(value = "stationType",required = false) String stationType) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getBoosterGatewayId();
-        ResultsData resultsData = monitorFanIndicatorImpl.getElectricQuantityList(current, size, gatewayId);
+        ResultsData resultsData = monitorFanIndicatorImpl.getElectricQuantityList(current, size, gatewayId,stationType);
         return ResponseHelper.buildResponse(resultsData);
     }
 
@@ -705,6 +706,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "箱变实时开关状态")
     @GetMapping("/equipSwitchStatus")
+    @Scheduled(cron = "0/10 * * * * ? ")
     public ResponseModel<Map<String,Object>> getEquipSwitchStatus() {
 
 
@@ -729,4 +731,25 @@ public class MonitorFanIdxController extends BaseController {
         String gatewayId = stationBasic.getFanGatewayId();
         return ResponseHelper.buildResponse(monitorFanIndicatorImpl.collectingBox(gatewayId,current, size ));
     }
+
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "光伏 运行列表")
+    @GetMapping("/solarPowerOperation")
+    public ResponseModel<IPage<Map<String, Object>>> solarPowerOperation(@RequestParam(value = "stationId")String stationId,@RequestParam(value = "current") int current, int size) {
+        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+        String gatewayId = stationBasic.getFanGatewayId();
+
+        List<Map<String, Object>> statusMonitoring = monitorFanIndicator.solarPowerOperation(gatewayId);
+        List<Map<String, Object>> collect = statusMonitoring.stream()
+                .skip((long) (current - 1) * size)
+                .limit(size)
+                .collect(Collectors.toList());
+        IPage<Map<String,Object>> result = new Page<>();
+        result.setRecords(collect);
+        result.setCurrent(current);
+        result.setTotal(statusMonitoring.size());
+        return ResponseHelper.buildResponse(result);
+    }
+
 }

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

@@ -137,4 +137,11 @@ public class MonitoringMapController extends BaseController {
     public ResponseModel<Page<HashMap<String, String>>> getPowerGenerationTrendsOfCompletionTopThree(@RequestParam(required = false)String areaName,@RequestParam(required = false,defaultValue = "0")String tabValue) {
         return  ResponseHelper.buildResponse(monitoringServiceImpl.getPowerGenerationTrendsOfCompletionTopThree(tabValue,areaName));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "运行监盘-获取全国数据")
+    @GetMapping("/getTotalData")
+    public void getTotalData() {
+          monitoringServiceImpl.getTotalData();
+    }
 }