From 2583078fdf32b87da154b1594f3e616a77824175 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 八月 2024 17:10:31 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java b/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java
index 04a396a..ddc38e0 100644
--- a/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java
+++ b/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java
@@ -1,20 +1,12 @@
-package com.zy.acs.gateway.handler.coder;
+package com.example.agvcontroller.protocol;
-import com.core.common.RadixTools;
-import com.zy.acs.common.utils.Utils;
-import com.zy.acs.gateway.config.SystemProperties;
-import com.zy.acs.gateway.constant.PackagePart;
-import com.zy.acs.gateway.domain.AgvPackage;
-import com.zy.acs.gateway.utils.ValidUtil;
+import java.util.logging.Logger;
+
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
/**
* 缂栫爜鍣�
@@ -22,13 +14,13 @@
* 澶勭悊鏂瑰紡: 寮傛垨鍜�
* Created by vincent on 2019-04-02
*/
-@Component
+//@Component
@ChannelHandler.Sharable
public class ProtocolEncoder extends MessageToByteEncoder<Object> {
- private static final Logger log = LoggerFactory.getLogger(ProtocolEncoder.class);
+ //private static final Logger log = LoggerFactory.getLogger(ProtocolEncoder.class);
- @Autowired
+ //@Autowired
private SystemProperties systemProperties;
@Override
@@ -48,9 +40,9 @@
byte[] bodyBytes = pac.getBody().getMessageBody().writeToBytes(); // body
- String uniqueNo = pac.getHeader().getUniqueNo();
+ //String uniqueNo = pac.getHeader().getUniqueNo();
- byte[] uniquenoBytes = RadixTools.intToBytes(Integer.parseInt(pac.getHeader().getUniqueNo())); // uniqueno
+ //byte[] uniquenoBytes = RadixTools.intToBytes(Integer.parseInt(pac.getHeader().getUniqueNo())); // uniqueno
int len = PackagePart.UNIQUENO.getLen() // len
@@ -58,14 +50,14 @@
+ PackagePart.COMMAND_MARK.getLen()
+ bodyBytes.length;
- out.writeByte(pac.getHeader().getStartSymbol()) // symbol
- .writeShortLE(len)
- .writeBytes(Utils.reverse(uniquenoBytes)) // uniqueno
- .writeIntLE((int) (System.currentTimeMillis() / 1000)) // timestamp
- .writeByte(pac.getHeader().getProtocolType().getCode()) // type
- .writeBytes(bodyBytes) // body
- .writeShort(pac.getValidCode()) // valid
- ;
+ //out.writeByte(pac.getHeader().getStartSymbol()) // symbol
+ // .writeShortLE(len)
+ // .writeBytes(Utils.reverse(uniquenoBytes)) // uniqueno
+ // .writeIntLE((int) (System.currentTimeMillis() / 1000)) // timestamp
+ // .writeByte(pac.getHeader().getProtocolType().getCode()) // type
+ // .writeBytes(bodyBytes) // body
+ // .writeShort(pac.getValidCode()) // valid
+ //;
pac.setValidCode(ValidUtil.calculateValidByteFromBuff(out));
out.resetReaderIndex();
@@ -75,7 +67,7 @@
if (systemProperties.isPrintPacLog()){
- log.info("Agv [{}] 涓嬭 [{}] >>> {}", uniqueNo, pac.getHeader().getProtocolType().getDes(), ByteBufUtil.hexDump(out).toUpperCase());
+ //log.info("Agv [{}] 涓嬭 [{}] >>> {}", uniqueNo, pac.getHeader().getProtocolType().getDes(), ByteBufUtil.hexDump(out).toUpperCase());
}
}
--
Gitblit v1.9.1