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

Merge branch 'master' of http://121.40.234.130:8899/wangs/maGang

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-12-29 16:12:23 +08:00
parent 7b853c0d73 aca615312b
commit a43def8062
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/maGang/MaGangConveyorDeviceDriver.java
View File

@@ -294,7 +294,7 @@ public class MaGangConveyorDeviceDriver extends AbstractOpcDeviceDriver implemen
String opcservcerid = this.getDevice().getOpc_server_id(); String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid); Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>(); Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(param, value); itemMap.put(param, Integer.parseInt(value));
ReadUtil.write(itemMap, server); ReadUtil.write(itemMap, server);
log.info("设备号{},kep点位名称{},下发信号{}", this.getDevice().getDevice_code(), param, value); log.info("设备号{},kep点位名称{},下发信号{}", this.getDevice().getDevice_code(), param, value);
} }

8
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvDeviceStatus.java
View File

@@ -102,10 +102,10 @@ public class QueryXZAgvDeviceStatus {
String kepStatus = String.valueOf(maGangAgvDeviceDriver.getStatus()); String kepStatus = String.valueOf(maGangAgvDeviceDriver.getStatus());
String kepType = String.valueOf(maGangAgvDeviceDriver.getType()); String kepType = String.valueOf(maGangAgvDeviceDriver.getType());
if (!StrUtil.equals(kepStatus, status)) { if (!StrUtil.equals(kepStatus, status)) {
maGangAgvDeviceDriver.writing("status", status); maGangAgvDeviceDriver.writing("status", Integer.parseInt(status));
} }
if (!StrUtil.equals(kepType, task_type)) { if (!StrUtil.equals(kepType, task_type)) {
maGangAgvDeviceDriver.writing("type", task_type); maGangAgvDeviceDriver.writing("type", Integer.parseInt(task_type));
} }
maGangAgvDeviceDriver.writing("x_coordinate", hisFormat.format(x)); maGangAgvDeviceDriver.writing("x_coordinate", hisFormat.format(x));
maGangAgvDeviceDriver.writing("y_coordinate", hisFormat.format(y)); maGangAgvDeviceDriver.writing("y_coordinate", hisFormat.format(y));
@@ -135,7 +135,7 @@ public class QueryXZAgvDeviceStatus {
MaGangLedDeviceDriver maGangLedDeviceDriver; MaGangLedDeviceDriver maGangLedDeviceDriver;
if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) { if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) {
maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver(); maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver();
maGangLedDeviceDriver.writing("D01", "1"); maGangLedDeviceDriver.writing("D01", 1);
} }
} else { } else {
String name = jsonObject.getString("name"); String name = jsonObject.getString("name");
@@ -146,7 +146,7 @@ public class QueryXZAgvDeviceStatus {
MaGangLedDeviceDriver maGangLedDeviceDriver; MaGangLedDeviceDriver maGangLedDeviceDriver;
if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) { if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) {
maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver(); maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver();
maGangLedDeviceDriver.writing("D01", "0"); maGangLedDeviceDriver.writing("D01", 0);
} }
} }
} }