From 3a97ed3e03c8969aef34d172bf46116596683bd3 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 27 九月 2023 21:50:00 +0800
Subject: [PATCH] 贝博粮情解析2
---
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
similarity index 98%
rename from igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java
rename to igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
index 0191804..297fd5c 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java
+++ b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
@@ -1,4 +1,4 @@
-package com.ld.igds.protocol.beibo.grain.analysis;
+package com.ld.igds.protocol.beibo.grainv1.analysis;
import com.ld.igds.common.CoreCommonService;
import com.ld.igds.common.CoreSerService;
@@ -15,9 +15,9 @@
import com.ld.igds.models.Grain;
import com.ld.igds.order.ExeOrderService;
import com.ld.igds.order.data.ExeRequest;
-import com.ld.igds.protocol.beibo.grain.builder.ReMessage;
-import com.ld.igds.protocol.beibo.grain.builder.ReMessageBuilder;
-import com.ld.igds.protocol.beibo.grain.util.BeiboGrainServerUtils;
+import com.ld.igds.protocol.beibo.grainv1.builder.ReMessage;
+import com.ld.igds.protocol.beibo.grainv1.builder.ReMessageBuilder;
+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.warn.WarnUtils;
@@ -25,7 +25,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.*;
/**
@@ -52,7 +51,6 @@
@Autowired
private ExeOrderService exeOrderService;
-
public static Map<String, Map<String, String>> contextMap = new HashMap<>();
public static double ERROR_CHECK_TAG = -100.0;
@@ -67,17 +65,17 @@
/**
* 00000000FFEB90FEAA 41 E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
*
- * @param result
+ * @param hexStr
*/
- public void analysis(String result) {
+ public void analysis(String ip, int port, String hexStr) {
- log.info("鍒嗘満------->>骞冲彴锛氫俊鎭姤鏂�={}", result);
- ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(result);
+ ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
+
+ log.info("鍒嗘満------->>骞冲彴锛氫俊鎭姤鏂�={}", reMessage);
if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
log.error("鍒嗘満------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ細鎶ユ枃璧峰绗�={}閿欒锛屼笉瑙ｆ瀽", reMessage.getStartStr());
}
-
//鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
DeviceSer ser = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), reMessage.getSerId());
--
Gitblit v1.9.3