From 76d5cfc674f9b1033baafbe3ac71f06ed001f289 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 07 三月 2024 10:49:27 +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 | 18 +++---------------
1 files changed, 3 insertions(+), 15 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 b3efc80..a541bc8 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
@@ -113,7 +113,7 @@
}
if(clazz != null){
//codeParse = clazz.newInstance() ;
- codeParse = clazz.getDeclaredConstructor(CodeParse.class).newInstance();
+ codeParse = clazz.getDeclaredConstructor().newInstance();
upCode2ClassInstance.put(code, codeParse) ;
}
}
@@ -135,14 +135,14 @@
}
if(clazz != null){
//codeParse = clazz.newInstance() ;
- codeParse = clazz.getDeclaredConstructor(CodeParse.class).newInstance();
+ codeParse = clazz.getDeclaredConstructor().newInstance();
downCode2ClassInstance.put(code, codeParse) ;
}
}
return codeParse ;
}
/**
- * 瑙ｆ瀽涓婅鏁版嵁
+ * 瑙ｆ瀽RTU涓婅鏁版嵁
* @param isLowPower 鏄惁鍦ㄤ綆鍔熻�楃幆澧冧笅杩愯
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @param upBuffer 瀛楄妭鏁扮粍
@@ -151,18 +151,6 @@
* @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