From 7f5fbf4ef6832a6ef27387d8ce973522feec2094 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 28 十二月 2023 16:53:09 +0800
Subject: [PATCH] 车辆管理数量
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 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 2b6f049..a281656 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,8 @@
package com.ruoyi.sy.controller;
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,9 +11,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.LockTypeParam;
+import com.ruoyi.sy.param.*;
import com.ruoyi.sy.service.*;
import com.ruoyi.sy.service.impl.ArdSyCarRtuServiceImpl;
import com.ruoyi.sy.vo.CarLockVo;
@@ -97,15 +97,32 @@
carLockVo.setCar(carVo);
String rtu = carVo.getRtu();
carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
+ ArdSyCarRtu ardSyCarRtu = ardSyCarRtuService.one(carId);
+ carVo.setInstallType(ardSyCarRtu.getInstallType());
+ carVo.setUnloadType(ardSyCarRtu.getUnloadType());
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")
@@ -114,9 +131,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);
@@ -185,16 +202,16 @@
return AjaxResult.success(ardAccessFenceService.updCarAlarm(id));
}
- @GetMapping("/onOff")
+ @PostMapping("/onOff")
@ApiOperation("杩滅▼寮�閿�")
- public AjaxResult onOff(@RequestBody LockTypeParam lockTypeParam) {
- return AjaxResult.success(ardSyCarLockService.onOff(lockTypeParam));
+ public AjaxResult onOff(@RequestBody LockTypeParam lockTypeParam) throws MqttException {
+ return ardSyCarLockService.onOff(lockTypeParam);
}
- @GetMapping("/seal")
+ @PostMapping("/seal")
@ApiOperation("杩滅▼灏佸嵃")
- public AjaxResult seal(@RequestBody LockTypeParam lockTypeParam) {
- return AjaxResult.success(ardSyCarLockService.seal(lockTypeParam));
+ public AjaxResult seal(@RequestBody RtuTypeParam rtuTypeParam) {
+ return ardSyCarLockService.seal(rtuTypeParam);
}
@GetMapping("/lockIng")
--
Gitblit v1.9.3