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

opt:1.优化多任务

Browse Source
This commit is contained in:
liejiu946
2025-03-17 14:42:54 +08:00
parent a3e8ebd110
commit c070658254
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nladmin-system/src/main/java/org/nl/agv/service/impl/TaskServiceServiceImpl.java
View File

@@ -320,8 +320,11 @@ public class TaskServiceServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo
} }
} }
try { try {
String clearSchedule = "HMI_Ctrl_Clear_Auto_Mode_Schedule"; //判断是否是终端发起的任务
sendToAgvUtil.send(clearSchedule); if (StringUtils.isBlank(taskName)){
String clearSchedule = "HMI_Ctrl_Clear_Auto_Mode_Schedule";
sendToAgvUtil.send(clearSchedule);
}
String instruct; String instruct;
int seq_num = 1; int seq_num = 1;
String task_status = "00"; String task_status = "00";
@@ -396,7 +399,7 @@ public class TaskServiceServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo
en_task_status_name = getLanguage("Executing", "en"); en_task_status_name = getLanguage("Executing", "en");
zh_task_status_name = getLanguage("Executing", "zh"); zh_task_status_name = getLanguage("Executing", "zh");
}else { }else {
returnjo.put("code", "1"); returnjo.put("code", "0");
returnjo.put("desc", TaskSendBackStatusEnum.getName(resultflag)); returnjo.put("desc", TaskSendBackStatusEnum.getName(resultflag));
return returnjo; return returnjo;
} }
@@ -587,9 +590,11 @@ public class TaskServiceServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo
returnjo.put("code", "0"); returnjo.put("code", "0");
return returnjo; return returnjo;
} }
TaskInfo taskInfo = taskInfoMapper.selectOne( new LambdaQueryWrapper<>(TaskInfo.class) WQLObject taskTable = WQLObject.getWQLObject("ST_TASK_INFO");
.eq(TaskInfo::getTaskCode, taskCode) JSONObject taskInfo = taskTable.query("task_code='" + taskCode + "'").uniqueResult(0);
); // TaskInfo taskInfo = taskInfoMapper.selectOne( new LambdaQueryWrapper<>(TaskInfo.class)
// .eq(TaskInfo::getTaskCode, taskCode)
// );
if (ObjectUtil.isEmpty(taskInfo)){ if (ObjectUtil.isEmpty(taskInfo)){
returnjo.put("result", "未找到任务号对应的任务"); returnjo.put("result", "未找到任务号对应的任务");
returnjo.put("code", "0"); returnjo.put("code", "0");

2
nladmin-system/src/main/resources/config/application.yml
View File

@@ -89,7 +89,7 @@ security:
- /api/users - /api/users
mybatis-plus: mybatis-plus:
configuration: configuration:
map-underscore-to-camel-case: false map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: mapper-locations:
- classpath:org.nl.**.mapper/*.xml - classpath:org.nl.**.mapper/*.xml