修改消息组件

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -87,10 +87,9 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
 
     @Override
     protected void saveAfter(DeviceEntity entity, Context context) throws AppException {
-
         PlatformEntity platformEntity = platformService.get(entity.getPlatformId());
         ProductEntity productEntity = productService.get(entity.getProductId());
-        if (!ObjectUtils.isEmpty(platformEntity) && ObjectUtils.isEmpty(productEntity)) {
+        if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
             //注册rabbmit相关队列与绑定
             String exchangeName = platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode();
             TopicPartitionInfo info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.UPLOAD_TOPIC + entity.getDeviceCode()).build();
@@ -114,6 +113,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             //创建下行队列
             info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.DOWN_TOPIC + entity.getDeviceCode()).build();
             messageService.queueDeclare(info, callback);
+        }else{
+            throw new AppException("产品或平台不存在！");
         }
 
 

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -135,7 +135,7 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
                     throw new AppException("当前设备未配置所属产品，请在后台配置后再激活！");
                 }
                 String exchangeName = platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode();
-                TopicPartitionInfo info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.DOWN_TOPIC + deviceEntity.getDeviceMac()).build();
+                TopicPartitionInfo info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.DOWN_TOPIC + deviceEntity.getDeviceCode()).build();
                 TbQueueMsgHeaders header = new DefaultTbQueueMsgHeaders();
                 header.put(MessageHeader.MESSAGETYPE, Constant.MESSAGETYPE_UPGREAD);
                 JSONObject obj = new JSONObject();