From f22a5485cbe6563447ace9cf7939405f7e06c6a6 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 13 十一月 2023 10:25:27 +0800
Subject: [PATCH] 车辆RTU

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 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 17d103d..ec3e0b4 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,20 +3,21 @@
 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.param.AddCarParam;
-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.AddRtuParam;
+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;
@@ -43,38 +44,40 @@
     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)+"鏉℃暟鎹�");
     }
 
     @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();
@@ -92,7 +95,7 @@
         carLockVo.setCar(carVo);
         String rtu = carVo.getRtu();
         carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
-        return Results.succeed(carLockVo);
+        return AjaxResult.success(carLockVo);
     }
 
     @GetMapping("/query")
@@ -180,6 +183,13 @@
         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();

--
Gitblit v1.9.3