From 3d2cc4fcc0d610bfdf0c20cdb5cd576fa4c9759d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 3 Jun 2020 11:22:47 +0800 Subject: [PATCH] 0603 --- .../main/java/com/ccsens/tall/service/TaskSubTimeService.java | 2 ++ tall/src/main/java/com/ccsens/tall/web/ChartController.java | 1 + tall/src/main/resources/mapper_dao/SysOperationDao.xml | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java index 9739562e..ecf315ed 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java +++ b/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()); diff --git a/tall/src/main/java/com/ccsens/tall/web/ChartController.java b/tall/src/main/java/com/ccsens/tall/web/ChartController.java index 822bb1ef..93ee7293 100644 --- a/tall/src/main/java/com/ccsens/tall/web/ChartController.java +++ b/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 getTasksByTaskId(HttpServletRequest request, diff --git a/tall/src/main/resources/mapper_dao/SysOperationDao.xml b/tall/src/main/resources/mapper_dao/SysOperationDao.xml index e46180fa..019b8203 100644 --- a/tall/src/main/resources/mapper_dao/SysOperationDao.xml +++ b/tall/src/main/resources/mapper_dao/SysOperationDao.xml @@ -1,6 +1,6 @@ - +