From eba0a973f03126d085abe02bef5c912be4047420 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 10 十一月 2023 22:40:55 +0800
Subject: [PATCH] 优化粮情返回与请求绑定
---
src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java | 5 ++---
src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java | 2 ++
src/main/java/com/fzzy/gateway/hx2023/data/ClientHeaders.java | 2 +-
src/main/java/com/fzzy/mqtt/MqttConsumerConfig.java | 6 ------
src/main/java/com/fzzy/gateway/hx2023/ScConstant.java | 12 ++++++++++++
src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java | 5 +++++
src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java | 7 ++++---
7 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
index 1457c53..dc64702 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
@@ -1,6 +1,10 @@
package com.fzzy.gateway.hx2023;
+import com.alibaba.fastjson2.util.UUIDUtils;
+import com.fzzy.api.utils.MyMD5Util;
import org.apache.commons.lang.math.RandomUtils;
+
+import java.util.UUID;
/**
* 甯搁噺
@@ -24,6 +28,14 @@
return System.currentTimeMillis() + RandomUtils.nextInt(1000) + "";
}
+ public static String getUUID() {
+ return UUID.randomUUID().toString().replaceAll("-", "");
+ }
+
+// public static String getMd5MessageId() {
+// return MyMD5Util.getMD5(getUUID());
+// }
+
/**
* 涓嬪彂鎸囦护鍥炲鎶ユ枃topic
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/ClientHeaders.java b/src/main/java/com/fzzy/gateway/hx2023/data/ClientHeaders.java
index ffcf80f..14a1664 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/ClientHeaders.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/ClientHeaders.java
@@ -7,6 +7,6 @@
private String productId;
private String deviceName;
- private String orgId;
+ private String orgId="";
private String msgId;
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
index 6bde012..c12e6e3 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -12,7 +12,6 @@
//璁惧缂栫爜
private String deviceId;
private ClientHeaders headers;
-
//娑堟伅 ID
private String messageId;
@@ -22,8 +21,8 @@
private String timestamp;
- private GrainOutPut output;
+ private String output;
- private GrainWeather weatherStation;
+ private String weatherStation;
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java
index 11d3573..2682014 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java
@@ -13,6 +13,8 @@
private String messageId;
+ private String messgeId;
+
private String pm;
private String radiation = "0";
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
index 6c32715..4c706c0 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
@@ -32,6 +32,11 @@
*/
public void onReceiveMessage(String topic, String message) {
+ // 杩欓噷鍙互澶勭悊鎺ユ敹鐨勬暟鎹�
+ log.info("----------------------------鏀跺埌璁㈤槄鍐呭---------------------------");
+ log.info("-----TOPIC-----{}", topic);
+ log.info("-----Message-----{}", message);
+
try {
CloudSendData cloudSendData = JSONObject.parseObject(message, CloudSendData.class);
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
index 3bd840c..c9d3ec5 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
@@ -289,7 +289,7 @@
headers.setDeviceName(device.getDeviceName());
headers.setProductId(device.getProductId());
headers.setOrgId(device.getOrgId());
- headers.setMsgId(ScConstant.getMessageId());
+ headers.setMsgId(reqData.getMessageId());
grain.setHeaders(headers);
GrainOutPut outPut = new GrainOutPut();
@@ -342,7 +342,7 @@
outPut.setTemperature(temperature);
- grain.setOutput(outPut);
+ grain.setOutput(JSONObject.toJSONString(outPut));
GatewayDevice gatewayDeviceWeather = GatewayUtils.getCacheByDeviceTypeOne(GatewayDeviceType.TYPE_09.getCode());
@@ -350,6 +350,7 @@
//姘旇薄淇℃伅
GrainWeather weatherStation = new GrainWeather();
weatherStation.setMessageId(ScConstant.getMessageId());
+ weatherStation.setMessgeId(weatherStation.getMessageId());
if (null != gatewayDeviceWeather) {
weatherStation.setId(gatewayDeviceWeather.getDeviceId());
@@ -365,7 +366,7 @@
weatherStation.setWindDirection(weather.getWin());
weatherStation.setWindPower(weather.getWin_meter());
weatherStation.setWindSpeed(weather.getWin_speed());
- grain.setWeatherStation(weatherStation);
+ grain.setWeatherStation(JSONObject.toJSONString(weatherStation));
return new BaseResp(JSONObject.toJSONString(grain));
}
diff --git a/src/main/java/com/fzzy/mqtt/MqttConsumerConfig.java b/src/main/java/com/fzzy/mqtt/MqttConsumerConfig.java
index 86e9090..4057450 100644
--- a/src/main/java/com/fzzy/mqtt/MqttConsumerConfig.java
+++ b/src/main/java/com/fzzy/mqtt/MqttConsumerConfig.java
@@ -84,12 +84,6 @@
public void handleMessage(Message<?> message) throws MessagingException {
String topic = message.getHeaders().get("mqtt_receivedTopic").toString();
String msg = message.getPayload().toString();
-
- // 杩欓噷鍙互澶勭悊鎺ユ敹鐨勬暟鎹�
- log.info("----------------------------鏀跺埌璁㈤槄鍐呭---------------------------");
- log.info("-----TOPIC-----{}", topic);
- log.info("-----Message-----{}", msg);
-
onReceiveMqttService.onReceiveMessage(topic, msg);
}
};
--
Gitblit v1.9.3