From d276650af474a920778ab083fb5dfed12a0c8c0f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 14 十一月 2023 17:31:25 +0800
Subject: [PATCH] mq发布问题
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
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..2df708a 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;
@@ -196,21 +197,23 @@
@Override
public List<ArdSyCarLock> data(String msg) {
- String pattern = "0.00"; // 鎸囧畾淇濈暀涓や綅灏忔暟鐨勬牸寮�
- DecimalFormat decimalFormat = new DecimalFormat(pattern); //
+// String pattern = "0.00"; // 鎸囧畾淇濈暀涓や綅灏忔暟鐨勬牸寮�
+// DecimalFormat decimalFormat = new DecimalFormat(pattern); //
JSONObject jsonObject = JSONObject.parseObject(msg);
List<ArdSyCarLock> lockList = new ArrayList<>();
ArdSyCarLock ardSyCarLock1 = new ArdSyCarLock();
ardSyCarLock1.setRelay("A01");
- ardSyCarLock1.setRelayInfo(String.valueOf(jsonObject.getInteger("A01")));
+// ardSyCarLock1.setRelayInfo(String.valueOf(jsonObject.getInteger("A01")));
+ ardSyCarLock1.setRelayInfo(jsonObject.getInteger("A01"));
ardSyCarLock1.setCurrents("C01");
- ardSyCarLock1.setCurrentInfo(decimalFormat.format(jsonObject.getDouble("C01")));
+// ardSyCarLock1.setCurrentInfo(decimalFormat.format(jsonObject.getDouble("C01")));
+ ardSyCarLock1.setCurrentInfo(jsonObject.getDouble("C01"));
lockList.add(ardSyCarLock1);
ArdSyCarLock ardSyCarLock2 = new ArdSyCarLock();
ardSyCarLock2.setRelay("A02");
- ardSyCarLock2.setRelayInfo(String.valueOf(jsonObject.getInteger("A02")));
+ ardSyCarLock2.setRelayInfo(jsonObject.getInteger("A02"));
ardSyCarLock2.setCurrents("C02");
- ardSyCarLock2.setCurrentInfo(decimalFormat.format(jsonObject.getDouble("C02")));
+ ardSyCarLock2.setCurrentInfo(jsonObject.getDouble("C02"));
lockList.add(ardSyCarLock2);
return lockList;
}
@@ -228,25 +231,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;
//鏌ヨ閿佷俊鎭�
@@ -254,7 +257,7 @@
for (int j = 0; j < ardSyCarLocks.size(); j++) {
ArdSyCarLock ardSyCarLock = ardSyCarLocks.get(j);
String currents = ardSyCarLock.getCurrents();
- String currentInfo = ardSyCarLock.getCurrentInfo();
+ Double currentInfo = ardSyCarLock.getCurrentInfo();
//鐢垫祦鍊间负4.0鏄叧閿佺姸鎬�
if(currentInfo.equals(4.00)){
lockCloseNum += 1;
@@ -275,7 +278,7 @@
}
while(true){
ArdSyCarLock ardSyCarLock1 = getCurrentInfo(ardSyCarRtu.getId(),currents);
- String currentInfo1 = ardSyCarLock1.getCurrentInfo();
+ Double currentInfo1 = ardSyCarLock1.getCurrentInfo();
if(currentInfo1.equals(4.00)){
lockCloseNum +=1;
break;
@@ -289,7 +292,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);
}
@@ -304,12 +307,12 @@
queryWrapper.eq("car_id",lockTypeParam.getCarId());
ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
ArdSyCarLock ardSyCarLock = lockMapper.selectById(lockTypeParam.getLockId());
- String relay = ardSyCarLock.getRelayInfo();
+ Integer relay = ardSyCarLock.getRelayInfo();
if(relay.equals("1")){
AjaxResult.error(0,"璇ラ攣澶勪簬瑙ｅ皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
}
String key = "";
- String currentInfo = ardSyCarLock.getCurrentInfo();
+ Double currentInfo = ardSyCarLock.getCurrentInfo();
if(currentInfo.equals("C01")){
key = "D03";
}else if(currentInfo.equals("C02")){
--
Gitblit v1.9.3