From 3087ff4ccc174d5952e9650ac3fae61eff477554 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期一, 01 四月 2024 10:42:55 +0800 Subject: [PATCH] 修改 流量计实体增加监测站ID外键和驼峰命名 流量计监测站绑定接口(同步修改流量计的监测站ID外键 和 绑定记录表) 流量计监测站解绑接口(同步修改流量计的监测站ID外键 和 绑定记录表) 条件查询监测站(绑定状态判定) 条件查询已绑定的流量计 回退误修改的获取绑定记录 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 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..746e926 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 ; /** * 鍒嗘瀽缁撴灉 @@ -17,20 +16,18 @@ class OnLineResult{ public int result ;//鍒嗘瀽缁撴灉 public String protocolName ;//鍗忚鍚嶇О - public String rtuAddr ;//IMEI鍙� - public String meterNo ;//姘磋〃鍙� + public String rtuAddr ;//Rtu鍦板潃 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; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟鑳藉緱鍒癛tu鍦板潃 + int OnLineAction_success_noMe = 2; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛岃瘑鍒嚭涓嶆槸鏈崗璁暟鎹� + int OnLineAction_success_response = 3; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟闇�瑕佸悜Rtu鍥炲啓鏁版嵁 } -- Gitblit v1.8.0