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 | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 54d03ed..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) {
@@ -55,8 +59,15 @@
}
@Override
- public List<ArdAccessFence> all() {
- return ardAccessFenceMapper.selectList(null);
+ public List<ArdAccessFence> all(String url) {
+ 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(ardAccessFence.getCarModel());
+ ardAccessFence.setIsLock(lockService.isLock(ardAccessFence.getCarId()));
+ }
+ return list;
}
@Override
@@ -72,7 +83,7 @@
}
@Override
- public int addCar(CarVo carVo) {
+ public int addCar(CarVo carVo,Integer isAlarm,String lng,String lat) {
ArdAccessFence ardAccessFence = new ArdAccessFence();
ardAccessFence.setId(String.valueOf(UUID.randomUUID()));
ardAccessFence.setCarId(carVo.getCarId());
@@ -81,6 +92,9 @@
ardAccessFence.setDeptName(carVo.getDeptName());
ardAccessFence.setCarModel(carVo.getCarModel());
ardAccessFence.setIsWarning(0);
+ ardAccessFence.setIsAlarm(isAlarm);
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLat(lat);
return ardAccessFenceMapper.insert(ardAccessFence);
}
--
Gitblit v1.9.3