From 66b091963fb0f3356f27ec094c013369bf91db89 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 14:02:19 +0800
Subject: [PATCH] 游仙协议解析-3
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index d71a7c5..2d572be 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.data.ConfigData;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
@@ -13,7 +14,9 @@
import com.fzzy.gateway.hx2023.data.WeightInfo;
import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReportService;
import com.fzzy.mqtt.MqttGatewayService;
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -26,6 +29,8 @@
private KafkaDeviceReportService kafkaDeviceReportService;
@Resource
private MqttGatewayService publishService;
+ @Resource
+ private ConfigData configData;
@Override
public String getProtocol() {
@@ -37,6 +42,16 @@
String topic = ScConstant.TOPIC_REPORT;
topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());
+
+ //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ��
+ if(configData.getActive().indexOf("dev")>=0){
+
+ log.info("----------------------------鎺ㄩ�丮QTT绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------");
+ log.info("-----TOPIC-----{}", topic);
+ log.info("-----Message-----{}", reqData.getData());
+
+ return new BaseResp();
+ }
publishService.publishMqttWithTopic(reqData.getData(), topic);
@@ -97,7 +112,7 @@
GatewayDevice device = reqData.getDevice();
- if (null == reqData.getData()) {
+ if (StringUtils.isEmpty(reqData.getData())) {
WebSocketPacket packet = new WebSocketPacket();
WebSocketPacketHeader header = new WebSocketPacketHeader();
header.setDeviceName(reqData.getDeviceName());
@@ -116,6 +131,8 @@
jsonObject.put("position", device.getPosition());
packet.setProperties(jsonObject);
packet.setTimestamp(System.currentTimeMillis());
+
+ reqData.setData(JSONObject.toJSONString(packet));
}
publishService.publishMqttWithTopic(reqData.getData(), topic);
--
Gitblit v1.9.3