From beb631b78961e266456555077e040418d4eda1b6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 09 十一月 2023 13:17:41 +0800
Subject: [PATCH] 修改一键报警列表时间字段
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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 c73e34b..bd1d29e 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
@@ -8,10 +8,8 @@
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.service.*;
import com.ruoyi.sy.vo.CarLockVo;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.sy.vo.RtuVo;
@@ -42,6 +40,8 @@
private ArdSyCarLockService ardSyCarLockService;
@Autowired
private ArdAccessFenceService ardAccessFenceService;
+ @Autowired
+ private ArdSyCarRtuService ardSyCarRtuService;
@GetMapping("/car")
@ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈�")
@@ -79,8 +79,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");
@@ -116,8 +115,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");
@@ -138,7 +136,8 @@
@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();
@@ -151,11 +150,19 @@
@PostMapping("/addCar")
@ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締淇濆瓨")
- public AjaxResult addCar(String carId){
- List<CarVo> list = ardSyCarLockService.addCarBefore(carId);
+ public AjaxResult addCar(@RequestBody AddCarParam addCarParam){
+ List<CarVo> list = ardSyCarLockService.addCarBefore(addCarParam.getCarId());
analysis(list);
if(list.size()>0){
- return AjaxResult.success(ardAccessFenceService.addCar(list.get(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();
}
@@ -166,11 +173,18 @@
return AjaxResult.success(ardAccessFenceService.delCar(id));
}
- @PutMapping("/addCar")
+ @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){
@@ -180,8 +194,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");
--
Gitblit v1.9.3