正在显示
1 个修改的文件
包含
6 行增加
和
3 行删除
| @@ -6,6 +6,7 @@ import com.zhonglai.luhui.device.analysis.comm.util.ByteUtil; | @@ -6,6 +6,7 @@ import com.zhonglai.luhui.device.analysis.comm.util.ByteUtil; | ||
| 6 | import com.zhonglai.luhui.device.analysis.util.TopicUtil; | 6 | import com.zhonglai.luhui.device.analysis.util.TopicUtil; |
| 7 | import com.zhonglai.luhui.device.protocol.factory.comm.DataLogType; | 7 | import com.zhonglai.luhui.device.protocol.factory.comm.DataLogType; |
| 8 | import com.zhonglai.luhui.device.protocol.factory.comm.DeviceDataLog; | 8 | import com.zhonglai.luhui.device.protocol.factory.comm.DeviceDataLog; |
| 9 | +import com.zhonglai.luhui.device.protocol.factory.plugins.FileChangeListener; | ||
| 9 | import com.zhonglai.luhui.device.protocol.factory.service.impl.DefaultDbService; | 10 | import com.zhonglai.luhui.device.protocol.factory.service.impl.DefaultDbService; |
| 10 | import org.eclipse.paho.client.mqttv3.MqttClient; | 11 | import org.eclipse.paho.client.mqttv3.MqttClient; |
| 11 | import org.eclipse.paho.client.mqttv3.MqttConnectOptions; | 12 | import org.eclipse.paho.client.mqttv3.MqttConnectOptions; |
| @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; | @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; | ||
| 20 | 21 | ||
| 21 | import javax.annotation.PostConstruct; | 22 | import javax.annotation.PostConstruct; |
| 22 | import javax.annotation.PreDestroy; | 23 | import javax.annotation.PreDestroy; |
| 24 | +import java.io.IOException; | ||
| 23 | import java.util.ArrayList; | 25 | import java.util.ArrayList; |
| 24 | import java.util.List; | 26 | import java.util.List; |
| 25 | import java.util.concurrent.ExecutorService; | 27 | import java.util.concurrent.ExecutorService; |
| @@ -37,10 +39,10 @@ public class TerminalService { | @@ -37,10 +39,10 @@ public class TerminalService { | ||
| 37 | private MqttCallback mqttCallback; | 39 | private MqttCallback mqttCallback; |
| 38 | 40 | ||
| 39 | @Autowired | 41 | @Autowired |
| 40 | - private DefaultDbService dbService; | 42 | + private SysParameter sysParameter; |
| 41 | 43 | ||
| 42 | @Autowired | 44 | @Autowired |
| 43 | - private SysParameter sysParameter; | 45 | + private FileChangeListener fileChangeListener; |
| 44 | 46 | ||
| 45 | @Value("${mqtt.broker}") | 47 | @Value("${mqtt.broker}") |
| 46 | private String broker; | 48 | private String broker; |
| @@ -97,7 +99,8 @@ public class TerminalService { | @@ -97,7 +99,8 @@ public class TerminalService { | ||
| 97 | } | 99 | } |
| 98 | 100 | ||
| 99 | @PostConstruct | 101 | @PostConstruct |
| 100 | - public void startMqttListenerService() throws MqttException { | 102 | + public void startMqttListenerService() throws MqttException, IOException { |
| 103 | + fileChangeListener.onApplicationEvent(); | ||
| 101 | log.info("-----------开始启动mqtt监听服务--------------------"); | 104 | log.info("-----------开始启动mqtt监听服务--------------------"); |
| 102 | init(); | 105 | init(); |
| 103 | log.info("-----------启动参数{}--------------------",options); | 106 | log.info("-----------启动参数{}--------------------",options); |
-
请 注册 或 登录 后发表评论