From f7178996ca77a1bccc941c0e7a73b36803e508cb Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 01 三月 2024 16:13:11 +0800
Subject: [PATCH] 优化协议
---
src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java | 254 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 216 insertions(+), 38 deletions(-)
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 7aca558..3c22d41 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
@@ -3,9 +3,13 @@
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiCommonDevice;
+import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.BytesUtil;
import com.fzzy.api.utils.NumberUtil;
+import com.fzzy.api.utils.RedisConst;
+import com.fzzy.api.utils.RedisUtil;
+import com.fzzy.data.ConfigData;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
@@ -14,15 +18,16 @@
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
-import com.fzzy.protocol.ConstantProtocol;
+import com.fzzy.protocol.ProtocolUtils;
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.bhzn.data.THDto;
+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;
-import com.fzzy.protocol.fzzy.server.ServerUtils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -42,6 +47,10 @@
@Resource
private GatewayRemoteManager gatewayRemoteManager;
+ @Resource
+ private ConfigData configData;
+ @Resource
+ private RedisUtil redisUtil;
/**
* 閽堝鍒嗗寘绮儏鎶ユ枃杩涜灏佽
@@ -99,24 +108,24 @@
private void analysisGrain(IoMessage message) {
try {
+ //鏍规嵁鍒嗘満SN鑾峰彇璁惧閰嶇疆淇℃伅
+ GatewayDevice gatewayDevice = GatewayUtils.getCacheByDeviceSn(message.getAddr());
+ if (null == gatewayDevice) {
+ replayGrain(message);
+ log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺璁惧閰嶇疆淇℃伅锛�" + message.getAddr());
+ return;
+ }
//鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
- ApiCommonDevice commonDevice = Constant.getCommonDeviceCache(message.getAddr());
+ ApiCommonDevice commonDevice = Constant.getCommonDeviceCache(message.getIp());
if (commonDevice == null) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + message.getAddr());
return;
}
- //鏍规嵁鍒嗘満SN鑾峰彇璁惧閰嶇疆淇℃伅
- GatewayDevice gatewayDevice = GatewayUtils.getCacheByDeviceSn(commonDevice.getSn());
- if (null == gatewayDevice) {
- replayGrain(message);
- log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺璁惧閰嶇疆淇℃伅锛�" + message.getAddr());
- return;
- }
//鑾峰彇璇锋眰淇℃伅
- BaseReqData reqData = BhznGrainV2ServerUtils.getSyncReq(gatewayDevice.getDepotIdSys());
+ BaseReqData reqData = ProtocolUtils.getSyncReq(gatewayDevice.getDeviceSn());
if (null == reqData) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绮儏璇锋眰淇℃伅锛�" + message.getAddr());
@@ -124,11 +133,8 @@
}
// 鍒ゆ柇鏁版嵁鏈夋病鏈夋敹鍙栧畬鏁�
- String[] attCable = gatewayDevice.getCableRule().split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- int cableY = Integer.valueOf(attCable[1]);
- int cableX = Integer.valueOf(attCable[2]);
- int sumPoint = cableZ * cableY * cableX;
+ GrainCableData cableData = GatewayUtils.getCableData(gatewayDevice);
+ int sumPoint = cableData.getSumNum();
//鑾峰彇褰撳墠绮儏娓╁害鎶ユ枃
String grainHex = message.getContent().substring(16);
@@ -141,7 +147,7 @@
log.info("鍒嗘満------>>>骞冲彴锛氱伯鎯呮暟鎹崟鍖�=" + grainHex);
//杩斿洖绮儏鎺ユ敹淇℃伅
replayGrain(message);
- analysisGrain2(message, reqData, grainHex);
+ analysisGrain2(message, reqData, grainHex, cableData);
return;
}
@@ -162,7 +168,7 @@
//杩斿洖绮儏鎺ユ敹淇℃伅
replayGrain(message);
log.info("鍒嗘満------>>>骞冲彴锛氱伯鎯呮暟鎹鍖咃紝瀹屾暣鏁版嵁=" + grainHex);
- analysisGrain2(message, reqData, grainHex);
+ analysisGrain2(message, reqData, grainHex, cableData);
return;
} else {
@@ -189,18 +195,14 @@
BhznGrainV2ServerEngine.push(message.getIp(), message.getPort(), BytesUtil.hexStrToBytes(hexStr));
}
- private void analysisGrain2(IoMessage message, BaseReqData reqData, String grainStr) {
-
+ private void analysisGrain2(IoMessage message, BaseReqData reqData, String grainStr, GrainCableData cableData) {
GatewayDevice device = reqData.getDevice();
// 鑾峰彇瀹屾暣鐨勭伯鎯呭寘淇℃伅
- String[] attCable = device.getCableRule().split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- int cableY = Integer.valueOf(attCable[1]);
- int cableX = Integer.valueOf(attCable[2]);
+ int sumNum = cableData.getSumNum();
// 鏍规嵁灞傝鍒楄幏鍙栨寚瀹氶暱搴�
int start = 0;
- int len = 4 * cableZ * cableY * cableX;
+ int len = 4 * sumNum;
log.info("鍒嗘満------>>>骞冲彴锛氳繑鍥炵伯鎯呭畬鏁翠俊鎭紝鍒嗘満={}", device.getDeviceName());
@@ -216,13 +218,13 @@
temp = "0000";
}
if (ReMessageBuilder.ERROR_TAG.equals(temp)) {
- tempValue = ConstantProtocol.ERROR_TEMP;
+ tempValue = ProtocolUtils.ERROR_TEMP;
} else {
tempValue = BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) / 10.0;
}
// 鏁呴殰鍊煎鐞�
if (tempValue >= ReMessageBuilder.FAULT_CHECK_TAG) {
- tempValue = ConstantProtocol.FAULT_TEMP;
+ tempValue = ProtocolUtils.FAULT_TEMP;
}
temps.add(tempValue);
}
@@ -230,14 +232,188 @@
THDto thDto = this.getTH(message);
if (null != thDto) {
- log.debug("-------THDto--={}", thDto);
+ log.info("-------THDto--={}", thDto);
}
//娓呯┖
String key = "GRAIN_" + message.getAddr();
contextMapGrain.put(key, null);
- // 灏嗛泦鍚堣В鏋愭垚鍧愭爣鏁版嵁
- addPoint1(temps, reqData, thDto);
+
+ if (DepotType.TYPE_02.getCode().equals(device.getDepotType()) || DepotType.TYPE_04.getCode().equals(device.getDepotType())) {
+ //绛掍粨
+ analysisAndPush2(temps, reqData, thDto, cableData);
+ } else if (DepotType.TYPE_03.getCode().equals(device.getDepotType())) {
+ //鍌ㄦ补缃�
+ analysisAndPush3(temps, reqData, thDto, cableData);
+ } else {
+ //骞虫埧浠�
+ analysisAndPush1(temps, reqData, thDto, cableData);
+ }
+ }
+
+ /**
+ * 绛掍粨鎺ㄩ��
+ *
+ * @param temps
+ * @param reqData
+ * @param thDto
+ * @param cableData
+ */
+ private void analysisAndPush2(List<Double> temps, BaseReqData reqData, THDto thDto, GrainCableData cableData) {
+ //TODO
+ log.info("---------------------------绛掍粨鏆傛棤瀹炵幇---------------------------");
+ }
+
+ /**
+ * 鍌ㄦ补缃�
+ *
+ * @param temps
+ * @throws Exception
+ */
+ private void analysisAndPush3(List<Double> temps, BaseReqData reqData, THDto thDto, GrainCableData cableData) {
+
+ GatewayDevice device = reqData.getDevice();
+
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+
+ int sumNum = temps.size();
+
+ //鏁版嵁灏佽
+ 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(reqData.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 + "");
+
+
+ JSONObject properties = new JSONObject();
+
+ properties.put("timestamp", grain.getTimestamp());
+ outPut.setDetectTime( grain.getTimestamp());
+ String height = this.getCacheHeight(device);
+ if (StringUtils.isEmpty(height)) height = "0.0";
+ properties.put("liquidHeight", height);
+
+ outPut.setLiquidHeight(height);
+ grain.setOutput(JSONObject.toJSONString(outPut));
+ properties.put("output", outPut);
+ GatewayDevice gatewayDeviceWeather = GatewayUtils.getCacheByDeviceTypeOne(GatewayDeviceType.TYPE_09.getCode());
+
+ //绯荤粺姘旇薄绔欎俊鎭�
+ WeatherWebDto weather = WeatherWebDto.contextMap.get("default");
+
+ //姘旇薄淇℃伅
+ GrainWeather weatherStation = new GrainWeather();
+ weatherStation.setMessageId(ScConstant.getMessageId());
+ weatherStation.setMessgeId(weatherStation.getMessageId());
+
+ if (null != gatewayDeviceWeather) {
+ weatherStation.setId(gatewayDeviceWeather.getDeviceId());
+ } else {
+ weatherStation.setId(device.getDeviceId());
+ }
+ weatherStation.setAirPressure(weather.getPressure());
+ weatherStation.setHumidity(weather.getHumidity());
+ weatherStation.setPm(weather.getAir_pm25());
+ weatherStation.setRadiation("0");
+ weatherStation.setRainfallAmount(weather.getWea());
+ weatherStation.setTemperature(weather.getTem());
+ weatherStation.setWindDirection(weather.getWin());
+ weatherStation.setWindPower(weather.getWin_meter());
+ weatherStation.setWindSpeed(weather.getWin_speed());
+
+ grain.setWeatherStation(JSONObject.toJSONString(weatherStation));
+
+ //灏佽濂界殑鏁版嵁
+ log.info("---娌圭綈浠撲俊鎭皝瑁呭畬鎴�----寮�濮嬫墽琛屾帹閫�");
+ grain.setProperties(properties);
+ reqData.setData(JSONObject.toJSONString(grain));
+
+ doPushGrain(reqData);
+ }
+
+ /**
+ * 浠嶳EDIS涓幏鍙栨恫浣嶉珮搴︿俊鎭�
+ *
+ * @param device
+ * @return
+ */
+ private String getCacheHeight(GatewayDevice device) {
+ //缁欏叾浠栬蒋浣跨敤
+ //igds:5012:DEPOT_HEIGHT:0134
+ String key = "igds:"+ device.getOrgId() + ":" + RedisConst.KEY_DEPOT_HEIGHT+ ":" + device.getDepotIdSys();
+ com.ld.igds.grain.dto.GrainData ht = (com.ld.igds.grain.dto.GrainData) redisUtil.get(key);
+ log.info("KEY="+key);
+ if(ht!=null){
+ log.info("VALUE="+ht.getOilHeight());
+ return ht.getOilHeight() ;
+ }else {
+ return "0.0";
+ }
+
}
@@ -247,14 +423,13 @@
* @param temps
* @throws Exception
*/
- private void addPoint1(List<Double> temps, BaseReqData reqData, THDto thDto) {
+ private void analysisAndPush1(List<Double> temps, BaseReqData reqData, THDto thDto, GrainCableData cableData) {
GatewayDevice device = reqData.getDevice();
- String[] attCable = device.getCableRule().split("-");
- int cableZ = Integer.valueOf(attCable[0]);
- int cableY = Integer.valueOf(attCable[1]);
- int cableX = Integer.valueOf(attCable[2]);
+ int cableZ = cableData.getCableZ();
+ int cableY = cableData.getCableY();
+ int cableX = cableData.getCableX();
//鏁版嵁灏佽
GrainData grain = new GrainData();
@@ -324,7 +499,10 @@
outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
outPut.setMinTemperature(min + "");
outPut.setMaxTemperature(min + "");
+ List<GrainTH> ths = new ArrayList<>();
+ ths.add(new GrainTH(thDto.getTempIn() != null ? thDto.getTempIn() + "" : "", thDto.getHumidityIn() != null ? thDto.getHumidityIn() + "" : "", "1"));
+ outPut.setTemperatureAndhumidity(ths);
grain.setOutput(JSONObject.toJSONString(outPut));
GatewayDevice gatewayDeviceWeather = GatewayUtils.getCacheByDeviceTypeOne(GatewayDeviceType.TYPE_09.getCode());
@@ -377,8 +555,8 @@
try {
THDto th = new THDto();
String data = message.getContent();
- String houseNo = data.substring(0, 4);
- int depotId = BytesUtil.hexToInt(BytesUtil.tran_LH(houseNo));
+ String houseNo = data.substring(0, 2);
+ int depotId = BytesUtil.hexToInt(houseNo);
String t = data.substring(4, 8);
String h = data.substring(8, 12);
double humy;
--
Gitblit v1.9.3