From e8a7beb5455d0c9f50f93004b600dd2781ad6bfd Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 30 六月 2025 09:36:56 +0800
Subject: [PATCH] feat(空调控制): 实现空调控制功能并优化 SVG 数据加载- 新增 AirCondConstants 类，定义空调控制常量 - 修改 AirConditionerServiceImpl，使用常量替代硬编码值 - 更新 MQTT 消息发送逻辑，使用常量定义主题 - 优化 SVG 数据加载和处理逻辑，改进标签值更新方式 - 调整域名地址配置，支持生产环境 API
---
zhitan-airconditioner/src/main/java/com/zhitan/airconditioner/service/impl/AirConditionerServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zhitan-airconditioner/src/main/java/com/zhitan/airconditioner/service/impl/AirConditionerServiceImpl.java b/zhitan-airconditioner/src/main/java/com/zhitan/airconditioner/service/impl/AirConditionerServiceImpl.java
index 9852b18..628b4a6 100644
--- a/zhitan-airconditioner/src/main/java/com/zhitan/airconditioner/service/impl/AirConditionerServiceImpl.java
+++ b/zhitan-airconditioner/src/main/java/com/zhitan/airconditioner/service/impl/AirConditionerServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.List;
import com.alibaba.fastjson2.JSONObject;
+import com.zhitan.airconditioner.common.AirCondConstants;
import com.zhitan.airconditioner.domain.AirConditioner;
import com.zhitan.airconditioner.domain.AirConditionerLog;
import com.zhitan.airconditioner.mapper.AirConditionerLogMapper;
@@ -12,6 +13,8 @@
import com.zhitan.common.utils.DateUtils;
import com.zhitan.common.utils.SecurityUtils;
import com.zhitan.framework.mqtt.MqttClientUtil;
+import com.zhitan.realtimedata.domain.TagValue;
+import com.zhitan.realtimedata.service.RealtimeDatabaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +34,9 @@
@Autowired
private MqttClientUtil mqttClientUtil;
+
+ @Autowired
+ private RealtimeDatabaseService realtimeDatabaseService;
/**
* 鏌ヨ绌鸿皟鎺у埗鍣ㄥ垪琛�
@@ -176,20 +182,19 @@
JSONObject jsonObject = JSONObject.parseObject(msg);
JSONObject rwProt = jsonObject.getJSONObject("rw_prot");
rwProt.put("id", airConditioner.getControllerId());
- if ("0".equals(mode)) {
+ if (AirCondConstants.COOL_OPEN.equals(mode)) {
rwProt.getJSONArray("w_data").getJSONObject(0).put("value", "1");
- } else if ("1".equals(mode)) {
+ } else if (AirCondConstants.HOT_OPEN.equals(mode)) {
rwProt.getJSONArray("w_data").getJSONObject(1).put("value", "1");
- } else if ("2".equals(mode)) {
+ } else if (AirCondConstants.OFF.equals(mode)) {
rwProt.getJSONArray("w_data").getJSONObject(2).put("value", "1");
}
// 鏋勫缓MQTT娑堟伅
- String topic = "lanbao/nygl/sevice/kt1/down";
String message = jsonObject.toJSONString();
// 鍙戦�丮QTT娑堟伅
- mqttClientUtil.sendMessage(topic, message, 2);
-
+ mqttClientUtil.sendMessage(AirCondConstants.SEND_COMMAND_TOPIC, message, 2);
+
// 璁板綍鎿嶄綔鏃ュ織
AirConditionerLog log = new AirConditionerLog();
log.setAirConditionerId(id);
--
Gitblit v1.9.3