From e9c961b6ca042a65ce070d288f7425adedf253aa Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 23 十一月 2023 17:18:54 +0800
Subject: [PATCH] 优化双语登出和字典
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 a761b97..26b9f4d 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
@@ -331,7 +331,7 @@
ArdSyCarLock ardSyCarLock = lockMapper.selectById(lockTypeParam.getLockId());
Integer relay = ardSyCarLock.getRelayInfo();
if(relay.equals("1")){
- AjaxResult.error(0,"璇ラ攣澶勪簬瑙ｅ皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
+ return AjaxResult.error(0,"璇ラ攣澶勪簬瑙ｅ皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
}
String key = "";
String currents = ardSyCarLock.getCurrents();
@@ -340,13 +340,13 @@
}else if(currents.equals("C02")){
key = "D04";
}
- Number lockState = (Number) lockTypeParam.getNum();
- if(lockState.equals(100)){
+ double lockState = lockTypeParam.getNum();
+ if(lockState==100){
lockState = 99.99;
- }else if(lockState.equals(0)){
+ }else if(lockState==0){
lockState = 0.01;
}else{
- lockState = lockState.doubleValue() + 0.01;
+ lockState = lockState + 0.01;
}
Map<String,Object> map = new HashMap();
map.put(key, lockState);//鑼冨洿鏄�0.01鍒�99.99
@@ -354,7 +354,7 @@
String mapString = JSON.toJSONString(map);
System.out.println(mapString);
MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
- mqttCustomerClient.connect(lockTypeParam.getCarId()+"change");
+ mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
return AjaxResult.success("寮�鍏抽攣鍛戒护鍙戦�佹垚鍔�,鍙戦�佽繘搴︿负"+lockTypeParam.getNum());
// QueryWrapper<SysConfig> queryWrapper1 = new QueryWrapper<>();
--
Gitblit v1.9.3