From 96a2b1c68aa545abbf8245b0b2859b342fa6e63d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 10:18:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
index 2a23a82..9fc64e3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
@@ -2,7 +2,11 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.RegionDataRankingTypeRequest;
+import com.doumee.core.haikang.model.param.respose.RegionDataRankingDataResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
@@ -10,11 +14,9 @@
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -36,12 +38,21 @@
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
public ApiResponse<EnergyBoardVO> centerData() {
-
EnergyBoardVO data =boardService.centerEnergyData();
-
return ApiResponse.success(data);
}
+
+
+ @LoginNoRequired
+ @ApiOperation("涓績鐢ㄧ數鑳借�楁暟鎹�")
+ @GetMapping("/regionDataRanking")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "鏌ヨ绫诲瀷锛�1=浠婃棩锛�2=鏈湀锛�3=鏄ㄦ棩", required = true),
+ })
+ public ApiResponse<List<RegionDataRankingDataResponse>> regionDataRanking(@RequestParam Integer type) {
+ return ApiResponse.success(boardService.getRegionDataRanking(type));
+ }
@LoginNoRequired
@@ -57,7 +68,6 @@
@ApiOperation("瀹炴椂璐熻嵎鏇茬嚎")
@GetMapping("/loadCurve")
public ApiResponse<List<EnergyDataVO>> loadCurve() {
-
List<EnergyDataVO> loadCurveList =boardService.loadEnergyCurve();
return ApiResponse.success(loadCurveList);
}
--
Gitblit v1.9.3