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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-09-15 14:47:08 +08:00
parent 88ebe9a426
commit 0adcccf20b
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -184,6 +184,20 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications);
} }
if (mode == 2 && move != 0 && task > 0) {
//inst_message
inst = instructionService.findByCodeFromCache(String.valueOf(task));
if (inst != null) {
if (StrUtil.equals(inst.getInstruction_status(), "1") && StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) {
finish_instruction();
}
if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) {
inst.setInstruction_status("1");
instructionService.update(inst);
}
}
}
} catch (Exception var17) { } catch (Exception var17) {
return; return;
} }
@@ -662,6 +676,11 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
ReadUtil.write(itemMap, server); ReadUtil.write(itemMap, server);
} }
public synchronized boolean finish_instruction() throws Exception {
instructionService.finish(inst);
return true;
}
public synchronized void OpenOrClose(String type) { public synchronized void OpenOrClose(String type) {
//进入区域 //进入区域