From 4fe7ea4fbdc0c45f14d1d8de77e3424f826ba909 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 28 六月 2024 21:39:12 +0800
Subject: [PATCH] 1、靳总协议上行数据处理修改完善; 2、上行数据处理任务修改完善.
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java
index b90809d..704df8c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java
@@ -2,20 +2,20 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3CAnd65Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* @Author liurunyu
- * @Date 2024/01/13 10:40
- * @LastEditTime 2024/01/13 10:40
+ * @Date 2024/4/10 18:42
+ * @LastEditTime 2024/4/10 18:42
* @Description
*/
@AnnotationCodeUp(ifAny={
CodeV1_0_1.cd_65
})
-@SuppressWarnings("unused")
public class Cd_65_Up implements CodeParse {
private static final Logger log = LogManager.getLogger(Cd_65_Up.class);
@@ -58,18 +58,10 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
- DataCd65Vo cdData = new DataCd65Vo() ;
- dV1.dataCd65Vo = cdData ;
- short index = ProtocolConstantV206V1_0_0.dataIndex ;
- String ip1 = "" + ByteUtilUnsigned.byte2Byte(bs, index++) ;
- String ip2 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
- String ip3 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
- String ip4 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
-
- cdData.ip = ip1 + "." + ip2 + "." + ip3 + "." + ip4 ;
-
- String port = "" +ByteUtilUnsigned.bytes2Short_LE(bs, index++) ;
- cdData.port = Integer.parseInt(port) ;
+ DataCd3CAnd65Vo cdData = new DataCd3CAnd65Vo() ;
+ dV1.subData = cdData ;
+ int minute = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
+ cdData.minute =minute ;
}
}
--
Gitblit v1.8.0