From 163942aec6316425d2eeaf93f34f7a8ff627d8b8 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 16:22:11 +0800
Subject: [PATCH] lock
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 62 insertions(+), 25 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 ec3e0b4..d9e9864 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,6 +1,9 @@
package com.ruoyi.sy.controller;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -9,8 +12,7 @@
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
-import com.ruoyi.sy.param.AddCarParam;
-import com.ruoyi.sy.param.AddRtuParam;
+import com.ruoyi.sy.param.*;
import com.ruoyi.sy.service.*;
import com.ruoyi.sy.service.impl.ArdSyCarRtuServiceImpl;
import com.ruoyi.sy.vo.CarLockVo;
@@ -21,6 +23,7 @@
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.*;
@@ -66,7 +69,7 @@
@PostMapping("/add")
@ApiOperation("娣诲姞rtu")
public AjaxResult add(@RequestBody AddRtuParam addRtuParam){
- return AjaxResult.success("鎴愬姛娣诲姞"+ardSyCarLockService.addRtu(addRtuParam)+"鏉℃暟鎹�");
+ return AjaxResult.success("鎴愬姛娣诲姞"+ardSyCarLockService.addRtu(addRtuParam)+"鏉℃暟鎹紝璁㈤槄杞﹁締"+addRtuParam.getCarId()+"鎴愬姛");
}
@DeleteMapping("/del")
@@ -85,25 +88,45 @@
String syURL = sysConfigService.getSYURL();
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);
- carLockVo.setCar(carVo);
+ if(list1.size()>0){
+ 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);
+ }
+
String rtu = carVo.getRtu();
carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
+ ArdSyCarRtu ardSyCarRtu = ardSyCarRtuService.one(carId);
+ carVo.setInstallType(ardSyCarRtu.getInstallType());
+ carVo.setUnloadType(ardSyCarRtu.getUnloadType());
+ carLockVo.setCar(carVo);
return AjaxResult.success(carLockVo);
}
@GetMapping("/query")
@ApiOperation("鏌ヨ鎵�鏈塺tu鎸傝浇鐨勮溅杈�")
- public Results query(){
+ public Results query(LockPageParam lockPageParam){
List<CarVo> list = ardSyCarLockService.carList();
analysis(list);
- return Results.succeed(list);
+ List<CarVo> newList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ String plate = list.get(i).getCarPlate();
+ if(lockPageParam.getCarPlate()!=null){
+ if(plate.contains(lockPageParam.getCarPlate())){
+ newList.add(list.get(i));
+ }
+ }
+ }
+ PageHelper.startPage(lockPageParam.getPageNum(),lockPageParam.getPageSize());
+ if(lockPageParam.getCarPlate()!=null){
+ return Results.succeed(new PageInfo<>(newList));
+ }else {
+ return Results.succeed(new PageInfo<>(list));
+ }
}
@PostMapping("/addLock")
@@ -112,9 +135,9 @@
return Results.succeed("鎴愬姛娣诲姞/淇敼"+ardSyCarLockService.addUpdLock(locks)+"鏉℃暟鎹�");
}
- @GetMapping("/onrRtu")
+ @GetMapping("/oneRtu")
@ApiOperation("鏇存敼Rtu鍓嶆煡璇�")
- public Results onrRtu(String carId){
+ public Results oneRtu(String carId){
RtuVo rtuVo = ardSyCarLockService.updRtu(carId);
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
@@ -183,10 +206,22 @@
return AjaxResult.success(ardAccessFenceService.updCarAlarm(id));
}
- @GetMapping("/openLock")
+ @PostMapping("/onOff")
@ApiOperation("杩滅▼寮�閿�")
- public AjaxResult openLock(String carId){
- return AjaxResult.success(ardSyCarRtuService.openLock(ardSyCarRtuService.one(carId)));
+ public AjaxResult onOff(@RequestBody LockTypeParam lockTypeParam) throws MqttException {
+ return ardSyCarLockService.onOff(lockTypeParam);
+ }
+
+ @PostMapping("/seal")
+ @ApiOperation("杩滅▼灏佸嵃")
+ public AjaxResult seal(@RequestBody RtuTypeParam rtuTypeParam) {
+ return ardSyCarLockService.seal(rtuTypeParam);
+ }
+
+ @GetMapping("/lockIng")
+ @ApiOperation("瀹炴椂閿佺姸鎬�")
+ public AjaxResult lockIng(String carId) {
+ return ardSyCarLockService.lockIng(carId);
}
@@ -200,13 +235,15 @@
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);
+ if(list1.size()>0){
+ 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