替换service为新数据源service

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.DeaviationRateDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ESEquipmentsDTO;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.MonitorService;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.EquipAlarmEventServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitorFanIndicatorImpl;

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

@@ -11,6 +11,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.MonitorService;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.*;
 //import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
 import io.swagger.annotations.Api;
@@ -40,6 +41,8 @@ import java.util.logging.Handler;
 public class MonitoringMapController extends BaseController {
     @Value("${sec.startdate:2017-06-30}")
     String secStartDate;
+    @Autowired
+    MonitorService monitorService;
 
     @Autowired
     MonitoringServiceImpl monitoringServiceImpl;
@@ -58,7 +61,7 @@ public class MonitoringMapController extends BaseController {
     @ApiOperation(value = "获取监盘全国地图数据")
     @GetMapping("/nationwide")
     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));
+        return ResponseHelper.buildResponse(monitorService.getNationWideInfo(provinceName, type));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -79,7 +82,7 @@ public class MonitoringMapController extends BaseController {
     @ApiOperation(value = "获取区域电量指标完成情况")
     @GetMapping("/getCompletionOfPowerIndicatorsByProvinceName")
     public ResponseModel<ResultsData> getCompletionOfPowerIndicatorsByProvinceName(@RequestParam(required = true) int current, @RequestParam(required = true) int size, @RequestParam(required = true) String provinceName) {
-        return ResponseHelper.buildResponse(monitoringServiceImpl.getCompletionOfPowerIndicatorsByProvinceName(current,size,provinceName));
+        return ResponseHelper.buildResponse(monitorService.getCompletionOfPowerIndicatorsByProvinceName(current,size,provinceName));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -128,7 +131,7 @@ public class MonitoringMapController extends BaseController {
     @ApiOperation(value = "监盘首页-社会贡献")
     @GetMapping("/getSocialContributionDtoList")
     public ResponseModel<Page<SocialContributionDto>> getSocialContributionDtoList(@RequestParam(required = false) String areaName, @RequestParam(required = false) String station) {
-        return ResponseHelper.buildResponse(monitoringServiceImpl.getSocialContributionDtoList(areaName, station));
+        return ResponseHelper.buildResponse(monitorService.getSocialContributionDtoList(areaName, station));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -142,7 +145,7 @@ public class MonitoringMapController extends BaseController {
     @ApiOperation(value = "监盘首页-发电量详情")
     @GetMapping("/getDetailsOnPowergeneration")
     public ResponseModel<Page<HashMap<String, String>>> getDetailsOnPowergeneration(@RequestParam(required = false) String areaName) {
-        return ResponseHelper.buildResponse(monitoringServiceImpl.getDetailsOnPowergeneration(areaName));
+        return ResponseHelper.buildResponse(monitorService.getDetailsOnPowergeneration(areaName));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -156,14 +159,14 @@ public class MonitoringMapController extends BaseController {
     @ApiOperation(value = "监盘首页-发电top5")
     @GetMapping("/getPowerGenerationTrendsOfCompletionTopFive")
     public ResponseModel<Page<HashMap<String, String>>> getPowerGenerationTrendsOfCompletionTopFive(@RequestParam(required = false) String areaName) {
-        return ResponseHelper.buildResponse(monitoringServiceImpl.getPowerGenerationTrendsOfCompletionTopFive(areaName));
+        return ResponseHelper.buildResponse(monitorService.getPowerGenerationTrendsOfCompletionTopFive(areaName));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "监盘首页-发电小时排名top3")
     @GetMapping("/getPowerGenerationTrendsOfCompletionTopThree")
     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));
+        return ResponseHelper.buildResponse(monitorService.getPowerGenerationTrendsOfCompletionTopThree(tabValue, areaName));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)