From a6f9e7d4faf7c1c536111e0db7f3317cbda9ddb1 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 30 十二月 2024 18:24:05 +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/PlatformJobRunActController.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java index 643d77e..93c3104 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java @@ -2,6 +2,7 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; +import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse; import com.doumee.core.model.ApiResponse; import com.doumee.core.utils.Constants; import com.doumee.dao.business.join.PlatformJobJoinMapper; @@ -52,8 +53,6 @@ return ApiResponse.success(data); } - - @LoginNoRequired @ApiOperation("杩愯緭浠诲姟鍒嗘瀽") @GetMapping("/transportMeasure") @@ -64,11 +63,20 @@ List<TransportMeasureVO> list = boardService.transportMeasure(queryType); return ApiResponse.success(list); } + @LoginNoRequired @ApiOperation("姹借溅鐘舵�併�佺粡绾害闆嗗悎鏁版嵁") @GetMapping("/carsList") public ApiResponse<BoardCarsListVO> carsList() { BoardCarsListVO data = boardService.platformJobCarsList(); + return ApiResponse.success(data); + } + + @LoginNoRequired + @ApiOperation("姹借溅鍛婅浜嬩欢闆嗗悎鏁版嵁") + @GetMapping("/carsEventList") + public ApiResponse<List<CarsAlarmResultListResponse>> carsEventList() { + List<CarsAlarmResultListResponse> data = boardService.carsEventList(); return ApiResponse.success(data); } @@ -102,7 +110,7 @@ ,Constants.PlatformJobStatus.WORKING.getKey() ,Constants.PlatformJobStatus.TRANSFERING.getKey() ,Constants.PlatformJobStatus.EXCEPTION.getKey() - ,Constants.PlatformJobStatus.DONE.getKey() +// ,Constants.PlatformJobStatus.DONE.getKey() ) .orderByDesc(PlatformJob::getSignNum) .last(" limit 20 ") -- Gitblit v1.9.3