添加区域点击

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

@@ -520,7 +520,7 @@ public class DeviceApiController {
         rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         try {
-            DownMsgTask downMsgTask = new DownMsgTask(list, platformService, productService, deviceService, deviceLogService);
+            DownMsgTask downMsgTask = new DownMsgTask(list, platformService, productService, deviceService, deviceLogService,messageProducer);
             sendTaskThreadPool.execute(downMsgTask);
         } catch (AppException e) {
             log.error("接收数据失败", e);

device-manager/src/main/java/com/mortals/xhx/common/utils/DownMsgTask.java

 package com.mortals.xhx.common.utils;
 
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
+import com.mortals.xhx.base.system.message.impl.MessageProducer;
 import com.mortals.xhx.busiz.req.DeviceMsgReq;
 import com.mortals.xhx.common.code.LogTypeEnum;
 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;
@@ -14,9 +17,9 @@ 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.TbQueueCallback;
+import com.mortals.xhx.queue.DefaultTbQueueMsg;
+import com.mortals.xhx.queue.TbQueueMsg;
 import com.mortals.xhx.queue.TbQueueMsgHeaders;
-import com.mortals.xhx.queue.TbQueueMsgMetadata;
 import com.mortals.xhx.queue.TopicPartitionInfo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +29,8 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
+import static com.mortals.xhx.common.key.Constant.MESSAGETYPE_UPGREAD;
+
 /**
  * 接收消息
  *
@@ -42,6 +47,8 @@ public class DownMsgTask implements Runnable {
     private DeviceService deviceService;
     private DeviceLogService deviceLogService;
 
+    private MessageProducer messageProducer;
+
     @Override
     public void run() {
         try {
@@ -66,6 +73,25 @@ public class DownMsgTask implements Runnable {
                     header.put(MessageHeader.MESSAGETYPE, item.getMessageType());
                     header.put(MessageHeader.DEVICECODE, item.getDeviceCode());
                     header.put(MessageHeader.TIMESTAMP, item.getTimestamp().toString());
+
+
+                    TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastUUID(), item.getData(), header);
+                    messageProducer.sendMsg(QueueKey.DEFAULT_EXCHANGE,Constant.DOWN_TOPIC + deviceEntity.getDeviceCode(),JSON.toJSONString(queueMsg));
+
+                    DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
+                    deviceLogEntity.initAttrValue();
+                    deviceLogEntity.setTraceID(IdUtil.fastSimpleUUID());
+                    deviceLogEntity.setSiteId(deviceEntity.getSiteId());
+                    deviceLogEntity.setDeviceId(deviceEntity.getId());
+                    deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
+                    deviceLogEntity.setDeviceCode(deviceEntity.getDeviceCode());
+                    deviceLogEntity.setMessageHead(MESSAGETYPE_UPGREAD);
+                    deviceLogEntity.setContent(item.getData());
+                    deviceLogEntity.setLogType(LogTypeEnum.下发服务.getValue());
+                    deviceLogEntity.setCreateUserId(1L);
+                    deviceLogEntity.setCreateTime(new Date());
+                    deviceLogService.save(deviceLogEntity,null);
+                /*
                     TbQueueCallback callback = new TbQueueCallback() {
                         @Override
                         public void onSuccess(TbQueueMsgMetadata metadata) {
@@ -107,11 +133,10 @@ public class DownMsgTask implements Runnable {
                             log.error("traceID:"+traceID,"消息投递失败,设备通道编码:" + deviceEntity.getDeviceMac(), t);
                         }
                     };
-                    log.info("deviceService:{}",deviceService.toString());
-                    log.info("deviceEntity:{}",deviceEntity.toString());
-                    deviceService.sendDeviceMessage(deviceEntity, info, header, item.getData(),callback, null);
 
+                    deviceService.sendDeviceMessage(deviceEntity, info, header, item.getData(),callback, null);
 
+*/
                 } else {
                     log.info("未找到设备，deviceCode:{}", item.getDeviceCode());
                 }

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

 package com.mortals.xhx.module.device.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.lang.PatternPool;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlPath;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.URLUtil;
 import com.alibaba.fastjson.JSON;
-import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
-import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.xhx.base.system.message.MessageService;
-import com.mortals.xhx.base.system.message.RabbitMessageService;
 import com.mortals.xhx.base.system.message.impl.MessageProducer;
 import com.mortals.xhx.busiz.req.DeviceReq;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.key.QueueKey;
-import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.feign.site.ISiteFeign;
@@ -43,21 +37,16 @@ import com.mortals.xhx.module.product.model.ProductEntity;
 import com.mortals.xhx.module.product.model.ProductQuery;
 import com.mortals.xhx.module.product.service.ProductService;
 import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.site.model.SiteQuery;
 import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.queue.*;
-import com.sun.javafx.fxml.builder.URLBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.charset.Charset;
@@ -180,6 +169,9 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         ApiResp<String> resp = new ApiResp<>();
         resp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         resp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
+
+        //messageProducer.sendMsg();
+
         messageService.send(info, header, message, callback);
         return resp;
     }