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/data/GrainCableData.java | 2
src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java | 37 --------
src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java | 39 ---------
src/main/java/com/fzzy/gateway/GatewayUtils.java | 36 +++++++++
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 116 +++++++++++++++++++++++++++--
5 files changed, 149 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayUtils.java b/src/main/java/com/fzzy/gateway/GatewayUtils.java
index 7e4df85..a0aa2d3 100644
--- a/src/main/java/com/fzzy/gateway/GatewayUtils.java
+++ b/src/main/java/com/fzzy/gateway/GatewayUtils.java
@@ -3,7 +3,9 @@
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiCommonDevice;
import com.fzzy.api.data.GatewayDeviceType;
+import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.gateway.entity.GatewayDevice;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.util.*;
@@ -138,4 +140,38 @@
}
return null;
}
+
+
+ public static GrainCableData getCableData(GatewayDevice gatewayDevice) {
+ String cableRule = gatewayDevice.getCableRule();
+ String cableCir = gatewayDevice.getCableCir();
+
+ GrainCableData result = new GrainCableData();
+
+ int cableY, cableX;
+ String[] attCable = cableRule.split("-");
+ int cableZ = Integer.valueOf(attCable[0]);
+ if (StringUtils.isEmpty(cableCir)) {
+ cableY = Integer.valueOf(attCable[1]);
+ cableX = Integer.valueOf(attCable[2]);
+ } else {
+ String[] attCir = cableCir.split("-");
+ cableZ = Integer.valueOf(attCir[0]);
+ cableY = 1;
+ cableX = 0;
+ //閽堝澶氬湀璁＄畻
+ for (int i = 0; i < cableCir.length(); i++) {
+ cableX += Integer.valueOf(attCir[i]);
+ }
+
+ result.setCir(true);
+ }
+
+ result.setCableY(cableY);
+ result.setCableZ(cableZ);
+ result.setCableX(cableX);
+ result.setSumNum(cableZ * cableY * cableX);
+
+ return result;
+ }
}
diff --git a/src/main/java/com/fzzy/protocol/data/GrainCableData.java b/src/main/java/com/fzzy/gateway/data/GrainCableData.java
similarity index 85%
rename from src/main/java/com/fzzy/protocol/data/GrainCableData.java
rename to src/main/java/com/fzzy/gateway/data/GrainCableData.java
index d42a0cb..59167fe 100644
--- a/src/main/java/com/fzzy/protocol/data/GrainCableData.java
+++ b/src/main/java/com/fzzy/gateway/data/GrainCableData.java
@@ -1,4 +1,4 @@
-package com.fzzy.protocol.data;
+package com.fzzy.gateway.data;
import lombok.Data;
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 b21e3ff..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,11 +2,14 @@
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.*;
@@ -177,16 +180,17 @@
result.setMaxTemperature(grainData.getTempMax() + "");
result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
- //灞�-琛�-鍒�
- String[] attrCable = grainData.getCable().split("-");
- if (StringUtils.isNotEmpty(grainData.getCableCir())) {
- return grainData2GatewayApiInfo2(grainData, device);
+
+ GrainCableData cableData = GatewayUtils.getCableData(device);
+
+ if(cableData.isCir()){
+ return grainData2GatewayApiInfo2(grainData, device,cableData);
}
//灞傝鍒�
- int cableZ = Integer.valueOf(attrCable[0]);
- int cableY = Integer.valueOf(attrCable[1]);
- int cableX = Integer.valueOf(attrCable[2]);
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+ int cableX = cableData.getCableX();
//娓╁害闆嗗悎
String[] attr = grainData.getPoints().split(",");
@@ -265,8 +269,104 @@
return resp;
}
- private BaseResp grainData2GatewayApiInfo2(Fz40Grain grainData, GatewayDevice device) {
+ 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;
diff --git a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
index ffc5f7b..423a4af 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
@@ -21,7 +21,7 @@
import com.fzzy.protocol.bhzn.cmd.CommandBuild;
import com.fzzy.protocol.bhzn.cmd.ReMessageBuilder;
import com.fzzy.protocol.bhzn.data.IoMessage;
-import com.fzzy.protocol.data.GrainCableData;
+import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.protocol.data.THDto;
import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerEngine;
import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerUtils;
@@ -132,7 +132,7 @@
}
// 鍒ゆ柇鏁版嵁鏈夋病鏈夋敹鍙栧畬鏁�
- GrainCableData cableData = this.getCableData(gatewayDevice);
+ GrainCableData cableData = GatewayUtils.getCableData(gatewayDevice);
int sumPoint = cableData.getSumNum();
//鑾峰彇褰撳墠绮儏娓╁害鎶ユ枃
@@ -179,39 +179,6 @@
} catch (Exception e) {
log.error(e.getMessage(), e);
}
- }
-
- private GrainCableData getCableData(GatewayDevice gatewayDevice) {
- String cableRule = gatewayDevice.getCableRule();
- String cableCir = gatewayDevice.getCableCir();
-
- GrainCableData result = new GrainCableData();
-
- int cableY, cableX;
- String[] attCable = cableRule.split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- if (StringUtils.isEmpty(cableCir)) {
- cableY = Integer.valueOf(attCable[1]);
- cableX = Integer.valueOf(attCable[2]);
- } else {
- String[] attCir = cableCir.split("-");
- cableZ = Integer.valueOf(attCir[0]);
- cableY = 1;
- cableX = 0;
- //閽堝澶氬湀璁＄畻
- for (int i = 0; i < cableCir.length(); i++) {
- cableX += Integer.valueOf(attCir[i]);
- }
-
- result.setCir(true);
- }
-
- result.setCableY(cableY);
- result.setCableZ(cableZ);
- result.setCableX(cableX);
- result.setSumNum(cableZ * cableY * cableX);
-
- return result;
}
/**
diff --git a/src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java
index 6caca77..1af6419 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java
@@ -8,7 +8,6 @@
import com.fzzy.api.utils.NumberUtil;
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
-import com.fzzy.async.fzzy40.entity.Fz40Grain;
import com.fzzy.data.ConfigData;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayDeviceReportService;
@@ -24,9 +23,8 @@
import com.fzzy.protocol.bhzn.v0.data.IoMessage;
import com.fzzy.protocol.bhzn.v0.server.BhznGrainV0ServerEngine;
import com.fzzy.protocol.bhzn.v0.server.BhznGrainV0ServerUtils;
-import com.fzzy.protocol.data.GrainCableData;
+import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.protocol.data.THDto;
-import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -132,7 +130,7 @@
}
// 鍒ゆ柇鏁版嵁鏈夋病鏈夋敹鍙栧畬鏁�
- GrainCableData cableData = this.getCableData(gatewayDevice);
+ GrainCableData cableData = GatewayUtils.getCableData(gatewayDevice);
//鑾峰彇褰撳墠绮儏娓╁害鎶ユ枃
String grainHex = message.getContent().substring(16);
@@ -177,39 +175,6 @@
} catch (Exception e) {
log.error(e.getMessage(), e);
}
- }
-
- private GrainCableData getCableData(GatewayDevice gatewayDevice) {
- String cableRule = gatewayDevice.getCableRule();
- String cableCir = gatewayDevice.getCableCir();
-
- GrainCableData result = new GrainCableData();
-
- int cableY, cableX;
- String[] attCable = cableRule.split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- if (StringUtils.isEmpty(cableCir)) {
- cableY = Integer.valueOf(attCable[1]);
- cableX = Integer.valueOf(attCable[2]);
- } else {
- String[] attCir = cableCir.split("-");
- cableZ = Integer.valueOf(attCir[0]);
- cableY = 1;
- cableX = 0;
- //閽堝澶氬湀璁＄畻
- for (int i = 0; i < cableCir.length(); i++) {
- cableX += Integer.valueOf(attCir[i]);
- }
-
- result.setCir(true);
- }
-
- result.setCableY(cableY);
- result.setCableZ(cableZ);
- result.setCableX(cableX);
- result.setSumNum(cableZ * cableY * cableX);
-
- return result;
}
/**
--
Gitblit v1.9.3