From 3f0b65b6b8af5c8c0aa2efa57be3adf2398cd62c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 21:10:30 +0800
Subject: [PATCH] 四川网关-提交测试
---
src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail.java | 12 ++++++------
src/main/java/com/fzzy/gateway/hx2023/data/KafaGrainData.java | 14 ++++++++------
src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java | 6 +++---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 17 +++++++++--------
src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java | 10 +++++-----
5 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/KafaGrainData.java b/src/main/java/com/fzzy/gateway/hx2023/data/KafaGrainData.java
index d7c2e06..41418f9 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/KafaGrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/KafaGrainData.java
@@ -13,6 +13,8 @@
//娑堟伅 ID
private String messageId;
+ private String messgeId;
+
//璁惧缂栫爜
private String deviceID;
@@ -28,17 +30,17 @@
//妫�娴嬫椂闂�-鏍煎紡锛歽yyy-MM-dd HH:mm:ss
private String collectTime;
- private int minX = 0;
+ private String minX = "0";
- private int minY = 0;
+ private String minY = "0";
- private int minZ = 0;
+ private String minZ = "0";
- private int maxX = 0;
+ private String maxX = "0";
- private int maxY = 0;
+ private String maxY = "0";
- private int maxZ = 0;
+ private String maxZ = "0";
//妯″潡璇嗗埆鐮�-甯搁噺锛屽浐瀹氫紶 apiTemperature
private String apISource = "apiTemperature";
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail.java b/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail.java
index ba10261..90323b3 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail.java
@@ -21,22 +21,22 @@
private String position;
//璇ユ俯搴︾偣鎵�鍦ㄧ殑鍒�,骞虫柟浠撱�佸湴涓嬩粨蹇呭～
- private int linex;
+ private String linex;
//璇ユ俯搴︾偣鎵�鍦ㄧ殑琛�,骞虫柟浠撱�佸湴涓嬩粨蹇呭～
- private int rowy;
+ private String rowy;
//娴呭渾浠撱�佺瓛浠撳繀濉紝绀轰緥锛歿\"totalCircle\":3,\"smallCircle\":\"4,10,16\"}锛宼otalCircle锛氭�诲湀鏁帮紝smallCircle锛氭瘡鍦堟湁鍑犳牴缂�
- private int total_circle;
+ private String total_circle;
//鍏蜂綋鍦堟暟--娴呭渾浠撱�佺瓛浠撳繀濉�
- private int circle;
+ private String circle;
public KafkaGrainDataDetail() {
}
- public KafkaGrainDataDetail(String cableNum, String layerNumber, String temperature, String position, int linex, int rowy, int total_circle, int circle) {
+ public KafkaGrainDataDetail(String cableNum, String layerNumber, String temperature, String position, String linex, String rowy, String total_circle, String circle) {
this.cableNum = cableNum;
this.layerNumber = layerNumber;
this.temperature = temperature;
@@ -47,7 +47,7 @@
this.circle = circle;
}
- public KafkaGrainDataDetail(String cableNum, String layerNumber, String temperature, String position, int linex, int rowy) {
+ public KafkaGrainDataDetail(String cableNum, String layerNumber, String temperature, String position, String linex, String rowy) {
this.cableNum = cableNum;
this.layerNumber = layerNumber;
this.temperature = temperature;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java b/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java
index 76e8512..ee8dd3d 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java
@@ -21,22 +21,22 @@
private String position;
//璇ユ俯搴︾偣鎵�鍦ㄧ殑鍒�,骞虫柟浠撱�佸湴涓嬩粨蹇呭～
- private int linex;
+ private String linex;
//璇ユ俯搴︾偣鎵�鍦ㄧ殑琛�,骞虫柟浠撱�佸湴涓嬩粨蹇呭～
- private int rowy;
+ private String rowy;
//娴呭渾浠撱�佺瓛浠撳繀濉紝绀轰緥锛歿\"totalCircle\":3,\"smallCircle\":\"4,10,16\"}锛宼otalCircle锛氭�诲湀鏁帮紝smallCircle锛氭瘡鍦堟湁鍑犳牴缂�
- // private int total_circle;
+ private String total_circle;
//鍏蜂綋鍦堟暟--娴呭渾浠撱�佺瓛浠撳繀濉�
- // private int circle;
+ private String circle;
public KafkaGrainDataDetail1() {
}
- public KafkaGrainDataDetail1(String cableNum, String layerNumber, String temperature, String position, int linex, int rowy) {
+ public KafkaGrainDataDetail1(String cableNum, String layerNumber, String temperature, String position, String linex, String rowy) {
this.cableNum = cableNum;
this.layerNumber = layerNumber;
this.temperature = temperature;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java b/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
index e2ba899..adb141c 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
@@ -35,7 +35,7 @@
String strData = JSONObject.toJSONString(data);
- log.debug("----鎺ㄩ�佺伯鎯呬俊鎭埌浜戠---{}", strData);
+ //log.debug("----鎺ㄩ�佺伯鎯呬俊鎭埌浜戠---{}", strData);
//鎺ㄩ�佷俊鎭�
kafkaTemplate.send("TOPIC_ZLJ_GRAIN_TEMPERATURE", strData).addCallback(success -> {
@@ -46,9 +46,9 @@
// 娑堟伅鍦ㄥ垎鍖哄唴鐨刼ffset
long offset = success.getRecordMetadata().offset();
- log.info("绮儏鎺ㄩ�佹垚鍔�:{}-{}-{}-{}", topic, partition, offset, data.getDeviceID());
+ log.info("---绮儏-->>浜戠鎴愬姛:{}-{}-{}-{}", topic, partition, offset, strData);
}, failure -> {
- log.info("绮儏鎺ㄩ�佸け璐�:{}-{}", data.getDeviceID(), failure.getMessage());
+ log.info("---绮儏-->>浜戠澶辫触:{}-{}", data.getDeviceID(), failure.getMessage());
});
return "SUCCESS";
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 94a291c..1fe57e0 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -196,6 +196,7 @@
KafaGrainData result = new KafaGrainData();
result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
result.setDeviceID(device.getDeviceId());
result.setAvgTemperature(lastData.getTempAve() + "");
result.setMinTemperature(lastData.getTempMin() + "");
@@ -245,20 +246,20 @@
//鍒ゆ柇鏈�澶�
if (curTemp.equals(result.getMaxTemperature())) {
- result.setMaxX(x);
- result.setMaxY(y);
- result.setMaxZ(position);
+ result.setMaxX(x+"");
+ result.setMaxY(y+"");
+ result.setMaxZ(position+"");
}
//鍒ゆ柇鏈�灏�
if (curTemp.equals(result.getMinTemperature())) {
- result.setMinX(x);
- result.setMinY(y);
- result.setMinZ(position);
+ result.setMinX(x+"");
+ result.setMinY(y+"");
+ result.setMinZ(position+"");
}
- temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x, y));
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x+"", y+""));
}
//绮俯淇℃伅
@@ -278,8 +279,8 @@
List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
temperatureAndhumidity.add(grainTH);
- // trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);
trhInfo.put("temperatureAndhumidity",temperatureAndhumidity);
+ //trhInfo.put("temperatureAndhumidity",grainTH);
JSONObject params = new JSONObject();
params.put("TRHInfo", trhInfo);
--
Gitblit v1.9.3