From 6b2c648f3bf251a03b3124f347e42edfd9357469 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 10 十一月 2023 17:40:10 +0800
Subject: [PATCH] 车辆锁回调
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 11 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 322a260..86c0509 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
@@ -1,17 +1,22 @@
package com.ruoyi.sy.controller;
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.service.ArdSyCarLockService;
-import com.ruoyi.sy.service.IArdSyCarService;
-import com.ruoyi.sy.service.IArdSyUserService;
+import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
+import com.ruoyi.sy.param.AddCarParam;
+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;
@@ -36,6 +41,10 @@
private IArdSyCarService ardSyCarService;
@Autowired
private ArdSyCarLockService ardSyCarLockService;
+ @Autowired
+ private ArdAccessFenceService ardAccessFenceService;
+ @Autowired
+ private ArdSyCarRtuService ardSyCarRtuService;
@GetMapping("/car")
@ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈�")
@@ -47,8 +56,8 @@
@GetMapping("/carAddOne")
@ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈嗗姞鏈溅杈嗕俊鎭�")
- public Results carAddOne(String CarId){
- List<CarVo> list = ardSyCarLockService.carAddOne(CarId);
+ public Results carAddOne(String carId){
+ List<CarVo> list = ardSyCarLockService.carAddOne(carId);
analysis(list);
return Results.succeed(list);
}
@@ -73,8 +82,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");
@@ -110,8 +118,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");
@@ -129,6 +136,60 @@
return Results.succeed("鎴愬姛淇敼"+ardSyCarLockService.updRtuCar(ardSyCarRtu)+"鏉℃暟鎹�");
}
+ @GetMapping("/queryCar")
+ @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締鏌ヨ")
+ public AjaxResult queryCar(){
+ 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();
+ carIdList.add(carId);
+ }
+ List<CarVo> list = ardSyCarLockService.queryCar(carIdList);
+ analysis(list);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/addCar")
+ @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締淇濆瓨")
+ 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("/openLock")
+ @ApiOperation("杩滅▼寮�閿�")
+ public AjaxResult openLock(String carId){
+ return AjaxResult.success(ardSyCarRtuService.openLock(ardSyCarRtuService.one(carId)));
+ }
+
+
+ //鑾峰彇31杞﹁締杞︾墝鍙烽┚椹跺憳鍜岀數璇�
public List<CarVo> analysis(List<CarVo> list){
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
@@ -136,8 +197,7 @@
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();
+ 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");
@@ -150,4 +210,5 @@
return list;
}
+
}
--
Gitblit v1.9.3