添加产品升级功能

device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/RabbitMsgComsumerStartedService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.xhx.base.framework.listener.SimpleDynamicListener;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.key.RedisKey;
@@ -24,6 +25,7 @@ import com.mortals.xhx.queue.TbQueueMsg;
 import com.mortals.xhx.queue.TopicPartitionInfo;
 import com.mortals.xhx.utils.IotThreadFactory;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -50,6 +52,10 @@ public class RabbitMsgComsumerStartedService implements IApplicationStartedServi
     private ProductService productService;
     @Autowired
     private PlatformService platformService;
+    @Autowired
+    private SimpleDynamicListener simpleDynamicListener;
+    @Autowired
+    private DirectMessageListenerContainer directMessageListenerContainer;
 
     @Autowired
     @Qualifier("simpleMessageListenerContainer")
@@ -71,6 +77,7 @@ public class RabbitMsgComsumerStartedService implements IApplicationStartedServi
         simpleContainer.addQueueNames(queues);
         simpleContainer.start();
         simpleContainer.addQueueNames("123");
+        simpleContainer.setMessageListener(simpleDynamicListener);
 
     }
 

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

@@ -32,6 +32,7 @@ import com.mortals.xhx.queue.TbQueueMsgHeaders;
 import com.mortals.xhx.queue.TbQueueMsgMetadata;
 import com.mortals.xhx.queue.TopicPartitionInfo;
 import com.sun.jndi.toolkit.url.UrlUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +59,7 @@ import static com.mortals.xhx.common.key.ErrorCode.DEVICE_VERSION_UNEXIST_CONTEN
  * @date 2022-06-27
  */
 @Service("productService")
+@Slf4j
 public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, ProductEntity, Long> implements ProductService {
 
     @Autowired
@@ -137,6 +139,8 @@ public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, Prod
             TbQueueCallback callback = new TbQueueCallback() {
                 @Override
                 public void onSuccess(TbQueueMsgMetadata metadata) {
+                    log.info("【成功】发送升级版本信息，设备编码:{}",deviceEntity.getDeviceCode());
+
                     DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
                     deviceLogEntity.initAttrValue();
                     deviceLogEntity.setTraceID(metadata.getMessageId());
@@ -170,6 +174,7 @@ public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, Prod
                     deviceLogService.save(deviceLogEntity);
                 }
             };
+            log.info("【发送中】发送升级版本信息，设备编码:{}",deviceEntity.getDeviceCode());
 
             deviceService.sendDeviceMessage(deviceEntity, info, header, JSON.toJSONString(productVersionInfo), callback, null);
         });