|
|
@@ -40,16 +40,15 @@ public class TaskController {
|
|
|
@PostMapping("/taskStatus")
|
|
|
public ResultData taskStatus(@RequestBody @Validated DtoTaskStatus dto) {
|
|
|
log.info("controller,任务状态下发,请求参数:{}", JSONUtil.toJsonStr(dto));
|
|
|
- if (!taskService.isTaskEnd()) {
|
|
|
- taskService.resourceOccupied(dto);
|
|
|
- return ResultData.fail("任已开始,请勿重复提交");
|
|
|
- }
|
|
|
boolean result = taskService.saveTaskToRedis(dto.getRedisMapping());
|
|
|
if (!result) {
|
|
|
return ResultData.fail("任务状态保存失败");
|
|
|
}
|
|
|
if (dto.getStatus() == 1) {
|
|
|
taskCollectService.stopReported();
|
|
|
+ } else if (taskService.isTaskRunning()) {
|
|
|
+ taskService.resourceOccupied(dto);
|
|
|
+ return ResultData.fail("任务已开始,请勿重复提交");
|
|
|
}
|
|
|
// 异步处理开始上报状态数据( 1、查询 2、上报 )
|
|
|
taskService.reported(TaskEnum.TaskInstanceId, ReportedTypeFactory.ReportedStatus.class, dto);
|