Commit f353dd2b authored by mcb's avatar mcb

no message

parent 61ebabf8
......@@ -15,7 +15,7 @@ public interface DmpDevelopTaskDao {
int deleteNavigationTreeByTreeId(String treeId) throws Exception;
Integer getDbInfoByParam(@Param("xmlTdb") String xmlTdb, @Param("projectId") Integer projectId);
Integer getDbInfoByParam(@Param("xmlTdb") String xmlTdb, @Param("projectId") Integer projectId) throws Exception;
int insert(DmpDevelopTask dmpDevelopTask) throws Exception;
......
......@@ -452,10 +452,10 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
* @return
*/
public JsonResult addSyncing(Map<String, Object> body) throws Exception {
Integer projectId = (Integer) body.get("projectId");
Integer parentId = (Integer) body.get("parentId"); //父节点ID
Integer projectId = Integer.valueOf(body.get("projectId").toString()) ;
Integer parentId = Integer.valueOf(body.get("parentId").toString()); //父节点ID
String taskName = (String) body.get("taskName"); //任务名称 业务节点名称 一对一
Integer treeId = (Integer) body.get("treeId"); //树节点ID
Integer treeId = Integer.valueOf(body.get("treeId").toString()); //树节点ID
if (StringUtils.isBlank(taskName)) {
return new JsonResult(ResultCode.PARAMS_ERROR, "任务名称不能为空");
......@@ -502,6 +502,7 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
task.setTaskDesc("Syncing Task"); //任务描述
task.setIsSubmit("0"); //是否已提交
task.setTreeId(treeId);
task.setDataStatus("1");
String script = JsonMapper.toJsonString(body);
byte[] data = null;
try {
......@@ -561,7 +562,7 @@ public class OfflineSynchServiceImpl implements OfflineSynchService {
private void settRuleInfo(String taskId, List<Map> rules, List<DvTaskRuleT> list) throws Exception {
for (Map rule : rules) {
DvTaskRuleT taskRuleT = new DvTaskRuleT();
Integer ruleId = (Integer) rule.get("ruleId");
Integer ruleId = Integer.valueOf(rule.get("ruleId").toString());
String ruleValue = (String) rule.get("ruleValue");
taskRuleT.setTaskId(taskId);//任务ID
taskRuleT.setRuleId(ruleId.longValue());
......
//{
// "version": "1.0",
// "parentId": "",
// "mode": "0",
// "projectId": "",
// "name": "",
// "scripts": {
// "setting": {
// "extract": "incremental", //增量或全量
// "extractExpression": "where 1=1", //增量表达式
// "targetBucketCounts": "",
// "errorLimitRecord": "0",
// "executorMemory": "",
// "executorCores": "",
// "totalExecutorCores": ""
// },
// "reader": {
// "dbConnection": "",
// "fileType": "",
// "sourceHdfsPath": "",
// "sourceHdfsFile": "",
// "sourceFtpDir": "",
// "sourceFtpFile": "",
// "sourceSkipFtpFile": "",
// "sourceCsvDelimiter": "",
// "sourceCsvHeader": "",
// "sourceCsvCharset": "",
// "sourceCsvQuote": "",
// "sourceFtpLoadDate": "",
// "registerTableName": "",
// "dayByDay": "false",
// "column": [
// {
// "name": "",
// "type": ""
// }
// ]
// },
// "writer": {
// "targetDbConnection": "",
// "targetTable": "",
// "targetFtpDir": "",
// "targetFtpFile": "",
// "targetCsvDelimiter": "",
// "targetCsvHeader": "",
// "targetCsvCharset": "",
// "targetInsertMergeOverwrite": "",
// "column": [
// {
// "name": "",
// "type": "",
// "isPk": "",
// "isPt": "",
// "rules": []
// }
// ]
// }
// },
// "treeId": 0,
// "taskRules": [
// {
// "ruleId": "",
// "ruleValue": {
// "dv_fields": [
// {
// "fieldName": ""
// }
// ],
// "dvTime": {
// "timeField": "",
// "timeValue": {
// "startTime": "",
// "endTime": ""
// }
// }
// }
// }
// ]
//}
{
"version": "1.0",
"parentId": "",
"mode": "0",
"projectId": "",
"name": "",
"scripts": {
"setting": {
"extract": "incremental", //增量或全量
"extractExpression": "where 1=1", //增量表达式
"targetBucketCounts": "",
"errorLimitRecord": "0",
"executorMemory": "",
"executorCores": "",
"totalExecutorCores": ""
},
"reader": {
"dbConnection": "",
"fileType": "",
"sourceHdfsPath": "",
"sourceHdfsFile": "",
"sourceFtpDir": "",
"sourceFtpFile": "",
"sourceSkipFtpFile": "",
"sourceCsvDelimiter": "",
"sourceCsvHeader": "",
"sourceCsvCharset": "",
"sourceCsvQuote": "",
"sourceFtpLoadDate": "",
"registerTableName": "",
"dayByDay": "false",
"column": [
{
"name": "",
"type": ""
}
]
},
"writer": {
"targetDbConnection": "",
"targetTable": "",
"targetFtpDir": "",
"targetFtpFile": "",
"targetCsvDelimiter": "",
"targetCsvHeader": "",
"targetCsvCharset": "",
"targetInsertMergeOverwrite": "",
"column": [
{
"name": "",
"type": "",
"isPk": "",
"isPt": "",
"rules": []
}
]
}
},
"treeId": 0,
"taskRules": [
{
"ruleId": "",
"ruleValue": {
"dv_fields": [
"params":{
"version":"1.0",
"parentId":"509",
"mode":"0",
"projectId":"31",
"taskName":"dmp_demo_dmp_azkaban_exector_server_config",
"scripts":{
"setting":{
"extract":"incremental",
"extractExpression":"where 1=1",
"targetInsertMergeOverwrite":"insert",
"ftColumn":"",
"ftCount":"20",
"separateMax":"",
"separateMin":"",
"primaryKey":"on",
"partition":"on"
},
"reader":{
"dbConnection":"mysql_dmp_demo_test",
"fileType":"",
"sourceHdfsPath":"",
"sourceHdfsFile":"",
"sourceFtpDir":"",
"sourceFtpFile":"",
"sourceSkipFtpFile":"",
"sourceCsvDelimiter":"",
"sourceCsvHeader":"",
"sourceCsvCharset":"",
"sourceCsvQuote":"",
"sourceFtpLoadDate":"",
"registerTableName":"dmp_azkaban_exector_server_config",
"dayByDay":"false",
"column":[
{
"name":"host",
"type":"VARCHAR"
},
{
"name":"port",
"type":"VARCHAR"
},
{
"name":"user_name",
"type":"VARCHAR"
},
{
"fieldName": ""
"name":"pass_word",
"type":"VARCHAR"
}
],
"dvTime": {
"timeField": "",
"timeValue": {
"startTime": "",
"endTime": ""
]
},
"writer":{
"targetDbConnection":"mysql_dmp_demo",
"targetTable":"dmp_azkaban_exector_server_config",
"targetFtpDir":"",
"targetFtpFile":"",
"targetCsvDelimiter":"",
"targetCsvHeader":"",
"targetCsvCharset":"",
"targetInsertMergeOverwrite":"insert",
"column":[
{
"name":"host",
"type":"VARCHAR",
"isPk":"1",
"isPt":"0",
"rules":[
{"method":"",
"type":""
}
]
},
{
"name":"port",
"type":"VARCHAR",
"isPk":"0",
"isPt":"1",
"rules":[
{"method":"",
"type":""
}
]
},
{
"name":"user_name",
"type":"VARCHAR",
"isPk":"0",
"isPt":"0",
"rules":[
{"method":"",
"type":""
}
]
},
{
"name":"pass_word",
"type":"VARCHAR",
"isPk":"0",
"isPt":"0",
"rules":[
{"method":"",
"type":""
}
]
}
]
}
},
"treeId":669,
"taskRules":[
{
"ruleId":"",
"ruleValue":{
"dv_fields":[
{
"fieldName":""
}
],
"dvTime":{
"timeField":"",
"timeValue":{
"startTime":"",
"endTime":""
}
}
}
}
}
]
]
}
}
\ No newline at end of file
......@@ -21,7 +21,7 @@
delete from dmp_navigation_tree where id = #{treeId}
</delete>
<select id="getDbType" resultType="java.lang.Integer">
<select id="getDbInfoByParam" resultType="java.lang.Integer">
SELECT
dsd.id AS id
FROM dmp_syncing_datasource dsd
......@@ -108,7 +108,7 @@
where ID = #{id}
</update>
<select id="selectTaskInfoByParam" parameterType="map">
<select id="selectTaskInfoByParam" parameterType="map" resultType="com.jz.dmp.modules.model.DmpDevelopTask">
select
ID, datasource_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, CHK_RESULT, SYNC_RESULT, CHK_TIME, SYNC_TIME, FLOW_HEADER, FLOW_JSON, VERSION, IS_GZIPED
......
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