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

rev:优化异常分切行架任务排序

Browse Source
This commit is contained in:
tuqiang
2024-06-27 18:48:41 +08:00
parent 97a3bb970a
commit 8762465bba
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -403,41 +403,39 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
TaskDto task = null; TaskDto task = null;
for (int i = 0; i < getDeviceCodeList.size(); i++) { for (int i = 0; i < getDeviceCodeList.size(); i++) {
String startDeviceCode = getDeviceCodeList.get(i); String startDeviceCode = getDeviceCodeList.get(i);
List<TaskDto> taskDtos = taskserver.queryTaskByDeviceCodeAndStatus(startDeviceCode); List<TaskDto> taskDtos = taskserver.queryTaskByDeviceCodeAndStatus2(startDeviceCode);
if (ObjectUtil.isNotEmpty(taskDtos)) { if (ObjectUtil.isNotEmpty(taskDtos)) {
//按照优先级排序 优先级相等按照创建时间排序 //按照创建时间排序
taskDtos = this.sortTask(taskDtos); List<TaskDto> taskDtoStream = taskDtos.stream().sorted(Comparator.comparing(TaskDto::getCreate_time)).collect(Collectors.toList());
TaskDto taskDto = taskDtos.get(0); if (ObjectUtil.isNotEmpty(taskDtoStream)) {
truss_type = taskDto.getTruss_type(); TaskDto taskDto = taskDtoStream.get(0);
//查询任务是行架任务 this.executeReadyInst(taskDto);
if (!StrUtil.equals(taskDto.getTask_type(), "6")) {
taskDto = null;
continue;
} }
flag = this.executeReadyInst(taskDto);
} else { } else {
List<TaskDto> taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); List<TaskDto> taskDtoList = taskserver.findByTrappedManipulatorReady();
if (ObjectUtil.isNotEmpty(taskDtoList)) { if (ObjectUtil.isNotEmpty(taskDtoList)) {
//按照优先级排序 优先级相等按照创建时间排序 List<TaskDto> taskDtosReady = new ArrayList<>();
taskDtoList = this.sortTask(taskDtoList); for (TaskDto taskDto1 : taskDtoList) {
for (int j = 0; j < taskDtoList.size(); j++) { if (getDeviceCodeList.contains(taskDto1.getStart_device_code())) {
task = taskDtoList.get(j); taskDtosReady.add(taskDto1);
// 6 行架任务
if (ObjectUtil.isNotEmpty(task) && !StrUtil.equals(task.getTask_type(), "6")) {
task = null;
continue;
} }
if (ObjectUtil.isNotEmpty(task)) break;
} }
//按照优先级排序 优先级相等按照创建时间排序
taskDtosReady = this.sortTask(taskDtosReady);
task = taskDtosReady.get(0);
}
if (!ObjectUtil.isEmpty(task)) {
break;
} }
} }
} }
if (!ObjectUtil.isEmpty(task)) { if (!ObjectUtil.isEmpty(task)) {
flag = this.executeReadyTask(task); this.executeReadyTask(task);
} else {
notCreateInstMessage = "universal_notCreateInstMessage";
} }
return true;
} }
return flag;
} }
//执行已有就绪指令 //执行已有就绪指令