From 071a8328823a2861f93ce556a4da3e4119cab1a3 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期四, 19 九月 2024 16:24:28 +0800
Subject: [PATCH] 完成金茂定制功能
---
HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java | 69 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java
index 63dd7a8..928d154 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java
@@ -20,35 +20,20 @@
private int channelNum;//鍥炶矾鍙�
private int deviceSubnetID;//璁惧瀛愮綉鍙�
private int deviceDeviceID;//璁惧鍙�
+ private int sourceSubnetID;//婧愬瓙缃戝彿
+ private int sourceDeviceID;//婧愯澶囧彿
private Object curState;//褰撳墠鐘舵��
private String remarks;//澶囨敞
private String parentRemarks;//妯″潡澶囨敞
private byte[] arrCurState;//鐘舵�佸弽棣堣褰曟暟鎹�
private int deviceType;//璁惧绫诲瀷
- // private int port;
-// private String ipAddress;
+
private LogicMode logicMode;//閫昏緫妯″潡鐗规湁
private int physicsChannelNum;//RCU 鐏厜鐗规湁
-// private byte[] feedbackState;//鐘舵�佸弽棣堣褰曟暟鎹� 20190729鏂板
private int intCurState;
private String deviceKey;
-
-// public int getPort() {
-// return port;
-// }
-//
-// public void setPort(int port) {
-// this.port = port;
-// }
-//
-// public String getIpAddress() {
-// return ipAddress;
-// }
-//
-// public void setIpAddress(String ipAddress) {
-// this.ipAddress = ipAddress;
-// }
+ private boolean isGetDeviceStateSuccess;
public int getDeviceType() {
return deviceType;
@@ -104,6 +89,22 @@
public void setDeviceDeviceID(int deviceDeviceID) {
this.deviceDeviceID = deviceDeviceID;
+ }
+
+ public int getSourceSubnetID() {
+ return sourceSubnetID;
+ }
+
+ public void setSourceSubnetID(int sourceSubnetID) {
+ this.sourceSubnetID = sourceSubnetID;
+ }
+
+ public int getSourceDeviceID() {
+ return sourceDeviceID;
+ }
+
+ public void setSourceDeviceID(int sourceDeviceID) {
+ this.sourceDeviceID = sourceDeviceID;
}
public int getLittleType() {
@@ -194,13 +195,13 @@
this.intCurState = intCurState;
}
-// public byte[] getFeedbackState() {
-// return feedbackState;
-// }
-//
-// public void setFeedbackState(byte[] feedbackState) {
-// this.feedbackState = feedbackState;
-// }
+ public boolean isGetDeviceStateSuccess() {
+ return isGetDeviceStateSuccess;
+ }
+
+ public void setGetDeviceStateSuccess(boolean getDeviceStateSuccess) {
+ isGetDeviceStateSuccess = getDeviceStateSuccess;
+ }
public String getDeviceKey() {
deviceKey = this.bigType
@@ -222,22 +223,24 @@
"deviceName='" + deviceName + '\'' +
", bigType=" + bigType +
", littleType=" + littleType +
- ", ctrlCommand=" + Integer.toHexString(ctrlCommand) +
- ", ctrlBackCommand=" + Integer.toHexString(ctrlBackCommand) +
- ", stateCommand=" + Integer.toHexString(stateCommand) +
- ", stateBackCommand=" + Integer.toHexString(stateBackCommand) +
+ ", ctrlCommand=" + ctrlCommand +
+ ", ctrlBackCommand=" + ctrlBackCommand +
+ ", stateCommand=" + stateCommand +
+ ", stateBackCommand=" + stateBackCommand +
", channelNum=" + channelNum +
", deviceSubnetID=" + deviceSubnetID +
", deviceDeviceID=" + deviceDeviceID +
+ ", sourceSubnetID=" + sourceSubnetID +
+ ", sourceDeviceID=" + sourceDeviceID +
", curState=" + curState +
", remarks='" + remarks + '\'' +
", parentRemarks='" + parentRemarks + '\'' +
-// ", arrCurState=" + Arrays.toString(arrCurState) +
+ ", arrCurState=" + Arrays.toString(arrCurState) +
", deviceType=" + deviceType +
-// ", port=" + port +
-// ", ipAddress='" + ipAddress + '\'' +
", logicMode=" + logicMode +
", physicsChannelNum=" + physicsChannelNum +
+ ", intCurState=" + intCurState +
+ ", deviceKey='" + deviceKey + '\'' +
'}';
}
}
--
Gitblit v1.8.0