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

更新

Browse Source
This commit is contained in:
gengby
2022-11-22 11:04:58 +08:00
parent b6fd4ac69e
commit 6ffe2ecd21
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -1123,7 +1123,14 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
"false".equalsIgnoreCase(json.getString("extra_value"))) { "false".equalsIgnoreCase(json.getString("extra_value"))) {
extraObj.put(json.getString("extra_code"), json.getBoolean("extra_value")); extraObj.put(json.getString("extra_code"), json.getBoolean("extra_value"));
} else { } else {
extraObj.put(json.getString("extra_code"), json.get("extra_value")); boolean endsWith = json.getString("extra_value").endsWith("]");
boolean startsWith = json.getString("extra_value").startsWith("[");
if (endsWith && startsWith){
JSONArray extraValue = JSONArray.parseArray(json.getString("extra_value"));
extraObj.put(json.getString("extra_code"), extraValue);
} else {
extraObj.put(json.getString("extra_code"), json.get("extra_value"));
}
} }
} }

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

@@ -90,7 +90,6 @@ public class MaGangConveyorDeviceDriver extends AbstractOpcDeviceDriver implemen
int flag; int flag;
String device_code; String device_code;
@Override @Override
@@ -111,7 +110,7 @@ public class MaGangConveyorDeviceDriver extends AbstractOpcDeviceDriver implemen
action = this.itemProtocol.getItem_action(); action = this.itemProtocol.getItem_action();
error = this.itemProtocol.getItem_error(); error = this.itemProtocol.getItem_error();
if (mode != last_mode) { if (mode != last_mode) {
if (mode == 3){ if (mode == 3) {
this.setRequireSucess(false); this.setRequireSucess(false);
} }
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
@@ -150,7 +149,7 @@ public class MaGangConveyorDeviceDriver extends AbstractOpcDeviceDriver implemen
message = ""; message = "";
Instruction instruction = null; Instruction instruction = null;
List toInstructions; List toInstructions;
if (mode == 3 && !requireSucess){ if (mode == 3 && !requireSucess) {
instruction_require(); instruction_require();
} }
} }
@@ -174,21 +173,21 @@ public class MaGangConveyorDeviceDriver extends AbstractOpcDeviceDriver implemen
for (int i = 0; i < link_device_codes.size(); i++) { for (int i = 0; i < link_device_codes.size(); i++) {
String link_device_code = link_device_codes.get(i); String link_device_code = link_device_codes.get(i);
Device device = deviceAppservice.findDeviceByCode(link_device_code); Device device = deviceAppservice.findDeviceByCode(link_device_code);
if (device.getDeviceDriver() instanceof MaGangConveyorDeviceDriver){ if (device.getDeviceDriver() instanceof MaGangConveyorDeviceDriver) {
maGangConveyorDeviceDriver = (MaGangConveyorDeviceDriver) device.getDeviceDriver(); maGangConveyorDeviceDriver = (MaGangConveyorDeviceDriver) device.getDeviceDriver();
if (maGangConveyorDeviceDriver.getMove() == 0){ if (maGangConveyorDeviceDriver.getMove() == 0) {
next_device_code = link_device_code; next_device_code = link_device_code;
break; break;
} }
} }
} }
if (StrUtil.isEmpty(next_device_code)){ if (StrUtil.isEmpty(next_device_code)) {
return false; return false;
} }
TaskDto taskDto = new TaskDto(); TaskDto taskDto = new TaskDto();
String now = DateUtil.now(); String now = DateUtil.now();
taskDto.setTask_id(IdUtil.simpleUUID()); taskDto.setTask_id(IdUtil.simpleUUID());
taskDto.setTask_code(CodeUtil.getNewCode("TASK_NO")); taskDto.setTask_code("-" + CodeUtil.getNewCode("TASK_NO"));
taskDto.setTask_type("1"); taskDto.setTask_type("1");
taskDto.setRoute_plan_code("normal"); taskDto.setRoute_plan_code("normal");
taskDto.setTask_status("0"); taskDto.setTask_status("0");