添加区域点击

device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java

@@ -6,54 +6,27 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.*;
 import com.mortals.framework.service.ICacheService;
-import com.mortals.framework.service.IMessageProduceService;
-import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
-import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.HttpUtil;
-import com.mortals.framework.util.ThreadPool;
 import com.mortals.xhx.base.system.message.MessageService;
-import com.mortals.xhx.busiz.req.ApiReq;
 import com.mortals.xhx.busiz.req.ApiThirdPartyReq;
 import com.mortals.xhx.busiz.req.DeviceReq;
 import com.mortals.xhx.busiz.rsp.ApiResp;
-import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import com.mortals.xhx.common.code.DeviceMethodEnum;
 import com.mortals.xhx.common.code.MessageTypeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 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.common.utils.SendTask;
 import com.mortals.xhx.common.utils.SendTaskThreadPool;
-import com.mortals.xhx.module.device.dao.DeviceDao;
-import com.mortals.xhx.module.device.model.DeviceEntity;
-import com.mortals.xhx.module.device.service.DeviceService;
 import com.mortals.xhx.queue.*;
 import com.mortals.xhx.queue.provider.TbCoreQueueProducerProvider;
-import com.mortals.xhx.utils.SpringUtils;
-import lombok.extern.apachecommons.CommonsLog;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.entity.ContentType;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
@@ -90,11 +63,7 @@ public class MessageServiceImpl implements MessageService{
         TbQueueProducer<TbQueueMsg> producer = producerProvider.getTbCoreMsgProducer();
         TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastSimpleUUID(), message == null ? "" : message, header);
         producer.send(info, queueMsg, callback);
-
-
         //rabbitTemplate.send();
-
-
     }
 
     @Override

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.alibaba.fastjson.JSONObject;
-import com.mortals.xhx.base.framework.ws.message.SendToAllRequest;
-import com.mortals.xhx.base.framework.ws.util.WebSocketUtil;
 import com.mortals.xhx.busiz.req.DeviceMsgReq;
-import com.mortals.xhx.busiz.req.DeviceReq;
-import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
 import com.mortals.xhx.common.code.LogTypeEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
@@ -32,8 +26,6 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
-import static com.mortals.xhx.common.model.MessageHeader.MESSAGETYPE;
-
 /**
  * 接收消息
  *
@@ -115,6 +107,8 @@ 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);