From 145de2dcd3124f236e7d06bcdee17c7be08048b1 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期一, 11 十一月 2024 18:34:13 +0800
Subject: [PATCH] 修改搜索按照index索引

---
 HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Bean/AppliancesInfo.java |   85 ++++++++++++++++++++++++------------------
 1 files changed, 49 insertions(+), 36 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 1568fae..701cacc 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
@@ -18,37 +18,23 @@
     private int stateCommand;//璇诲彇鐘舵�佺爜
     private int stateBackCommand;//璇诲彇鐘舵�佽繑鍥炵爜
     private int channelNum;//鍥炶矾鍙�
+    private int deviceIndex;//搴忓垪鍙�
     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;
@@ -106,6 +92,22 @@
         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() {
         return littleType;
     }
@@ -128,6 +130,14 @@
 
     public void setChannelNum(int channelNum) {
         this.channelNum = channelNum;
+    }
+
+    public int getDeviceIndex() {
+        return deviceIndex;
+    }
+
+    public void setDeviceIndex(int deviceIndex) {
+        this.deviceIndex = deviceIndex;
     }
 
     public String getRemarks() {
@@ -194,22 +204,21 @@
         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() {
-        if (deviceKey == null) {
-            deviceKey = "K" + this.bigType
-                    + "-" + this.littleType
-                    + "-" + this.deviceSubnetID
-                    + "-" + this.deviceDeviceID
-                    + "-" + this.channelNum;
-        }
+        deviceKey = this.bigType
+                + "-" + this.littleType
+                + "-" + this.deviceSubnetID
+                + "-" + this.deviceDeviceID
+                + "-" + this.channelNum;
+
         return deviceKey;
     }
 
@@ -228,17 +237,21 @@
                 ", stateCommand=" + stateCommand +
                 ", stateBackCommand=" + stateBackCommand +
                 ", channelNum=" + channelNum +
+                ", deviceIndex=" + deviceIndex +
                 ", 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 + '\'' +
+                ", isGetDeviceStateSuccess=" + isGetDeviceStateSuccess +
                 '}';
     }
 }

--
Gitblit v1.8.0