From 42fd1a3b7711b2287b70f9799963468702227234 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Thu, 13 Jul 2023 19:27:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E7=9A=84=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
index bd62201..18cccf8 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
@@ -25,7 +25,7 @@ public interface OpcDeviceDriver extends DeviceDriver {
 
         //设备扩展表【acs_device_extra】
         WQLObject extraTab = WQLObject.getWQLObject("acs_device_extra");
-        JSONArray arr = extraTab.query("filed_type='02' and device_id = '" + this.getDevice().getDevice_id() + "'").getResultJSONArray(0);
+        JSONArray arr = extraTab.query(" (filed_type='02' or filed_type='03' )and device_id = '" + this.getDevice().getDevice_id() + "'").getResultJSONArray(0);
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
             OpcItemDto dto = new OpcItemDto();