From d6670149331bbdeda4b0573927c13d36225a09c1 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 04 十二月 2023 15:52:08 +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/Driver.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Driver.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Driver.java index 9f29d8c..4b607f3 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Driver.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Driver.java @@ -142,7 +142,7 @@ return codeParse ; } /** - * 瑙ｆ瀽鐢典俊骞冲彴涓婅鏁版嵁 + * 瑙ｆ瀽涓婅鏁版嵁 * @param isLowPower 鏄惁鍦ㄤ綆鍔熻�楃幆澧冧笅杩愯 * @param rtuAddr 鎺у埗鍣ㄥ湴鍧� * @param upBuffer 瀛楄妭鏁扮粍 @@ -151,6 +151,18 @@ * @return MidResult[] */ public abstract MidResult[] parseData(Boolean isLowPower, String rtuAddr, byte[] upBuffer, String upHex, DriverParserDataCallback callback, Object... params) ; + /** + * 瑙ｆ瀽鐢典俊骞冲彴涓婅鏁版嵁 + * @param isLowPower 鏄惁鍦ㄤ綆鍔熻�楃幆澧冧笅杩愯 + * @param rtuAddr 鎺у埗鍣ㄥ湴鍧� + * @param productId 鐢典俊骞冲彴浜у搧ID锛屽綋涓嶅湪鐢典俊骞冲彴涓繍琛屾椂锛屼负null + * @param deviceId 鐢典俊骞冲彴璁惧ID锛屽綋涓嶅湪鐢典俊骞冲彴涓繍琛屾椂锛屼负null + * @param upBuffer 瀛楄妭鏁扮粍 + * @param upHex 瀛楄妭鏁扮粍16杩涘埗褰㈠紡 + * @param callback 鍥炶皟 + * @return MidResult[] + */ + public abstract MidResult[] parseData(Boolean isLowPower, String rtuAddr, Integer productId, String deviceId, byte[] upBuffer, String upHex, DriverParserDataCallback callback, Object... params) ; /** * 鏋勯�犱笅琛屾暟鎹紙鍛戒护锛� -- Gitblit v1.8.0