From a6a89eeaf5162890d616444fddf17639881a0fac Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 07 十月 2023 18:50:21 +0800
Subject: [PATCH] 贝博粮情解析uat
---
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java | 168 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 97 insertions(+), 71 deletions(-)
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
index f130495..5a789b8 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
+++ b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
@@ -20,11 +20,13 @@
import com.ld.igds.protocol.beibo.grainv1.util.BeiboGrainServerUtils;
import com.ld.igds.util.BytesUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import com.ld.igds.warn.WarnUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.*;
/**
@@ -53,21 +55,21 @@
public static String result = "";
- public static Map<String, String> contextMap = new HashMap<>();
-
public static double ERROR_CHECK_TAG = -100.0;
public static double FAULT_CHECK_TAG = 85.0;
public static double ERROR_CHECK_TAG2 = 50;
+ public static String ERROR_HEX = "FFFF";
public static double MAX_TEMP = -50.0;
public static double MIN_TEMP = 50.0;
public static void main(String[] args) {
String str = "00000000FFEB90FEAA41E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF";
- System.out.println(str.substring(9*2, 10*2));
+ System.out.println(str.substring(9 * 2, 10 * 2));
}
+
/**
* 00000000FFEB90FEAA41E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
*
@@ -76,59 +78,66 @@
public void analysis(String ip, int port, String hexStr) {
result += hexStr;
- if(result.length() < 1066*2){
+ if (result.length() < 1066 * 2) {
log.info("鍒嗘満------->>骞冲彴锛屾姤鏂囬暱搴︿笉澶燂紝绛夊緟涓嬩竴鍖呮暟鎹�");
return;
}
- //灏佽鏁版嵁
- ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
- reMessage.setIp(ip);
- reMessage.setPort(port);
- log.info("鍒嗘満------->>骞冲彴锛氱伯鎯呭畬鏁存姤鏂囦俊鎭�={}", reMessage);
+ try {
- if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
- log.error("鍒嗘満------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ細鎶ユ枃璧峰绗�={}閿欒锛屼笉瑙ｆ瀽", reMessage.getStartStr());
- return;
+
+ //灏佽鏁版嵁
+ ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(result);
+ reMessage.setIp(ip);
+ reMessage.setPort(port);
+ log.info("鍒嗘満------->>骞冲彴锛氱伯鎯呭畬鏁存姤鏂囦俊鎭�={}", reMessage);
+ result = "";
+ if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
+ log.error("鍒嗘満------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ細鎶ユ枃璧峰绗�={}閿欒锛屼笉瑙ｆ瀽", reMessage.getStartStr());
+ return;
+ }
+
+ //鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
+ DeviceSer ser = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), reMessage.getSerId());
+ if (ser == null) {
+ log.error("鍒嗘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + reMessage.getSerId());
+ return;
+ }
+
+ List<ExeRequest> list = exeOrderService.getInProgressOrderBySerId(BizType.GRAIN.getCode(), ser.getId());
+ if (null == list || list.isEmpty()) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒版墍灞炰粨搴撲俊鎭��";
+ log.error("鍒嗘満------>>>骞冲彴锛�" + info);
+ notifyGrainInvoker.notifyWeb(ser.getCompanyId(), OrderRespEnum.MSG_ERROR, BizType.GRAIN, info);
+ return;
+ }
+
+ ExeRequest exeRequest = list.get(0);
+ log.info("鑾峰彇绮儏鍛戒护淇℃伅={}", exeRequest);
+ if (null == exeRequest) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍘嗗彶鍛戒护銆�";
+ log.error("璐濆崥鍒嗘満------>>>骞冲彴锛�" + info);
+ return;
+ }
+
+ DepotConf depotConf = commonService.getCacheDepotConf(exeRequest.getCompanyId(), exeRequest.getDepotId());
+ if (null == depotConf) {
+ String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃俊鎭��";
+ log.error("鍒嗘満------>>>骞冲彴锛�" + info);
+ notifyGrainInvoker.notifyWeb(ser.getCompanyId(),
+ OrderRespEnum.MSG_ERROR, BizType.GRAIN, info);
+ return;
+ }
+
+ // 棣栧厛鑾峰彇鍒扮郴缁熷弬鏁帮紝鍒ゆ柇鏄惁闇�瑕佹壒娆¤嚜鍔ㄤ紭鍖�
+ DicSysConf sysConf = commonService.getCacheSysConf(ser.getCompanyId());
+
+ reMessage.setCompanyId(ser.getCompanyId());
+ analysisGrain(depotConf, reMessage, ser, exeRequest, sysConf);
+ } catch (Exception e) {
+ result = "";
+ log.error("鍒嗘満------->>骞冲彴锛岃В鏋愮伯鎯呭紓甯革細鍘熷洜={}", e.toString());
}
-
- //鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
- DeviceSer ser = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), reMessage.getSerId());
- if (ser == null) {
- log.error("鍒嗘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + reMessage.getSerId());
- return;
- }
-
- List<ExeRequest> list = exeOrderService.getInProgressOrderBySerId(BizType.GRAIN.getCode(), ser.getId());
- if (null == list || list.isEmpty()) {
- String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒版墍灞炰粨搴撲俊鎭��";
- log.error("鍒嗘満------>>>骞冲彴锛�" + info);
- notifyGrainInvoker.notifyWeb(ser.getCompanyId(), OrderRespEnum.MSG_ERROR, BizType.GRAIN, info);
- return;
- }
-
- ExeRequest exeRequest = list.get(0);
- log.info("鑾峰彇绮儏鍛戒护淇℃伅={}", exeRequest);
- if (null == exeRequest) {
- String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍘嗗彶鍛戒护銆�";
- log.error("璐濆崥鍒嗘満------>>>骞冲彴锛�" + info);
- return;
- }
-
- DepotConf depotConf = commonService.getCacheDepotConf(exeRequest.getCompanyId(), exeRequest.getDepotId());
- if (null == depotConf) {
- String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃俊鎭��";
- log.error("鍒嗘満------>>>骞冲彴锛�" + info);
- notifyGrainInvoker.notifyWeb(ser.getCompanyId(),
- OrderRespEnum.MSG_ERROR, BizType.GRAIN, info);
- return;
- }
-
- // 棣栧厛鑾峰彇鍒扮郴缁熷弬鏁帮紝鍒ゆ柇鏄惁闇�瑕佹壒娆¤嚜鍔ㄤ紭鍖�
- DicSysConf sysConf = commonService.getCacheSysConf(ser.getCompanyId());
-
- reMessage.setCompanyId(ser.getCompanyId());
- analysisGrain(depotConf, reMessage, ser, exeRequest, sysConf);
}
@@ -170,23 +179,6 @@
}
// 涓�鍒嗗嚑澶氫粨鎯呭喌锛岃�冭檻鍗曚粨閲囬泦鍜屽浠撻噰闆�
- // 鍗曚粨閲囬泦鏃跺�欐暟鎹粠0杩斿洖
- if (StringUtils.isEmpty(exeRequest.getDepotIds())) {
-
- depotConf.setCableEnd(depotConf.getCableEnd() - depotConf.getCableStart() + 1);
- depotConf.setCableStart(ser.getCableStart());
-
- if (DepotType.TYPE_02.getCode().equals(depotConf.getDepotType())) {
- analysisStep2(depotConf, ser, exeRequest, reMessage, sysConf);
- } else if (DepotType.TYPE_04.getCode().equals(depotConf.getDepotType())) {
- analysisStep2(depotConf, ser, exeRequest, reMessage, sysConf);
- } else {
- analysisStep1(depotConf, ser, exeRequest, reMessage, sysConf);
- }
-
- return;
-
- }
// 鎵归噺閲囬泦鎵�鏈夊叧鑱斾竴璧烽噰闆嗭紝閬嶅巻鎵ц
for (DepotConf depotConfTemp : depotConfs) {
@@ -264,12 +256,29 @@
int curRoot = 1;//鎵�鍦ㄦ牴
int curCir = 1;//鎵�鍦ㄥ湀
int cirLay = 1;//褰撳墠鍦堢殑灞�
+ int symbol = 0; //绗﹀彿浣�
for (int i = 0; i < strPoints.length() / 4; i++) {
temp = strPoints.substring(i * 4, i * 4 + 4);
if (temp == null) {
temp = "0000";
}
- tempValue = BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) / 10.0;
+ //楂樹綆浣嶈浆鎹㈠悗杞负16浣嶄簩杩涘埗瀛楃涓�
+ temp = BytesUtil.tran_LH(temp);
+ if(ERROR_HEX.equals(temp)){
+ tempValue = Constant.ERROR_TEMP;
+ }else {
+ //10杩涘埗杞�16浣嶇殑2杩涘埗
+ temp = BytesUtil.hexString2binaryString(temp, 16);
+ //绗﹀彿浣�
+ symbol = Integer.valueOf(temp.substring(0, 1));
+ //鑾峰彇娓╁害鍊�
+ tempValue = BytesUtil.biannary2Decimal(temp.substring(6)) * 0.0625;
+ //鑻ヤ负璐燂紝鍒欒ˉ鐮侊細鍙栧弽鍔�1
+ if (symbol == 1) {
+ tempValue = ((~BytesUtil.biannary2Decimal(temp.substring(6))) + 1) * 0.0625;
+ }
+ tempValue = NumberUtil.keepPrecision(tempValue, 1);
+ }
//闈炴甯稿��
if (tempValue > ERROR_CHECK_TAG2) {
@@ -369,12 +378,29 @@
List<Double> temps = new ArrayList<>();
double tempValue;
String temp;
+ int symbol = 0;
for (int i = 0; i < strPoints.length() / 4; i++) {
temp = strPoints.substring(i * 4, i * 4 + 4);
if (temp == null) {
temp = "0000";
}
- tempValue = BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) / 10.0;
+
+ if(ERROR_HEX.equals(temp)){
+ tempValue = Constant.ERROR_TEMP;
+ }else {
+ //10杩涘埗杞�16浣嶇殑2杩涘埗
+ temp = BytesUtil.hexString2binaryString(temp, 16);
+ //绗﹀彿浣�
+ symbol = Integer.valueOf(temp.substring(0, 1));
+ //鑾峰彇娓╁害鍊�
+ tempValue = BytesUtil.biannary2Decimal(temp.substring(6)) * 0.0625;
+ //鑻ヤ负璐燂紝鍒欒ˉ鐮侊細鍙栧弽鍔�1
+ if (symbol == 1) {
+ tempValue = ((~BytesUtil.biannary2Decimal(temp.substring(6))) + 1) * 0.0625;
+ }
+ tempValue = NumberUtil.keepPrecision(tempValue, 1);
+ }
+
// 璇存槑瑙ｆ瀽鐨勬暟鎹湁闂
if (tempValue == ERROR_CHECK_TAG || tempValue == ERROR_CHECK_TAG2) {
tempValue = Constant.ERROR_TEMP;
@@ -437,7 +463,7 @@
grain.setTempIn(Constant.ERROR_TEMP);
grain.setHumidityIn(Constant.ERROR_TEMP);
- grain.setReceiveDate(msg.getReceiveDate());
+ grain.setReceiveDate(new Date());
grain.setRemark("绮俯姝ｅ父");
// 鑾峰彇缂撳瓨涓殑鍛戒护淇℃伅
@@ -519,7 +545,7 @@
grain.setTempIn(Constant.ERROR_TEMP);
grain.setHumidityIn(Constant.ERROR_TEMP);
- grain.setReceiveDate(msg.getReceiveDate());
+ grain.setReceiveDate(new Date());
grain.setRemark("绮俯姝ｅ父");
grain.setCheckUser(exeRequest.getExeUser());
--
Gitblit v1.9.3