分组更新设备

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

 package com.mortals.xhx.daemon;
 
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.xhx.base.system.message.MessageService;
-import com.mortals.xhx.busiz.req.UploadDeviceReq;
+import com.mortals.xhx.base.system.message.impl.MessageProducer;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import com.mortals.xhx.common.code.OneThingRespCodeEnum;
 import com.mortals.xhx.common.key.Constant;
+import com.mortals.xhx.common.key.QueueKey;
 import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
 import com.mortals.xhx.common.model.MessageHeader;
 import com.mortals.xhx.module.device.model.DeviceEntity;
@@ -19,10 +21,7 @@ import com.mortals.xhx.module.platform.model.PlatformEntity;
 import com.mortals.xhx.module.platform.service.PlatformService;
 import com.mortals.xhx.module.product.model.ProductEntity;
 import com.mortals.xhx.module.product.service.ProductService;
-import com.mortals.xhx.queue.TbQueueMsg;
-import com.mortals.xhx.queue.TbQueueMsgHeaders;
-import com.mortals.xhx.queue.TbQueueProducer;
-import com.mortals.xhx.queue.TopicPartitionInfo;
+import com.mortals.xhx.queue.*;
 import com.mortals.xhx.queue.provider.TbCoreQueueProducerProvider;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +43,7 @@ import java.util.Map;
 @RequestMapping("/test/")
 public class DemoApiController {
 
-   // @Autowired
+    // @Autowired
     private TbCoreQueueProducerProvider producerProvider;
     @Autowired
     private DeviceService deviceService;
@@ -55,16 +54,19 @@ public class DemoApiController {
     @Autowired
     private MessageService messageService;
 
+    @Autowired
+    private MessageProducer messageProducer;
+
     @PostMapping("/sentry")
     public String sentry(@RequestBody String body) {
-        log.info("body==>{}",body);
+        log.info("body==>{}", body);
 
         return "success";
     }
 
     @PostMapping("/getToken")
     public String getToken() {
-       return messageService.getBasePlatformToken();
+        return messageService.getBasePlatformToken();
     }
 
 
@@ -143,7 +145,7 @@ public class DemoApiController {
      */
     @PostMapping("upload")
     @UnAuth
-    public String upload(@RequestParam(value = "deviceId") Long deviceId ) {
+    public String upload(@RequestParam(value = "deviceId") Long deviceId) {
         ApiResp<String> rsp = new ApiResp<>();
         rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
@@ -164,16 +166,25 @@ public class DemoApiController {
                 }
                 String exchangeName = platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode();
 
-                TopicPartitionInfo info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.UPLOAD_TOPIC + deviceEntity.getDeviceMac()).build();
+       /*         TopicPartitionInfo info = TopicPartitionInfo.builder().exchangeName(exchangeName).topic(Constant.UPLOAD_TOPIC + deviceEntity.getDeviceMac()).build();
                 TbQueueMsgHeaders header = new DefaultTbQueueMsgHeaders();
                 header.put(MessageHeader.MESSAGETYPE, Constant.MESSAGETYPE_HEARTBEAT);
                 UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
                 //uploadDeviceReq.setDeviceMac(deviceEntity.getDeviceMac());
                 uploadDeviceReq.setDeviceCode(deviceEntity.getDeviceCode());
 
-                for (int i = 0; i < 100; i++) {
-                    deviceService.sendDeviceMessage(deviceEntity, info, header, JSON.toJSONString(deviceEntity), null,null);
-                }
+
+                deviceService.sendDeviceMessage(deviceEntity, info, header, JSON.toJSONString(deviceEntity), null, null);
+*/
+                TbQueueMsgHeaders header = new DefaultTbQueueMsgHeaders();
+                header.put(MessageHeader.MESSAGETYPE,Constant.MESSAGETYPE_HEARTBEAT);
+                header.put(MessageHeader.DEVICECODE, deviceEntity.getDeviceCode());
+               // header.put(MessageHeader.TIMESTAMP, );
+
+                TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastUUID(), "w==", header);
+                messageProducer.sendMsg(QueueKey.DEFAULT_EXCHANGE, Constant.DOWN_TOPIC + deviceEntity.getDeviceCode(), JSON.toJSONString(queueMsg));
+
+
 
             }
         } catch (Exception e) {

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

@@ -65,6 +65,12 @@ Authorization: {{authToken}}
 Accept: application/json
 
 
+###设备上报
+POST {{baseUrl}}/test/upload?deviceId=1
+
+
+
+