From 54596b451997789a1407a7063ea07bdb78ad8ddc Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 14 十一月 2023 13:43:58 +0800
Subject: [PATCH] 车辆锁
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 137 +++++++++++++++++++++++++++++++--------------
1 files changed, 94 insertions(+), 43 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 fc95160..2b6f049 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
@@ -3,22 +3,26 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.domain.ArdSyCarLock;
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
-import com.ruoyi.sy.service.ArdAccessFenceService;
-import com.ruoyi.sy.service.ArdSyCarLockService;
-import com.ruoyi.sy.service.IArdSyCarService;
-import com.ruoyi.sy.service.IArdSyUserService;
+import com.ruoyi.sy.param.AddCarParam;
+import com.ruoyi.sy.param.AddRtuParam;
+import com.ruoyi.sy.param.LockTypeParam;
+import com.ruoyi.sy.service.*;
+import com.ruoyi.sy.service.impl.ArdSyCarRtuServiceImpl;
import com.ruoyi.sy.vo.CarLockVo;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.sy.vo.RtuVo;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.utils.mqtt.MqttConsumer;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -42,45 +46,46 @@
private ArdSyCarLockService ardSyCarLockService;
@Autowired
private ArdAccessFenceService ardAccessFenceService;
+ @Autowired
+ private ArdSyCarRtuService ardSyCarRtuService;
@GetMapping("/car")
@ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈�")
- public Results car(){
+ public AjaxResult car(){
List<CarVo> list = ardSyCarLockService.car();
analysis(list);
- return Results.succeed(list);
+ return AjaxResult.success(list);
}
@GetMapping("/carAddOne")
@ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈嗗姞鏈溅杈嗕俊鎭�")
- public Results carAddOne(String carId){
+ public AjaxResult carAddOne(String carId){
List<CarVo> list = ardSyCarLockService.carAddOne(carId);
analysis(list);
- return Results.succeed(list);
+ return AjaxResult.success(list);
}
@PostMapping("/add")
@ApiOperation("娣诲姞rtu")
- public Results add(String carId){
- return Results.succeed("鎴愬姛娣诲姞"+ardSyCarLockService.addRtu(carId)+"鏉℃暟鎹�");
+ public AjaxResult add(@RequestBody AddRtuParam addRtuParam){
+ return AjaxResult.success("鎴愬姛娣诲姞"+ardSyCarLockService.addRtu(addRtuParam)+"鏉℃暟鎹紝璁㈤槄杞﹁締"+addRtuParam.getCarId()+"鎴愬姛");
}
@DeleteMapping("/del")
@ApiOperation("鍒犻櫎rtu")
- public Results del(String id){
- return Results.succeed("鎴愬姛鍒犻櫎"+ardSyCarLockService.delCar(id)+"鏉℃暟鎹�");
+ public AjaxResult del(String id){
+ return AjaxResult.success("鎴愬姛鍒犻櫎"+ardSyCarLockService.delCar(id)+"鏉℃暟鎹�");
}
@GetMapping("/one")
@ApiOperation("鏌ヨ涓�鏉tu鍙婇攣")
- public Results one(String carId){
+ public AjaxResult one(String 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();
+ Map<String,Object> map = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
List list1 = (List) map.get("list");
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0)));
String carPlate = (String) jsonObject.get("carPlate");
@@ -92,7 +97,7 @@
carLockVo.setCar(carVo);
String rtu = carVo.getRtu();
carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
- return Results.succeed(carLockVo);
+ return AjaxResult.success(carLockVo);
}
@GetMapping("/query")
@@ -116,8 +121,7 @@
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();
+ Map<String,Object> map = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
List list1 = (List) map.get("list");
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0)));
String carPlate = (String) jsonObject.get("carPlate");
@@ -135,31 +139,11 @@
return Results.succeed("鎴愬姛淇敼"+ardSyCarLockService.updRtuCar(ardSyCarRtu)+"鏉℃暟鎹�");
}
- public List<CarVo> analysis(List<CarVo> list){
- String usersId = SecurityUtils.getUserId();
- ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
- String syURL = sysConfigService.getSYURL();
- for (int i = 0; i < list.size(); i++) {
- CarVo carVo = list.get(i);
- String carId = carVo.getCarId();
- 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);
- }
- return list;
- }
-
- @GetMapping("/addCar")
+ @GetMapping("/queryCar")
@ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締鏌ヨ")
public AjaxResult queryCar(){
- List<ArdAccessFence> ardAccessFences = ardAccessFenceService.all();
+ String url = sysConfigService.selectConfigByKey("minioIn")+"/";
+ List<ArdAccessFence> ardAccessFences = ardAccessFenceService.all(url);
List<String> carIdList = new ArrayList<>();
for (int i = 0; i < ardAccessFences.size(); i++) {
String carId = ardAccessFences.get(i).getCarId();
@@ -172,7 +156,74 @@
@PostMapping("/addCar")
@ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締淇濆瓨")
- public AjaxResult queryCar(@RequestBody CarVo carVo){
- return AjaxResult.success(ardAccessFenceService.addCar(carVo));
+ public AjaxResult addCar(@RequestBody AddCarParam addCarParam){
+ List<CarVo> list = ardSyCarLockService.addCarBefore(addCarParam.getCarId());
+ analysis(list);
+ if(list.size()>0){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ Map<String, Object> map = ardSyCarService.getCarGPSBycarId(usersId,addCarParam.getCarId(),syURL,ardSyUser);
+ List list1 = (List) map.get("list");
+ JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0)));
+ String lng = (String) jsonObject.get("lng");
+ String lat = (String) jsonObject.get("lat");
+ return AjaxResult.success(ardAccessFenceService.addCar(list.get(0),addCarParam.getIsAlarm(),lng,lat));
+ }
+ return AjaxResult.success();
}
+
+ @DeleteMapping("/delCar")
+ @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締鍒犻櫎")
+ public AjaxResult delCar(String id){
+ return AjaxResult.success(ardAccessFenceService.delCar(id));
+ }
+
+ @PutMapping("/cleanAlarm")
+ @ApiOperation("娓呯┖鎶ヨ")
+ public AjaxResult updCarAlarm(String id){
+ return AjaxResult.success(ardAccessFenceService.updCarAlarm(id));
+ }
+
+ @GetMapping("/onOff")
+ @ApiOperation("杩滅▼寮�閿�")
+ public AjaxResult onOff(@RequestBody LockTypeParam lockTypeParam) {
+ return AjaxResult.success(ardSyCarLockService.onOff(lockTypeParam));
+ }
+
+ @GetMapping("/seal")
+ @ApiOperation("杩滅▼灏佸嵃")
+ public AjaxResult seal(@RequestBody LockTypeParam lockTypeParam) {
+ return AjaxResult.success(ardSyCarLockService.seal(lockTypeParam));
+ }
+
+ @GetMapping("/lockIng")
+ @ApiOperation("瀹炴椂閿佺姸鎬�")
+ public AjaxResult lockIng(String carId) {
+ return AjaxResult.success(ardSyCarLockService.lockIng(carId));
+ }
+
+
+ //鑾峰彇31杞﹁締杞︾墝鍙烽┚椹跺憳鍜岀數璇�
+ public List<CarVo> analysis(List<CarVo> list){
+ String usersId = SecurityUtils.getUserId();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ String syURL = sysConfigService.getSYURL();
+ for (int i = 0; i < list.size(); i++) {
+ CarVo carVo = list.get(i);
+ String carId = carVo.getCarId();
+ Map<String,Object> map = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
+ 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);
+ }
+ return list;
+ }
+
+
}
--
Gitblit v1.9.3