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/ArdSyCarRtuService.java | 2 ++
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java | 7 +++----
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java | 17 +++++++++++++++++
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java
index 15783b1..cbdc79e 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarRtuService.java
@@ -17,4 +17,6 @@
String openLock(ArdSyCarRtu ardSyCarRtu);
ArdSyCarRtu subscribeByCarId(String subscribe);
+
+ String url(String key);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
index fce9045..b2a0ea3 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
@@ -2,14 +2,17 @@
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
import com.ruoyi.sy.service.ArdSyCarRtuService;
+import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.utils.mqtt.MqttConsumer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -20,6 +23,8 @@
@Autowired
private ArdSyCarRtuMapper ardSyCarRtuMapper;
+ @Resource
+ private SysConfigMapper configMapper;
@Override
public String[] allCarTopic() {
@@ -60,4 +65,16 @@
return ardSyCarRtuMapper.selectOne(queryWrapper);
}
+ @Override
+ public String url(String key) {
+ QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("config_key",key);
+ SysConfig sysConfig = configMapper.selectOne(queryWrapper);
+ if(sysConfig!=null){
+ return sysConfig.getConfigValue();
+ }else {
+ return "閰嶇疆琛ㄦ棤鍦板潃鏁版嵁";
+ }
+ }
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java
index d71f5d7..cb797b1 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttOnce.java
@@ -1,5 +1,6 @@
package com.ruoyi.utils.mqtt;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
import com.ruoyi.sy.service.ArdSyCarRtuService;
@@ -25,9 +26,6 @@
@Autowired
private ArdSyCarRtuService ardSyCarRtuService;
-
- @Autowired
- private ISysConfigService sysConfigService;
@PostConstruct
public void init() {
@@ -63,8 +61,9 @@
}
public MqttClient getMqttClient(String carId) throws MqttException {
+ ArdSyCarRtuService carRtuService = SpringUtils.getBean(ArdSyCarRtuService.class);
//鑾峰彇鐢电閿佸湴鍧�
- String mqttUrl = sysConfigService.selectConfigByKey("ElectromagneticLockUrl");
+ String mqttUrl = carRtuService.url("ElectromagneticLockUrl");
MqttClient client = new MqttClient(mqttUrl,carId);
//log.debug("--鍒涘缓"+carId+"鍙疯溅杈嗙數瀛愰攣mqtt瀹㈡埛绔�");
return client;
--
Gitblit v1.9.3