From d70d789667434c1ba80b281f398137d66d68aa6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 23 十二月 2024 17:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..49f08c6 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;
@@ -71,6 +72,13 @@
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);
+ }
@LoginNoRequired
@ApiOperation("鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎")
@@ -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