数据运维修改

src/main/java/com/jz/dmp/azkaban/dao/ExecutionFlowsMapper.java

@@ -37,4 +37,8 @@ public interface ExecutionFlowsMapper {
      * @since 2021-02-03
      */
     List<Map> queryExamplesLogByExecId(String execId) throws Exception;
+
+    Map<String, Object> queryTaskInstanceStatus() throws Exception;
+
+    List<Map> queryLastStatus(@Param("taskName") String[] taskName) throws Exception;
 }

src/main/java/com/jz/dmp/modules/controller/dataOperation/DmpDevTaskController.java

@@ -3,6 +3,7 @@ package com.jz.dmp.modules.controller.dataOperation;
 import com.jz.common.constant.JsonResult;
 import com.jz.common.constant.ResultCode;
 import com.jz.common.page.PageInfoResponse;
+import com.jz.dmp.modules.controller.DataIntegration.bean.ConflictCheckReq;
 import com.jz.dmp.modules.controller.DataIntegration.bean.RealTimeSyncListDto;
 import com.jz.dmp.modules.controller.DataIntegration.bean.RealTimeSyncListReq;
 import com.jz.dmp.modules.controller.dataOperation.bean.DataDevTaskListDto;
@@ -74,4 +75,28 @@ public class DmpDevTaskController {
         JsonResult list = dmpDevelopTaskService.runTaskByTaskId(taskId);
         return list;
     }
+
+    /**
+     * 运维大屏--获取任务状态
+     *
+     * @return
+     * @author Bellamy
+     * @since 2021-02-22
+     */
+    @ApiOperation(value = "运维大屏--重点关注任务状态", notes = "重点关注")
+    @PostMapping(value = "/getTaskStatus")
+    public JsonResult getTaskStatus(@RequestParam String projectId) throws Exception {
+        if (StringUtils.isEmpty(projectId)) {
+            return new JsonResult(ResultCode.PARAMS_ERROR, "projectId不能为空！");
+        }
+        JsonResult result = new JsonResult();
+        try {
+            result = dmpDevelopTaskService.getTaskStatus(projectId);
+        } catch (Exception e) {
+            result.setMessage(e.getMessage());
+            result.setCode(ResultCode.INTERNAL_SERVER_ERROR);
+            e.printStackTrace();
+        }
+        return result;
+    }
 }

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

@@ -44,6 +44,9 @@ public class DataDevTaskListReq extends BasePageBean {
     @ApiModelProperty(value = "任务类型")
     private String taskType;
 
+    @ApiModelProperty(value = "最后执行状态")
+    private String status;
+
     public String getProjectId() {
         return projectId;
     }
@@ -75,4 +78,12 @@ public class DataDevTaskListReq extends BasePageBean {
     public void setTaskType(String taskType) {
         this.taskType = taskType;
     }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

src/main/java/com/jz/dmp/modules/controller/dataService/bean/AuthApiListReq.java

@@ -18,12 +18,16 @@ import java.io.Serializable;
 @ApiModel("授权api列表请求对象")
 public class AuthApiListReq extends BasePageBean implements Serializable {
 
-    @ApiModelProperty(value = "文件夹id", required = false)
+    @ApiModelProperty(value = "文件夹id",required = false)
     private Long fileId;
-    @ApiModelProperty(value = "组织编码", required = false)
+    @ApiModelProperty(value = "文件来源:,1 API制做,2 组织创建",required = false)
+    private String fileSource;
+    @ApiModelProperty(value = "组织编码",required = false)
     private String orgCode;
-    @ApiModelProperty(value = "组织名称", required = false)
+    @ApiModelProperty(value = "组织名称",required = false)
     private String orgName;
-    @ApiModelProperty(value = "api名称", required = false)
+    @ApiModelProperty(value = "api名称",required = false)
     private String apiName;
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
 }

src/main/java/com/jz/dmp/modules/controller/dataService/bean/OrganizationManageListQueryReq.java

@@ -30,4 +30,7 @@ public class OrganizationManageListQueryReq extends BasePageBean implements Seri
     @ApiModelProperty(value = "文件夹id")
     private String fileId;
 
+    @ApiModelProperty(value = "工程id")
+    private Long projectId;
+
 }

src/main/java/com/jz/dmp/modules/dao/DmpRealtimeSyncInfoDao.java

@@ -195,4 +195,13 @@ public interface DmpRealtimeSyncInfoDao {
      * @since 2021-02-02
      */
     int insertRealtimeHistory(DmpRealtimeTaskHistory taskHistory) throws Exception;
+
+    /**
+     * 获取实时任务状态
+     *
+     * @return
+     * @author Bellamy
+     * @since 2021-02-02
+     */
+    Map<String, Object> queryTaskStatus(String projectId) throws Exception;
 }
\ No newline at end of file

src/main/java/com/jz/dmp/modules/service/DmpDevelopTaskService.java

@@ -174,4 +174,13 @@ public interface DmpDevelopTaskService {
      * @since 2021-02-03
      */
     JsonResult queryExamplesLogByExecId(String execId) throws Exception;
+
+	/**
+	 * 运维大屏--获取任务状态
+	 *
+	 * @return
+	 * @author Bellamy
+	 * @since 2021-02-22
+	 */
+	JsonResult getTaskStatus(String projectId) throws Exception;
 }
\ No newline at end of file

src/main/resources/application-test.yml

 # 测试环境配置
 server:
-  port: 7181
+  port: 7183
   #contextPath: /resource
 
 management:
-  port: 54001
+  port: 54003
   health:
     mail:
       enabled: false

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

@@ -546,4 +546,17 @@
             #{item}
         </foreach>
     </update>
+
+    <!--实时任务状态-->
+    <select id="queryTaskStatus" resultType="java.util.Map" parameterType="string">
+        select
+            sum(case when t1.status='FAILED' then 1 else 0 end) failed,
+            sum(case when t1.status='RUNNING' then 1 else 0 end) running,
+            sum(case when t1.status='PAUSED' then 1 else 0 end) paused
+        from
+        dmp_realtime_sync_info t1
+        inner join dmp_navigation_tree t2 on t1.tree_id=t2.id
+        where 1=1 and t1.data_status='1' and t2.data_status='1'
+        and t1.project_id =#{projectId}
+    </select>
 </mapper>
\ No newline at end of file