OCT
REM: 1. 删除定时器时间日志打印 2. 任务管理器定时器更改为500ms执行 3. 修正启动任务响应消息缺少设备id字段
This commit is contained in:
parent
591c6f8561
commit
00c1c8d09e
|
@ -111,7 +111,12 @@ public class DisposeTaskController {
|
||||||
|
|
||||||
MReturnType<ErrorCode, Long> ret = taskService.createTask(task);
|
MReturnType<ErrorCode, Long> ret = taskService.createTask(task);
|
||||||
|
|
||||||
rspInfo.setTaskId(String.valueOf(ret.getSecondParam()));
|
if (ret.getFirstParam() == ErrorCode.ERR_OK) {
|
||||||
|
TaskInfoDetail tf = taskCacheManager.getTaskById(ret.getSecondParam());
|
||||||
|
rspInfo.setId(String.valueOf(tf.getDeviceId()));
|
||||||
|
rspInfo.setTaskId(String.valueOf(ret.getSecondParam()));
|
||||||
|
}
|
||||||
|
|
||||||
rspInfo.setStatus(ret.getFirstParam().getCode());
|
rspInfo.setStatus(ret.getFirstParam().getCode());
|
||||||
rspInfo.setMessage(ret.getFirstParam().getMsg());
|
rspInfo.setMessage(ret.getFirstParam().getMsg());
|
||||||
|
|
||||||
|
|
|
@ -324,8 +324,6 @@ public class TaskServiceImpl implements TaskService {
|
||||||
LocalDateTime lt = LocalDateTime.parse(task.getPlanEndTime(),
|
LocalDateTime lt = LocalDateTime.parse(task.getPlanEndTime(),
|
||||||
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
||||||
|
|
||||||
log.info(lt.toString());
|
|
||||||
|
|
||||||
return LocalDateTime.parse(task.getPlanEndTime(),
|
return LocalDateTime.parse(task.getPlanEndTime(),
|
||||||
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
|
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
|
||||||
.isBefore(LocalDateTime.now());
|
.isBefore(LocalDateTime.now());
|
||||||
|
|
|
@ -35,7 +35,7 @@ public class TaskManagerTask {
|
||||||
* Task runtime manager.
|
* Task runtime manager.
|
||||||
*/
|
*/
|
||||||
@Async("bizExecutor")
|
@Async("bizExecutor")
|
||||||
@Scheduled(fixedDelay = 5000)
|
@Scheduled(fixedDelay = 500)
|
||||||
public void taskRuntimeManager() {
|
public void taskRuntimeManager() {
|
||||||
Iterator it = taskCacheManager.getAllTask().iterator();
|
Iterator it = taskCacheManager.getAllTask().iterator();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue