From f7178996ca77a1bccc941c0e7a73b36803e508cb Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 01 三月 2024 16:13:11 +0800
Subject: [PATCH] 优化协议

---
 src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java |   37 ++++++++++---------------------------
 1 files changed, 10 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 c51084a..2c6194b 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -1,8 +1,8 @@
 package com.fzzy.gateway.hx2023.data;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
-import java.util.List;
 
 /**
  * 绮儏淇℃伅
@@ -10,40 +10,23 @@
 @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 JSONObject properties;
 
-    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