Browse Source

Merge branch 'pt' of https://gitee.com/ccsens_s/ccsenscloud into pt

master
zhizhi wu 5 years ago
parent
commit
1e7d51e06f
  1. 2
      tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
  2. 1
      tall/src/main/java/com/ccsens/tall/web/ChartController.java

2
tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java

@ -338,6 +338,8 @@ public class TaskSubTimeService implements ITaskSubTimeService {
throw new BaseException("任务信息不正确");
}
// }
}else{
detail.setLevel((byte) 1);
}
if(ObjectUtil.isNotNull(addTask.getBeginTime())){
detail.setBeginTime(addTask.getBeginTime());

1
tall/src/main/java/com/ccsens/tall/web/ChartController.java

@ -27,6 +27,7 @@ public class ChartController {
@ApiOperation(value = "任务执行者分布图",notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "类型 0按任务数量返回 1按任务时长返回(分钟)", required = true, paramType = "query"),
})
@RequestMapping(value = "/executor", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ChartVo.ExecutorChart> getTasksByTaskId(HttpServletRequest request,

Loading…
Cancel
Save