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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-22 13:36:12 +08:00
parent 89fb5d375b b4d06c541c
commit c71642a66b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
View File

@@ -83,6 +83,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
private void runOld() { private void runOld() {
OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService .class);
while (true) { while (true) {
start: start:
try { try {
@@ -95,10 +96,10 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
server.disconnect(); server.disconnect();
log.trace("清理server..."); log.trace("清理server...");
} }
this.server = OpcServerUtl.getServerWithOutException(this.OpcServer.getOpc_host(), this.OpcServer.getCls_id(), this.OpcServer.getUser(), this.OpcServer.getPassword(), this.OpcServer.getDomain()); this.server = OpcServerUtl.getServerWithOutException(this.OpcServer.getOpc_host(), this.OpcServer.getCls_id(), this.OpcServer.getUser(), this.OpcServer.getPassword(), this.OpcServer.getDomain());
this.server.addStateListener(this); this.server.addStateListener(this);
group = this.server.addGroup(); group = this.server.addGroup();
// group =opcServerService.getServer(this.getOpcGroupID());
List<String> itemsString = new ArrayList(); List<String> itemsString = new ArrayList();
Iterator var3 = this.protocols.iterator(); Iterator var3 = this.protocols.iterator();