From fd07b985eee589cc66fb0bea127b982842378320 Mon Sep 17 00:00:00 2001
From: DYL <Dn1332079466>
Date: 星期五, 17 一月 2025 23:13:22 +0800
Subject: [PATCH] 测试

---
 zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 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..8558e04 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
@@ -25,17 +25,14 @@
 
     @Autowired
     public IHomePageService homepageService;
+
    /**
-    * @description: 鍏ㄥ巶鑳借�楃粺璁�
-    * @param timeType
-    * @return 
-    * @author: hmj
-    * @date: 2024/10/8 13:41
+    * &#064;description:  鍏ㄥ巶鑳借�楃粺璁�
     */
    @GetMapping("/energyConsumptionSummation")
    public AjaxResult energyConsumptionSummation(String timeType) {
        try {
-           String modelcode = "Composite_Indicators";
+           String modelcode = "COMPREHENSIVE_CODE";
            return AjaxResult.success(homepageService.energyConsumptionSummation(timeType,modelcode));
        } catch (Exception ex) {
            logger.error("鑾峰彇鍑洪敊锛�", ex);
@@ -46,15 +43,13 @@
 
     /**
      * @description: 鑳借�楄秼鍔�
-     * @param timeType
-     * @return
      * @author: hmj
      * @date: 2024/10/8 13:41
      */
     @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);
@@ -66,15 +61,13 @@
 
     /**
      * @description: 绉戝鑳借�楁帓鍚�
-     * @param timeType
-     * @return
      * @author: hmj
      * @date: 2024/10/8 13:41
      */
     @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) {
@@ -85,8 +78,6 @@
 
     /**
      * @description: 宄板钩璋峰崰姣�
-     * @param timeType
-     * @return
      * @author: hmj
      * @date: 2024/10/8 13:41
      */
@@ -94,7 +85,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