From 204bb9eb1ff8a9aca875381f6b8cfd689cbf4990 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 28 九月 2023 16:33:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/builder/ReMessageBuilder.java | 24 ++++++++++++++++++++----
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java | 30 ++++++++++++++++++++++--------
2 files changed, 42 insertions(+), 12 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 297fd5c..f130495 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
@@ -51,7 +51,9 @@
@Autowired
private ExeOrderService exeOrderService;
- public static Map<String, Map<String, String>> contextMap = new HashMap<>();
+ public static String result = "";
+
+ public static Map<String, String> contextMap = new HashMap<>();
public static double ERROR_CHECK_TAG = -100.0;
@@ -62,19 +64,32 @@
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));
+ }
/**
- * 00000000FFEB90FEAA 41 E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+ * 00000000FFEB90FEAA41E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
*
* @param hexStr
*/
public void analysis(String ip, int port, String hexStr) {
- ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
+ result += hexStr;
+ if(result.length() < 1066*2){
+ log.info("鍒嗘満------->>骞冲彴锛屾姤鏂囬暱搴︿笉澶燂紝绛夊緟涓嬩竴鍖呮暟鎹�");
+ return;
+ }
- log.info("鍒嗘満------->>骞冲彴锛氫俊鎭姤鏂�={}", reMessage);
+ //灏佽鏁版嵁
+ ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
+ reMessage.setIp(ip);
+ reMessage.setPort(port);
+ log.info("鍒嗘満------->>骞冲彴锛氱伯鎯呭畬鏁存姤鏂囦俊鎭�={}", reMessage);
if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
log.error("鍒嗘満------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ細鎶ユ枃璧峰绗�={}閿欒锛屼笉瑙ｆ瀽", reMessage.getStartStr());
+ return;
}
//鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
@@ -100,8 +115,7 @@
return;
}
- DepotConf depotConf = commonService.getCacheDepotConf(
- exeRequest.getCompanyId(), exeRequest.getDepotId());
+ DepotConf depotConf = commonService.getCacheDepotConf(exeRequest.getCompanyId(), exeRequest.getDepotId());
if (null == depotConf) {
String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃俊鎭��";
log.error("鍒嗘満------>>>骞冲彴锛�" + info);
@@ -646,7 +660,7 @@
return msg.getSerId() + "_" + curPacket;
}
- private String buildContextKey(ReMessage msg, String depotId) {
- return msg.getCompanyId() + "_" + msg.getSerId() + "_" + depotId;
+ private String buildContextKey(String companyId, String serId) {
+ return companyId + "_" + serId;
}
}
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/builder/ReMessageBuilder.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/builder/ReMessageBuilder.java
index eccf5be..98613dc 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/builder/ReMessageBuilder.java
+++ b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/builder/ReMessageBuilder.java
@@ -28,13 +28,29 @@
ReMessage message = new ReMessage();
message.setStrMsg(strMsg);
//璁剧疆璧峰绗�
- message.setStartStr(strMsg.substring(0, 9*2-1));
+ message.setStartStr(strMsg.substring(0, 9*2));
//璁剧疆绮儏鍒嗘満鍦板潃
- String str = strMsg.substring(9*2-1, 10*2-1);
+ String str = strMsg.substring(9*2, 10*2);
int i = BytesUtil.hexToInt(str);
- String serId = String.valueOf(i - BeiboGrainServerUtils.BM);
- message.setSerId(serId);
+ str = String.valueOf(i - BeiboGrainServerUtils.BM);
+ message.setSerId(str);
+
+ //绮儏鏁版嵁
+ str = strMsg.substring(10*2, 1034*2);
+ message.setGrainStr(str);
+
+ //娓╁害鏁版嵁
+ str = strMsg.substring(1034*2, 1052*2);
+ message.setThStr(str);
+
+ //鎵╁厖鏁版嵁
+ str = strMsg.substring(1052*2, 1062*2);
+ message.setExpand(str);
+
+ //妫�楠岀爜
+ str = strMsg.substring(1062*2);
+ message.setHexCrc16(str);
return message;
}
--
Gitblit v1.9.3