From 320350eb18e32a9a008c4e6409441730732e2e97 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 17 二月 2025 16:24:55 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 191 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 190 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index c163ba9..0a8e17b 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -1,5 +1,6 @@
package com.fzzy.gateway.hx2023.service;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.PushProtocol;
@@ -22,6 +23,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -64,6 +66,21 @@
return new BaseResp();
}
+ @Override
+ public BaseResp reportGrainDataByKafka(BaseReqData reqData) {
+ String topic = ScConstant.TOPIC_ZLJ_GRAIN_TEMPERATURE;
+ //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ��
+ if (configData.getActive().indexOf("dev") >= 0) {
+ log.info("----------------------------鎺ㄩ�並AFKA绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------");
+ log.info("-----TOPIC-----{}", topic);
+ log.info("-----Message-----{}", reqData.getData());
+
+ return new BaseResp();
+ }
+
+ kafkaDeviceReportService.publishWithTopic(reqData.getData(), topic);
+ return new BaseResp();
+ }
@Override
public BaseResp reportWeightData(BaseReqData reqData) {
@@ -91,7 +108,7 @@
weightInfo.setNetWeight(reqData.getWeight());
weightInfo.setWeightUnit("KG");
JSONObject jsonObject = new JSONObject();
- jsonObject.put("weightInfo", weightInfo);
+ jsonObject.put("weightInfo", JSON.toJSONString(weightInfo));
packet.setProperties(jsonObject);
@@ -531,4 +548,176 @@
return resp;
}
+
+
+
+ // ----------------------------------------------------
+
+ @Override
+ public BaseResp grainData2GatewayApiInfoKafka(GrainData grainData, GatewayDevice device) {
+
+ BaseResp resp = new BaseResp();
+
+ GrainCableData cableData = GatewayUtils.getCableData(device);
+
+ if (null == device.getDepotType()) device.setDepotType(DepotType.TYPE_01.getCode());
+
+// //琛ㄧず绛掍粨
+// if (DepotType.TYPE_02.getCode().equals(device.getDepotType()) || DepotType.TYPE_04.getCode().equals(device.getDepotType())) {
+// return grainData2GatewayApiInfo2(grainData, device, cableData);
+// }
+//
+// //琛ㄧず涓虹瓛浠撳寘鎷补缃愪粨
+// if (DepotType.TYPE_03.getCode().equals(device.getDepotType())) {
+// return grainData2GatewayApiInfo3(grainData, device, cableData);
+// }
+ GrainOutPut output = JSONObject.parseObject(grainData.getOutput(),GrainOutPut.class);
+ KafaGrainData result = new KafaGrainData();
+ result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
+ result.setDeviceID(device.getDeviceId());
+ result.setAvgTemperature(output.getAvgTemperature());
+ result.setMinTemperature(output.getMinTemperature());
+ result.setMaxTemperature(output.getMaxTemperature() );
+ result.setCollectTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+
+ //灞傝鍒�
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+ int cableX = cableData.getCableX();
+
+ //娓╁害闆嗗悎
+ List<GrainTemp> attr = output.getTemperature();
+
+ //鏍瑰彿
+ int cableNum = 1, position = 0;
+ String curTemp;
+ List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
+
+ int x = 0, y = 0, z = 0;
+ for (int i = 0; i < attr.size(); i++) {
+ position = i;
+ z = i % cableZ + 1;
+ x = i / (cableZ * cableY);
+ y = x * (cableZ * cableY);
+ y = (i - y) / cableZ;
+ // 鍊掕浆X杞�
+ x = cableX - 1 - x;
+ //鏍瑰彿
+ cableNum = (i / cableZ) + 1;
+ curTemp = attr.get(i).getTemperature();
+
+
+ //濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO
+ if (Double.valueOf(curTemp) < -99.9) {
+
+ //curTemp = output.getAvgTemperature();
+
+ } else {
+ //鍒ゆ柇鏈�澶�
+ if (curTemp.equals(result.getMaxTemperature())) {
+ result.setMaxX(x + "");
+ result.setMaxY(y + "");
+ result.setMaxZ(position + "");
+ }
+ //鍒ゆ柇鏈�灏�
+ if (curTemp.equals(result.getMinTemperature())) {
+ result.setMinX(x + "");
+ result.setMinY(y + "");
+ result.setMinZ(position + "");
+ }
+ }
+
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
+ }
+
+ //绮俯淇℃伅
+ JSONObject trhInfo = new JSONObject();
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature", temperature);
+
+
+ //浠撴俯搴︿俊鎭�
+ KafkaGrainTH grainTH = new KafkaGrainTH();
+ List<GrainTH> ths= output.getTemperatureAndhumidity();
+ if(ths != null && ths.size() > 0){
+ grainTH.setHumidity(ths.get(0).getHumidity());
+ grainTH.setTemperature(ths.get(0).getTemperature() );
+ }
+
+
+ GrainWeather weather = JSON.parseObject(grainData.getWeatherStation(),GrainWeather.class);
+ if (weather!=null){
+ grainTH.setAirHumidity(weather.getHumidity());
+ grainTH.setAirTemperature(weather.getTemperature() );
+ }
+ List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
+ temperatureAndhumidity.add(grainTH);
+
+ trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
+
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
+
+
+ resp.setData(JSONObject.toJSONString(result));
+
+ return resp;
+ }
+
+
+
+ /**
+ * 鑾峰彇褰撶偣鎵�鍦ㄥ湀
+ *
+ * @param cableNum
+ * @param cableData
+ * @return
+ */
+ private int getCirCleKafka(int position, int cableNum, GrainCableData cableData) {
+
+ int num1 = 1, num2 = 2;
+ String[] attCable = cableData.getCableRule().split("-");
+
+ if (cableData.getTotalCircle() == 1) return 1;
+
+ if (cableData.getTotalCircle() == 2) {
+ num1 = Integer.valueOf(attCable[0]);
+
+ if (cableNum <= num1) return 1;
+
+ return 2;
+ }
+
+ if (cableData.getTotalCircle() == 3) {
+ num1 = Integer.valueOf(attCable[0]);
+ num2 = num1 + Integer.valueOf(attCable[1]);
+ if (cableNum <= num1) return 1;
+
+ if (cableNum <= num2) return 2;
+
+ return 3;
+ }
+
+ if (cableData.getTotalCircle() == 4) {
+ num1 = Integer.valueOf(attCable[0]);
+ num2 = num1 + Integer.valueOf(attCable[1]);
+ if (cableNum <= num1) return 1;
+
+ if (cableNum <= num2) return 2;
+
+ num2 = num1 + Integer.valueOf(attCable[1]) + Integer.valueOf(attCable[2]);
+
+ if (cableNum <= num2) return 3;
+
+ return 4;
+ }
+
+ return 1;
+ }
+
+
}
--
Gitblit v1.9.3