From eaf4587b47701f3df0559e64362d6ea413d782f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 11 十月 2024 10:41:49 +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/openapi/HkOpenApiController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
index 0170f1c..b9135cf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -10,10 +10,7 @@
import com.doumee.dao.openapi.request.*;
import com.doumee.dao.openapi.response.*;
import com.doumee.dao.system.model.SystemUser;
-import com.doumee.service.business.PlatformJobService;
-import com.doumee.service.business.PlatformLogService;
-import com.doumee.service.business.PlatformService;
-import com.doumee.service.business.PlatformWaterGasService;
+import com.doumee.service.business.*;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -42,6 +39,9 @@
@Autowired
private PlatformJobService platformJobService;
+
+ @Autowired
+ private PlatformWarnEventService platformWarnEventService;
@Autowired
private PlatformWaterGasService platformWaterGasService;
@@ -123,10 +123,27 @@
@LoginNoRequired
@PreventRepeat
+ @ApiOperation("銆愮敤姘撮噺銆戣繎12涓湀鐢ㄦ按閲忎俊鎭垪琛�")
+ @PostMapping("/water/lastMonthsDataList")
+ public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsWaterList() {
+ return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ZERO));
+ }
+
+ @LoginNoRequired
+ @PreventRepeat
@ApiOperation("銆愮敤姘旈噺銆戞湰鏈堛�佷笂鏈堝拰鍘诲勾鍚屾湀")
@PostMapping("/gas/dataByMonth")
public ApiResponse<GasByMonthResponse> gasDataByMonth(@RequestBody GasByMonthRequest param) {
return ApiResponse.success(platformWaterGasService.gasDataByMonth(param));
+ }
+
+
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("銆愮敤姘旈噺銆戣繎12涓湀鐢ㄦ皵閲忎俊鎭垪琛�")
+ @PostMapping("/gas/lastMonthsDataList")
+ public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsGasList () {
+ return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ONE));
}
@LoginNoRequired
@@ -151,7 +168,7 @@
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙板綋鍓嶄綔涓氫俊鎭垪琛�")
@PostMapping("/platform/workingDataList")
- public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList(@RequestBody PlatformDataListRequest param) {
+ public ApiResponse<List<PlatformDataListResponse>> workingDataList(@RequestBody PlatformDataListRequest param) {
return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
@@ -159,7 +176,7 @@
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙颁綔涓氳鎯呬俊鎭�")
@PostMapping("/platform/workDataInfo")
- public ApiResponse<PlatformDataInfoResponse> platformWorkingDataList(@RequestBody PlatformDataInfoRequest param) {
+ public ApiResponse<PlatformDataInfoResponse> workDataInfo(@RequestBody PlatformDataInfoRequest param) {
return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
@@ -193,6 +210,14 @@
@ApiOperation("銆愭湀鍙般�戦璀︿簨浠堕泦鍚堝垪琛�")
@PostMapping("/platform/warningEventList")
public ApiResponse<List<PlatformWarnEventListResponse>> warningEventList(@RequestBody PlatformWarnEventListRequest param) {
- return ApiResponse.success(new ArrayList<>());
+ return ApiResponse.success(platformWarnEventService.findListToHk());
+ }
+
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("銆愭湀鍙般�戞湀鍙扮姸鎬�")
+ @PostMapping("/platform/getStatusList")
+ public ApiResponse<List<PlatformStatusListResponse>> getStatusList() {
+ return ApiResponse.success(platformService.getPlatformStatusList());
}
}
--
Gitblit v1.9.3