From 2b8bbbbf97836f2230b42da2fd519a221af449b0 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 10:12:14 +0800
Subject: [PATCH] 车辆锁管理
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 41 +++++++++++++++++++-
ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java | 3 -
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 25 +++++++++++-
ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java | 3 +
4 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
index 2abf37f..855640f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -7,6 +7,7 @@
import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.sy.service.IArdSyUserService;
+import com.ruoyi.sy.vo.CarLockVo;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.result.Results;
@@ -57,7 +58,25 @@
@GetMapping("/one")
@ApiOperation("鏌ヨ涓�鏉tu鍙婇攣")
public Results one(String carId){
- return Results.succeed(ardSyCarLockService.carLock(carId));
+ CarLockVo carLockVo = new CarLockVo();
+ CarVo carVo = ardSyCarLockService.carOne(carId);
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ Results results = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
+ Map<String,Object> map = (Map<String, Object>) results.getData();
+ List list1 = (List) map.get("list");
+ JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0)));
+ String carPlate = (String) jsonObject.get("carPlate");
+ carVo.setCarPlate(carPlate);
+ String drvName = (String) jsonObject.get("drvName");
+ carVo.setDrvName(drvName);
+ String drvPhone = (String) jsonObject.get("drvPhone");
+ carVo.setDrvPhone(drvPhone);
+ carLockVo.setCar(carVo);
+ String rtu = carVo.getRtu();
+ carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
+ return Results.succeed(carLockVo);
}
@GetMapping("/query")
@@ -68,10 +87,10 @@
return Results.succeed(list);
}
- @GetMapping("/addLock")
+ @PostMapping("/addLock")
@ApiOperation("娣诲姞淇敼閿�")
public Results addLock(@RequestBody List<ArdSyCarLock> locks){
- return Results.succeed(ardSyCarLockService.addUpdLock(locks));
+ return Results.succeed("鎴愬姛娣诲姞/淇敼"+ardSyCarLockService.addUpdLock(locks)+"鏉℃暟鎹�");
}
public List<CarVo> analysis(List<CarVo> list){
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java
index e4ec985..258acf5 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java
@@ -1,10 +1,9 @@
package com.ruoyi.sy.domain;
-import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
@Data
-public class ArdSyCarLock extends BaseEntity {
+public class ArdSyCarLock {
private String id;
private String rtuId;
private String lockName;
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
index cf986df..146f406 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
@@ -22,7 +22,8 @@
int delCar(String id);
- List<CarLockVo> carLock(String carId);
+ CarVo carOne(String carId);
+ List<ArdSyCarLock> carLock(String rtu);
int addUpdLock(List<ArdSyCarLock> ardSyCarLock);
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index ac7e54c..cc3f651 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.sy.domain.ArdSyCar;
import com.ruoyi.sy.domain.ArdSyCarLock;
import com.ruoyi.sy.domain.ArdSyCarRtu;
+import com.ruoyi.sy.mapper.ArdSyCarLockMapper;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
import com.ruoyi.sy.service.ArdSyCarLockService;
@@ -30,6 +31,8 @@
private SysDeptMapper sysDeptMapper;
@Autowired
private ArdSyCarRtuMapper rtuMapper;
+ @Autowired
+ private ArdSyCarLockMapper lockMapper;
@Override
public List<CarVo> car() {
@@ -73,13 +76,45 @@
}
@Override
- public List<CarLockVo> carLock(String carId) {
- return null;
+ public CarVo carOne(String carId) {
+ CarVo carVo = new CarVo();
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("car_id",carId);
+ ArdSyCar ardSyCar= ardSyCarMapper.selectOne(queryWrapper);
+ carVo.setCarId(ardSyCar.getCarId());
+ carVo.setCarPicture(ardSyCar.getCarPicture());
+ carVo.setCarType(ardSyCar.getCarType());
+ carVo.setDeptId(ardSyCar.getDeptId());
+ SysDept sysDept = sysDeptMapper.selectById(ardSyCar.getDeptId());
+ carVo.setDeptName(sysDept.getDeptName());
+ carVo.setRtu(ardSyCar.getReserved1());
+ return carVo;
+ }
+
+ @Override
+ public List<ArdSyCarLock> carLock(String rtu) {
+ QueryWrapper<ArdSyCarLock> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("rtu_id",rtu);
+ return lockMapper.selectList(queryWrapper);
}
@Override
public int addUpdLock(List<ArdSyCarLock> ardSyCarLock) {
- return 0;
+ int num = 0;
+ if(ardSyCarLock.size()>0){
+ String rtu = ardSyCarLock.get(0).getRtuId();
+ QueryWrapper<ArdSyCarLock> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("rtu_id",rtu);
+ lockMapper.delete(queryWrapper);
+ for (int i = 0; i < ardSyCarLock.size(); i++) {
+ ArdSyCarLock lock = ardSyCarLock.get(i);
+ if(lock.getId()==null){
+ lock.setId(String.valueOf(UUID.randomUUID()));
+ }
+ num += lockMapper.insert(lock);
+ }
+ }
+ return num;
}
public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){
--
Gitblit v1.9.3