From 8435cf1d25d07b09e2a9937d39bed1c1a422e4f0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 14 十二月 2023 14:10:45 +0800
Subject: [PATCH] 提交正来电子协议解析-1
---
src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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..fb8b9ba 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
@@ -14,14 +14,13 @@
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.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.springframework.stereotype.Component;
@@ -116,7 +115,7 @@
}
//鑾峰彇璇锋眰淇℃伅
- BaseReqData reqData = BhznGrainV2ServerUtils.getSyncReq(gatewayDevice.getDepotIdSys());
+ BaseReqData reqData = ProtocolUtils.getSyncReq(gatewayDevice.getDepotIdSys());
if (null == reqData) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绮儏璇锋眰淇℃伅锛�" + message.getAddr());
@@ -216,13 +215,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);
}
--
Gitblit v1.9.3