From 5fd51c437819f1c9d027a936db4ba2ee7cd2e053 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期二, 07 一月 2025 15:02:58 +0800
Subject: [PATCH] 升级架构

---
 zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java
index ec027ed..00cff85 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java
@@ -28,14 +28,15 @@
    /**
     * @description: 鍏ㄥ巶鑳借�楃粺璁�
     * @param timeType
-    * @return 
+    * @return
     * @author: hmj
     * @date: 2024/10/8 13:41
     */
    @GetMapping("/energyConsumptionSummation")
    public AjaxResult energyConsumptionSummation(String timeType) {
        try {
-           String modelcode = "Composite_Indicators";
+//           String modelcode = "Composite_Indicators";
+           String modelcode = "COMPREHENSIVE_CODE";
            return AjaxResult.success(homepageService.energyConsumptionSummation(timeType,modelcode));
        } catch (Exception ex) {
            logger.error("鑾峰彇鍑洪敊锛�", ex);
@@ -54,7 +55,7 @@
     @GetMapping("/energyConsumptionTrend")
     public AjaxResult energyConsumptionTrend(String timeType) {
         try {
-            String modelcode = "Composite_Indicators";
+            String modelcode = "COMPREHENSIVE_CODE";
             HomeEnergyConsumptionTrendVO vo = homepageService.energyConsumptionTrend(timeType,modelcode);
 
             return AjaxResult.success(vo);
@@ -74,7 +75,7 @@
     @GetMapping("/energyConsumptionRanking")
     public AjaxResult energyConsumptionRanking(String timeType) {
         try {
-            String modelcode = "Composite_Indicators";
+            String modelcode = "COMPREHENSIVE_CODE";
             List<RankingEnergyData> consumptionAnalysisVO = homepageService.energyConsumptionRanking(modelcode,timeType);
             return AjaxResult.success(consumptionAnalysisVO);
         } catch (Exception ex) {
@@ -94,7 +95,7 @@
     public AjaxResult peakValley(String timeType) {
         try {
 //            String modelcode = "Composite_Indicators";
-            String modelcode = "PEAK_VALLEY";
+            String modelcode = "COMPREHENSIVE_CODE";
             List<HomePeakValleyVO> vo = homepageService.peakValley(timeType,modelcode);
             return AjaxResult.success(vo);
         } catch (Exception ex) {

--
Gitblit v1.9.3