From b7edb0f3526d5ca32016d5f332ddf957d74c01c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 01:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
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 8e73894..9c9dcd0 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -2,7 +2,6 @@
import lombok.Data;
-import java.util.List;
/**
* 绮儏淇℃伅
@@ -10,40 +9,22 @@
@Data
public class GrainData {
+ //璁惧缂栫爜
+ private String deviceId;
+ private ClientHeaders headers;
//娑堟伅 ID
private String messageId;
- //璁惧缂栫爜
- private String deviceID;
+ private String messageType = "INVOKE_FUNCTION_REPLY";
- //鏁翠粨骞冲潎娓╁害
- private String avgTemperature;
+ private boolean success = true;
- //鏁翠粨鏈�浣庢俯搴�
- private String minTemperature;
+ private String timestamp;
- //鏁翠粨鏈�楂樻俯搴�
- private String maxTemperature;
+ private String output;
- //妫�娴嬫椂闂�-鏍煎紡锛歽yyy-MM-dd HH:mm:ss
- private String collectTime;
+ private String weatherStation;
- private String minX = "0";
- private String minY = "0";
-
- private String minZ = "0";
-
- private String maxX = "0";
-
- private String maxY = "0";
-
- private String maxZ = "0";
-
- //妯″潡璇嗗埆鐮�-甯搁噺锛屽浐瀹氫紶 apiTemperature
- private String apISource = "apiTemperature";
-
- //绮俯璇︾粏
- private List<GrainDataDetail> temperature;
}
--
Gitblit v1.9.3