Skip to content

J
jz-dmp-service
Commit 684e1560 authored by sml's avatar sml
Browse files
Options

Merge branch 'dmp_dev' of http://gitlab.ioubuy.cn/yaobenzhang/jz-dmp-service.git into dmp_dev

parents f9939759 14910f3f
Show whitespace changes
Inline Side-by-side
Showing with 485 additions and 126 deletions
src/main/java/com/jz/common/enums/FlowInstanceEnum.java
View file @ 684e1560
......@@ -8,7 +8,7 @@ package com.jz.common.enums;
*/
public enum FlowInstanceEnum {
/**
* 运行
* 运行中
*/
running("running", "30"),
......@@ -19,6 +19,9 @@ public enum FlowInstanceEnum {
kill("kill", "60"),
/**
* 失败
*/
failed("failed", "70"),
;
......
src/main/java/com/jz/common/utils/web/HttpClientUtils.java
View file @ 684e1560
......@@ -172,6 +172,7 @@ public class HttpClientUtils {
HttpEntity resEntity = response.getEntity();
if (resEntity != null) {
result = EntityUtils.toString(resEntity, charset);
LOGGER.info("response results{}" + result);
}
}
} catch (Exception ex) {
......
src/main/java/com/jz/dmp/azkaban/dao/ExecutionFlowsMapper.java
View file @ 684e1560
......@@ -40,5 +40,30 @@ public interface ExecutionFlowsMapper {
Map<String, Object> queryTaskInstanceStatus() throws Exception;
/**
* 查询业务流程任务，最后一个执行实例的状态
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
List<Map> queryLastStatus(@Param("taskName") String[] taskName, @Param("status") String status) throws Exception;
/**
* 根据24小时查询运行成功或未运行的实例数量
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
Map<String, Object> getTaskStatus(@Param("timeParam") String timeParam, @Param("taskStatus") String taskStatus, @Param("taskName") String[] taskName) throws Exception;
/**
* 查询实例存在的天数
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
Long queryDaysNumber(@Param("taskStatus") String taskStatus, @Param("taskName") String[] taskName) throws Exception;
}
src/main/java/com/jz/dmp/modules/controller/dataOperation/DmpDevTaskController.java
View file @ 684e1560
......@@ -11,6 +11,7 @@ import com.jz.dmp.modules.controller.dataOperation.bean.DataDevTaskListReq;
import com.jz.dmp.modules.service.DmpDevelopTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -70,7 +71,7 @@ public class DmpDevTaskController {
@ApiImplicitParam(name = "taskId", value = "任务id")
public JsonResult runTaskByTaskId(@RequestParam(value = "taskId") String taskId) throws Exception {
if (StringUtils.isEmpty(taskId)) {
return new JsonResult(ResultCode.PARAMS_ERROR,"任务id不能为空！");
return new JsonResult(ResultCode.PARAMS_ERROR, "任务id不能为空！");
}
JsonResult list = dmpDevelopTaskService.runTaskByTaskId(taskId);
return list;
......@@ -93,7 +94,84 @@ public class DmpDevTaskController {
try {
result = dmpDevelopTaskService.getTaskStatus(projectId);
} catch (Exception e) {
result.setMessage(e.getMessage());
result.setMessage("failed!");
result.setCode(ResultCode.INTERNAL_SERVER_ERROR);
e.printStackTrace();
}
return result;
}
/**
* 运维大屏--任务完成情况
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
@ApiOperation(value = "运维大屏--任务完成情况", notes = "运维大屏--任务完成情况")
@GetMapping(value = "/getTaskStatusByHours")
@ApiImplicitParams({@ApiImplicitParam(name = "projectId", value = "projectId", required = true),
@ApiImplicitParam(name = "taskStatus", value = "50:运行成功，70：未运行", required = true)})
public JsonResult getTaskStatusByHours(@RequestParam String projectId, @RequestParam String taskStatus) throws Exception {
if (StringUtils.isEmpty(projectId)) {
return new JsonResult(ResultCode.PARAMS_ERROR, "projectId不能为空！");
}
JsonResult result = new JsonResult();
try {
result = dmpDevelopTaskService.getTaskStatusByHours(projectId, taskStatus);
} catch (Exception e) {
result.setMessage("failed");
result.setCode(ResultCode.INTERNAL_SERVER_ERROR);
e.printStackTrace();
}
return result;
}
/**
* 获取 SLA
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
@ApiOperation(value = "获取 SLA", notes = "获取 SLA")
@GetMapping(value = "/getSlaInfo")
@ApiImplicitParams({@ApiImplicitParam(name = "scheduleId", value = "scheduleId", required = true),
@ApiImplicitParam(name = "projectId", value = "projectId", required = true)})
public JsonResult getSlaInfo(@RequestParam String scheduleId, @RequestParam String projectId) throws Exception {
if (StringUtils.isEmpty(scheduleId)) {
return new JsonResult(ResultCode.PARAMS_ERROR, "scheduleId不能为空！");
}
JsonResult result = new JsonResult();
try {
result = dmpDevelopTaskService.getSlaInfo(scheduleId,projectId);
} catch (Exception e) {
result.setMessage("failed");
result.setCode(ResultCode.INTERNAL_SERVER_ERROR);
e.printStackTrace();
}
return result;
}
/**
* 获取 flowId/任务名称
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
@ApiOperation(value = "设置SLA--获取flowId/任务名称", notes = "获取flowId/任务名称")
@GetMapping(value = "/getTaskFlowId")
@ApiImplicitParam(name = "projectId", value = "projectId", required = true)
public JsonResult getTaskFlowId(@RequestParam String projectId) throws Exception {
if (StringUtils.isEmpty(projectId)) {
return new JsonResult(ResultCode.PARAMS_ERROR, "projectId不能为空！");
}
JsonResult result = new JsonResult();
try {
result = dmpDevelopTaskService.getTaskFlowId(projectId);
} catch (Exception e) {
result.setMessage("failed");
result.setCode(ResultCode.INTERNAL_SERVER_ERROR);
e.printStackTrace();
}
......
src/main/java/com/jz/dmp/modules/controller/dataOperation/bean/DataDevTaskListDto.java
View file @ 684e1560
......@@ -87,6 +87,9 @@ public class DataDevTaskListDto {
@ApiModelProperty(value = "任务类型")
private String type;
@ApiModelProperty(value = "scheduleId")
private String scheduleId;
public String getStatus() {
return status;
}
......@@ -182,4 +185,12 @@ public class DataDevTaskListDto {
public void setTreeId(String treeId) {
this.treeId = treeId;
}
public String getScheduleId() {
return scheduleId;
}
public void setScheduleId(String scheduleId) {
this.scheduleId = scheduleId;
}
}
src/main/java/com/jz/dmp/modules/dao/DmpNavigationTreeDao.java
View file @ 684e1560
......@@ -122,4 +122,13 @@ public interface DmpNavigationTreeDao {
* @Date 2021/02/03
*/
int deleteByTreeId(Map params) throws Exception;
/**
* 获取 flowId/任务名称
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
List<Map> queryTaskFlowId(String projectId) throws Exception;
}
\ No newline at end of file
src/main/java/com/jz/dmp/modules/service/DmpDevelopTaskService.java
View file @ 684e1560
......@@ -49,108 +49,116 @@ public interface DmpDevelopTaskService {
*/
PageInfoResponse<DataDevExamplesListDto> queryDevExamplesListPage(DataDevExamplesListReq req) throws Exception;
/**条件分頁查询所有任务开发
/**
* 条件分頁查询所有任务开发
*
* @param dmpDevelopTaskRequest
* @param httpRequest
* @return
* @throws Exception
*/
public com.jz.common.bean.PageInfoResponse<DmpDevelopTaskDto> findListWithPage(DmpDevelopTaskRequest dmpDevelopTaskRequest, HttpServletRequest httpRequest)throws Exception;
public com.jz.common.bean.PageInfoResponse<DmpDevelopTaskDto> findListWithPage(DmpDevelopTaskRequest dmpDevelopTaskRequest, HttpServletRequest httpRequest) throws Exception;
/**
* @Title: getConfigFileNameNotSuffix4Published
* @Description: TODO(根据treeId取得最新版提交的同步脚本文件名（不含后缀）及版本信息)
* @param @param treeId
* @param @return
* @param @throws Exception 参数
* @return String 返回类型
* @throws
* @Title: getConfigFileNameNotSuffix4Published
* @Description: TODO(根据treeId取得最新版提交的同步脚本文件名 （ 不含后缀 ） 及版本信息)
*/
public String getConfigFileNameNotSuffix4Published(Long treeId)throws Exception;
public String getConfigFileNameNotSuffix4Published(Long treeId) throws Exception;
/**新增开发任务
/**
* 新增开发任务
*
* @param dmpDevelopTask
* @param httpRequest
* @return
* @throws Exception
*/
public BaseBeanResponse<DmpDevelopTask> add(DmpDevelopTask dmpDevelopTask, HttpServletRequest httpRequest)throws Exception;
public BaseBeanResponse<DmpDevelopTask> add(DmpDevelopTask dmpDevelopTask, HttpServletRequest httpRequest) throws Exception;
/**树ID查询任务开发
/**
* 树ID查询任务开发
*
* @param treeId
* @param httpRequest
* @return
* @throws Exception
*/
public BaseBeanResponse<DmpDevelopTaskDto> findByTreeId(Integer treeId, HttpServletRequest httpRequest)throws Exception;
public BaseBeanResponse<DmpDevelopTaskDto> findByTreeId(Integer treeId, HttpServletRequest httpRequest) throws Exception;
/**修改任务开发
/**
* 修改任务开发
*
* @param dmpDevelopTask
* @param httpRequest
* @return
* @throws Exception
*/
public BaseBeanResponse<DmpDevelopTask> edit(DmpDevelopTask dmpDevelopTask, HttpServletRequest httpRequest)throws Exception;
public BaseBeanResponse<DmpDevelopTask> edit(DmpDevelopTask dmpDevelopTask, HttpServletRequest httpRequest) throws Exception;
/**
* @Title: flowSubmit
* @Description: TODO(任务流程发布到azkaban)
* @param @param treeId
* @param @param httpRequest
* @param @return
* @param @throws Exception 参数
* @return BaseResponse 返回类型
* @throws
* @Title: flowSubmit
* @Description: TODO(任务流程发布到azkaban)
*/
public BaseResponse flowSubmit(Long treeId, HttpServletRequest httpRequest)throws Exception;
public BaseResponse flowSubmit(Long treeId, HttpServletRequest httpRequest) throws Exception;
/**
* @Title: taskAzkabanRun
* @Description: TODO(运行任务)
* @param @param treeId
* @param @param httpRequest
* @param @return
* @param @throws Exception 参数
* @return BaseResponse 返回类型
* @throws
* @Title: taskAzkabanRun
* @Description: TODO(运行任务)
*/
public BaseResponse taskAzkabanRun(Long treeId, HttpServletRequest httpRequest)throws Exception;
public BaseResponse taskAzkabanRun(Long treeId, HttpServletRequest httpRequest) throws Exception;
/**
* @Title: taskAzkabanStop
* @Description: TODO(停止任务)
* @param @param treeId
* @param @param httpRequest
* @param @return 参数
* @return BaseBeanResponse<String> 返回类型
* @throws
* @Title: taskAzkabanStop
* @Description: TODO(停止任务)
*/
public BaseBeanResponse<String> taskAzkabanStop(Long treeId, HttpServletRequest httpRequest)throws Exception;
public BaseBeanResponse<String> taskAzkabanStop(Long treeId, HttpServletRequest httpRequest) throws Exception;
/**
* @Title: taskPublish
* @Description: TODO(SHELL/SQL发布接口)
* @param @param treeId
* @param @param httpRequest
* @param @return
* @param @throws Exception 参数
* @return BaseResponse 返回类型
* @throws
* @Title: taskPublish
* @Description: TODO(SHELL / SQL发布接口)
*/
public BaseResponse taskPublish(Long treeId, HttpServletRequest httpRequest)throws Exception;
public BaseResponse taskPublish(Long treeId, HttpServletRequest httpRequest) throws Exception;
/**
* @Title: softDeleteByTreeId
* @Description: TODO(软删除任务)
* @param @param treeId
* @param @param httpRequest
* @param @return
* @param @throws Exception 参数
* @return BaseResponse 返回类型
* @throws
* @Title: softDeleteByTreeId
* @Description: TODO(软删除任务)
*/
public BaseResponse softDeleteByTreeId(Integer treeId, HttpServletRequest httpRequest)throws Exception;
public BaseResponse softDeleteByTreeId(Integer treeId, HttpServletRequest httpRequest) throws Exception;
/**
* @param @param syncTaskTreeId
......@@ -180,6 +188,7 @@ public interface DmpDevelopTaskService {
* @since 2021-02-22
*/
JsonResult getTaskStatus(String projectId) throws Exception;
/**
* 设置SLA
*
......@@ -188,4 +197,31 @@ public interface DmpDevelopTaskService {
* @since 2021-02-03
*/
JsonResult setSla(SetSlaReq req) throws Exception;
/**
* 运维大屏--任务完成情况
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
JsonResult getTaskStatusByHours(String projectId, String taskStatus) throws Exception;
/**
* 获取 SLA
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
JsonResult getSlaInfo(String scheduleId, String projectId) throws Exception;
/**
* 获取 flowId/任务名称
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
JsonResult getTaskFlowId(String projectId) throws Exception;
}
\ No newline at end of file
src/main/java/com/jz/dmp/modules/service/impl/DmpDevelopTaskServiceImpl.java
View file @ 684e1560
package com.jz.dmp.modules.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.github.pagehelper.Page;
......@@ -17,6 +18,7 @@ import com.jz.common.enums.ModuleLogEnum;
import com.jz.common.page.PageInfoResponse;
import com.jz.common.persistence.BaseService;
import com.jz.common.utils.*;
import com.jz.common.utils.web.HttpClientUtils;
import com.jz.common.utils.web.XmlUtils;
import com.jz.dmp.agent.DmpAgentResult;
import com.jz.dmp.azkaban.dao.ExecutionFlowsMapper;
......@@ -44,6 +46,7 @@ import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Pattern;
......@@ -774,8 +777,12 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
*/
@Override
public PageInfoResponse<DataDevTaskListDto> queryDevTaskListPage(DataDevTaskListReq req) throws Exception {
PageInfoResponse<DataDevTaskListDto> pageInfoResponse = new PageInfoResponse<>();
DmpProjectSystemInfo publishToProjectSystemInfo = dmpProjectDao.queryProjectSystemInfo(Long.valueOf(req.getProjectId()));
//调用azkaban服务
String azkabanApiUrl = publishToProjectSystemInfo.getAzkabanMonitorUrl();
AzkabanApiUtils2 azkabanApiUtils = new AzkabanApiUtils2(azkabanApiUrl, redisTemplate);
PageInfoResponse<DataDevTaskListDto> pageInfoResponse = new PageInfoResponse<>();
if (StringUtils.isNotBlank(req.getTreeIdOrName())) {
//判断是否为整数 是整数返回true,否则返回false
......@@ -784,7 +791,7 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
req.setTaskId(req.getTreeIdOrName()); //id
req.setTreeIdOrName(null);
} else {
req.setTreeIdOrName(req.getTreeIdOrName().trim());//节点名称
req.setTreeIdOrName(req.getTreeIdOrName().trim());//任务名称
}
}
if (StringUtils.isNotBlank(req.getStatus())) {
......@@ -812,11 +819,38 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
}
//查询实例最后执行状态
List<Map> flowList = executionFlowsMapper.queryLastStatus(taskName.substring(1).split(","), req.getStatus());
for (Map strFlow : flowList) {
String projectId = String.valueOf(strFlow.get("projectId"));
String flowId = String.valueOf(strFlow.get("taskName"));
//获取调度配置
Map responseData = (Map) JSONObject.parse(azkabanApiUtils.getSchedule(projectId, flowId));
if (responseData != null && responseData.size() > 0) {
Map schedule = (Map) responseData.get("schedule");
strFlow.put("scheduleId", schedule.get("scheduleId"));
strFlow.put("cronExpression", schedule.get("cronExpression")); //调度周期
//获取sla 是否已配置 状态
if (null == schedule.get("scheduleId")) {
strFlow.put("slaStatus", "N");
} else {
JsonResult jsonResult = getSlaInfo(String.valueOf(schedule.get("scheduleId")), "");
Map s = (Map) jsonResult.getData();
if (s.size() > 0 && s != null) {
strFlow.put("slaStatus", "Y");
}
}
}
}
if (flowList.size() > 0 && flowList != null) {
for (DataDevTaskListDto str : listObj) {
for (Map strFlow : flowList) {
if (str.getTaskName().equals(strFlow.get("taskName"))) {
str.setStatus(String.valueOf(strFlow.get("status")));
str.setStatus(String.valueOf(strFlow.get("status"))); //实例执行最后状态
if (null != strFlow.get("cronExpression")) { //调度周期
str.setSchedulinCycle(String.valueOf(strFlow.get("cronExpression")));
}
if (null != strFlow.get("scheduleId")) {
str.setScheduleId(String.valueOf(strFlow.get("scheduleId")));
}
}
}
}
......@@ -1646,7 +1680,102 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
String azkabanApiUrl = publishToProjectSystemInfo.getAzkabanMonitorUrl();
AzkabanApiUtils2 azkabanApiUtils = new AzkabanApiUtils2(azkabanApiUrl, redisTemplate);
azkabanApiUtils.saveSla(req);
return null;
return JsonResult.ok();
}
/**
* 运维大屏--任务完成情况
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
@Override
public JsonResult getTaskStatusByHours(String projectId, String taskStatus) throws Exception {
Map param = new HashMap();
param.put("projectId", projectId);
String taskName = "";
List<DataDevTaskListDto> list = dmpDevelopTaskDao.queryTaskTreeInfo(param);
for (DataDevTaskListDto str : list) {
taskName += "," + str.getTaskName();
}
String[] taskNames = taskName.substring(1).split(",");
String nowTime = DateUtils.currentDate(); //今天
String yesterdayTime = DateUtils.getYesterdayStr(); //昨天
List<String> nowList = new ArrayList<>();
Map<String, Object> nowData = executionFlowsMapper.getTaskStatus(nowTime, taskStatus, taskNames);
if (nowData == null || nowData.size() == 0) {
for (int i = 0; i < 24; i++) {
nowList.add("0");
}
} else {
for (Map.Entry<String, Object> entry : nowData.entrySet()) {
nowList.add(String.valueOf(entry.getValue()));
}
}
List<String> yesterdayList = new ArrayList<>();
Map<String, Object> yesterdayData = executionFlowsMapper.getTaskStatus(yesterdayTime, taskStatus, taskNames);
if (yesterdayData == null || yesterdayData.size() == 0) {
for (int i = 0; i < 24; i++) {
yesterdayList.add("0");
}
} else {
for (Map.Entry<String, Object> entry : yesterdayData.entrySet()) {
yesterdayList.add(String.valueOf(entry.getValue()));
}
}
List<String> historyAvgList = new ArrayList<>();
Map<String, Object> historyAvgData = executionFlowsMapper.getTaskStatus("", taskStatus, taskNames);
Long dayNum = executionFlowsMapper.queryDaysNumber(taskStatus, taskNames);
if (historyAvgData == null || historyAvgData.size() == 0) {
for (int i = 0; i < 24; i++) {
historyAvgList.add("0");
}
} else {
for (Map.Entry<String, Object> entry : historyAvgData.entrySet()) {
BigDecimal taskNum = new BigDecimal(String.valueOf(entry.getValue()));
BigDecimal dayNumStr = new BigDecimal(dayNum);
historyAvgList.add(String.valueOf(taskNum.divide(dayNumStr, 2, BigDecimal.ROUND_HALF_UP)));
}
}
Map returnData = new HashMap();
returnData.put("nowData", nowList);
returnData.put("yesterdayData", yesterdayList);
returnData.put("historyAvgData", historyAvgList);
return JsonResult.ok(returnData);
}
/**
* 获取 SLA
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
@Override
public JsonResult getSlaInfo(String scheduleId, String projectId) throws Exception {
DmpProjectSystemInfo publishToProjectSystemInfo = dmpProjectDao.queryProjectSystemInfo(Long.valueOf(projectId));
//调用azkaban服务
String azkabanApiUrl = publishToProjectSystemInfo.getAzkabanMonitorUrl();
AzkabanApiUtils2 azkabanApiUtils = new AzkabanApiUtils2(azkabanApiUrl, redisTemplate);
return JsonResult.ok(JSONObject.parse(azkabanApiUtils.getSlaInfo(scheduleId)));
}
/**
* 获取 flowId/任务名称
*
* @return
* @author Bellamy
* @since 2021-03-08
*/
@Override
public JsonResult getTaskFlowId(String projectId) throws Exception {
List<Map> list = dmpNavigationTreeDao.queryTaskFlowId(projectId);
return JsonResult.ok(list);
}
}
\ No newline at end of file
src/main/resources/azkabanmapper/ExecutionFlowsMapper.xml
View file @ 684e1560
......@@ -221,9 +221,12 @@
FROM execution_flows
)t
</select>
<!--查询业务流程任务，最后一个执行实例的状态-->
<select id="queryLastStatus" resultType="java.util.Map">
SELECT
exec_id AS execId,
project_id as projectId,
flow_id AS taskName,
max(from_unixtime( submit_time / 1000, '%Y-%m-%d %H:%i:%s' )) AS startTime,
(case when status='30' then '运行中' when status='50' then '成功' when status='70' then '失败' end) status
......@@ -231,11 +234,64 @@
execution_flows
WHERE 1 = 1
<if test="status != null and status !='' ">and status=#{status}</if>
<include refid="flowIdSql"/>
group by flow_id
</select>
<!--根据24小时查询运行成功或未运行的实例数量-->
<select id="getTaskStatus" resultType="java.util.LinkedHashMap">
select
sum(case when t.timeHour='0' then 1 else 0 end) zero,
sum(case when t.timeHour='1' then 1 else 0 end) one,
sum(case when t.timeHour='2' then 1 else 0 end) Two,
sum(case when t.timeHour='3' then 1 else 0 end) three,
sum(case when t.timeHour='4' then 1 else 0 end) four,
sum(case when t.timeHour='5' then 1 else 0 end) five,
sum(case when t.timeHour='6' then 1 else 0 end) six,
sum(case when t.timeHour='7' then 1 else 0 end) seven,
sum(case when t.timeHour='8' then 1 else 0 end) eight,
sum(case when t.timeHour='9' then 1 else 0 end) nine,
sum(case when t.timeHour='10' then 1 else 0 end) ten,
sum(case when t.timeHour='11' then 1 else 0 end) eleven,
sum(case when t.timeHour='12' then 1 else 0 end) twelve,
sum(case when t.timeHour='13' then 1 else 0 end) thirteen,
sum(case when t.timeHour='14' then 1 else 0 end) fourteen,
sum(case when t.timeHour='15' then 1 else 0 end) fifteen,
sum(case when t.timeHour='16' then 1 else 0 end) sixteen,
sum(case when t.timeHour='17' then 1 else 0 end) seventeen,
sum(case when t.timeHour='18' then 1 else 0 end) eighteen,
sum(case when t.timeHour='19' then 1 else 0 end) nineteen,
sum(case when t.timeHour='20' then 1 else 0 end) twenty,
sum(case when t.timeHour='21' then 1 else 0 end) twentyOne,
sum(case when t.timeHour='22' then 1 else 0 end) twentyTwo,
sum(case when t.timeHour='23' then 1 else 0 end) twentyThree
from(
select
hour(from_unixtime( submit_time / 1000, '%Y-%m-%d %H:%i:%s' )) as timeHour,
from_unixtime( submit_time / 1000, '%Y-%m-%d %H:%i:%s' )
from
execution_flows
where 1=1 and status=#{taskStatus}
<if test="timeParam !=null and timeParam !='' ">and from_unixtime( submit_time / 1000, '%Y-%m-%d' ) = #{timeParam}</if>
<include refid="flowIdSql"/>
) t
</select>
<sql id="flowIdSql">
and flow_id in
<foreach collection="taskName" item="item" open="(" separator="," close=")">
#{item}
</foreach>
group by flow_id
</sql>
<!--查询实例存在的天数-->
<select id="queryDaysNumber" resultType="java.lang.Long">
select
count(distinct from_unixtime( submit_time / 1000, '%Y-%m-%d' )) dayNum
from
execution_flows
where 1=1 and status=#{taskStatus}
<include refid="flowIdSql"/>
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/dmp/DmpNavigationTreeMapper.xml
View file @ 684e1560
......@@ -308,4 +308,15 @@
and t1.parent_id = #{parentId}
</select>
<select id="queryTaskFlowId" resultType="java.util.Map">
SELECT
id,
name
FROM
dmp_navigation_tree
WHERE
1 = 1 AND DATA_STATUS = '1' AND IS_LEVEL = '1' AND type != '02'
and project_id = #{projectId}
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment