From 7c1e2217d0e4aad7498a5c136710c33cb55d00d0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 17 七月 2024 15:11:00 +0800
Subject: [PATCH] 三一车辆模型bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
index 7923a60..1519639 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java
@@ -34,6 +34,12 @@
@Autowired
private ArdAccessNumService ardAccessNumService;
+ @Autowired
+ private ISysConfigService sysConfigService;
+
+ @Autowired
+ private ArdSyCarLockService lockService;
+
@PostMapping("/add")
@ApiOperation("娣诲姞鐢靛瓙鍥存爮")
public AjaxResult add(@RequestBody ArdOilWall ardOilWall){
@@ -63,7 +69,7 @@
return AjaxResult.success(ardOilWallService.one(id));
}
- @GetMapping("/query")
+ @GetMapping("/queryPage")
@ApiOperation("鏉′欢鏌ヨ鎵�鏈夌數瀛愬洿鏍忓垎椤�")
public AjaxResult queryPage(OilWallParam oilWallParam){
if(oilWallParam.getPageNum()==null || oilWallParam.getPageNum() == 0){
@@ -87,7 +93,12 @@
@GetMapping("/wallCar")
@ApiOperation("鎵�鏈夎繘鍏ュ洿鏍忕殑杞﹁締")
public AjaxResult wallCar(){
- return AjaxResult.success(ardAccessFenceService.all());
+ String url = sysConfigService.selectConfigByKey("minioIn")+"/";
+ List<ArdAccessFence> list = ardAccessFenceService.all(url);
+ for (int i = 0; i < list.size(); i++) {
+ list.get(i).setIsLock(lockService.isLock(list.get(i).getCarId()));
+ }
+ return AjaxResult.success(list);
}
@GetMapping("/rollTime")
@@ -99,8 +110,7 @@
@PostMapping("/updTime")
@ApiOperation("淇濆瓨鏃堕棿姝ラ暱")
public AjaxResult updTime(@RequestBody ArdAccessNum ardAccessNum){
- return AjaxResult.success(ardAccessNumService.add(ardAccessNum));
+ return AjaxResult.success(ardAccessNumService.upd(ardAccessNum));
}
-
}
--
Gitblit v1.9.3