From 2dad62bb75aa57948f9b5b2d4bc88625fa7def0f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 20 十一月 2023 11:15:43 +0800
Subject: [PATCH] 后端双语处理
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 2df708a..7390c64 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
@@ -1,5 +1,6 @@
package com.ruoyi.sy.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -259,7 +260,7 @@
String currents = ardSyCarLock.getCurrents();
Double currentInfo = ardSyCarLock.getCurrentInfo();
//鐢垫祦鍊间负4.0鏄叧閿佺姸鎬�
- if(currentInfo.equals(4.00)){
+ if(currentInfo.equals(4.00) || currentInfo.equals(4)){
lockCloseNum += 1;
}else {
String key = "";
@@ -312,10 +313,10 @@
AjaxResult.error(0,"璇ラ攣澶勪簬瑙ｅ皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
}
String key = "";
- Double currentInfo = ardSyCarLock.getCurrentInfo();
- if(currentInfo.equals("C01")){
+ String currents = ardSyCarLock.getCurrents();
+ if(currents.equals("C01")){
key = "D03";
- }else if(currentInfo.equals("C02")){
+ }else if(currents.equals("C02")){
key = "D04";
}
Number lockState = (Number) lockTypeParam.getNum();
@@ -329,9 +330,11 @@
Map<String,Object> map = new HashMap();
map.put(key, lockState);//鑼冨洿鏄�0.01鍒�99.99
map.put("res", String.valueOf(System.currentTimeMillis()));
+ String mapString = JSON.toJSONString(map);
+ System.out.println(mapString);
MqttOnce mqttOnce = new MqttOnce();
try {
- return AjaxResult.success(mqttOnce.publishCar("carId",ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"寮�鍏抽攣鎸囦护"+lockState));
+ return AjaxResult.success(mqttOnce.publishCar("carId",ardSyCarRtu.getTopicPublish(), mapString,"寮�鍏抽攣鎸囦护"+lockTypeParam.getNum()));
} catch (MqttException e) {
log.debug("寮�鍏抽攣鎸囦护鍙戦�佸け璐�"+e);
}
--
Gitblit v1.9.3