From 8dd7af51db4cf768fbf92002b5b62f7fb9d1c929 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期二, 06 五月 2025 15:04:59 +0800 Subject: [PATCH] refactor(zhitan):调整模型代码和优化能源统计功能 --- zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java index 109aa81..f3c6986 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java @@ -44,7 +44,7 @@ public AjaxResult energyConsumptionSummationDay() { try { String timeType = "DAY"; - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "LBJT"; return AjaxResult.success(homepageService.energyConsumptionSummation(timeType,modelCode)); } catch (Exception ex) { logger.error("鑾峰彇鍑洪敊锛�", ex); @@ -60,7 +60,7 @@ @GetMapping("/energyConsumptionSummation") public AjaxResult energyConsumptionSummation(String timeType) { try { - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "LBJT"; return AjaxResult.success(statisticService.energyConsumptionSummation(timeType,modelCode)); } catch (Exception ex) { logger.error("鑾峰彇鍑洪敊锛�", ex); @@ -76,7 +76,7 @@ public AjaxResult factoryEnergyConsumption() { try { String timeType = "MONTH"; - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "LBJT"; FactoryEnergyConsumptionVo vo=statisticService.factoryEnergyConsumption(timeType,modelCode); return AjaxResult.success(vo); } catch (Exception ex) { @@ -92,7 +92,7 @@ @GetMapping("/segmentAnalysis/year") public AjaxResult segmentAnalysisMonth() { PeakValleyDTO dto =new PeakValleyDTO(); - dto.setModelCode("COMPREHENSIVE_CODE"); + dto.setModelCode("LBJT"); dto.setTimeType("YEAR"); dto.setQueryTime(new Date()); return AjaxResult.success(statisticService.segmentAnalysisMonth(dto)); @@ -106,7 +106,7 @@ @GetMapping("/segmentAnalysis/month") public AjaxResult segmentAnalysisDay() { PeakValleyDTO dto =new PeakValleyDTO(); - dto.setModelCode("COMPREHENSIVE_CODE"); + dto.setModelCode("LBJT"); dto.setTimeType("MONTH"); dto.setQueryTime(new Date()); return AjaxResult.success(statisticService.segmentAnalysisDay(dto)); @@ -119,7 +119,7 @@ @GetMapping("/segmentAnalysis/day") public AjaxResult segmentAnalysisHour() { PeakValleyDTO dto =new PeakValleyDTO(); - dto.setModelCode("COMPREHENSIVE_CODE"); + dto.setModelCode("LBJT"); dto.setTimeType("DAY"); dto.setQueryTime(new Date()); return AjaxResult.success(statisticService.segmentAnalysisHour(dto)); @@ -132,7 +132,7 @@ @GetMapping("/purchaseConsumption") public AjaxResult purchaseConsumption() { String timeType="MONTH"; - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "LBJT"; List<PurchaseConsumptionVo> consumptionAnalysisVO = statisticService.purchaseConsumption(modelCode,timeType); return AjaxResult.success(consumptionAnalysisVO); } @@ -143,7 +143,7 @@ */ @GetMapping("/energyConsumptionRanking") public AjaxResult energyConsumptionRanking(String timeType) { - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "LBJT"; List<RankingEnergyData> consumptionAnalysisVO = statisticService.energyConsumptionRanking(modelCode,timeType); return AjaxResult.success(consumptionAnalysisVO); } @@ -154,7 +154,7 @@ */ @GetMapping("/costProp") public AjaxResult costProp(String timeType) { - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "LBJT"; List<PurchaseConsumptionVo> consumptionAnalysisVO = statisticService.costProp(modelCode, timeType); return AjaxResult.success(consumptionAnalysisVO); @@ -167,7 +167,7 @@ @GetMapping("/peakValley") public AjaxResult peakValley(String timeType) { try { - String modelcode = "COMPREHENSIVE_CODE"; + String modelcode = "LBJT"; List<HomePeakValleyVO> vo = homepageService.peakValley(timeType,modelcode); return AjaxResult.success(vo); } catch (Exception ex) { -- Gitblit v1.9.3