Browse Source

0603

master
zy_Java 5 years ago
parent
commit
3d2cc4fcc0
  1. 2
      tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
  2. 1
      tall/src/main/java/com/ccsens/tall/web/ChartController.java
  3. 2
      tall/src/main/resources/mapper_dao/SysOperationDao.xml

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

@ -338,6 +338,8 @@ public class TaskSubTimeService implements ITaskSubTimeService {
throw new BaseException("任务信息不正确"); throw new BaseException("任务信息不正确");
} }
// } // }
}else{
detail.setLevel((byte) 1);
} }
if(ObjectUtil.isNotNull(addTask.getBeginTime())){ if(ObjectUtil.isNotNull(addTask.getBeginTime())){
detail.setBeginTime(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 = "") @ApiOperation(value = "任务执行者分布图",notes = "")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "类型 0按任务数量返回 1按任务时长返回(分钟)", required = true, paramType = "query"),
}) })
@RequestMapping(value = "/executor", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/executor", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ChartVo.ExecutorChart> getTasksByTaskId(HttpServletRequest request, public JsonResponse<ChartVo.ExecutorChart> getTasksByTaskId(HttpServletRequest request,

2
tall/src/main/resources/mapper_dao/SysOperationDao.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.tall.persist.dao.SysOperationDao" xmlns:c="http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ccsens.tall.persist.dao.SysOperationDao">
<resultMap id="MessageQuery" type="com.ccsens.tall.bean.vo.ProjectMessageVo$Query"> <resultMap id="MessageQuery" type="com.ccsens.tall.bean.vo.ProjectMessageVo$Query">
<result column="id" jdbcType="BIGINT" property="id"></result> <result column="id" jdbcType="BIGINT" property="id"></result>

Loading…
Cancel
Save