增加发电量趋势图

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

@@ -10,10 +10,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IMapRegionService;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitoringServiceImpl;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.RegionServiceImpl;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationBasicServiceImpl;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TestServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.*;
 import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,6 +40,9 @@ public class MonitoringMapController extends BaseController {
 
     @Autowired
     MonitoringServiceImpl monitoringServiceImpl;
+    @Autowired
+    LargeScreenImpl largeScreenImpl;
+
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(value = "获取监盘全国地图数据")
@@ -165,4 +165,29 @@ public class MonitoringMapController extends BaseController {
     public ResponseModel<HashMap<String, Object>> getTheStationPowerCurve(@RequestParam(required = false)String stationId,@RequestParam(required = false)String date) {
         return ResponseHelper.buildResponse(monitoringServiceImpl.getTheStationPowerCurve(stationId,date));
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "监盘首页-  全国发电量趋势完成率")
+    @GetMapping("/getqgqs")
+    public ResponseModel<HashMap<String, List<String>>> getqgqs() {
+
+        largeScreenImpl.sendQYFDLMqttyfdqs();
+
+        largeScreenImpl.sendQYFDLMqttyfd();
+
+        return  ResponseHelper.buildResponse(null);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(value = "监盘首页-  全国发电量趋势完成率")
+    @GetMapping("/getqyqs")
+    public ResponseModel<HashMap<String, List<String>>> getqyqs() {
+
+        largeScreenImpl.gettimedateyfdqs();
+        largeScreenImpl.gettimedateyfd();
+
+        return  ResponseHelper.buildResponse(null);
+    }
+
+
 }

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

@@ -563,7 +563,7 @@ public List<Double> gettimedateyfd( ){
     //获取区域月日发电量
 
     @Scheduled(cron = "0/10 * * * * ?")
-    private void sendQYFDLMqttyfd(){
+    public void sendQYFDLMqttyfd(){
         List<StationCacheInfoDto> listStationCacheInfoDto = commonServiceImpl.getListStationCacheInfoDto();
         Map<String, List<StationCacheInfoDto>> belongAreaList = listStationCacheInfoDto.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getBelongArea));
         for (String s : belongAreaList.keySet()) {
@@ -701,7 +701,7 @@ public List<Double> gettimedateyfd( ){
     //区域发电完成趋势
 
     @Scheduled(cron = "0/10 * * * * ?")
-    private void sendQYFDLMqttyfdqs(){
+    public void sendQYFDLMqttyfdqs(){
         List<StationCacheInfoDto> listStationCacheInfoDto = commonServiceImpl.getListStationCacheInfoDto();
         Map<String, List<StationCacheInfoDto>> belongAreaList = listStationCacheInfoDto.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getBelongArea));
         for (String s : belongAreaList.keySet()) {