no message

src/main/java/com/jz/dmp/modules/controller/DataIntegration/bean/TaskListPageDto.java

@@ -17,81 +17,87 @@ public class TaskListPageDto {
      * taskId
      * */
     @ApiModelProperty(value = "任务taskId")
-    String taskId;
+    private String taskId;
 
     /*
-     * treeId
+     * 节点id
      * */
-    @ApiModelProperty(value = "treeId")
-    String treeId;
+    @ApiModelProperty(value = "节点id")
+    private String treeId;
 
     /*
-     * 任务树名称
+     * 节点名称
      * */
-    @ApiModelProperty(value = "任务树名称")
-    String treeName;
+    @ApiModelProperty(value = "节点名称")
+    private String treeName;
+
+    /*
+     * 创建人
+     * */
+    @ApiModelProperty(value = "创建人")
+    private String createUserId;
 
     /*
      * 同步时间
      * */
     @ApiModelProperty(value = "同步时间")
-    String syncTime;
+    private String syncTime;
 
     /*
      * 同步状态
      * */
     @ApiModelProperty(value = "同步状态")
-    String syncResult;
+    private String syncResult;
     /*
      *校验状态
      * */
     @ApiModelProperty(value = "校验状态")
-    String chkResult;
+    private String chkResult;
     /*
      * 校验时间
      * */
     @ApiModelProperty(value = "校验时间")
-    String chkTime;
+    private String chkTime;
     /*
      * 创建时间
      * */
     @ApiModelProperty(value = "创建时间")
-    String createTime;
+    private String createTime;
     /*
      * 更改时间
      * */
     @ApiModelProperty(value = "更改时间")
-    String updateTime;
+    private String updateTime;
 
     /*
      * 源数据库名称
      * */
     @ApiModelProperty(value = "源数据库名称")
-    String sourceDbName;
+    private String sourceDbName;
 
     /*
      * 源数据库表名称
      * */
     @ApiModelProperty(value = "源数据表名称")
-    String sourceTableName;
+    private String sourceTableName;
 
     /*
      * 目标数据库名称
      * */
     @ApiModelProperty(value = "目标数据库名称")
-    String targetDbName;
+    private String targetDbName;
 
     /*
      * 目标数据库表名称
      * */
     @ApiModelProperty(value = "目标数据表名称")
-    String targetTableName;
+    private String targetTableName;
 
     /*
      * 目标数据库类型
      * */
     @ApiModelProperty(value = "目标数据库类型")
-    String targetDbType;
+    private String targetDbType;
 
     public String getSyncTime() {
         return syncTime;
@@ -204,4 +210,12 @@ public class TaskListPageDto {
     public void setTreeName(String treeName) {
         this.treeName = treeName;
     }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
 }

src/main/java/com/jz/dmp/modules/controller/DataIntegration/bean/TaskListPageReq.java

@@ -27,41 +27,46 @@ public class TaskListPageReq extends BasePageBean {
     private String projectId;
 
     /*
-     * 父类ID
+     * 创建人
      * */
-    //@NotNull(message = "父类ID不能空")
-    @ApiModelProperty(value = "父类ID")
-    private String parentId;
-
-    /*
-     * 源数据库id
-     * */
-    @ApiModelProperty(value = "源数据库id")
-    private String sourceDbId;
-
-    /*
-     * 目标数据库id
-     * */
-    @ApiModelProperty(value = "目标数据库id")
-    private String targetDbId;
-
-    /*
-     * 目标数据库名称
-     * */
-    @ApiModelProperty(value = "目标数据库名称")
-    private String targetDbName;
-
-    /*
-     * 源数据库表名称
-     * */
-    @ApiModelProperty(value = "源数据库表")
-    private String sourceTableName;
-
-    /*
-     * 目标数据库表名称
-     * */
-    @ApiModelProperty(value = "目标数据库表")
-    private String targetTableName;
+    @ApiModelProperty(value = "创建人")
+    private String createUserId;
+
+//    /*
+//     * 父类ID
+//     * */
+//    @ApiModelProperty(value = "父类ID")
+//    private String parentId;
+//
+//    /*
+//     * 源数据库id
+//     * */
+//    @ApiModelProperty(value = "源数据库id")
+//    private String sourceDbId;
+//
+//    /*
+//     * 目标数据库id
+//     * */
+//    @ApiModelProperty(value = "目标数据库id")
+//    private String targetDbId;
+//
+//    /*
+//     * 目标数据库名称
+//     * */
+//    @ApiModelProperty(value = "目标数据库名称")
+//    private String targetDbName;
+//
+//    /*
+//     * 源数据库表名称
+//     * */
+//    @ApiModelProperty(value = "源数据库表")
+//    private String sourceTableName;
+//
+//    /*
+//     * 目标数据库表名称
+//     * */
+//    @ApiModelProperty(value = "目标数据库表")
+//    private String targetTableName;
 
     public String getProjectId() {
         return projectId;
@@ -71,51 +76,11 @@ public class TaskListPageReq extends BasePageBean {
         this.projectId = projectId;
     }
 
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getSourceDbId() {
-        return sourceDbId;
-    }
-
-    public void setSourceDbId(String sourceDbId) {
-        this.sourceDbId = sourceDbId;
-    }
-
-    public String getTargetDbId() {
-        return targetDbId;
-    }
-
-    public void setTargetDbId(String targetDbId) {
-        this.targetDbId = targetDbId;
-    }
-
-    public String getTargetDbName() {
-        return targetDbName;
-    }
-
-    public void setTargetDbName(String targetDbName) {
-        this.targetDbName = targetDbName;
-    }
-
-    public String getSourceTableName() {
-        return sourceTableName;
-    }
-
-    public void setSourceTableName(String sourceTableName) {
-        this.sourceTableName = sourceTableName;
-    }
-
-    public String getTargetTableName() {
-        return targetTableName;
+    public String getCreateUserId() {
+        return createUserId;
     }
 
-    public void setTargetTableName(String targetTableName) {
-        this.targetTableName = targetTableName;
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
     }
 }

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

@@ -28,4 +28,6 @@ public interface OfflineSynchDao {
     Map<String, Object> selectNavigationTreeByTaskId(String taskId) throws Exception;
 
     List<CheckJyRlueStatusDto> selectCheckJyStatusInfo(@Param("executionId") String executionId) throws Exception;
+
+    List<TaskListPageDto> selectOfflineTaskInfo(TaskListPageReq taskListPageReq) throws Exception;
 }
\ No newline at end of file

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

@@ -77,12 +77,8 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
     public PageInfoResponse<TaskListPageDto> queryTaskListPage(TaskListPageReq taskListPageReq) throws Exception {
         PageInfoResponse<TaskListPageDto> pageInfoResponse = new PageInfoResponse<>();
 
-        Map param = new HashMap();
-        //param.put("userId", user.getUserId());
-        //param.put("pageNum", pageBean.getPageNum());
-        //param.put("pageSize", pageBean.getPageSize());
         PageHelper.startPage(taskListPageReq.getPageNum(), taskListPageReq.getPageSize());
-        List<TaskListPageDto> list = offlineSynchDao.queryTaskListPage(taskListPageReq);
+        List<TaskListPageDto> list = offlineSynchDao.selectOfflineTaskInfo(taskListPageReq);
         PageInfo<TaskListPageDto> pageInfo = new PageInfo<>(list);
 
         pageInfoResponse.setCode(ResultCode.SUCCESS);

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

@@ -170,4 +170,24 @@
             AND checkResult.execution_id = #{executionId,jdbcType=BIGINT}
         </if>
     </select>
+
+    <select id="selectOfflineTaskInfo"  resultType="com.jz.dmp.modules.controller.DataIntegration.bean.TaskListPageDto"
+            parameterType="com.jz.dmp.modules.controller.DataIntegration.bean.TaskListPageReq">
+          SELECT
+            ddt.id AS taskId,
+            ddt.tree_id AS treeId,
+            dnt.NAME AS treeName,
+            dnt.CREATE_USER_ID as createUserId,
+            DATE_FORMAT( ddt.create_time, '%Y-%m-%d %H:%i:%s' ) AS createTime,
+            DATE_FORMAT( ddt.update_time, '%Y-%m-%d %H:%i:%s' ) AS updateTime
+       FROM dmp_develop_task AS ddt
+        INNER JOIN dmp_navigation_tree AS dnt ON ddt.TREE_ID = dnt.ID
+        LEFT JOIN dmp_syncing_datasource AS dsd ON instr(script,concat('"targetDbConnection":"',dsd.datasource_name,'"'))>0
+        WHERE ddt.data_status ='1' AND ddt.TYPE='3' AND ddt.TASK_TYPE ='2'
+        AND dnt.CATEGORY='2' AND dnt.TYPE ='3'
+        AND dnt.IS_LEVEL ='1'
+        AND dnt.PROJECT_ID =31
+        AND dsd.PROJECT_ID=31
+        ORDER BY ddt.create_time DESC
+    </select>
 </mapper>
\ No newline at end of file