commit

src/main/java/com/jz/dmp/modules/controller/DataIntegration/OfflineSynchController.java

@@ -285,6 +285,30 @@ public class OfflineSynchController {
         return list;
     }
 
+    /**
+     * 离线任务详情--编辑回显
+     *
+     * @return
+     * @author Bellamy
+     */
+    @ApiOperation(value = "离线任务详情--编辑回显", notes = "离线任务详情--编辑回显")
+    @GetMapping(value = "/getSyncTaskInfoById")
+    @ApiImplicitParam(name = "id",value = "离线任务id",required = true)
+    public JsonResult getSyncTaskInfoById(@RequestParam String id) throws Exception {
+        if(StringUtils.isEmpty(id)){
+            return JsonResult.error(ResultCode.PARAMS_ERROR,"id不能为空");
+        }
+        JsonResult list = new JsonResult();
+        try {
+            list = offlineSynchService.querySyncTaskInfoById(id);
+        } catch (Exception e) {
+            list.setCode(ResultCode.INTERNAL_SERVER_ERROR);
+            list.setMessage("failed!");
+            e.printStackTrace();
+        }
+        return list;
+    }
+
     /**
      * 编辑离线任务数据
      *

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

@@ -138,4 +138,12 @@ public interface OfflineSynchService {
      * @author Bellamy
      */
     JsonResult getSyncSoureAndTargetColumns(Map<String, List<SynchTableColumnsReq>> req) throws Exception;
+
+    /**
+     * 离线任务详情--编辑回显
+     *
+     * @return
+     * @author Bellamy
+     */
+    JsonResult querySyncTaskInfoById(String id) throws Exception;
 }

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

@@ -172,10 +172,10 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
         Map<String, Object> map = offlineSynchDao.selectNavigationTreeByTaskId(taskId);
         if (map.size() > 0 && map != null) {
             Integer execId = this.publish(map);
-            if (execId!=null) {
-				flag = true;
-			}
-            
+            if (execId != null) {
+                flag = true;
+            }
+
             if (flag) {
                 return new JsonResult(ResultCode.SUCCESS, flag);
             } else {
@@ -647,15 +647,17 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
         //更新规则信息
         List<Map> taskRules = (List<Map>) body.get("taskRules");
         //判断taskId是否存在，存在编辑，不存在新增
+        Integer id = null;
         if (StringUtils.isEmpty(taskId)) {
             task.setVersion("1.0");
             task.setCreateUserId(SessionUtils.getCurrentUserId());
             task.setCreateTime(new Date());
             dmpDevelopTaskDao.insert(task); //新增任务数据
+            id = task.getId();
             logger.info("======== save sync task end ========");
             this.saveTaskHistory(task); //保存任务历史版本
             //保存dmp数据校验规则信息
-            settRuleInfo(taskId, taskRules, list);
+            settRuleInfo(task.getId().toString(), taskRules, list);
         } else {
             DmpDevelopTask devTask = dmpDevelopTaskDao.selectTaskById(taskId);
             BigDecimal version = new BigDecimal(devTask.getVersion());
@@ -665,6 +667,7 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
             task.setUpdateUserId(SessionUtils.getCurrentUserId());
             task.setId(Integer.valueOf(taskId));
             dmpDevelopTaskDao.update(task);
+            id = task.getId();
             logger.info("======== edit sync task end ========");
             this.saveTaskHistory(task); //保存任务历史版本
             //更新规则信息
@@ -679,7 +682,9 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
         }
         //保存时提交XML
         //dmpDevelopTaskService.submitSyncing(task);
-        return JsonResult.ok();
+        Map map = new HashMap();
+        map.put("id", id);
+        return JsonResult.ok(map);
     }
 
     /**
@@ -1036,4 +1041,17 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
         return JsonResult.ok(data);
     }
 
+    /**
+     * 离线任务详情--编辑回显
+     *
+     * @return
+     * @author Bellamy
+     */
+    @Override
+    public JsonResult querySyncTaskInfoById(String id) throws Exception {
+        DmpDevelopTask dmpDevelopTask = dmpDevelopTaskDao.selectTaskById(id);
+
+        return JsonResult.ok(dmpDevelopTask);
+    }
+
 }

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

@@ -31,7 +31,7 @@
 
 	<sql id="FIND_ALL_COLUMN">
 		id,task_type,type,schedule_type,is_submit,task_desc,script,data_status,create_user_id,create_time,update_user_id,update_time,tree_id,flow_header,
-		flow_json, version, publish_version, is_gziped
+		flow_json, version, publish_version, is_gziped,source_db_id,target_db_name,target_table_name,source_db_name,source_table_name
 	</sql>
 
     <select id="getDmpTaskAndTreeInfo" parameterType="string" resultType="map">