From 2cfcb15fdff730140b6a03a874466802704078eb Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 22 十二月 2023 10:01:42 +0800
Subject: [PATCH] 群组

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 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 bd1d29e..92d6ab4 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,27 @@
 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.param.AddRtuParam;
+import com.ruoyi.sy.param.LockTypeParam;
+import com.ruoyi.sy.param.RtuTypeParam;
 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;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,35 +52,35 @@
 
     @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)+"鏉℃暟鎹紝璁㈤槄杞﹁締"+addRtuParam.getCarId()+"鎴愬姛");
     }
 
     @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();
@@ -91,7 +98,10 @@
         carLockVo.setCar(carVo);
         String rtu = carVo.getRtu();
         carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
-        return Results.succeed(carLockVo);
+        ArdSyCarRtu ardSyCarRtu = ardSyCarRtuService.one(carId);
+        carVo.setInstallType(ardSyCarRtu.getInstallType());
+        carVo.setUnloadType(ardSyCarRtu.getUnloadType());
+        return AjaxResult.success(carLockVo);
     }
 
     @GetMapping("/query")
@@ -108,9 +118,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);
@@ -179,10 +189,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 AjaxResult.success(ardSyCarLockService.lockIng(carId));
     }
 
 

--
Gitblit v1.9.3