From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 e103374..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,24 +2,22 @@
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.*;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
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 java.math.BigDecimal;
-import java.util.ArrayList;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
-import java.util.Random;
/**
* Created by IntelliJ IDEA.
@@ -28,7 +26,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "鑳借�楃湅鏉�")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戣兘鑰楃湅鏉�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/energy")
@@ -40,14 +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,11 +62,12 @@
RegionEnergyListResponse data=boardService.energyRegionData();
return ApiResponse.success(data);
}
+
+
@LoginNoRequired
@ApiOperation("瀹炴椂璐熻嵎鏇茬嚎")
@GetMapping("/loadCurve")
public ApiResponse<List<EnergyDataVO>> loadCurve() {
-
List<EnergyDataVO> loadCurveList =boardService.loadEnergyCurve();
return ApiResponse.success(loadCurveList);
}
--
Gitblit v1.9.3