From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 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 6342791..686dbf0 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
@@ -7,8 +7,13 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.openapi.request.*;
import com.doumee.dao.openapi.response.*;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,67 +31,66 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/hk/api")
public class HkOpenApiController extends BaseController {
+ @Autowired
+ private PlatformService platformService;
+
+ @Autowired
+ private PlatformLogService platformLogService;
+
+ @Autowired
+ private PlatformJobService platformJobService;
+
+ @Autowired
+ private PlatformWaterGasService platformWaterGasService;
+
@PreventRepeat
@ApiOperation("銆愮敤姘撮噺銆戞湰鏈堛�佷笂鏈堝拰鍘诲勾鍚屾湀")
@PostMapping("/water/dataByMonth")
@LoginNoRequired
public ApiResponse<WaterByMonthResponse> waterDataByMonth(@RequestBody WaterByMonthRequest param) {
- return ApiResponse.success(new WaterByMonthResponse());
- }
- @PreventRepeat
- @ApiOperation("銆愮敤姘撮噺銆戣繎12涓湀鐢ㄦ按閲忎俊鎭垪琛�")
- @PostMapping("/water/lastMonthsDataList")
- @LoginNoRequired
- public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsWaterList( ) {
- return ApiResponse.success(new ArrayList<>());
- }
- @ApiOperation("銆愮敤姘旈噺銆戣繎12涓湀鐢ㄦ皵閲忎俊鎭垪琛�")
- @PostMapping("/gas/lastMonthsDataList")
- @LoginNoRequired
- public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsGasList () {
- return ApiResponse.success(new ArrayList<>());
+ return ApiResponse.success(platformWaterGasService.waterDataByMonth(param));
}
@PreventRepeat
@ApiOperation("銆愮敤姘旈噺銆戞湰鏈堛�佷笂鏈堝拰鍘诲勾鍚屾湀")
@PostMapping("/gas/dataByMonth")
@LoginNoRequired
public ApiResponse<GasByMonthResponse> gasDataByMonth(@RequestBody GasByMonthRequest param) {
- return ApiResponse.success(new GasByMonthResponse());
+ return ApiResponse.success(platformWaterGasService.gasDataByMonth(param));
}
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞寜澶╃粺璁¤繍鍗曡姹傚弬鏁�")
@PostMapping("/platform/orderNumByDate")
@LoginNoRequired
public ApiResponse<PlatformOrderNumByDateResponse> orderNumByDate(@RequestBody PlatformOrderNumByDateRequest param) {
- return ApiResponse.success(new PlatformOrderNumByDateResponse());
+ return ApiResponse.success(platformJobService.orderNumByDate(param));
}
@PreventRepeat
- @ApiOperation("銆愭湀鍙般�戞湀鍙板悇鐘舵�佹暟閲忕粺璁�")
+ @ApiOperation("銆愭湀鍙般�戞湀鍙扮姸鎬佹暟閲忕粺璁�")
@PostMapping("/platform/totalNumByStatus")
@LoginNoRequired
- public ApiResponse<PlatformNumByStatusResponse> totalNumByStatus( ) {
- return ApiResponse.success(new PlatformNumByStatusResponse());
+ public ApiResponse<PlatformNumByStatusResponse> totalNumByStatus(@RequestBody PlatformNumByStatusRequest param) {
+ return ApiResponse.success(platformService.getPlatformNumByStatusResponse());
}
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙板綋鍓嶄綔涓氫俊鎭垪琛�")
@PostMapping("/platform/workingDataList")
@LoginNoRequired
- public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList( ) {
- return ApiResponse.success(new ArrayList<>());
+ public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList(@RequestBody PlatformDataListRequest param) {
+ return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙颁綔涓氳鎯呬俊鎭�")
@PostMapping("/platform/workDataInfo")
@LoginNoRequired
- public ApiResponse<PlatformDataInfoResponse> platformWorkingDataInfo(@RequestBody PlatformDataInfoRequest param) {
- return ApiResponse.success(new PlatformDataInfoResponse());
+ public ApiResponse<PlatformDataInfoResponse> platformWorkingDataList(@RequestBody PlatformDataInfoRequest param) {
+ return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戝綋鍓嶈溅杈嗙姸鎬佹暟閲忕粺璁�")
@PostMapping("/platform/carStatusNum")
@LoginNoRequired
- public ApiResponse<CarNumByStatusResponse> carStatusNum( ) {
- return ApiResponse.success(new CarNumByStatusResponse());
+ public ApiResponse<CarNumByStatusResponse> carStatusNum(@RequestBody CarNumByStatusRequest param) {
+ return ApiResponse.success(platformJobService.carStatusNum(param));
}
@PreventRepeat
@@ -94,21 +98,21 @@
@PostMapping("/platform/carLogsList")
@LoginNoRequired
public ApiResponse<List<CarLogsListResponse>> carLogsList(@RequestBody CarLogsListRequest param) {
- return ApiResponse.success(new ArrayList<>());
+ return ApiResponse.success(platformLogService.getCarLogsListResponse(param));
}
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞帓闃熼槦鍒楀垪琛ㄩ泦鍚�")
@PostMapping("/platform/queueList")
@LoginNoRequired
- public ApiResponse< PlatformQueuingListResponse> queueList( ) {
- return ApiResponse.success(new PlatformQueuingListResponse());
+ public ApiResponse<PlatformQueuingListResponse> queueList(@RequestBody PlatformQueuingListRequest param) {
+ return ApiResponse.success(platformJobService.queueList(param));
}
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戦璀︿簨浠堕泦鍚堝垪琛�")
@PostMapping("/platform/warningEventList")
@LoginNoRequired
- public ApiResponse<List<CarLogsListResponse>> warningEventList( ) {
+ public ApiResponse<List<PlatformWarnEventListResponse>> warningEventList(@RequestBody PlatformWarnEventListRequest param) {
return ApiResponse.success(new ArrayList<>());
}
}
--
Gitblit v1.9.3