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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 3c34866..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
@@ -2,18 +2,29 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
import java.util.List;
+import java.util.UUID;
@Service
public class ArdAccessFenceServiceImpl implements ArdAccessFenceService {
@Autowired
private ArdAccessFenceMapper ardAccessFenceMapper;
+ @Autowired
+ private ArdSyCarMapper carMapper;
+ @Autowired
+ private ArdSyCarLockService lockService;
@Override
public int access(ArdAccessFence ardAccessFence) {
@@ -48,8 +59,43 @@
}
@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
+ public int delCar(String id) {
+ return ardAccessFenceMapper.deleteById(id);
+ }
+
+ @Override
+ public int updCarAlarm(String id) {
+ ArdAccessFence ardAccessFence = ardAccessFenceMapper.selectById(id);
+ ardAccessFence.setIsWarning(0);
+ return ardAccessFenceMapper.updateById(ardAccessFence);
+ }
+
+ @Override
+ 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());
+ ardAccessFence.setCarName(carVo.getCarPlate());
+ ardAccessFence.setDeptId(carVo.getDeptId());
+ 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