From 80d2948aae6140db6cb7fde97d3ef8cc859144ab Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 十一月 2023 14:36:56 +0800
Subject: [PATCH] 行政区划编码最大值改为999,农户编码改为字符串型

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java
index a005b72..d11f570 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java
@@ -4,11 +4,10 @@
 
 	/**
 	 * 瀵逛笂绾挎暟鎹繘琛屽垎鏋� 
-	 * @param aepImei 鐢典俊骞冲彴浼犳潵鐨処MEI鍙�
 	 * @param upBuf 涓婅鏁版嵁
 	 * @return OnLineResult
 	 */
-	OnLineResult parse(String aepImei, byte[] upBuf)throws Exception ;
+	OnLineResult parse(byte[] upBuf)throws Exception ;
 	
 	/**
 	 * 鍒嗘瀽缁撴灉
@@ -18,19 +17,17 @@
 		public int result ;//鍒嗘瀽缁撴灉
 		public String protocolName ;//鍗忚鍚嶇О
 		public String rtuAddr ;//IMEI鍙�
-		public String meterNo ;//姘磋〃鍙�
 		public byte[] remoteData;//闇�瑕佸悜Rtu鍥炲啓鐨勬暟鎹�
 		public OnLineResult(){
 			result = OnLineAction_fail ;
 			rtuAddr = null ;
-			meterNo = null ;
 			remoteData = null ;
 		}
 	}
 	
-	public static final int OnLineAction_fail = 0; //鍒嗘瀽涓婄嚎鏁版嵁澶辫触锛屽鎻愪緵鐨勬暟鎹负null绛夊師鍥�  
-	public static final int OnLineAction_success = 1; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟鑳藉緱鍒癐MEI鍙� 
-	public static final int OnLineAction_success_noMe = 2; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛岃瘑鍒嚭涓嶆槸鏈崗璁暟鎹� 
-	public static final int OnLineAction_success_response = 3; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟闇�瑕佸悜Rtu鍥炲啓鏁版嵁
+	int OnLineAction_fail = 0; //鍒嗘瀽涓婄嚎鏁版嵁澶辫触锛屽鎻愪緵鐨勬暟鎹负null绛夊師鍥�
+	int OnLineAction_success = 1; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟鑳藉緱鍒癐MEI鍙�
+	int OnLineAction_success_noMe = 2; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛岃瘑鍒嚭涓嶆槸鏈崗璁暟鎹�
+	int OnLineAction_success_response = 3; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟闇�瑕佸悜Rtu鍥炲啓鏁版嵁
 	
 }

--
Gitblit v1.8.0