From 902506299d0cfef195cdbd8322fdd1d175792102 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 19:27:26 +0800
Subject: [PATCH] 四川网关-提交测试
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 19 ++++-----
src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java | 47 +++++++++++++++++++++++
2 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java b/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java
new file mode 100644
index 0000000..76e8512
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java
@@ -0,0 +1,47 @@
+package com.fzzy.gateway.hx2023.data;
+
+import lombok.Data;
+
+/**
+ * 绮儏淇℃伅璇︾粏
+ */
+@Data
+public class KafkaGrainDataDetail1 {
+
+ //鏍瑰彿
+ private String cableNum;
+
+ //灞傚彿
+ private String layerNumber;
+
+ //娓╁害鍊�
+ private String temperature;
+
+ //绱㈠紩锛屼粠0寮�濮�
+ private String position;
+
+ //璇ユ俯搴︾偣鎵�鍦ㄧ殑鍒�,骞虫柟浠撱�佸湴涓嬩粨蹇呭～
+ private int linex;
+
+ //璇ユ俯搴︾偣鎵�鍦ㄧ殑琛�,骞虫柟浠撱�佸湴涓嬩粨蹇呭～
+ private int rowy;
+
+ //娴呭渾浠撱�佺瓛浠撳繀濉紝绀轰緥锛歿\"totalCircle\":3,\"smallCircle\":\"4,10,16\"}锛宼otalCircle锛氭�诲湀鏁帮紝smallCircle锛氭瘡鍦堟湁鍑犳牴缂�
+ // private int total_circle;
+
+
+ //鍏蜂綋鍦堟暟--娴呭渾浠撱�佺瓛浠撳繀濉�
+ // private int circle;
+
+ public KafkaGrainDataDetail1() {
+ }
+
+ public KafkaGrainDataDetail1(String cableNum, String layerNumber, String temperature, String position, int linex, int rowy) {
+ this.cableNum = cableNum;
+ this.layerNumber = layerNumber;
+ this.temperature = temperature;
+ this.position = position;
+ this.linex = linex;
+ this.rowy = rowy;
+ }
+}
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index b3b59e9..94a291c 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -13,10 +13,7 @@
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.hx2023.data.KafaGrainData;
-import com.fzzy.gateway.hx2023.data.KafkaGrainDataDetail;
-import com.fzzy.gateway.hx2023.data.KafkaGrainTH;
-import com.fzzy.gateway.hx2023.data.TRHInfo;
+import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
import lombok.extern.slf4j.Slf4j;
@@ -225,7 +222,7 @@
int cableNum = 1, position = 0;
String curTemp;
- List<KafkaGrainDataDetail> temperature = new ArrayList<>();
+ List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
int x = 0, y = 0, z = 0;
for (int i = 0; i < attr.length; i++) {
@@ -261,12 +258,14 @@
result.setMinZ(position);
}
- temperature.add(new KafkaGrainDataDetail(cableNum + "", z + "", curTemp, position + "", x, y));
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x, y));
}
//绮俯淇℃伅
- TRHInfo trhInfo = new TRHInfo();
- trhInfo.setTemperature(temperature);
+
+ JSONObject trhInfo = new JSONObject();
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature",temperature);
//浠撴俯搴︿俊鎭�
@@ -279,8 +278,8 @@
List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
temperatureAndhumidity.add(grainTH);
- trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);
-
+ // trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);
+ trhInfo.put("temperatureAndhumidity",temperatureAndhumidity);
JSONObject params = new JSONObject();
params.put("TRHInfo", trhInfo);
--
Gitblit v1.9.3