|
@@ -61,6 +61,12 @@ public class MqttController {
|
|
|
@ApiOperation("添加订阅主题")
|
|
|
@PostMapping("/addTopic")
|
|
|
public ResponseModel<?> addTopic(@RequestBody MqttTopics mqttTopics){
|
|
|
+ LambdaQueryWrapper<MqttTopics> query = Wrappers.lambdaQuery();
|
|
|
+ query.eq(MqttTopics::getTopic, mqttTopics.getTopic());
|
|
|
+ MqttTopics mqttTopic = mqttTopicsService.getOne(query);
|
|
|
+ if(mqttTopic != null) {
|
|
|
+ return R.fail("主题已存在");
|
|
|
+ }
|
|
|
mqttTopics.setCreateDate(new Date());
|
|
|
mqttTopicsService.save(mqttTopics);
|
|
|
mqttService.subscribe(mqttTopics.getTopic(), mqttTopics.getQos());
|
|
@@ -70,12 +76,10 @@ public class MqttController {
|
|
|
@ApiOperation("删除订阅主题")
|
|
|
@PostMapping("/delTopic")
|
|
|
public ResponseModel<?> delTopic(@RequestBody MqttTopics mqtt) {
|
|
|
- LambdaQueryWrapper<MqttTopics> query = Wrappers.lambdaQuery();
|
|
|
- query.eq(MqttTopics::getTopic, mqtt.getTopic());
|
|
|
- MqttTopics mqttTopic = mqttTopicsService.getOne(query);
|
|
|
- if(mqttTopic != null) {
|
|
|
- mqttTopicsService.removeById(mqttTopic);
|
|
|
- mqttService.unsubscribe(mqttTopic.getTopic());
|
|
|
+ MqttTopics mqttTopics = mqttTopicsService.getById(mqtt.getId());
|
|
|
+ if(mqttTopics != null) {
|
|
|
+ mqttTopicsService.removeById(mqttTopics);
|
|
|
+ mqttService.unsubscribe(mqttTopics.getTopic());
|
|
|
return R.ok();
|
|
|
} else {
|
|
|
return R.fail("主题不存在");
|