From 92dba8e44a911c92832ecc22e4c98968409d5c68 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 14 十一月 2023 15:01:37 +0800
Subject: [PATCH] 远程封印
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 13 +++++++------
ard-work/src/main/java/com/ruoyi/sy/param/RtuTypeParam.java | 9 +++++++++
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 5 +++--
ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java | 3 ++-
4 files changed, 21 insertions(+), 9 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..a202a1b 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
@@ -12,6 +12,7 @@
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;
@@ -193,8 +194,8 @@
@GetMapping("/seal")
@ApiOperation("杩滅▼灏佸嵃")
- public AjaxResult seal(@RequestBody LockTypeParam lockTypeParam) {
- return AjaxResult.success(ardSyCarLockService.seal(lockTypeParam));
+ public AjaxResult seal(@RequestBody RtuTypeParam rtuTypeParam) {
+ return AjaxResult.success(ardSyCarLockService.seal(rtuTypeParam));
}
@GetMapping("/lockIng")
diff --git a/ard-work/src/main/java/com/ruoyi/sy/param/RtuTypeParam.java b/ard-work/src/main/java/com/ruoyi/sy/param/RtuTypeParam.java
new file mode 100644
index 0000000..58c8a83
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/param/RtuTypeParam.java
@@ -0,0 +1,9 @@
+package com.ruoyi.sy.param;
+
+import lombok.Data;
+
+@Data
+public class RtuTypeParam {
+ private String carId;
+ private Integer type;
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
index cf0d0b5..1042150 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
@@ -5,6 +5,7 @@
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.param.AddRtuParam;
import com.ruoyi.sy.param.LockTypeParam;
+import com.ruoyi.sy.param.RtuTypeParam;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.sy.vo.RtuVo;
import org.eclipse.paho.client.mqttv3.MqttException;
@@ -46,7 +47,7 @@
ArdSyCarLock getCurrentInfo(String Rtu,String currents);
- AjaxResult seal(LockTypeParam lockTypeParam);
+ AjaxResult seal(RtuTypeParam rtuTypeParam);
AjaxResult onOff(LockTypeParam lockTypeParam);
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index 6f80f7c..0dd636a 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
import com.ruoyi.sy.param.AddRtuParam;
import com.ruoyi.sy.param.LockTypeParam;
+import com.ruoyi.sy.param.RtuTypeParam;
import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.sy.vo.RtuVo;
@@ -228,25 +229,25 @@
}
@Override
- public AjaxResult seal(LockTypeParam lockTypeParam) {
+ public AjaxResult seal(RtuTypeParam rtuTypeParam) {
QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("carId",lockTypeParam.getCarId());
+ queryWrapper.eq("carId",rtuTypeParam.getCarId());
ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
MqttOnce mqttOnce = new MqttOnce();
//1瑙ｅ皝
- if(lockTypeParam.getType()==1){
+ if(rtuTypeParam.getType()==1){
Map<String,Object> map = new HashMap<>();
map.put("A01", 110000);//瀵奸�氱涓�璺户鐢靛櫒
map.put("A02", 110000);//瀵奸�氱浜岃矾缁х數鍣�
map.put("res", String.valueOf(System.currentTimeMillis()));
try {
- return AjaxResult.success(mqttOnce.publishCar(lockTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"瑙ｅ皝"));
+ return AjaxResult.success(mqttOnce.publishCar(rtuTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"瑙ｅ皝"));
} catch (MqttException e) {
log.debug("瑙ｅ皝鎸囦护鍙戠敓澶辫触"+e);
}
}
//0鏂藉皝
- if(lockTypeParam.getType()==0){
+ if(rtuTypeParam.getType()==0){
//閿佸紑鍏崇姸鎬�
int lockCloseNum = 0;
//鏌ヨ閿佷俊鎭�
@@ -289,7 +290,7 @@
map.put("A02", 100000);//鏂紑绗簩璺户鐢靛櫒
map.put("res", String.valueOf(System.currentTimeMillis()));
try {
- return AjaxResult.success(mqttOnce.publishCar(lockTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"鏂藉皝"));
+ return AjaxResult.success(mqttOnce.publishCar(rtuTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"鏂藉皝"));
} catch (MqttException e) {
log.debug("鏂藉皝鎸囦护鍙戠敓澶辫触"+e);
}
--
Gitblit v1.9.3