From 89a04d01291a9ea953ae62fe581630aec608af6a Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 11 十二月 2025 16:05:19 +0800
Subject: [PATCH] #
---
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_04_UP.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_04_UP.java b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_04_UP.java
index 07170e4..5d173ae 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_04_UP.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_04_UP.java
@@ -1,11 +1,15 @@
package com.zy.acs.common.domain.protocol;
+import com.zy.acs.common.constant.CommonConstant;
import com.zy.acs.framework.common.RadixTools;
import com.zy.acs.common.utils.Utils;
import lombok.Data;
import java.io.Serializable;
+/**
+ * 鏁呴殰鏁版嵁鍖�
+ */
@Data
public class AGV_04_UP implements IMessageBody, Serializable {
@@ -13,7 +17,6 @@
@Override
public byte[] writeToBytes() {
-
return Utils.merge(
Utils.reverse(RadixTools.shortToByte((short) this.faultId))
, Utils.reverse(RadixTools.hexStringToBytes(this.hexFaultId))
@@ -21,25 +24,28 @@
, (byte) this.faultLevel
, Utils.reverse(RadixTools.intToBytes(this.data1))
, Utils.reverse(RadixTools.intToBytes(this.data2))
- , Utils.reverse(RadixTools.intToBytes(this.flag))
+ , Utils.reverse(RadixTools.intToBytes(Integer.parseInt(this.qrCode)))
);
}
@Override
- public void readFromBytes(byte[] messageBodyBytes) {
+ public void readFromBytes(byte[] bytes) {
//鏁呴殰ID
- this.faultId = RadixTools.byteToShort(Utils.sliceWithReverse(messageBodyBytes, 0, 2));
- this.hexFaultId = RadixTools.bytesToHexStr(Utils.sliceWithReverse(messageBodyBytes, 0, 2));
+ this.faultId = RadixTools.byteToShort(Utils.sliceWithReverse(bytes, 0, 2));
+ this.hexFaultId = RadixTools.bytesToHexStr(Utils.sliceWithReverse(bytes, 0, 2));
//鏁呴殰鐘舵��
- this.faultStatus = Utils.slice(messageBodyBytes, 2, 1)[0];
+ this.faultStatus = Utils.slice(bytes, 2, 1)[0];
//鏁呴殰绛夌骇
- this.faultLevel = Utils.slice(messageBodyBytes, 3, 1)[0];
+ this.faultLevel = Utils.slice(bytes, 3, 1)[0];
//鏁呴殰鏁版嵁1
- this.data1 = RadixTools.bytesToInt(Utils.sliceWithReverse(messageBodyBytes, 4, 4));
+ this.data1 = RadixTools.bytesToInt(Utils.sliceWithReverse(bytes, 4, 4));
//鏁呴殰鏁版嵁2
- this.data2 = RadixTools.bytesToInt(Utils.sliceWithReverse(messageBodyBytes, 8, 4));
- //鏁呴殰鏍囧織浣�
- this.flag = RadixTools.bytesToInt(Utils.sliceWithReverse(messageBodyBytes, 12, 4));
+ this.data2 = RadixTools.bytesToInt(Utils.sliceWithReverse(bytes, 8, 4));
+// //鏁呴殰鏍囧織浣�
+// this.flag = RadixTools.bytesToInt(Utils.sliceWithReverse(bytes, 12, 4));
+ //鍦伴潰鐮両D
+ this.qrCode = Utils.zeroFill(String.valueOf(RadixTools.bytesToInt(Utils.sliceWithReverse(bytes, 12, 4))), CommonConstant.QR_CODE_LEN);;
+
}
//鏁呴殰ID
@@ -60,7 +66,7 @@
//鏁呴殰鏁版嵁2
private int data2;
- //鏁呴殰鏍囧織浣�
- private int flag;
+ //鍦伴潰鐮両D
+ private String qrCode;
}
--
Gitblit v1.9.1