物联设备解绑mq优化

This commit is contained in:
曹磊 2026-03-23 13:21:00 +08:00
parent 95a97f674c
commit 1559b6a234
1 changed files with 15 additions and 2 deletions

View File

@ -12,12 +12,14 @@ import com.nu.modules.tq.common.entity.TqDeviceInfo;
import com.nu.modules.tq.common.service.ITqDeviceInfoService;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import com.nu.modules.tq.electricity.service.IElectricityMeterService;
import com.nu.modules.tq.utils.MqttMessageHandler;
import com.nu.modules.tq.water.entity.WaterMeter;
import com.nu.modules.tq.water.service.IWaterMeterService;
import com.nu.modules.yiweilian.humid.entity.HumidDevice;
import com.nu.modules.yiweilian.humid.service.IHumidDeviceService;
import com.nu.utils.RabbitMQUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.logging.Log;
import org.springframework.amqp.core.ExchangeTypes;
import org.springframework.amqp.rabbit.annotation.Exchange;
import org.springframework.amqp.rabbit.annotation.Queue;
@ -25,6 +27,7 @@ import org.springframework.amqp.rabbit.annotation.QueueBinding;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
@ -56,6 +59,9 @@ public class IotSyncBizMQListener {
@Autowired
private INuBaseInfoApi nuBaseInfoApi;
@Autowired
private MqttMessageHandler mqttMessageHandler;
@RabbitListener(
bindings = @QueueBinding(
value = @Queue(name = "#{iotDeviceAsyncDQNP.getSyncDeviceQueueName()}"),
@ -208,6 +214,7 @@ public class IotSyncBizMQListener {
ElectricityMeter electricityMeter = new ElectricityMeter();
BeanUtils.copyProperties(iotElectricityMeterMQDto, electricityMeter);
electricityMeterService.save(electricityMeter);
mqttMessageHandler.subscribeUplinkMessage(iotElectricityMeterMQDto.getSn());
}
statusList.add(statusMQDto);
}
@ -516,7 +523,9 @@ public class IotSyncBizMQListener {
QueryWrapper<CameraCapability> capabilityQw = new QueryWrapper<>();
capabilityQw.eq("device_index",entity.getDeviceIndex());
CameraCapability capability = cameraCapabilityService.getOne(capabilityQw);
cameraCapabilityService.removeById(capability.getId());
if(capability!=null){
cameraCapabilityService.removeById(capability.getId());
}
}
statusList.add(statusMQDto);
}
@ -547,10 +556,12 @@ public class IotSyncBizMQListener {
ElectricityMeter entity = electricityMeterService.getOne(electricityQw);
if(entity!=null){
electricityMeterService.removeById(entity.getId());
mqttMessageHandler.unsubscribeUplinkMessage(iotElectricityMeterMQDto.getSn());
}
statusList.add(statusMQDto);
}
catch (Exception e) {
log.error(e.getMessage());
StatusMQDto statusMQDto = new StatusMQDto();
statusMQDto.setAsyncId(iotElectricityMeterMQDto.getSn());
statusMQDto.setMessage("失败");
@ -580,7 +591,9 @@ public class IotSyncBizMQListener {
QueryWrapper<TqDeviceInfo> collectorQw = new QueryWrapper<>();
collectorQw.eq("cid",entity.getCid());
TqDeviceInfo collector = collectorService.getOne(collectorQw);
collectorService.removeById(collector.getId());
if(collector!=null) {
collectorService.removeById(collector.getId());
}
}
statusList.add(statusMQDto);
}