修改设备通知刷新消息

device-manager/src/main/java/com/mortals/xhx/busiz/req/DeviceMsgReq.java

@@ -17,6 +17,8 @@ public class DeviceMsgReq implements Serializable {
 
     private String productCode;
 
+    private Long siteid;
+
     /**
      * 消息类型
      */

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -583,7 +583,7 @@ public class DeviceApiController {
         try {
             ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(deviceMsgReq.getProductCode()));
             if(!ObjectUtils.isEmpty(productEntity)){
-                List<DeviceEntity> deviceEntities = deviceService.find(new DeviceQuery().productId(productEntity.getId()));
+                List<DeviceEntity> deviceEntities = deviceService.find(new DeviceQuery().productId(productEntity.getId()).siteId(deviceMsgReq.getSiteid()));
                 List<DeviceMsgReq> list = deviceEntities.stream().map(item -> {
                     DeviceMsgReq msgReq = new DeviceMsgReq();
                     BeanUtils.copyProperties(deviceMsgReq,msgReq,BeanUtil.getNullPropertyNames(deviceMsgReq));

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceSendMsgController.java

 package com.mortals.xhx.busiz.web;
 
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -55,7 +56,7 @@ public class DeviceSendMsgController {
                 header.put(MessageHeader.DEVICECODE, deviceEntity.getDeviceCode());
                 header.put(MessageHeader.TIMESTAMP,  DateUtils.getCurrStrDateTime());
 
-                TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastUUID(), "==", header);
+                TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastUUID(), Base64.encode(new JSONObject().toJSONString()), header);
                 messageProducer.sendMsg(QueueKey.DEFAULT_EXCHANGE,Constant.DOWN_TOPIC + deviceEntity.getDeviceCode(),JSON.toJSONString(queueMsg));
             }
         } catch (Exception e) {