修改redis 过期事件通知

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

@@ -114,6 +114,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
         ProductEntity productEntity = productService.get(deviceEntity.getProductId());
         if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
+            //注册rabbmit相关队列与绑定
+            registerRabbitQueue(deviceEntity, platformEntity, productEntity);
             //新增设备通知第三方平台
             sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceStatusEnum.ACTIVE);
         }
@@ -137,12 +139,23 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         ProductEntity productEntity = productService.get(entity.getProductId());
         if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
             //注册rabbmit相关队列与绑定
+            registerRabbitQueue(entity, platformEntity, productEntity);
+
+            //新增设备通知第三方平台
+            sendThirdParty(entity, productEntity, platformEntity, DeviceStatusEnum.ADD);
+        } else {
+            throw new AppException("产品或平台不存在！");
+        }
+        super.saveAfter(entity, context);
+    }
+
+    private void registerRabbitQueue(DeviceEntity entity, PlatformEntity platformEntity, ProductEntity productEntity) {
         String exchangeName = platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode();
         TopicPartitionInfo info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.UPLOAD_TOPIC + entity.getDeviceCode()).build();
         TbQueueCallback callback = new TbQueueCallback() {
             @Override
             public void onSuccess(TbQueueMsgMetadata metadata) {
-                    log.info("队列创建成功,设备编码:{}", entity.getDeviceCode());
+                log.debug("队列创建成功,设备编码:{}", entity.getDeviceCode());
             }
 
             @Override
@@ -160,13 +173,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         //创建下行队列
         info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.DOWN_TOPIC + entity.getDeviceCode()).build();
         messageService.queueDeclare(info, callback);
-
-            //新增设备通知第三方平台
-            sendThirdParty(entity, productEntity, platformEntity, DeviceStatusEnum.ADD);
-        } else {
-            throw new AppException("产品或平台不存在！");
-        }
-        super.saveAfter(entity, context);
     }
 
 
@@ -175,6 +181,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         PlatformEntity platformEntity = platformService.get(entity.getPlatformId());
         ProductEntity productEntity = productService.get(entity.getProductId());
         if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
+            //注册rabbmit相关队列与绑定
+            registerRabbitQueue(entity, platformEntity, productEntity);
             //新增设备通知第三方平台
             sendThirdParty(entity, productEntity, platformEntity, DeviceStatusEnum.UPDATE);
         }

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -102,25 +102,13 @@ Content-Type: application/json
 }
 
 
-
-###设备上报
-POST {{baseUrl}}/api/upload
-Content-Type: application/json
-Authorization: Bearer  {{authToken}}
-
-{
-  "deviceNum": "AB:DD:DF:FD:AD:FA:DA:SS",
-  "action": "upload"
-}
-
-
 ###设备上报
 POST {{baseUrl}}/api/upload
 Content-Type: application/json
 Authorization: {{authToken}}
 
 {
-  "deviceNum": "AB:DD:DF:FD:AD:FA:DA:bb",
+  "deviceCode": "b12345678",
   "action": "upload"
 }