From f2380ac60fe0dc6959954d04228b7a97541a3e62 Mon Sep 17 00:00:00 2001
From: DYL0109 <1332079466@qq.com>
Date: 星期五, 17 一月 2025 23:23:52 +0800
Subject: [PATCH] !21 测试 Merge pull request !21 from DYL0109/dyl_dev

---
 zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 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 8558e04..d101c3e 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
@@ -26,19 +26,19 @@
     @Autowired
     public IHomePageService homepageService;
 
-   /**
-    * &#064;description:  鍏ㄥ巶鑳借�楃粺璁�
-    */
-   @GetMapping("/energyConsumptionSummation")
-   public AjaxResult energyConsumptionSummation(String timeType) {
-       try {
-           String modelcode = "COMPREHENSIVE_CODE";
-           return AjaxResult.success(homepageService.energyConsumptionSummation(timeType,modelcode));
-       } catch (Exception ex) {
-           logger.error("鑾峰彇鍑洪敊锛�", ex);
-           return AjaxResult.error("鑾峰彇鍑洪敊!");
-       }
-   }
+    /**
+     * &#064;description:  鍏ㄥ巶鑳借�楃粺璁�
+     */
+    @GetMapping("/energyConsumptionSummation")
+    public AjaxResult energyConsumptionSummation(String timeType) {
+        try {
+            String modelcode = "COMPREHENSIVE_CODE";
+            return AjaxResult.success(homepageService.energyConsumptionSummation(timeType, modelcode));
+        } catch (Exception ex) {
+            logger.error("鑾峰彇鍑洪敊锛�", ex);
+            return AjaxResult.error("鑾峰彇鍑洪敊!");
+        }
+    }
 
 
     /**
@@ -50,7 +50,7 @@
     public AjaxResult energyConsumptionTrend(String timeType) {
         try {
             String modelcode = "COMPREHENSIVE_CODE";
-            HomeEnergyConsumptionTrendVO vo = homepageService.energyConsumptionTrend(timeType,modelcode);
+            HomeEnergyConsumptionTrendVO vo = homepageService.energyConsumptionTrend(timeType, modelcode);
 
             return AjaxResult.success(vo);
         } catch (Exception ex) {
@@ -68,7 +68,7 @@
     public AjaxResult energyConsumptionRanking(String timeType) {
         try {
             String modelcode = "COMPREHENSIVE_CODE";
-            List<RankingEnergyData> consumptionAnalysisVO = homepageService.energyConsumptionRanking(modelcode,timeType);
+            List<RankingEnergyData> consumptionAnalysisVO = homepageService.energyConsumptionRanking(modelcode, timeType);
             return AjaxResult.success(consumptionAnalysisVO);
         } catch (Exception ex) {
             logger.error("鑾峰彇鍑洪敊锛�", ex);
@@ -84,9 +84,8 @@
     @GetMapping("/peakValley")
     public AjaxResult peakValley(String timeType) {
         try {
-//            String modelcode = "Composite_Indicators";
             String modelcode = "COMPREHENSIVE_CODE";
-            List<HomePeakValleyVO> vo = homepageService.peakValley(timeType,modelcode);
+            List<HomePeakValleyVO> vo = homepageService.peakValley(timeType, modelcode);
             return AjaxResult.success(vo);
         } catch (Exception ex) {
             logger.error("鑾峰彇鍑洪敊锛�", ex);

--
Gitblit v1.9.3