root/nd_hh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/lyd/nd_hh

Browse Source
This commit is contained in:
周俊杰
2024-02-27 16:17:52 +08:00
parent 4548e7cce2 68fb54daf1
commit e939972a81
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerService.java
View File

@@ -1,5 +1,5 @@
package org.nl.acs.opc; package org.nl.acs.opc;
import org.nl.acs.device_driver.driver.ItemValue;
import org.openscada.opc.lib.da.Group; import org.openscada.opc.lib.da.Group;
/** /**

1
acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java
View File

@@ -5,6 +5,7 @@ import org.jinterop.dcom.common.JIException;
import org.nl.acs.auto.initial.ApplicationAutoInitial; import org.nl.acs.auto.initial.ApplicationAutoInitial;
import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.exception.WDKException; import org.nl.modules.wql.exception.WDKException;
import org.nl.acs.device_driver.driver.ItemValue;
import org.openscada.opc.lib.common.NotConnectedException; import org.openscada.opc.lib.common.NotConnectedException;
import org.openscada.opc.lib.da.Group; import org.openscada.opc.lib.da.Group;
import org.openscada.opc.lib.da.Server; import org.openscada.opc.lib.da.Server;

2
acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java
View File

@@ -8,7 +8,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.exception.WDKException; import org.nl.modules.wql.exception.WDKException;
import org.openscada.opc.lib.common.ConnectionInformation; import org.openscada.opc.lib.common.ConnectionInformation;
import org.openscada.opc.lib.da.*; import org.openscada.opc.lib.da.*;
import org.nl.acs.device_driver.driver.ItemValue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;