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/PlatformJobRunActController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 7db4ebd..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;
@@ -36,7 +37,7 @@
@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝洯鍖虹墿娴佽繍琛岃皟搴︾湅鏉跨湡瀹�")
@RestController
@Slf4j
-@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRunAct")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
public class PlatformJobRunActController extends BaseController {
@Autowired
@@ -52,8 +53,6 @@
return ApiResponse.success(data);
}
-
-
@LoginNoRequired
@ApiOperation("杩愯緭浠诲姟鍒嗘瀽")
@GetMapping("/transportMeasure")
@@ -64,6 +63,7 @@
List<TransportMeasureVO> list = boardService.transportMeasure(queryType);
return ApiResponse.success(list);
}
+
@LoginNoRequired
@ApiOperation("姹借溅鐘舵�併�佺粡绾害闆嗗悎鏁版嵁")
@GetMapping("/carsList")
@@ -71,6 +71,15 @@
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("鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎")
@PostMapping("/getCarsJobDetails")
@@ -101,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 ")
@@ -125,14 +134,7 @@
@ApiOperation("浠婃棩鍏ュ簱閲忕粺璁�")
@GetMapping("/totalInList")
public ApiResponse<List<GeneralVO>> totalInList() {
- List<GeneralVO> list = new ArrayList<>();
- for (int i = 1; i < 4; i++) {
- Random random = new Random();
- GeneralVO data = new GeneralVO();
- data.setName("鍘傚尯鍚嶇О_"+i);
- data.setNum(BigDecimal.valueOf(random.nextInt(1000)));
- list.add(data);
- }
+ List<GeneralVO> list = boardService.todayTotalInList();
return ApiResponse.success(list);
}
--
Gitblit v1.9.3