From 6a9cf62f7ca4b45c48a571c63fd484c186070a0e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 19 一月 2024 23:53:12 +0800
Subject: [PATCH] 增加油罐仓的解析2
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 249 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 243 insertions(+), 6 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 7ba5fdc..e7af6a7 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -2,22 +2,28 @@
import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.utils.NumberUtil;
+import com.fzzy.async.fzzy40.entity.Fz40Grain;
+import com.fzzy.data.ConfigData;
+import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
+import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.hx2023.data.LprData;
-import com.fzzy.gateway.hx2023.data.WebSocketPacket;
-import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
-import com.fzzy.gateway.hx2023.data.WeightInfo;
+import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReportService;
import com.fzzy.mqtt.MqttGatewayService;
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
@Slf4j
@Component
@@ -27,6 +33,8 @@
private KafkaDeviceReportService kafkaDeviceReportService;
@Resource
private MqttGatewayService publishService;
+ @Resource
+ private ConfigData configData;
@Override
public String getProtocol() {
@@ -38,6 +46,16 @@
String topic = ScConstant.TOPIC_REPORT;
topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());
+
+ //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ��
+ if (configData.getActive().indexOf("dev") >= 0) {
+
+ log.info("----------------------------鎺ㄩ�丮QTT绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------");
+ log.info("-----TOPIC-----{}", topic);
+ log.info("-----Message-----{}", reqData.getData());
+
+ return new BaseResp();
+ }
publishService.publishMqttWithTopic(reqData.getData(), topic);
@@ -130,9 +148,228 @@
}
@Override
- public BaseResp reportGrainDataByKafka(BaseReqData reqData) {
- String topic = ScConstant.TOPIC_MESSAGE_REPORT;
+ public BaseResp reportGrainDataByHand(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 grainData2GatewayApiInfo(Fz40Grain grainData, GatewayDevice device) {
+
+ BaseResp resp = new BaseResp();
+
+ KafaGrainData result = new KafaGrainData();
+
+ result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
+ result.setDeviceID(device.getDeviceId());
+ result.setAvgTemperature(grainData.getTempAve() + "");
+ result.setMinTemperature(grainData.getTempMin() + "");
+ result.setMaxTemperature(grainData.getTempMax() + "");
+ result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
+
+
+ GrainCableData cableData = GatewayUtils.getCableData(device);
+
+ if(cableData.isCir()){
+ return grainData2GatewayApiInfo2(grainData, device,cableData);
+ }
+
+ //灞傝鍒�
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+ int cableX = cableData.getCableX();
+
+ //娓╁害闆嗗悎
+ String[] attr = grainData.getPoints().split(",");
+
+ //鏍瑰彿
+ 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.length; 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[i];
+
+
+ //濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO
+ if (Double.valueOf(curTemp) < -99.9) {
+
+ curTemp = grainData.getTempAve() + "";
+
+ } 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();
+ grainTH.setHumidity(grainData.getHumidityIn() + "");
+ grainTH.setTemperature(grainData.getTempIn() + "");
+ grainTH.setAirHumidity(grainData.getHumidityOut() + "");
+ grainTH.setAirTemperature(grainData.getTempOut() + "");
+
+ List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
+ temperatureAndhumidity.add(grainTH);
+
+ trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
+ //trhInfo.put("temperatureAndhumidity",grainTH);
+
+ JSONObject params = new JSONObject();
+ params.put("TRHInfo", trhInfo);
+
+ result.setParams(params);
+
+
+ //resp.setObj(result);
+
+ resp.setData(JSONObject.toJSONString(result));
+
+ return resp;
+ }
+
+ private BaseResp grainData2GatewayApiInfo2(Fz40Grain grainData, GatewayDevice device,GrainCableData cableData) {
+ BaseResp resp = new BaseResp();
+
+// int cableZ = cableData.getCableZ();
+// int cableY = cableData.getCableY();
+// int cableX = cableData.getCableX();
+//
+// int sumNum = cableData.getSumNum();
+//
+// //鏁版嵁灏佽
+// GrainData grain = new GrainData();
+// grain.setMessageId(ScConstant.getMessageId());
+// grain.setDeviceId(device.getDeviceId());
+// grain.setTimestamp(System.currentTimeMillis() + "");
+//
+// ClientHeaders headers = new ClientHeaders();
+// headers.setDeviceName(device.getDeviceName());
+// headers.setProductId(device.getProductId());
+// headers.setOrgId(device.getOrgId());
+// headers.setMsgId(ScConstant.getMessageId());
+// grain.setHeaders(headers);
+//
+//
+// GrainOutPut outPut = new GrainOutPut();
+//
+//
+// double max = com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MAX_TEMP, min = com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MIN_TEMP, sumT = 0.0;
+//
+// List<GrainTemp> temperature = new ArrayList<>();
+// //鏍瑰彿
+// int cableNum = 1, position = 0;
+//
+// double curTemp;
+// int x = 0, y = 0, z = 0;
+// for (int i = 0; i < sumNum; i++) {
+// curTemp = temps.get(i);
+// position = i;
+//
+// z = i % cableZ + 1;
+// x = i / (cableZ * cableY);
+// y = x * (cableZ * cableY);
+// y = (i - y) / cableZ;
+// //鏍瑰彿
+// cableNum = (i / cableZ) + 1;
+//
+// temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
+//
+// //姹傛渶澶ф渶灏忓��
+// if (curTemp < -900) {
+// sumNum--;
+// } else {
+// sumT += curTemp;
+// if (curTemp > max) {
+// max = curTemp;
+// }
+// if (curTemp < min) {
+// min = curTemp;
+// }
+// }
+// }
+//
+// if (sumNum == 0) {
+// sumNum = 1;
+// log.warn("---褰撳墠绮儏閲囬泦寮傚父--");
+// }
+// //杩囨护姣旇緝鐢ㄧ殑鏈�澶ф渶灏忓��
+// if (max == com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MAX_TEMP) {
+// max = 0.0;
+// }
+// if (min == com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MIN_TEMP) {
+// min = 0.0;
+// }
+//
+// outPut.setTemperature(temperature);
+// outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
+// outPut.setMinTemperature(min + "");
+// outPut.setMaxTemperature(min + "");
+//
+//
+// com.alibaba.fastjson.JSONObject properties = new com.alibaba.fastjson.JSONObject();
+// properties.put("data", com.alibaba.fastjson.JSONObject.toJSONString(outPut));
+// properties.put("timestamp", grain.getTimestamp());
+//
+// String height = this.getCacheHeight(device);
+// if (org.apache.commons.lang3.StringUtils.isEmpty(height)) height = "0.0";
+// properties.put("liquidHeight", height);
+//
+// grain.setProperties(properties.toJSONString());
+//
+// //灏佽濂界殑鏁版嵁
+// log.info("---娴呭渾浠撳皝瑁呭畬鎴�----寮�濮嬫墽琛屾帹閫�");
+
+
+
+
+
+
+
+ resp.setCode(BaseResp.CODE_500);
+ resp.setMsg("绛掍粨瑙ｆ瀽鏆傛湭瀹炵幇");
+ return resp;
+ }
+
}
--
Gitblit v1.9.3