From 22acc39ce207d951c6dcadbcb1cc68e27059d595 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 17:19:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 26 +++++++++-----------------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java | 3 +++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java | 1 -
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java | 4 ++++
4 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
index 7966f6f..a212efb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
@@ -52,7 +52,6 @@
bs[0] = (byte)(Integer.parseInt(cdData.getControllerType(), 16));
bs[1] = cdData.projectNo.byteValue() ;
bs[2] = 0x01 ;//01:鎴愬姛 81:澶辫触
- //GlCreate.createTp(bs, 2) ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
}else{
throw new Exception("涓嬭鍛戒护鍙傛暟鎹负null") ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
index ac82316..e689d31 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
@@ -114,6 +114,9 @@
}
index++ ;
+ cdData.orderNo = ByteUtil.BCD2String_BE(bs, index, index + 7) ;
+
+ index += 8 ;
GlParse.parseRtuDt(bs, index);
index+= 6 ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index d2ac976..17e4e73 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -114,18 +114,16 @@
ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
- //浠ヤ笅鍐欐硶鑷劧涔熸槸BCD
- bs[index + 4] = (byte)((DateTime.week_Int().byteValue() << 5 | Byte.parseByte(DateTime.MM()))) ;
- ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
- /*
- bs[index] = Byte.parseByte(DateTime.ss()) ;
- bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
- bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
- bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
- bs[index + 4] = (byte)(DateTime.week_Int().byteValue() << 5 | Byte.parseByte(DateTime.MM())) ;
- bs[index + 5] = Byte.parseByte(DateTime.yy()) ;
- */
+ byte week = DateTime.week_Int().byteValue() ;
+ byte month = Byte.parseByte(DateTime.MM()) ;
+ if(month < 10){
+ bs[index + 4] = (byte)((week << 5) | month) ;
+ }else{
+ bs[index + 4] = (byte)((week << 5) | 0x10 | (month - 10)) ;
+ }
+
+ ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
}
public static void createS2D(byte[] bs, int index) throws Exception {
@@ -133,12 +131,6 @@
ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
- /*
- bs[index] = Byte.parseByte(DateTime.ss()) ;
- bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
- bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
- bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
- */
}
public static void createLen(byte[] bsNoTail) throws Exception {
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
index 8cebaa7..f3142ac 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
@@ -8,6 +8,7 @@
public String controllerType ;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
public Integer projectNo ;//椤圭洰缂栧彿:
+ public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
public Byte opType1 ;//鎿嶄綔鏂瑰紡锛�0:鍒峰崱寮�姘存车/闃�闂紱1:杩滅▼寮�姘存车/闃�闂紱2:APP寮�姘存车/闃�闂�
public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴
public Boolean success ;//鎵ц缁撴灉锛坱rue鎴愬姛, false澶辫触锛�
@@ -28,6 +29,9 @@
sb.append(" 椤圭洰缂栧彿 : ") ;
sb.append(projectNo == null?"鏈煡":projectNo) ;
sb.append("\n") ;
+ sb.append(" 璁㈠崟鍙� : ") ;
+ sb.append(orderNo == null?"鏈煡":orderNo) ;
+ sb.append("\n") ;
sb.append(" 鎿嶄綔鏂瑰紡 : ") ;
sb.append(opType1 == null?"鏈煡":(opType1.byteValue()==0?"鍒峰崱":(opType1.byteValue()==1?"杩滅▼":(opType1.byteValue()==2?"App":"鏈煡")))) ;
sb.append("\n") ;
--
Gitblit v1.8.0