diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c50fb06..f0f75c3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -49,6 +49,11 @@ com.casic + casic-etl-support + ${extension.version} + + + com.casic casic-job-support ${extension.version} @@ -58,6 +63,7 @@ casic-websocket ${extension.version} + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c50fb06..f0f75c3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -49,6 +49,11 @@ com.casic + casic-etl-support + ${extension.version} + + + com.casic casic-job-support ${extension.version} @@ -58,6 +63,7 @@ casic-websocket ${extension.version} + diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e7c1dc7..6ac6d7e 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -598,11 +598,6 @@ 项管项目同步更新 Y - - 项管任务表 - 项管任务同步更新 - Y - 163工地信息 @@ -906,6 +901,307 @@ + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + + 163工地类别表 TableInput @@ -1439,342 +1735,6 @@ - 项管任务同步更新 - InsertUpdate - - Y - - 1 - - none - - - 111.198.10.15-casic_palnning_construction - 1000 - N - - casic_palnning_construction - pm_task
- - id - id - = - - - - id - id - N - - - task_name - task_name - Y - - - grade - grade - Y - - - plan_finish_time - plan_finish_time - Y - - - actual_finish_time - actual_finish_time - Y - - - project_id - project_id - Y - - - status - status - Y - - - update_time - update_time - Y - - - associated_status - associated_status - Y - - - - - - - - - - - - 480 - 256 - Y - - - - 项管任务表 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, task_name -, grade -, plan_finish_time -, actual_finish_time -, project_id -, status -, update_time -, associated_status -FROM casic_palnning_construction.pm_task - - 0 - - N - N - N - N - - - Integer - normal - id - 15 - 0 - 项管任务表 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - task_name - 100 - -1 - 项管任务表 - task_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - grade - 20 - -1 - 项管任务表 - grade - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - plan_finish_time - 0 - -1 - 项管任务表 - plan_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - actual_finish_time - 0 - -1 - 项管任务表 - actual_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - project_id - 15 - 0 - 项管任务表 - project_id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - status - 4 - 0 - 项管任务表 - status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - update_time - 0 - -1 - 项管任务表 - update_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - associated_status - 4 - 0 - 项管任务表 - associated_status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 352 - 256 - Y - - - 项管项目同步更新 InsertUpdate @@ -2110,307 +2070,6 @@ Y - - 163工地信息 2 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, project_num -, project_name -, start_time -, end_time -, project_status -, short_name -, project_type -, is_delete -, contract_amount -, create_time -FROM casic_palnning_construction.const_site_pro_info - - 0 - - N - N - N - N - - - Integer - normal - id - 9 - 0 - 表输入 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_num - 50 - -1 - 表输入 - project_num - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_name - 100 - -1 - 表输入 - project_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - start_time - 20 - -1 - 表输入 - start_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - end_time - 20 - -1 - 表输入 - end_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_status - 20 - -1 - 表输入 - project_status - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - short_name - 100 - -1 - 表输入 - short_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_type - 20 - -1 - 表输入 - project_type - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - is_delete - 9 - 0 - 表输入 - is_delete - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - contract_amount - 20 - -1 - 表输入 - contract_amount - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - create_time - 20 - -1 - 表输入 - create_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 793 - 234 - Y - - diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c50fb06..f0f75c3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -49,6 +49,11 @@ com.casic + casic-etl-support + ${extension.version} + + + com.casic casic-job-support ${extension.version} @@ -58,6 +63,7 @@ casic-websocket ${extension.version} + diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e7c1dc7..6ac6d7e 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -598,11 +598,6 @@ 项管项目同步更新 Y - - 项管任务表 - 项管任务同步更新 - Y - 163工地信息 @@ -906,6 +901,307 @@ + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + + 163工地类别表 TableInput @@ -1439,342 +1735,6 @@ - 项管任务同步更新 - InsertUpdate - - Y - - 1 - - none - - - 111.198.10.15-casic_palnning_construction - 1000 - N - - casic_palnning_construction - pm_task
- - id - id - = - - - - id - id - N - - - task_name - task_name - Y - - - grade - grade - Y - - - plan_finish_time - plan_finish_time - Y - - - actual_finish_time - actual_finish_time - Y - - - project_id - project_id - Y - - - status - status - Y - - - update_time - update_time - Y - - - associated_status - associated_status - Y - - - - - - - - - - - - 480 - 256 - Y - - - - 项管任务表 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, task_name -, grade -, plan_finish_time -, actual_finish_time -, project_id -, status -, update_time -, associated_status -FROM casic_palnning_construction.pm_task - - 0 - - N - N - N - N - - - Integer - normal - id - 15 - 0 - 项管任务表 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - task_name - 100 - -1 - 项管任务表 - task_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - grade - 20 - -1 - 项管任务表 - grade - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - plan_finish_time - 0 - -1 - 项管任务表 - plan_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - actual_finish_time - 0 - -1 - 项管任务表 - actual_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - project_id - 15 - 0 - 项管任务表 - project_id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - status - 4 - 0 - 项管任务表 - status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - update_time - 0 - -1 - 项管任务表 - update_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - associated_status - 4 - 0 - 项管任务表 - associated_status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 352 - 256 - Y - - - 项管项目同步更新 InsertUpdate @@ -2110,307 +2070,6 @@ Y - - 163工地信息 2 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, project_num -, project_name -, start_time -, end_time -, project_status -, short_name -, project_type -, is_delete -, contract_amount -, create_time -FROM casic_palnning_construction.const_site_pro_info - - 0 - - N - N - N - N - - - Integer - normal - id - 9 - 0 - 表输入 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_num - 50 - -1 - 表输入 - project_num - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_name - 100 - -1 - 表输入 - project_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - start_time - 20 - -1 - 表输入 - start_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - end_time - 20 - -1 - 表输入 - end_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_status - 20 - -1 - 表输入 - project_status - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - short_name - 100 - -1 - 表输入 - short_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_type - 20 - -1 - 表输入 - project_type - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - is_delete - 9 - 0 - 表输入 - is_delete - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - contract_amount - 20 - -1 - 表输入 - contract_amount - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - create_time - 20 - -1 - 表输入 - create_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 793 - 234 - Y - - diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 320c628..0664daf 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -125,6 +125,16 @@ provided + com.casic + casic-etl-support + ${extension.version} + + + com.casic + casic-etl-job-support + ${extension.version} + + javax.servlet javax.servlet-api 3.1.0 diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c50fb06..f0f75c3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -49,6 +49,11 @@ com.casic + casic-etl-support + ${extension.version} + + + com.casic casic-job-support ${extension.version} @@ -58,6 +63,7 @@ casic-websocket ${extension.version} + diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e7c1dc7..6ac6d7e 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -598,11 +598,6 @@ 项管项目同步更新 Y - - 项管任务表 - 项管任务同步更新 - Y - 163工地信息 @@ -906,6 +901,307 @@ + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + + 163工地类别表 TableInput @@ -1439,342 +1735,6 @@ - 项管任务同步更新 - InsertUpdate - - Y - - 1 - - none - - - 111.198.10.15-casic_palnning_construction - 1000 - N - - casic_palnning_construction - pm_task
- - id - id - = - - - - id - id - N - - - task_name - task_name - Y - - - grade - grade - Y - - - plan_finish_time - plan_finish_time - Y - - - actual_finish_time - actual_finish_time - Y - - - project_id - project_id - Y - - - status - status - Y - - - update_time - update_time - Y - - - associated_status - associated_status - Y - - - - - - - - - - - - 480 - 256 - Y - - - - 项管任务表 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, task_name -, grade -, plan_finish_time -, actual_finish_time -, project_id -, status -, update_time -, associated_status -FROM casic_palnning_construction.pm_task - - 0 - - N - N - N - N - - - Integer - normal - id - 15 - 0 - 项管任务表 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - task_name - 100 - -1 - 项管任务表 - task_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - grade - 20 - -1 - 项管任务表 - grade - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - plan_finish_time - 0 - -1 - 项管任务表 - plan_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - actual_finish_time - 0 - -1 - 项管任务表 - actual_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - project_id - 15 - 0 - 项管任务表 - project_id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - status - 4 - 0 - 项管任务表 - status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - update_time - 0 - -1 - 项管任务表 - update_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - associated_status - 4 - 0 - 项管任务表 - associated_status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 352 - 256 - Y - - - 项管项目同步更新 InsertUpdate @@ -2110,307 +2070,6 @@ Y - - 163工地信息 2 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, project_num -, project_name -, start_time -, end_time -, project_status -, short_name -, project_type -, is_delete -, contract_amount -, create_time -FROM casic_palnning_construction.const_site_pro_info - - 0 - - N - N - N - N - - - Integer - normal - id - 9 - 0 - 表输入 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_num - 50 - -1 - 表输入 - project_num - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_name - 100 - -1 - 表输入 - project_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - start_time - 20 - -1 - 表输入 - start_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - end_time - 20 - -1 - 表输入 - end_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_status - 20 - -1 - 表输入 - project_status - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - short_name - 100 - -1 - 表输入 - short_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_type - 20 - -1 - 表输入 - project_type - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - is_delete - 9 - 0 - 表输入 - is_delete - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - contract_amount - 20 - -1 - 表输入 - contract_amount - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - create_time - 20 - -1 - 表输入 - create_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 793 - 234 - Y - - diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 320c628..0664daf 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -125,6 +125,16 @@ provided + com.casic + casic-etl-support + ${extension.version} + + + com.casic + casic-etl-job-support + ${extension.version} + + javax.servlet javax.servlet-api 3.1.0 diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 1af6682..583ee70 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -25,6 +25,7 @@ tomcat: false #判断是否是tomcat启动 配置websocket加载 kettle: pluginsPath: "D:\\dev-soft\\pdi\\pdi-ce-9.0.0.0-423\\plugins" + job-path: E:\project\casic-opt-monitoring-parent\casic-web\etl\demo\ config: export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ @@ -35,7 +36,7 @@ userName: rongjiangqu password: a58cc7c077b1ece3fad6923bf8f35d71 appKey: 53a21bdd-626a-4b3b-9170-0c79498193e6 #可视化应用app key - url-exclusion: /view/add,/view/update,/config/add,/config/update + url-exclusion: /view/add,/view/update,/config/add,/config/update,/jobConfig/add,/jobConfig/update elasticjob: enabled: true tracing: @@ -43,7 +44,7 @@ reg-center: serverLists: zookeeper.com:2181 namespace: elasticjob-lite-springboot - digest: admin:Casic203 + #digest: admin:Casic203 dump: enabled: true monitor: diff --git a/casic-server/pom.xml b/casic-server/pom.xml index c50fb06..f0f75c3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -49,6 +49,11 @@ com.casic + casic-etl-support + ${extension.version} + + + com.casic casic-job-support ${extension.version} @@ -58,6 +63,7 @@ casic-websocket ${extension.version} + diff --git a/casic-web/etl/demo/java-demo.ktr b/casic-web/etl/demo/java-demo.ktr index e7c1dc7..6ac6d7e 100644 --- a/casic-web/etl/demo/java-demo.ktr +++ b/casic-web/etl/demo/java-demo.ktr @@ -598,11 +598,6 @@ 项管项目同步更新 Y - - 项管任务表 - 项管任务同步更新 - Y - 163工地信息 @@ -906,6 +901,307 @@ + 163工地信息 2 + TableInput + + Y + + 1 + + none + + + 163_casic_palnning_construction + SELECT + id +, project_num +, project_name +, start_time +, end_time +, project_status +, short_name +, project_type +, is_delete +, contract_amount +, create_time +FROM casic_palnning_construction.const_site_pro_info + + 0 + + N + N + N + N + + + Integer + normal + id + 9 + 0 + 表输入 + id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_num + 50 + -1 + 表输入 + project_num + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_name + 100 + -1 + 表输入 + project_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + start_time + 20 + -1 + 表输入 + start_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + end_time + 20 + -1 + 表输入 + end_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_status + 20 + -1 + 表输入 + project_status + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + short_name + 100 + -1 + 表输入 + short_name + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + project_type + 20 + -1 + 表输入 + project_type + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + is_delete + 9 + 0 + 表输入 + is_delete + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + contract_amount + 20 + -1 + 表输入 + contract_amount + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + create_time + 20 + -1 + 表输入 + create_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 793 + 234 + Y + + + 163工地类别表 TableInput @@ -1439,342 +1735,6 @@ - 项管任务同步更新 - InsertUpdate - - Y - - 1 - - none - - - 111.198.10.15-casic_palnning_construction - 1000 - N - - casic_palnning_construction - pm_task
- - id - id - = - - - - id - id - N - - - task_name - task_name - Y - - - grade - grade - Y - - - plan_finish_time - plan_finish_time - Y - - - actual_finish_time - actual_finish_time - Y - - - project_id - project_id - Y - - - status - status - Y - - - update_time - update_time - Y - - - associated_status - associated_status - Y - - - - - - - - - - - - 480 - 256 - Y - - - - 项管任务表 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, task_name -, grade -, plan_finish_time -, actual_finish_time -, project_id -, status -, update_time -, associated_status -FROM casic_palnning_construction.pm_task - - 0 - - N - N - N - N - - - Integer - normal - id - 15 - 0 - 项管任务表 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - task_name - 100 - -1 - 项管任务表 - task_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - grade - 20 - -1 - 项管任务表 - grade - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - plan_finish_time - 0 - -1 - 项管任务表 - plan_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - actual_finish_time - 0 - -1 - 项管任务表 - actual_finish_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - project_id - 15 - 0 - 项管任务表 - project_id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - status - 4 - 0 - 项管任务表 - status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Timestamp - normal - update_time - 0 - -1 - 项管任务表 - update_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - associated_status - 4 - 0 - 项管任务表 - associated_status - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 352 - 256 - Y - - - 项管项目同步更新 InsertUpdate @@ -2110,307 +2070,6 @@ Y - - 163工地信息 2 - TableInput - - Y - - 1 - - none - - - 163_casic_palnning_construction - SELECT - id -, project_num -, project_name -, start_time -, end_time -, project_status -, short_name -, project_type -, is_delete -, contract_amount -, create_time -FROM casic_palnning_construction.const_site_pro_info - - 0 - - N - N - N - N - - - Integer - normal - id - 9 - 0 - 表输入 - id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_num - 50 - -1 - 表输入 - project_num - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_name - 100 - -1 - 表输入 - project_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - start_time - 20 - -1 - 表输入 - start_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - end_time - 20 - -1 - 表输入 - end_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_status - 20 - -1 - 表输入 - project_status - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - short_name - 100 - -1 - 表输入 - short_name - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - project_type - 20 - -1 - 表输入 - project_type - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - Integer - normal - is_delete - 9 - 0 - 表输入 - is_delete - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - contract_amount - 20 - -1 - 表输入 - contract_amount - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - create_time - 20 - -1 - 表输入 - create_time - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 793 - 234 - Y - - diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 320c628..0664daf 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -125,6 +125,16 @@ provided + com.casic + casic-etl-support + ${extension.version} + + + com.casic + casic-etl-job-support + ${extension.version} + + javax.servlet javax.servlet-api 3.1.0 diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 1af6682..583ee70 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -25,6 +25,7 @@ tomcat: false #判断是否是tomcat启动 配置websocket加载 kettle: pluginsPath: "D:\\dev-soft\\pdi\\pdi-ce-9.0.0.0-423\\plugins" + job-path: E:\project\casic-opt-monitoring-parent\casic-web\etl\demo\ config: export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ @@ -35,7 +36,7 @@ userName: rongjiangqu password: a58cc7c077b1ece3fad6923bf8f35d71 appKey: 53a21bdd-626a-4b3b-9170-0c79498193e6 #可视化应用app key - url-exclusion: /view/add,/view/update,/config/add,/config/update + url-exclusion: /view/add,/view/update,/config/add,/config/update,/jobConfig/add,/jobConfig/update elasticjob: enabled: true tracing: @@ -43,7 +44,7 @@ reg-center: serverLists: zookeeper.com:2181 namespace: elasticjob-lite-springboot - digest: admin:Casic203 + #digest: admin:Casic203 dump: enabled: true monitor: diff --git a/pom.xml b/pom.xml index b5ccc38..b6577cc 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,12 @@ ${core.version} + com.casic + casic-etl-starter + ${extension.version} + + + mysql mysql-connector-java ${mysql-connector-java.version}