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-admin/src/main/resources/application.yml | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/zhitan-admin/src/main/resources/application.yml b/zhitan-admin/src/main/resources/application.yml index b766372..4ac24f8 100644 --- a/zhitan-admin/src/main/resources/application.yml +++ b/zhitan-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ # 鍚嶇О name: admin # 鐗堟湰 - version: 3.8.7 + version: 2.5.2 # 鐗堟潈骞翠唤 copyrightYear: 2024 profile: ./uploadPath @@ -11,11 +11,14 @@ addressEnabled: true # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁$畻 char 瀛楃楠岃瘉 captchaType: math + # 鍩熷悕鍦板潃 + # domainName: http://127.0.0.1:8088 + domainName: http://192.168.0.24:8888/prod-api # 寮�鍙戠幆澧冮厤缃� server: # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 - port: 8080 + port: 8088 servlet: # 搴旂敤鐨勮闂矾寰� context-path: / @@ -140,23 +143,25 @@ # 韪㈠嚭涔嬪墠鐧诲綍鐨�/涔嬪悗鐧诲綍鐨勭敤鎴凤紝榛樿韪㈠嚭涔嬪墠鐧诲綍鐨勭敤鎴� kickoutAfter: false rtdb: - host: http://127.0.0.1:8086 - token: == - org: org - bucket: bucket + host: http://192.168.0.24:8086 # 鐢ㄦ埛鍚峳oot 瀵嗙爜12345678 + #token: AminQagYp5rjb09mFPYvriK0T0vlF-zmwboqtUzdcq3nkXNuhnEpMuG_Ht5vtfWC4xBIVOThvoxy5reTer9XcQ== + token: i8WwVZz3RvkEVF3qGaY8uIDXTFEe2PzjgrKebDzcxlYGKnR-kOK5Hf1S5G4z3p-lc9UO7MQS4qKGL4lIeHSw1A== + org: lanbao + bucket: nygl + measurement: data ###################### MQTT ################################# mqtt: # 鏈嶅姟鍣ㄥ湴鍧� - host: tcp://127.0.0.1:1883 + host: tcp://lanpucloud.cn:1883 # ID鍞竴 clientId: MQTT_WK # 涓婚 澶氫釜涓婚鐢ㄩ�楀彿(,)鍒嗗壊 #琛ㄧず杩欎釜涓婚涓嬮潰鎵�鏈夛紝topic1,topic2,topic2/topic22/#(榛樿浼氬彇绗竴涓富棰�) topics: topic1 # 鐢ㄦ埛鍚� - username: admin + username: tongjitang # 瀵嗙爜 - password: 1q2w3e4r. + password: 123456 # 杩炴帴瓒呮椂 timeout: 30 # 蹇冭烦妫�娴� -- Gitblit v1.9.3