no message

src/main/java/com/jz/dmp/modules/controller/dataOperation/bean/DataDevExamplesListDto.java

@@ -20,6 +20,12 @@ public class DataDevExamplesListDto {
     @ApiModelProperty(value = "任务ID")
     private String taskId;
 
+    /*
+     * 执行实例ID
+     * */
+    @ApiModelProperty(value = "执行实例ID")
+    private String execId;
+
     /*
      * 基本信息（任务名称）
      * */
@@ -74,8 +80,6 @@ public class DataDevExamplesListDto {
     @ApiModelProperty(value = "结束时间")
     private String endTime;
 
-    private String execId;
-
     private String flowData;
 
     /*

src/main/java/com/jz/dmp/modules/controller/dataOperation/bean/DataDevExamplesListReq.java

+package com.jz.dmp.modules.controller.dataOperation.bean;
+
+
+import com.jz.common.page.BasePageBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName: DataDevExamplesListReq
+ * @Description: 数据运维-数据开发实例列表请求参数
+ * @Author：Bellamy
+ * @Date 2021/01/14
+ * @Version 1.0
+ */
+@ApiModel(value = "数据运维-数据开发实例列表请求参数", description = "数据开发实例列表请求参数")
+public class DataDevExamplesListReq extends BasePageBean {
+
+    /*
+     * 项目id
+     * */
+    @ApiModelProperty(value = "项目id")
+    @NotNull(message = "项目id不能为空")
+    @NotEmpty(message = "项目ID不能空")
+    private String projectId;
+
+    /*
+     * 任务名称
+     * */
+    @ApiModelProperty(value = "任务名称")
+    private String treeName;
+
+    /*
+     * 业务日期
+     * */
+    @ApiModelProperty(value = "业务日期(时间范围)")
+    private String businessTime;
+
+    /*
+     * 业务日期类型
+     * */
+    @ApiModelProperty(value = "业务日期类型:01 昨天，02 前天，03 全部")
+    private String creTimeType;
+
+    /*
+     * 业务日期
+     * */
+    private String startTime;
+
+    /*
+     * 业务日期
+     * */
+    private String endTime;
+
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getTreeName() {
+        return treeName;
+    }
+
+    public void setTreeName(String treeName) {
+        this.treeName = treeName;
+    }
+
+    public String getCreTimeType() {
+        return creTimeType;
+    }
+
+    public void setCreTimeType(String creTimeType) {
+        this.creTimeType = creTimeType;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getBusinessTime() {
+        return businessTime;
+    }
+
+    public void setBusinessTime(String businessTime) {
+        this.businessTime = businessTime;
+    }
+}

src/main/java/com/jz/dmp/modules/controller/dataOperation/bean/DataDevTaskListDto.java

@@ -3,6 +3,7 @@ package com.jz.dmp.modules.controller.dataOperation.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.htrace.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * @ClassName: DataDevTaskListDto
@@ -73,6 +74,12 @@ public class DataDevTaskListDto {
      * */
     @ApiModelProperty(value = "通知")
     private String notice;
+    /*
+     * 任务类型
+     * */
+    @JsonIgnore
+    @ApiModelProperty(value = "任务类型")
+    private String type;
 
     public String getStatus() {
         return status;
@@ -153,4 +160,12 @@ public class DataDevTaskListDto {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

src/main/java/com/jz/dmp/modules/service/impl/DmpDevelopTaskServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.regex.Pattern;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.jcraft.jsch.MAC;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -953,11 +954,25 @@ public class DmpDevelopTaskServiceImpl implements DmpDevelopTaskService {
     @Override
     public PageInfoResponse<DataDevExamplesListDto> queryDevExamplesListPage(DataDevExamplesListReq req) throws Exception {
         PageInfoResponse<DataDevExamplesListDto> pageInfoResponse = new PageInfoResponse<>();
-        Map saveParams = new HashMap();
+
+        String taskName = ""; //任务名称
+        //查询离线任务信息
+        Map params = new HashMap();
+        params.put("projectId", req.getProjectId());
         if (StringUtils.isNotBlank(req.getTreeName())) {
-            saveParams.put("taskName", req.getTreeName());
+            params.put("taskName", req.getTreeName().trim());
+        }
+        List<DataDevTaskListDto> treeList = dmpDevelopTaskDao.queryTaskTreeInfo(params);
+        if (treeList.size() > 0 && treeList != null) {
+            for (DataDevTaskListDto treeDto : treeList) {
+                if (StringUtils.isNotBlank(treeDto.getTaskName())) {
+                    taskName += "," + treeDto.getTaskName();
                 }
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(req.getBusinessTime())) {
+            }
+            //通过任务名称，去查询开发实例
+            PageHelper.startPage(req.getPageNum(), req.getPageSize());
+            Map saveParams = new HashMap();
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(req.getBusinessTime())) { //业务时间范围
                 String[] cretime = req.getBusinessTime().split("-");
                 saveParams.put("startTime", cretime[0].trim() + " 00:00:00");
                 saveParams.put("endTime", cretime[1].trim() + " 23:59:59");
@@ -974,48 +989,26 @@ public class DmpDevelopTaskServiceImpl implements DmpDevelopTaskService {
             } else {
                 //默认当天日期
                 saveParams.put("businessTime", DateUtils.currentDate());
-        }
-        String taskName = "";
-        PageHelper.startPage(req.getPageNum(), req.getPageSize());
-
-        Map params = new HashMap();
-        params.put("projectId", req.getProjectId());
-        //
-        List<DataDevTaskListDto> treeList = dmpDevelopTaskDao.queryTaskTreeInfo(params);
-        if (treeList.size() > 0 && treeList != null) {
-            for (DataDevTaskListDto treeDto : treeList) {
-                if (StringUtils.isNotBlank(treeDto.getTaskName())) {
-                    taskName += "," + treeDto.getTaskName();
-                }
-            }
+                //saveParams.put("businessTime", "2021-01-07");
             }
             saveParams.put("taskName", taskName.substring(1).split(","));
             List<DataDevExamplesListDto> list = executionFlowsMapper.queryDevExamplesListPage(saveParams);
-
-
-        /*List<DataDevExamplesListDto> list = executionFlowsMapper.queryDevExamplesListPage(req);
             if (list.size() > 0) {
+                for (DataDevTaskListDto treeDto : treeList) {
                     for (DataDevExamplesListDto dto : list) {
-                if (StringUtils.isNotBlank(dto.getTaskName())) {
-                    taskName += "," + dto.getTaskName();
+                        if (treeDto.getTaskName().equals(dto.getTaskName())) {
+                            dto.setTaskType(treeDto.getType());
+                            dto.setRunTime(dto.getRunTime() + "s");
+                            //JsonMapper.fromJsonString(dto.getFlowData(), Map.class);
                         }
                     }
-            Map params = new HashMap();
-            params.put("projectId", req.getProjectId());
-            params.put("taskName", taskName.substring(1).split(","));
-            List<DataDevTaskListDto> treeList = dmpDevelopTaskDao.queryTaskTreeInfo(params);
-            if (treeList.size() > 0 && treeList != null) {
-                for (DataDevTaskListDto treeDto : treeList) {
-                    treeDto.getTaskName();
-
                 }
             }
-        }*/
-
             PageInfo<DataDevExamplesListDto> pageInfo = new PageInfo<>(list);
             pageInfoResponse.setCode(ResultCode.SUCCESS);
             pageInfoResponse.setMessage("查询成功");
             pageInfoResponse.setData(pageInfo);
+        }
         return pageInfoResponse;
     }
 }
\ No newline at end of file

src/main/resources/azkabanmapper/ExecutionFlowsMapper.xml

@@ -182,7 +182,12 @@
            execution_flows
         where 1=1
         <if test="businessTime != null and businessTime != ''"> and from_unixtime(submit_time/1000,'%Y-%m-%d') =#{businessTime} </if>
-        <if test="taskName != null and taskName != ''"> and flow_id like concat('%',#{taskName},'%') </if>
+        <if test="taskName != null and taskName != ''">
+            and flow_id  in
+            <foreach collection="taskName" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="startTime != null and startTime != ''"> and from_unixtime(submit_time/1000,'%Y-%m-%d %H:%i:%s') >=#{startTime} </if>
         <if test="endTime != null and endTime != ''">#{endTime} >= and from_unixtime(submit_time/1000,'%Y-%m-%d %H:%i:%s')</if>
     </select>

src/main/resources/mapper/dmp/DmpDevelopTaskMapper.xml

@@ -190,7 +190,7 @@
         select
             t1.id as treeId,
             t1.name as taskName,
-            t1.type as taskType
+            (case when t1.type='01' then '离线同步' when t1.type='02' then '实时同步' when t1.type='03' then '数据开发' end) as type
         from
         dmp_navigation_tree t1
         left join dmp_develop_task t2 on t2.TREE_ID=t1.ID
@@ -198,12 +198,7 @@
         where 1=1 and t1.type='01'
         and t1.project_id = #{projectId}
         <if test="treeId != null and treeId != ''"> and t1.id =#{treeId} </if>
-        <if test="taskName != null and taskName != ''">
-            and t1.name  in
-            <foreach collection="taskName" item="item" open="(" separator="," close=")">
-            #{item}
-            </foreach>
-        </if>
+        <if test="taskName != null and taskName != ''"> and t1.name like concat('%',#{taskName},'%') </if>
         <if test="taskType != null and taskType!= ''"> and t1.type=#{taskType} </if>
     </select>