From 493caef7413992d0215b9c2e2bcedd30471d89e7 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 15:49:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
index da8ce6e..0b2ac2e 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java
@@ -4,9 +4,11 @@
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.domain.ArdSyCar;
import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
+import com.ruoyi.sy.mapper.ArdSyCarLockMapper;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.param.OilWallParam;
import com.ruoyi.sy.service.ArdAccessFenceService;
+import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.vo.CarVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,6 +23,8 @@
private ArdAccessFenceMapper ardAccessFenceMapper;
@Autowired
private ArdSyCarMapper carMapper;
+ @Autowired
+ private ArdSyCarLockService lockService;
@Override
public int access(ArdAccessFence ardAccessFence) {
@@ -59,7 +63,9 @@
List<ArdAccessFence> list = ardAccessFenceMapper.selectList(null);
for (int i = 0; i < list.size(); i++) {
ArdAccessFence ardAccessFence = list.get(i);
- ardAccessFence.setCarModel(url+ardAccessFence.getCarModel());
+// ardAccessFence.setCarModel(url+ardAccessFence.getCarModel());
+ ardAccessFence.setCarModel(ardAccessFence.getCarModel());
+ ardAccessFence.setIsLock(lockService.isLock(ardAccessFence.getCarId()));
}
return list;
}
--
Gitblit v1.9.3