diff --git a/intelligent/single_yuejuan/analysis/adm/adm.ktr b/intelligent/single_yuejuan/analysis/adm/adm.ktr
index f03ee69..34ee2a0 100644
--- a/intelligent/single_yuejuan/analysis/adm/adm.ktr
+++ b/intelligent/single_yuejuan/analysis/adm/adm.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:56.153</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:18:42.081</modified_date>
+ <modified_date>2021/08/14 13:26:04.737</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/analysis/core.kjb b/intelligent/single_yuejuan/analysis/core.kjb
index b7883c0..7a94563 100644
--- a/intelligent/single_yuejuan/analysis/core.kjb
+++ b/intelligent/single_yuejuan/analysis/core.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:21:41.533</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:20:30.021</modified_date>
+ <modified_date>2021/07/28 13:29:48.166</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -546,8 +546,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>1040</xloc>
- <yloc>224</yloc>
+ <xloc>1296</xloc>
+ <yloc>320</yloc>
<attributes_kjc/>
</entry>
<entry>
@@ -629,28 +629,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>stage_roll_back</name>
- <description/>
- <type>SET_VARIABLES</type>
- <attributes/>
- <replacevars>Y</replacevars>
- <filename/>
- <file_variable_type>JVM</file_variable_type>
- <fields>
- <field>
- <variable_name>stage</variable_name>
- <variable_value>roll_back</variable_value>
- <variable_type>JVM</variable_type>
- </field>
- </fields>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>896</xloc>
- <yloc>112</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>Set variables</name>
<description/>
<type>SET_VARIABLES</type>
@@ -795,8 +773,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>896</xloc>
- <yloc>224</yloc>
+ <xloc>1168</xloc>
+ <yloc>320</yloc>
<attributes_kjc/>
</entry>
<entry>
@@ -1091,8 +1069,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>1040</xloc>
- <yloc>128</yloc>
+ <xloc>1408</xloc>
+ <yloc>320</yloc>
<attributes_kjc/>
</entry>
<entry>
@@ -1134,6 +1112,178 @@
<yloc>560</yloc>
<attributes_kjc/>
</entry>
+ <entry>
+ <name>core</name>
+ <description/>
+ <type>JOB</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <job_object_id/>
+ <filename/>
+ <jobname>core</jobname>
+ <directory>/intelligent/single_yuejuan/transfer</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Nothing</loglevel>
+ <slave_server_name/>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <expand_remote_job>N</expand_remote_job>
+ <create_parent_folder>N</create_parent_folder>
+ <pass_export>N</pass_export>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <set_append_logfile>N</set_append_logfile>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1168</xloc>
+ <yloc>32</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>transfer_core</name>
+ <description/>
+ <type>SET_VARIABLES</type>
+ <attributes/>
+ <replacevars>Y</replacevars>
+ <filename/>
+ <file_variable_type>JVM</file_variable_type>
+ <fields>
+ <field>
+ <variable_name>stage</variable_name>
+ <variable_value>transfer_core</variable_value>
+ <variable_type>JVM</variable_type>
+ </field>
+ </fields>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1056</xloc>
+ <yloc>32</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>write_log_unsuccess 1</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>write_log_unsuccess</transname>
+ <directory>/intelligent/single_yuejuan/analysis/total_control</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1312</xloc>
+ <yloc>32</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>中止作业 3</name>
+ <description/>
+ <type>ABORT</type>
+ <attributes/>
+ <message/>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1424</xloc>
+ <yloc>32</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>stage_roll_back</name>
+ <description/>
+ <type>SET_VARIABLES</type>
+ <attributes/>
+ <replacevars>Y</replacevars>
+ <filename/>
+ <file_variable_type>JVM</file_variable_type>
+ <fields>
+ <field>
+ <variable_name>stage</variable_name>
+ <variable_value>roll_back</variable_value>
+ <variable_type>JVM</variable_type>
+ </field>
+ </fields>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1168</xloc>
+ <yloc>208</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>write_log_success 1</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>write_log_success</transname>
+ <directory>/intelligent/single_yuejuan/analysis/total_control</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1168</xloc>
+ <yloc>128</yloc>
+ <attributes_kjc/>
+ </entry>
</entries>
<hops>
<hop>
@@ -1146,15 +1296,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>stage_roll_back</from>
- <to>roll_back</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>fundamental</from>
<to>write_log_unsuccess 3</to>
<from_nr>0</from_nr>
@@ -1335,15 +1476,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>set_variable</from>
- <to>stage_roll_back</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>write_log_unsuccess 2</from>
<to>中止作业</to>
<from_nr>0</from_nr>
@@ -1388,6 +1520,69 @@
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
+ <hop>
+ <from>set_variable</from>
+ <to>transfer_core</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>transfer_core</from>
+ <to>core</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>core</from>
+ <to>write_log_unsuccess 1</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>write_log_unsuccess 1</from>
+ <to>中止作业 3</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>core</from>
+ <to>write_log_success 1</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>write_log_success 1</from>
+ <to>stage_roll_back</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>stage_roll_back</from>
+ <to>roll_back</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
</hops>
<notepads>
</notepads>
diff --git a/intelligent/single_yuejuan/analysis/fundamental/fundamental.ktr b/intelligent/single_yuejuan/analysis/fundamental/fundamental.ktr
index 5bbb724..0d9a3c1 100644
--- a/intelligent/single_yuejuan/analysis/fundamental/fundamental.ktr
+++ b/intelligent/single_yuejuan/analysis/fundamental/fundamental.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:56.153</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:18:54.413</modified_date>
+ <modified_date>2021/08/16 16:03:01.826</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable.ktr b/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable.ktr
index 710938a..f87162f 100644
--- a/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable.ktr
+++ b/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:19:32.507</modified_date>
+ <modified_date>2021/07/30 09:48:27.052</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -609,22 +609,21 @@
a.id as task_id,
a.type as task_type,
a.type_id,
-a.include_zero,
-a.include_absent,
-a.show_student_rank,
-a.default_score,
+c.include_zero,
+c.include_absent,
+c.show_student_rank,
+c.default_score,
a.exam_id,
--a.model,
-b.exam_type as model,
-b.exam_type,
+a.model as model,
+a.model as exam_type,
a.create_time as end_time,
case when (select count(*) from single_yuejuan_source_process.task_list where task_status=2)>0
then (select max(create_time) from single_yuejuan_source_process.task_list where task_status=2)
else '2000-01-01 00:00:00' end start_time
from single_yuejuan_source_process.task_list a
-inner join single_yuejuan_source_process.bus_exam b
-on a.exam_id=b.id
-where a.task_status=1 and a.del_flag=0 and b.del_flag=0
+inner join single_yuejuan_source_process.bus_score_param_config c on a.exam_id=c.exam_id and a.type_id=c.type_id
+where a.task_status=1 and a.del_flag=0 and c.del_flag=0
order by a.create_time limit 1</sql>
<limit>0</limit>
<lookup/>
diff --git a/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr b/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr
index a2c63f2..2e0c6e2 100644
--- a/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr
+++ b/intelligent/single_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:17.611</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:19:36.259</modified_date>
+ <modified_date>2021/08/11 15:08:53.009</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -539,7 +539,7 @@
<schema_name/>
</partitioning>
<connection>intelligent_greenplum_neiwang</connection>
- <sql>select case when (select count(*) from single_yuejuan_source_process.task_list where task_status=1)>0 then 1 else 0 end is_run</sql>
+ <sql>select case when (select count(*) from single_yuejuan_source_process.task_list where task_status=1 and del_flag=0)>0 then 1 else 0 end is_run</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
diff --git a/intelligent/single_yuejuan/analysis/total_control/update_fenxi_state.ktr b/intelligent/single_yuejuan/analysis/total_control/update_fenxi_state.ktr
index 5aa6b50..aaa6b48 100644
--- a/intelligent/single_yuejuan/analysis/total_control/update_fenxi_state.ktr
+++ b/intelligent/single_yuejuan/analysis/total_control/update_fenxi_state.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:38.865</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:19:48.933</modified_date>
+ <modified_date>2021/08/04 13:33:51.931</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -504,7 +504,7 @@
<single_statement>Y</single_statement>
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
- <sql>update single_yuejuan_source_process.task_list set task_status=2 where id=${task_id}</sql>
+ <sql>update single_yuejuan_source_process.task_list set task_status=2 where id=${task_id} and del_flag=0</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
diff --git a/intelligent/single_yuejuan/analysis/total_control/update_yuejuan_state.ktr b/intelligent/single_yuejuan/analysis/total_control/update_yuejuan_state.ktr
index 5340edb..5d35d63 100644
--- a/intelligent/single_yuejuan/analysis/total_control/update_yuejuan_state.ktr
+++ b/intelligent/single_yuejuan/analysis/total_control/update_yuejuan_state.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:30:57.418</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:20:07.021</modified_date>
+ <modified_date>2021/07/28 13:09:37.179</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -516,7 +516,7 @@
<single_statement>Y</single_statement>
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
- <sql>update task_list set task_status=4 where exam_id=${exam_id} and del_flag=0</sql>
+ <sql>update bus_exam set status=3 where id=${exam_id} and del_flag=0</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
diff --git a/intelligent/single_yuejuan/transfer/core.kjb b/intelligent/single_yuejuan/transfer/core.kjb
index 87ae019..5479095 100644
--- a/intelligent/single_yuejuan/transfer/core.kjb
+++ b/intelligent/single_yuejuan/transfer/core.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:21:41.533</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/24 15:46:18.843</modified_date>
+ <modified_date>2021/07/28 13:29:50.519</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -287,45 +287,6 @@
<shared_objects_file/>
<entries>
<entry>
- <name>update_state</name>
- <description/>
- <type>TRANS</type>
- <attributes/>
- <specification_method>rep_name</specification_method>
- <trans_object_id/>
- <filename/>
- <transname>update_state</transname>
- <directory>/intelligent/single_yuejuan/transfer/total_control</directory>
- <arg_from_previous>N</arg_from_previous>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <clear_rows>N</clear_rows>
- <clear_files>N</clear_files>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <loglevel>Basic</loglevel>
- <cluster>N</cluster>
- <slave_server_name/>
- <set_append_logfile>N</set_append_logfile>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
- <create_parent_folder>N</create_parent_folder>
- <logging_remote_work>N</logging_remote_work>
- <run_configuration>Pentaho local</run_configuration>
- <parameters>
- <pass_all_parameters>Y</pass_all_parameters>
- </parameters>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>208</xloc>
- <yloc>304</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>fundamental</name>
<description/>
<type>JOB</type>
@@ -363,28 +324,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Set variables</name>
- <description/>
- <type>SET_VARIABLES</type>
- <attributes/>
- <replacevars>Y</replacevars>
- <filename/>
- <file_variable_type>ROOT_JOB</file_variable_type>
- <fields>
- <field>
- <variable_name>stage</variable_name>
- <variable_value>start</variable_value>
- <variable_type>ROOT_JOB</variable_type>
- </field>
- </fields>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>128</xloc>
- <yloc>32</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>START</name>
<description/>
<type>SPECIAL</type>
@@ -505,18 +444,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Success</name>
- <description/>
- <type>SUCCESS</type>
- <attributes/>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>384</xloc>
- <yloc>112</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>write_log_unsuccess (3)</name>
<description/>
<type>TRANS</type>
@@ -632,67 +559,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Simple evaluation</name>
- <description/>
- <type>SIMPLE_EVAL</type>
- <attributes/>
- <valuetype>variable</valuetype>
- <fieldname/>
- <variablename>is_run</variablename>
- <fieldtype>number</fieldtype>
- <mask/>
- <comparevalue>1</comparevalue>
- <minvalue/>
- <maxvalue/>
- <successcondition>equal</successcondition>
- <successnumbercondition>equal</successnumbercondition>
- <successbooleancondition>false</successbooleancondition>
- <successwhenvarset>N</successwhenvarset>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>384</xloc>
- <yloc>32</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
- <name>set_variable</name>
- <description/>
- <type>JOB</type>
- <attributes/>
- <specification_method>rep_name</specification_method>
- <job_object_id/>
- <filename/>
- <jobname>set_variable</jobname>
- <directory>/intelligent/single_yuejuan/transfer/total_control</directory>
- <arg_from_previous>N</arg_from_previous>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <loglevel>Nothing</loglevel>
- <slave_server_name/>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
- <expand_remote_job>N</expand_remote_job>
- <create_parent_folder>N</create_parent_folder>
- <pass_export>N</pass_export>
- <run_configuration>Pentaho local</run_configuration>
- <parameters>
- <pass_all_parameters>Y</pass_all_parameters>
- </parameters>
- <set_append_logfile>N</set_append_logfile>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>256</xloc>
- <yloc>32</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>write_log_success (2)</name>
<description/>
<type>TRANS</type>
@@ -732,28 +598,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>source_stage</name>
- <description/>
- <type>SET_VARIABLES</type>
- <attributes/>
- <replacevars>Y</replacevars>
- <filename/>
- <file_variable_type>ROOT_JOB</file_variable_type>
- <fields>
- <field>
- <variable_name>stage</variable_name>
- <variable_value>source</variable_value>
- <variable_type>ROOT_JOB</variable_type>
- </field>
- </fields>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>512</xloc>
- <yloc>32</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>stage_roll_back</name>
<description/>
<type>SET_VARIABLES</type>
@@ -904,6 +748,28 @@
<yloc>416</yloc>
<attributes_kjc/>
</entry>
+ <entry>
+ <name>source_stage</name>
+ <description/>
+ <type>SET_VARIABLES</type>
+ <attributes/>
+ <replacevars>Y</replacevars>
+ <filename/>
+ <file_variable_type>ROOT_JOB</file_variable_type>
+ <fields>
+ <field>
+ <variable_name>stage</variable_name>
+ <variable_value>source</variable_value>
+ <variable_type>ROOT_JOB</variable_type>
+ </field>
+ </fields>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>464</xloc>
+ <yloc>32</yloc>
+ <attributes_kjc/>
+ </entry>
</entries>
<hops>
<hop>
@@ -916,15 +782,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>write_log_success (2)</from>
- <to>update_state</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>fundamental_stage</from>
<to>fundamental</to>
<from_nr>0</from_nr>
@@ -934,15 +791,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>START</from>
- <to>Set variables</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>Y</unconditional>
- </hop>
- <hop>
<from>stage_roll_back</from>
<to>roll_back</to>
<from_nr>0</from_nr>
@@ -961,15 +809,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>Simple evaluation</from>
- <to>Success</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>N</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>roll_back</from>
<to>write_log_success (3)</to>
<from_nr>0</from_nr>
@@ -979,15 +818,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>Simple evaluation</from>
- <to>source_stage</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>write_log_success (3)</from>
<to>fundamental_stage</to>
<from_nr>0</from_nr>
@@ -997,15 +827,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>source_stage</from>
- <to>source</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>roll_back</from>
<to>write_log_unsuccess (2)</to>
<from_nr>0</from_nr>
@@ -1024,24 +845,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>Set variables</from>
- <to>set_variable</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
- <from>set_variable</from>
- <to>Simple evaluation</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>write_log_success</from>
<to>stage_roll_back</to>
<from_nr>0</from_nr>
@@ -1087,7 +890,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>update_state</from>
+ <from>write_log_success (2)</from>
<to>Success 2</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
@@ -1095,6 +898,24 @@
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
+ <hop>
+ <from>START</from>
+ <to>source_stage</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>source_stage</from>
+ <to>source</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
</hops>
<notepads>
</notepads>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/area.ktr b/intelligent/single_yuejuan/transfer/fundamental/area.ktr
index 10efb81..ab2e49d 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/area.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/area.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:43:48.161</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/13 10:45:14.174</modified_date>
+ <modified_date>2021/08/14 13:26:09.631</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -542,7 +542,7 @@ from single_yuejuan_source.area</sql>
</output>
</remotesteps>
<GUI>
- <xloc>304</xloc>
+ <xloc>272</xloc>
<yloc>192</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_exam.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_exam.ktr
index e079f92..d52428c 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_exam.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_exam.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:23.420</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 10:13:09.147</modified_date>
+ <modified_date>2021/07/02 10:24:01.163</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_school.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_school.ktr
index 612e4ab..4cf056e 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_school.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_school.ktr
@@ -428,7 +428,7 @@
<created_user>-</created_user>
<created_date>2021/03/09 09:01:44.816</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/15 17:53:49.930</modified_date>
+ <modified_date>2021/07/02 14:28:26.644</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_student.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_student.ktr
index e479b12..7d62b0f 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_student.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_student.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:26.914</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 10:21:52.957</modified_date>
+ <modified_date>2021/07/02 10:34:27.652</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject.ktr
index d38c468..08990ea 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:30.636</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:55.980</modified_date>
+ <modified_date>2021/06/08 13:54:29.004</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_relation.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_relation.ktr
index 31ac993..1d7463c 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_relation.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_relation.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:34.109</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:52.349</modified_date>
+ <modified_date>2021/06/08 13:54:30.142</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_student.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_student.ktr
index fee14e3..a39a1fa 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_student.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_exam_subject_student.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:37.606</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:48.160</modified_date>
+ <modified_date>2021/06/08 13:54:31.372</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_marking_person.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_marking_person.ktr
index 243b816..e121d50 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_marking_person.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_marking_person.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:43:51.733</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 10:32:36.665</modified_date>
+ <modified_date>2021/07/02 10:46:14.243</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_objective_question_config.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_objective_question_config.ktr
index b8f457e..709518d 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_objective_question_config.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_objective_question_config.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:41.111</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:40.140</modified_date>
+ <modified_date>2021/06/08 13:54:33.526</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_relation_student_class.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_relation_student_class.ktr
index 012c815..7210d7f 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_relation_student_class.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_relation_student_class.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:44.530</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:35.583</modified_date>
+ <modified_date>2021/06/08 13:54:34.451</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_scan_model.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_scan_model.ktr
index 9940665..3bce6cf 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_scan_model.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_scan_model.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:43:53.586</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:31.970</modified_date>
+ <modified_date>2021/06/08 13:54:35.364</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_scan_student_paper.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_scan_student_paper.ktr
index 4290dc3..92d850e 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_scan_student_paper.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_scan_student_paper.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:43:54.168</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:27.643</modified_date>
+ <modified_date>2021/06/08 13:54:36.662</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_student_obj_ques_score.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_student_obj_ques_score.ktr
index b63c57c..abc84d3 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_student_obj_ques_score.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_student_obj_ques_score.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:47.932</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:23.419</modified_date>
+ <modified_date>2021/06/08 13:54:38.491</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_student_subj_ques_score.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_student_subj_ques_score.ktr
index d430857..91c6481 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_student_subj_ques_score.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_student_subj_ques_score.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:51.333</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:19.599</modified_date>
+ <modified_date>2021/06/08 13:54:40.684</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -571,7 +571,7 @@ from single_yuejuan_source.bus_student_subj_ques_score</sql>
</output>
</remotesteps>
<GUI>
- <xloc>208</xloc>
+ <xloc>192</xloc>
<yloc>112</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_config.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_config.ktr
index 18095c1..0acdcc1 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_config.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_config.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:31:54.776</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:15.392</modified_date>
+ <modified_date>2021/06/08 13:54:39.523</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_coordinate.ktr b/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_coordinate.ktr
index ec0e180..11f45b4 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_coordinate.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/bus_subjective_question_coordinate.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:43:56.577</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:11.351</modified_date>
+ <modified_date>2021/06/08 13:54:41.772</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/dic_question_type.ktr b/intelligent/single_yuejuan/transfer/fundamental/dic_question_type.ktr
index 662d4b3..5a9d7e5 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/dic_question_type.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/dic_question_type.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:32:01.825</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:14:03.504</modified_date>
+ <modified_date>2021/06/08 13:54:44.598</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/dic_select_subject.ktr b/intelligent/single_yuejuan/transfer/fundamental/dic_select_subject.ktr
index 82b267d..363695a 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/dic_select_subject.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/dic_select_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:32:05.306</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:13:59.153</modified_date>
+ <modified_date>2021/06/08 13:54:45.998</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/fundamental.kjb b/intelligent/single_yuejuan/transfer/fundamental/fundamental.kjb
index ef6ad46..b5341f8 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/fundamental.kjb
+++ b/intelligent/single_yuejuan/transfer/fundamental/fundamental.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:35:29.899</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/13 10:52:29.321</modified_date>
+ <modified_date>2021/07/09 16:52:20.255</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -1201,31 +1201,19 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>560</xloc>
+ <xloc>592</xloc>
<yloc>480</yloc>
<attributes_kjc/>
</entry>
<entry>
- <name>Success</name>
- <description/>
- <type>SUCCESS</type>
- <attributes/>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>400</xloc>
- <yloc>608</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
- <name>fundamental</name>
+ <name>user</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>fundamental</transname>
+ <transname>user</transname>
<directory>/intelligent/single_yuejuan/transfer/fundamental</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -1252,8 +1240,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>560</xloc>
- <yloc>608</yloc>
+ <xloc>720</xloc>
+ <yloc>480</yloc>
<attributes_kjc/>
</entry>
<entry>
@@ -1296,14 +1284,26 @@
<attributes_kjc/>
</entry>
<entry>
- <name>user</name>
+ <name>Success</name>
+ <description/>
+ <type>SUCCESS</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>288</xloc>
+ <yloc>608</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>fundamental</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>user</transname>
+ <transname>fundamental</transname>
<directory>/intelligent/single_yuejuan/transfer/fundamental</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -1330,8 +1330,8 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>720</xloc>
- <yloc>480</yloc>
+ <xloc>544</xloc>
+ <yloc>608</yloc>
<attributes_kjc/>
</entry>
</entries>
@@ -1535,8 +1535,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>teacher</from>
- <to>area</to>
+ <from>bus_subjective_question_coordinate</from>
+ <to>user</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1544,8 +1544,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>bus_subjective_question_coordinate</from>
- <to>user</to>
+ <from>user</from>
+ <to>header_teacher</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1553,8 +1553,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>user</from>
- <to>header_teacher</to>
+ <from>teacher</from>
+ <to>area</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/fundamental.ktr b/intelligent/single_yuejuan/transfer/fundamental/fundamental.ktr
index 900f527..149bdb4 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/fundamental.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/fundamental.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:18:01.920</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:13:55.358</modified_date>
+ <modified_date>2021/07/30 10:31:36.026</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -508,7 +508,7 @@
select single_yuejuan_source_process.gp_exam_total_student(${exam_id});
select single_yuejuan_source_process.gp_exam_subject_score(${exam_id});
select single_yuejuan_source_process.gp_exam_class_relation(${exam_id});
-select single_yuejuan_source_process.gp_task_list(${exam_id}); </sql>
+</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/header_teacher.ktr b/intelligent/single_yuejuan/transfer/fundamental/header_teacher.ktr
index a70d4df..2b44e1b 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/header_teacher.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/header_teacher.ktr
@@ -426,9 +426,9 @@
<clusterschemas>
</clusterschemas>
<created_user>-</created_user>
- <created_date>2021/07/13 10:49:32.193</created_date>
+ <created_date>2021/07/03 14:49:46.532</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/16 13:46:43.534</modified_date>
+ <modified_date>2021/08/14 13:26:08.710</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -526,7 +526,7 @@ school_area_id,
school_id,
school_phase_id,
user_id,
-replace(status,' ','')
+status,
created_by,
created_time,
deleted,
@@ -548,8 +548,8 @@ from single_yuejuan_source.header_teacher</sql>
</output>
</remotesteps>
<GUI>
- <xloc>107</xloc>
- <yloc>207</yloc>
+ <xloc>145</xloc>
+ <yloc>116</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/report_exam_subject.ktr b/intelligent/single_yuejuan/transfer/fundamental/report_exam_subject.ktr
index 3317b75..63d36f9 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/report_exam_subject.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/report_exam_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:32:12.225</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:13:51.727</modified_date>
+ <modified_date>2021/08/14 13:26:06.510</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/school_class.ktr b/intelligent/single_yuejuan/transfer/fundamental/school_class.ktr
index b460ddc..354dde8 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/school_class.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/school_class.ktr
@@ -5,6 +5,7 @@
<extended_description/>
<trans_version/>
<trans_type>Normal</trans_type>
+ <trans_status>0</trans_status>
<directory>/intelligent/single_yuejuan/transfer/fundamental</directory>
<parameters>
</parameters>
@@ -425,24 +426,24 @@
</slaveservers>
<clusterschemas>
</clusterschemas>
- <created_user>-</created_user>
- <created_date>2021/07/13 10:48:53.776</created_date>
- <modified_user>-</modified_user>
- <modified_date>2021/07/13 10:49:23.548</modified_date>
- <key_for_session_key/>
+ <created_user>admin</created_user>
+ <created_date>2020/08/14 09:31:58.239</created_date>
+ <modified_user>admin</modified_user>
+ <modified_date>2021/07/03 09:57:00.481</modified_date>
+ <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -554,8 +555,8 @@ from single_yuejuan_source.school_class</sql>
</output>
</remotesteps>
<GUI>
- <xloc>184</xloc>
- <yloc>230</yloc>
+ <xloc>192</xloc>
+ <yloc>112</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/student.ktr b/intelligent/single_yuejuan/transfer/fundamental/student.ktr
index 2a18923..b1b058e 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/student.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/student.ktr
@@ -425,24 +425,24 @@
</slaveservers>
<clusterschemas>
</clusterschemas>
- <created_user>-</created_user>
- <created_date>2021/07/13 10:46:36.984</created_date>
- <modified_user>-</modified_user>
- <modified_date>2021/07/13 10:47:28.795</modified_date>
- <key_for_session_key/>
+ <created_user>admin</created_user>
+ <created_date>2021/03/03 10:44:00.315</created_date>
+ <modified_user>admin</modified_user>
+ <modified_date>2021/08/14 13:26:07.425</modified_date>
+ <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -542,8 +542,8 @@ from single_yuejuan_source.student</sql>
</output>
</remotesteps>
<GUI>
- <xloc>243</xloc>
- <yloc>211</yloc>
+ <xloc>193</xloc>
+ <yloc>206</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/teacher.ktr b/intelligent/single_yuejuan/transfer/fundamental/teacher.ktr
index 88dda76..c36f6a3 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/teacher.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/teacher.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:32:15.844</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/13 10:48:47.517</modified_date>
+ <modified_date>2021/07/02 11:26:50.899</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/tenant.ktr b/intelligent/single_yuejuan/transfer/fundamental/tenant.ktr
index d0ee4a7..7763eb7 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/tenant.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/tenant.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:01.527</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/13 10:48:31.860</modified_date>
+ <modified_date>2021/07/02 11:27:08.835</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/user.ktr b/intelligent/single_yuejuan/transfer/fundamental/user.ktr
index e856c5d..3510be4 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/user.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/user.ktr
@@ -426,9 +426,9 @@
<clusterschemas>
</clusterschemas>
<created_user>-</created_user>
- <created_date>2021/07/13 10:47:48.524</created_date>
+ <created_date>2021/07/02 11:30:25.064</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/13 10:48:18.890</modified_date>
+ <modified_date>2021/07/02 11:31:21.601</modified_date>
<key_for_session_key/>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -566,8 +566,8 @@ from single_yuejuan_source.user</sql>
</output>
</remotesteps>
<GUI>
- <xloc>159</xloc>
- <yloc>199</yloc>
+ <xloc>520</xloc>
+ <yloc>251</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/fundamental/zh_subject_spilt_score.ktr b/intelligent/single_yuejuan/transfer/fundamental/zh_subject_spilt_score.ktr
index eb518d8..87ac276 100644
--- a/intelligent/single_yuejuan/transfer/fundamental/zh_subject_spilt_score.ktr
+++ b/intelligent/single_yuejuan/transfer/fundamental/zh_subject_spilt_score.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:02.155</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:13:29.486</modified_date>
+ <modified_date>2021/06/08 13:55:02.628</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/monitor_exam.ktr b/intelligent/single_yuejuan/transfer/monitor_exam.ktr
index 855de5f..2b5611f 100644
--- a/intelligent/single_yuejuan/transfer/monitor_exam.ktr
+++ b/intelligent/single_yuejuan/transfer/monitor_exam.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:43:47.544</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:15:55.687</modified_date>
+ <modified_date>2021/06/08 14:09:21.818</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_monitor_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_monitor</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/roll_back/roll_back.kjb b/intelligent/single_yuejuan/transfer/roll_back/roll_back.kjb
index 23fb21e..96591b2 100644
--- a/intelligent/single_yuejuan/transfer/roll_back/roll_back.kjb
+++ b/intelligent/single_yuejuan/transfer/roll_back/roll_back.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:35:53.635</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/03/03 16:49:48.745</modified_date>
+ <modified_date>2021/06/08 09:22:13.513</modified_date>
<parameters>
</parameters>
<slaveservers>
diff --git a/intelligent/single_yuejuan/transfer/roll_back/source_fundamental.ktr b/intelligent/single_yuejuan/transfer/roll_back/source_fundamental.ktr
index 3dc8ef5..118439f 100644
--- a/intelligent/single_yuejuan/transfer/roll_back/source_fundamental.ktr
+++ b/intelligent/single_yuejuan/transfer/roll_back/source_fundamental.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:18:01.920</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 09:37:26.132</modified_date>
+ <modified_date>2021/08/17 10:58:09.847</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -510,6 +510,7 @@ delete from single_yuejuan_source_process.gp_exam_total_student where exam_id =
delete from single_yuejuan_source_process.bus_exam_class_relation where exam_id = ${exam_id};
-------
delete from single_yuejuan_source_process.bus_exam where id = ${exam_id};
+delete from single_yuejuan_source_process.bus_exam_school where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_exam_student where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_exam_subject_relation where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_exam_subject_student where exam_id = ${exam_id};
@@ -545,6 +546,7 @@ vacuum single_yuejuan_source_process.gp_exam_total_student;
vacuum single_yuejuan_source_process.bus_exam_class_relation;
-------
vacuum single_yuejuan_source_process.bus_exam;
+vacuum single_yuejuan_source_process.bus_exam_school;
vacuum single_yuejuan_source_process.bus_exam_student;
vacuum single_yuejuan_source_process.bus_exam_subject_relation;
vacuum single_yuejuan_source_process.bus_exam_subject_student;
diff --git a/intelligent/single_yuejuan/transfer/source/area.ktr b/intelligent/single_yuejuan/transfer/source/area.ktr
index 461a1df..74d16e8 100644
--- a/intelligent/single_yuejuan/transfer/source/area.ktr
+++ b/intelligent/single_yuejuan/transfer/source/area.ktr
@@ -428,18 +428,18 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:03.367</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 09:21:06.987</modified_date>
+ <modified_date>2021/08/23 16:54:45.677</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base</name>
+ <name>school_yuejuan_base_archive</name>
<server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>jty_basic</database>
+ <database>jty_archive</database>
<port>3306</port>
<username>read_only</username>
<password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
@@ -448,14 +448,6 @@
<index_tablespace/>
<attributes>
<attribute>
- <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
- <attribute>500</attribute>
- </attribute>
- <attribute>
- <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
- <attribute>true</attribute>
- </attribute>
- <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -561,7 +553,7 @@
</output>
</remotesteps>
<GUI>
- <xloc>544</xloc>
+ <xloc>608</xloc>
<yloc>208</yloc>
<draw>Y</draw>
</GUI>
@@ -577,7 +569,7 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base</connection>
+ <connection>school_yuejuan_base_archive</connection>
<sql>select
id,
created_time,
@@ -605,7 +597,7 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>128</xloc>
+ <xloc>208</xloc>
<yloc>208</yloc>
<draw>Y</draw>
</GUI>
@@ -833,7 +825,7 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>304</xloc>
+ <xloc>400</xloc>
<yloc>208</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_exam.ktr b/intelligent/single_yuejuan/transfer/source/bus_exam.ktr
index 1cdba48..5a9b867 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_exam.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_exam.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 10:12:57.403</modified_date>
+ <modified_date>2021/08/23 16:54:38.726</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_exam_school.ktr b/intelligent/single_yuejuan/transfer/source/bus_exam_school.ktr
index 94f3153..dd84068 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_exam_school.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_exam_school.ktr
@@ -428,7 +428,7 @@
<created_user>-</created_user>
<created_date>2021/03/09 08:57:43.145</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/15 17:53:57.672</modified_date>
+ <modified_date>2021/08/23 16:54:32.062</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_exam_student.ktr b/intelligent/single_yuejuan/transfer/source/bus_exam_student.ktr
index 05c6a13..2073d2d 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_exam_student.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_exam_student.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 10:21:14.218</modified_date>
+ <modified_date>2021/08/23 16:54:26.390</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_exam_subject.ktr b/intelligent/single_yuejuan/transfer/source/bus_exam_subject.ktr
index 1017d62..4ca2543 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_exam_subject.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_exam_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:56.839</modified_date>
+ <modified_date>2021/08/23 16:54:19.988</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -557,7 +557,7 @@
</output>
</remotesteps>
<GUI>
- <xloc>384</xloc>
+ <xloc>368</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_exam_subject_relation.ktr b/intelligent/single_yuejuan/transfer/source/bus_exam_subject_relation.ktr
index a216ca4..87dce75 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_exam_subject_relation.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_exam_subject_relation.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:52.132</modified_date>
+ <modified_date>2021/08/23 16:54:10.397</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_exam_subject_student.ktr b/intelligent/single_yuejuan/transfer/source/bus_exam_subject_student.ktr
index 5c97492..60f3c9c 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_exam_subject_student.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_exam_subject_student.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:48.115</modified_date>
+ <modified_date>2021/08/23 16:54:03.943</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_marking_person.ktr b/intelligent/single_yuejuan/transfer/source/bus_marking_person.ktr
index 9d96678..19b5af8 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_marking_person.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_marking_person.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:07.359</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/16 10:30:06.771</modified_date>
+ <modified_date>2021/08/23 16:53:57.631</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_objective_question_config.ktr b/intelligent/single_yuejuan/transfer/source/bus_objective_question_config.ktr
index b8dc2c0..85eb6f6 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_objective_question_config.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_objective_question_config.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:38.392</modified_date>
+ <modified_date>2021/08/23 16:53:49.981</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_relation_student_class.ktr b/intelligent/single_yuejuan/transfer/source/bus_relation_student_class.ktr
index f834e6e..ad39685 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_relation_student_class.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_relation_student_class.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:32.974</modified_date>
+ <modified_date>2021/08/23 16:53:43.613</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_scan_model.ktr b/intelligent/single_yuejuan/transfer/source/bus_scan_model.ktr
index 08692b1..d97b1ee 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_scan_model.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_scan_model.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:09.343</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:27.858</modified_date>
+ <modified_date>2021/08/23 16:53:37.215</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_scan_student_paper.ktr b/intelligent/single_yuejuan/transfer/source/bus_scan_student_paper.ktr
index 5fbfa42..356d8bf 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_scan_student_paper.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_scan_student_paper.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:09.985</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:23.517</modified_date>
+ <modified_date>2021/08/23 16:52:14.884</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_student_obj_ques_score.ktr b/intelligent/single_yuejuan/transfer/source/bus_student_obj_ques_score.ktr
index e1f9722..d9c4c49 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_student_obj_ques_score.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_student_obj_ques_score.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:18.734</modified_date>
+ <modified_date>2021/06/08 13:58:44.403</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/wljty/etl_total/data/intelligent/single_yuejuan/bus_student_obj_ques_score</name>
+ <name>/home/gpadmin/gpfdist/intelligent/single_yuejuan/bus_student_obj_ques_score</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_student_subj_ques_score.ktr b/intelligent/single_yuejuan/transfer/source/bus_student_subj_ques_score.ktr
index c012dc3..fb47b60 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_student_subj_ques_score.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_student_subj_ques_score.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:14.236</modified_date>
+ <modified_date>2021/06/08 13:58:49.372</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/wljty/etl_total/data/intelligent/single_yuejuan/bus_student_subj_ques_score</name>
+ <name>/home/gpadmin/gpfdist/intelligent/single_yuejuan/bus_student_subj_ques_score</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_subjective_question_config.ktr b/intelligent/single_yuejuan/transfer/source/bus_subjective_question_config.ktr
index e16cc85..29a37a1 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_subjective_question_config.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_subjective_question_config.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:10:02.871</modified_date>
+ <modified_date>2021/08/23 16:52:08.702</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr b/intelligent/single_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr
index 4475510..3961a43 100644
--- a/intelligent/single_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr
+++ b/intelligent/single_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:13.015</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:09:58.164</modified_date>
+ <modified_date>2021/08/23 16:53:22.164</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/dic_question_type.ktr b/intelligent/single_yuejuan/transfer/source/dic_question_type.ktr
index 42c6221..2f186ac 100644
--- a/intelligent/single_yuejuan/transfer/source/dic_question_type.ktr
+++ b/intelligent/single_yuejuan/transfer/source/dic_question_type.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:09:39.251</modified_date>
+ <modified_date>2021/08/23 16:51:56.998</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/dic_select_subject.ktr b/intelligent/single_yuejuan/transfer/source/dic_select_subject.ktr
index 5285bf4..5a80d17 100644
--- a/intelligent/single_yuejuan/transfer/source/dic_select_subject.ktr
+++ b/intelligent/single_yuejuan/transfer/source/dic_select_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:09:34.681</modified_date>
+ <modified_date>2021/08/23 16:53:30.052</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/header_teacher.ktr b/intelligent/single_yuejuan/transfer/source/header_teacher.ktr
index 5a3a8d7..67fdd7f 100644
--- a/intelligent/single_yuejuan/transfer/source/header_teacher.ktr
+++ b/intelligent/single_yuejuan/transfer/source/header_teacher.ktr
@@ -426,20 +426,20 @@
<clusterschemas>
</clusterschemas>
<created_user>-</created_user>
- <created_date>2021/07/13 11:10:19.823</created_date>
+ <created_date>2021/07/03 14:45:32.421</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/13 14:13:40.978</modified_date>
+ <modified_date>2021/08/23 16:53:15.741</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base_archive</name>
+ <name>school_yuejuan_base</name>
<server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>jty_archive</database>
+ <database>jty_basic</database>
<port>3306</port>
<username>read_only</username>
<password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
@@ -448,6 +448,14 @@
<index_tablespace/>
<attributes>
<attribute>
+ <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
+ <attribute>500</attribute>
+ </attribute>
+ <attribute>
+ <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
+ <attribute>true</attribute>
+ </attribute>
+ <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -553,8 +561,8 @@
</output>
</remotesteps>
<GUI>
- <xloc>472</xloc>
- <yloc>118</yloc>
+ <xloc>400</xloc>
+ <yloc>96</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -569,7 +577,7 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base_archive</connection>
+ <connection>school_yuejuan_base</connection>
<sql>select
id,
class_id,
@@ -600,8 +608,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>136</xloc>
- <yloc>118</yloc>
+ <xloc>128</xloc>
+ <yloc>96</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -888,8 +896,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>296</xloc>
- <yloc>118</yloc>
+ <xloc>256</xloc>
+ <yloc>96</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/source/report_exam_subject.ktr b/intelligent/single_yuejuan/transfer/source/report_exam_subject.ktr
index 3200267..a99e590 100644
--- a/intelligent/single_yuejuan/transfer/source/report_exam_subject.ktr
+++ b/intelligent/single_yuejuan/transfer/source/report_exam_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:09:26.903</modified_date>
+ <modified_date>2021/08/23 16:53:09.127</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/source/school_class.ktr b/intelligent/single_yuejuan/transfer/source/school_class.ktr
index b7e2aa0..0d113ed 100644
--- a/intelligent/single_yuejuan/transfer/source/school_class.ktr
+++ b/intelligent/single_yuejuan/transfer/source/school_class.ktr
@@ -426,20 +426,20 @@
<clusterschemas>
</clusterschemas>
<created_user>-</created_user>
- <created_date>2021/07/13 11:09:34.272</created_date>
+ <created_date>2021/07/02 14:33:36.108</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/16 09:56:13.402</modified_date>
+ <modified_date>2021/08/23 16:53:02.374</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base_archive</name>
+ <name>school_yuejuan_base</name>
<server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>jty_archive</database>
+ <database>jty_basic</database>
<port>3306</port>
<username>read_only</username>
<password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
@@ -448,6 +448,14 @@
<index_tablespace/>
<attributes>
<attribute>
+ <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
+ <attribute>500</attribute>
+ </attribute>
+ <attribute>
+ <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
+ <attribute>true</attribute>
+ </attribute>
+ <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -553,8 +561,8 @@
</output>
</remotesteps>
<GUI>
- <xloc>522</xloc>
- <yloc>100</yloc>
+ <xloc>448</xloc>
+ <yloc>176</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -569,7 +577,7 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base_archive</connection>
+ <connection>school_yuejuan_base</connection>
<sql>select
id,
created_by,
@@ -603,8 +611,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>186</xloc>
- <yloc>100</yloc>
+ <xloc>164</xloc>
+ <yloc>167</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -622,67 +630,51 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
<fields>
<field>
<name>id</name>
- <rename/>
</field>
<field>
<name>created_by</name>
- <rename/>
</field>
<field>
<name>created_time</name>
- <rename/>
</field>
<field>
<name>deleted</name>
- <rename/>
</field>
<field>
<name>modified_time</name>
- <rename/>
</field>
<field>
<name>alias</name>
- <rename/>
</field>
<field>
<name>entry_year</name>
- <rename/>
</field>
<field>
<name>grade_id</name>
- <rename/>
</field>
<field>
<name>graduate_year</name>
- <rename/>
</field>
<field>
<name>graduated</name>
- <rename/>
</field>
<field>
<name>name</name>
- <rename/>
</field>
<field>
<name>ordinal</name>
- <rename/>
</field>
<field>
<name>school_area_id</name>
- <rename/>
</field>
<field>
<name>school_id</name>
- <rename/>
</field>
<field>
<name>type</name>
- <rename/>
</field>
<field>
<name>school_phase_id</name>
- <rename/>
</field>
<select_unspecified>N</select_unspecified>
<meta>
@@ -967,8 +959,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>346</xloc>
- <yloc>100</yloc>
+ <xloc>288</xloc>
+ <yloc>176</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/source/source.kjb b/intelligent/single_yuejuan/transfer/source/source.kjb
index f7b8c08..dcce475 100644
--- a/intelligent/single_yuejuan/transfer/source/source.kjb
+++ b/intelligent/single_yuejuan/transfer/source/source.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:36:00.094</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/13 11:13:57.746</modified_date>
+ <modified_date>2021/08/24 09:16:27.949</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -631,7 +631,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>784</xloc>
+ <xloc>752</xloc>
<yloc>528</yloc>
<attributes_kjc/>
</entry>
@@ -1165,14 +1165,14 @@
<attributes_kjc/>
</entry>
<entry>
- <name>header_teacher</name>
+ <name>student</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>header_teacher</transname>
+ <transname>student</transname>
<directory>/intelligent/single_yuejuan/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -1199,7 +1199,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>880</xloc>
+ <xloc>1088</xloc>
<yloc>528</yloc>
<attributes_kjc/>
</entry>
@@ -1238,19 +1238,19 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>976</xloc>
+ <xloc>992</xloc>
<yloc>528</yloc>
<attributes_kjc/>
</entry>
<entry>
- <name>student</name>
+ <name>header_teacher</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>student</transname>
+ <transname>header_teacher</transname>
<directory>/intelligent/single_yuejuan/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -1277,7 +1277,7 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>1072</xloc>
+ <xloc>896</xloc>
<yloc>528</yloc>
<attributes_kjc/>
</entry>
diff --git a/intelligent/single_yuejuan/transfer/source/student.ktr b/intelligent/single_yuejuan/transfer/source/student.ktr
index 641c1bd..814ef4c 100644
--- a/intelligent/single_yuejuan/transfer/source/student.ktr
+++ b/intelligent/single_yuejuan/transfer/source/student.ktr
@@ -426,20 +426,20 @@
<clusterschemas>
</clusterschemas>
<created_user>-</created_user>
- <created_date>2021/07/13 10:59:06.977</created_date>
+ <created_date>2021/07/02 10:59:15.432</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/16 09:50:02.459</modified_date>
+ <modified_date>2021/08/23 16:52:55.332</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base_archive</name>
+ <name>school_yuejuan_base</name>
<server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>jty_archive</database>
+ <database>jty_basic</database>
<port>3306</port>
<username>read_only</username>
<password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
@@ -448,6 +448,14 @@
<index_tablespace/>
<attributes>
<attribute>
+ <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
+ <attribute>500</attribute>
+ </attribute>
+ <attribute>
+ <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
+ <attribute>true</attribute>
+ </attribute>
+ <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -553,8 +561,8 @@
</output>
</remotesteps>
<GUI>
- <xloc>400</xloc>
- <yloc>160</yloc>
+ <xloc>480</xloc>
+ <yloc>112</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -569,7 +577,7 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base_archive</connection>
+ <connection>school_yuejuan_base</connection>
<sql>select
user_id,
candidate_number,
@@ -597,8 +605,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>80</xloc>
- <yloc>160</yloc>
+ <xloc>112</xloc>
+ <yloc>112</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -616,43 +624,33 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
<fields>
<field>
<name>user_id</name>
- <rename/>
</field>
<field>
<name>candidate_number</name>
- <rename/>
</field>
<field>
<name>status</name>
- <rename/>
</field>
<field>
<name>student_identity</name>
- <rename/>
</field>
<field>
<name>student_number</name>
- <rename/>
</field>
<field>
<name>created_by</name>
- <rename/>
</field>
<field>
<name>created_time</name>
- <rename/>
</field>
<field>
<name>deleted</name>
- <rename/>
</field>
<field>
<name>modified_time</name>
- <rename/>
</field>
<field>
<name>tenant_id</name>
- <rename/>
</field>
<select_unspecified>N</select_unspecified>
<meta>
@@ -835,8 +833,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>224</xloc>
- <yloc>160</yloc>
+ <xloc>304</xloc>
+ <yloc>112</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/source/teacher.ktr b/intelligent/single_yuejuan/transfer/source/teacher.ktr
index e69eb48..5d01084 100644
--- a/intelligent/single_yuejuan/transfer/source/teacher.ktr
+++ b/intelligent/single_yuejuan/transfer/source/teacher.ktr
@@ -429,18 +429,18 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/13 14:14:13.372</modified_date>
+ <modified_date>2021/08/23 16:52:47.998</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base_archive</name>
+ <name>school_yuejuan_base</name>
<server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>jty_archive</database>
+ <database>jty_basic</database>
<port>3306</port>
<username>read_only</username>
<password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
@@ -449,6 +449,14 @@
<index_tablespace/>
<attributes>
<attribute>
+ <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
+ <attribute>500</attribute>
+ </attribute>
+ <attribute>
+ <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
+ <attribute>true</attribute>
+ </attribute>
+ <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -554,7 +562,7 @@
</output>
</remotesteps>
<GUI>
- <xloc>512</xloc>
+ <xloc>464</xloc>
<yloc>96</yloc>
<draw>Y</draw>
</GUI>
@@ -570,7 +578,7 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base_archive</connection>
+ <connection>school_yuejuan_base</connection>
<sql>select
user_id,
job_number,
@@ -597,7 +605,7 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>176</xloc>
+ <xloc>192</xloc>
<yloc>96</yloc>
<draw>Y</draw>
</GUI>
@@ -616,39 +624,30 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
<fields>
<field>
<name>user_id</name>
- <rename/>
</field>
<field>
<name>job_number</name>
- <rename/>
</field>
<field>
<name>created_by</name>
- <rename/>
</field>
<field>
<name>created_time</name>
- <rename/>
</field>
<field>
<name>deleted</name>
- <rename/>
</field>
<field>
<name>modified_time</name>
- <rename/>
</field>
<field>
<name>job_status</name>
- <rename/>
</field>
<field>
<name>position_id</name>
- <rename/>
</field>
<field>
<name>station_id</name>
- <rename/>
</field>
<select_unspecified>N</select_unspecified>
<meta>
@@ -814,7 +813,7 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>336</xloc>
+ <xloc>320</xloc>
<yloc>96</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/single_yuejuan/transfer/source/tenant.ktr b/intelligent/single_yuejuan/transfer/source/tenant.ktr
index cfccaa3..64f669a 100644
--- a/intelligent/single_yuejuan/transfer/source/tenant.ktr
+++ b/intelligent/single_yuejuan/transfer/source/tenant.ktr
@@ -428,18 +428,18 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:18.197</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/07/13 14:14:21.260</modified_date>
+ <modified_date>2021/08/23 16:52:41.375</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base_archive</name>
+ <name>school_yuejuan_base</name>
<server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>jty_archive</database>
+ <database>jty_basic</database>
<port>3306</port>
<username>read_only</username>
<password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
@@ -448,6 +448,14 @@
<index_tablespace/>
<attributes>
<attribute>
+ <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
+ <attribute>500</attribute>
+ </attribute>
+ <attribute>
+ <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
+ <attribute>true</attribute>
+ </attribute>
+ <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -553,8 +561,8 @@
</output>
</remotesteps>
<GUI>
- <xloc>415</xloc>
- <yloc>221</yloc>
+ <xloc>528</xloc>
+ <yloc>224</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -569,7 +577,7 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base_archive</connection>
+ <connection>school_yuejuan_base</connection>
<sql>select
id,
created_by,
@@ -599,8 +607,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>96</xloc>
- <yloc>224</yloc>
+ <xloc>239</xloc>
+ <yloc>221</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -618,51 +626,39 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
<fields>
<field>
<name>id</name>
- <rename/>
</field>
<field>
<name>created_by</name>
- <rename/>
</field>
<field>
<name>created_time</name>
- <rename/>
</field>
<field>
<name>deleted</name>
- <rename/>
</field>
<field>
<name>modified_time</name>
- <rename/>
</field>
<field>
<name>address_id</name>
- <rename/>
</field>
<field>
<name>alias</name>
- <rename/>
</field>
<field>
<name>name</name>
- <rename/>
</field>
<field>
<name>remark</name>
- <rename/>
</field>
<field>
<name>state</name>
- <rename/>
</field>
<field>
<name>type</name>
- <rename/>
</field>
<field>
<name>english</name>
- <rename/>
</field>
<select_unspecified>N</select_unspecified>
<meta>
@@ -879,7 +875,7 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>240</xloc>
+ <xloc>368</xloc>
<yloc>224</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/single_yuejuan/transfer/source/user.ktr b/intelligent/single_yuejuan/transfer/source/user.ktr
index 4dc0633..84f2789 100644
--- a/intelligent/single_yuejuan/transfer/source/user.ktr
+++ b/intelligent/single_yuejuan/transfer/source/user.ktr
@@ -426,20 +426,20 @@
<clusterschemas>
</clusterschemas>
<created_user>-</created_user>
- <created_date>2021/07/13 11:04:55.542</created_date>
+ <created_date>2021/07/02 11:01:00.246</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/07/13 14:14:29.955</modified_date>
+ <modified_date>2021/08/23 16:52:33.062</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base_archive</name>
+ <name>school_yuejuan_base</name>
<server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>jty_archive</database>
+ <database>jty_basic</database>
<port>3306</port>
<username>read_only</username>
<password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
@@ -448,6 +448,14 @@
<index_tablespace/>
<attributes>
<attribute>
+ <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
+ <attribute>500</attribute>
+ </attribute>
+ <attribute>
+ <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
+ <attribute>true</attribute>
+ </attribute>
+ <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -553,8 +561,8 @@
</output>
</remotesteps>
<GUI>
- <xloc>416</xloc>
- <yloc>208</yloc>
+ <xloc>432</xloc>
+ <yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -569,7 +577,7 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base_archive</connection>
+ <connection>school_yuejuan_base</connection>
<sql>select
id,
created_by,
@@ -609,8 +617,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>96</xloc>
- <yloc>208</yloc>
+ <xloc>112</xloc>
+ <yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -628,91 +636,69 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
<fields>
<field>
<name>id</name>
- <rename/>
</field>
<field>
<name>created_by</name>
- <rename/>
</field>
<field>
<name>created_time</name>
- <rename/>
</field>
<field>
<name>deleted</name>
- <rename/>
</field>
<field>
<name>modified_time</name>
- <rename/>
</field>
<field>
<name>address_id</name>
- <rename/>
</field>
<field>
<name>birth_day</name>
- <rename/>
</field>
<field>
<name>gender</name>
- <rename/>
</field>
<field>
<name>identity_card</name>
- <rename/>
</field>
<field>
<name>login_name</name>
- <rename/>
</field>
<field>
<name>name</name>
- <rename/>
</field>
<field>
<name>password</name>
- <rename/>
</field>
<field>
<name>tenant_id</name>
- <rename/>
</field>
<field>
<name>nation_id</name>
- <rename/>
</field>
<field>
<name>native_place_area_id</name>
- <rename/>
</field>
<field>
<name>politic_countenance_id</name>
- <rename/>
</field>
<field>
<name>professional_qualification_id</name>
- <rename/>
</field>
<field>
<name>state</name>
- <rename/>
</field>
<field>
<name>salt</name>
- <rename/>
</field>
<field>
<name>password_token</name>
- <rename/>
</field>
<field>
<name>avatar</name>
- <rename/>
</field>
<field>
<name>identity</name>
- <rename/>
</field>
<select_unspecified>N</select_unspecified>
<meta>
@@ -1099,8 +1085,8 @@ where (created_time>'${start_time}' and created_time<='${end_time}') or (modi
</output>
</remotesteps>
<GUI>
- <xloc>224</xloc>
- <yloc>208</yloc>
+ <xloc>256</xloc>
+ <yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/single_yuejuan/transfer/source/zh_subject_spilt_score.ktr b/intelligent/single_yuejuan/transfer/source/zh_subject_spilt_score.ktr
index 6cf4c34..c58981e 100644
--- a/intelligent/single_yuejuan/transfer/source/zh_subject_spilt_score.ktr
+++ b/intelligent/single_yuejuan/transfer/source/zh_subject_spilt_score.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:19.320</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:08:43.059</modified_date>
+ <modified_date>2021/08/23 16:52:24.014</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
diff --git a/intelligent/single_yuejuan/transfer/total_control/set_variable.kjb b/intelligent/single_yuejuan/transfer/total_control/set_variable.kjb
index bbc67b6..5bc387e 100644
--- a/intelligent/single_yuejuan/transfer/total_control/set_variable.kjb
+++ b/intelligent/single_yuejuan/transfer/total_control/set_variable.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/08/14 09:36:23.704</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/03/04 10:08:00.900</modified_date>
+ <modified_date>2021/06/08 14:08:51.867</modified_date>
<parameters>
</parameters>
<slaveservers>
diff --git a/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable.ktr b/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable.ktr
index 8065c4b..3dab899 100644
--- a/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable.ktr
+++ b/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:08:35.396</modified_date>
+ <modified_date>2021/06/08 13:59:17.180</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_is_run.ktr b/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_is_run.ktr
index d4c39c0..26c26c4 100644
--- a/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_is_run.ktr
+++ b/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_is_run.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:17.611</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:08:31.267</modified_date>
+ <modified_date>2021/06/08 14:08:35.403</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr b/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr
index 76ca7c1..80e6b07 100644
--- a/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr
+++ b/intelligent/single_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr
@@ -429,34 +429,26 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:08:19.926</modified_date>
+ <modified_date>2021/08/05 15:47:40.365</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
- <type>MYSQL</type>
+ <name>intelligent_greenplum_neiwang</name>
+ <server>10.1.103.241</server>
+ <type>POSTGRESQL</type>
<access>Native</access>
- <database>union_yuejuan_yun</database>
- <port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <database>intelligent</database>
+ <port>5432</port>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
<attributes>
<attribute>
- <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
- <attribute>500</attribute>
- </attribute>
- <attribute>
- <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
- <attribute>true</attribute>
- </attribute>
- <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -470,7 +462,7 @@
</attribute>
<attribute>
<code>PORT_NUMBER</code>
- <attribute>3306</attribute>
+ <attribute>5432</attribute>
</attribute>
<attribute>
<code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -481,10 +473,6 @@
<attribute>N</attribute>
</attribute>
<attribute>
- <code>STREAM_RESULTS</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
<code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
<attribute>Y</attribute>
</attribute>
@@ -568,16 +556,17 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>intelligent_single_yuejuan_neiwang</connection>
+ <connection>intelligent_greenplum_neiwang</connection>
<sql>select
-id as task_id,
-exam_id,
-create_time as end_time,
-case when (select count(*) from task_list where task_status>1)>0
-then (select max(create_time) from task_list where task_status>1)
+a.id as task_id,
+a.exam_id,
+a.create_time as end_time,
+case when (select count(*) from single_yuejuan_source_process.task_list where task_status=2)>0
+then (select max(create_time) from single_yuejuan_source_process.task_list where task_status=2)
else '2000-01-01 00:00:00' end start_time
-from task_list
-where task_status=1 and del_flag=0 and source_type=1</sql>
+from single_yuejuan_source_process.task_list a
+where a.del_flag=0 and task_status=1
+order by a.create_time limit 1</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
diff --git a/intelligent/single_yuejuan/transfer/total_control/set_variable/update_state.ktr b/intelligent/single_yuejuan/transfer/total_control/set_variable/update_state.ktr
index 64a0c6a..42f50a5 100644
--- a/intelligent/single_yuejuan/transfer/total_control/set_variable/update_state.ktr
+++ b/intelligent/single_yuejuan/transfer/total_control/set_variable/update_state.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:38.865</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:08:03.613</modified_date>
+ <modified_date>2021/06/08 14:08:48.973</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/total_control/update_state.ktr b/intelligent/single_yuejuan/transfer/total_control/update_state.ktr
index 60ed3fa..e558591 100644
--- a/intelligent/single_yuejuan/transfer/total_control/update_state.ktr
+++ b/intelligent/single_yuejuan/transfer/total_control/update_state.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:38.865</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:15:17.384</modified_date>
+ <modified_date>2021/06/08 14:08:54.011</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/total_control/write_log_success.ktr b/intelligent/single_yuejuan/transfer/total_control/write_log_success.ktr
index bac8fcb..6ab453f 100644
--- a/intelligent/single_yuejuan/transfer/total_control/write_log_success.ktr
+++ b/intelligent/single_yuejuan/transfer/total_control/write_log_success.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:45.877</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 09:59:24.853</modified_date>
+ <modified_date>2021/06/08 14:08:55.549</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/single_yuejuan/transfer/total_control/write_log_unsuccess.ktr b/intelligent/single_yuejuan/transfer/total_control/write_log_unsuccess.ktr
index 0535350..d73da4d 100644
--- a/intelligent/single_yuejuan/transfer/total_control/write_log_unsuccess.ktr
+++ b/intelligent/single_yuejuan/transfer/total_control/write_log_unsuccess.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:52.787</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/05/14 10:15:21.611</modified_date>
+ <modified_date>2021/06/08 14:09:13.204</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>gp-8vb6gifi3l9404qmz-master.gpdbmaster.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent</database>
<port>5432</port>
- <username>wlyuejuan</username>
- <password>Encrypted 2be98c5bc13cd8ba4bc15a464c7c3fd89</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -488,13 +488,13 @@
</connection>
<connection>
<name>intelligent_single_yuejuan_neiwang</name>
- <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>wl_admin</username>
- <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
+ <username>dev</username>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
diff --git a/intelligent/union_yuejuan/analysis/core.kjb b/intelligent/union_yuejuan/analysis/core.kjb
index fd5f307..2159b65 100644
--- a/intelligent/union_yuejuan/analysis/core.kjb
+++ b/intelligent/union_yuejuan/analysis/core.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:21:41.533</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/03/09 16:20:06.665</modified_date>
+ <modified_date>2021/08/03 17:02:19.700</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -348,31 +348,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Shell</name>
- <description/>
- <type>SHELL</type>
- <attributes/>
- <filename>/home/gpadmin/kettle/python_pkgs_new/bigdata_etl_test/jobs/intelligent_test/union_yuejuan/analysis_status_union.sh</filename>
- <work_directory/>
- <arg_from_previous>N</arg_from_previous>
- <exec_per_row>N</exec_per_row>
- <set_logfile>N</set_logfile>
- <logfile/>
- <set_append_logfile>N</set_append_logfile>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <insertScript>N</insertScript>
- <script/>
- <loglevel>Basic</loglevel>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>768</xloc>
- <yloc>448</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>START</name>
<description/>
<type>SPECIAL</type>
@@ -932,28 +907,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>stage_roll_back</name>
- <description/>
- <type>SET_VARIABLES</type>
- <attributes/>
- <replacevars>Y</replacevars>
- <filename/>
- <file_variable_type>JVM</file_variable_type>
- <fields>
- <field>
- <variable_name>stage</variable_name>
- <variable_value>roll_back</variable_value>
- <variable_type>JVM</variable_type>
- </field>
- </fields>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>896</xloc>
- <yloc>112</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>adm</name>
<description/>
<type>JOB</type>
@@ -1069,6 +1022,19 @@
<attributes_kjc/>
</entry>
<entry>
+ <name>中止作业</name>
+ <description/>
+ <type>ABORT</type>
+ <attributes/>
+ <message/>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>768</xloc>
+ <yloc>160</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
<name>write_log_unsuccess 4</name>
<description/>
<type>TRANS</type>
@@ -1108,7 +1074,7 @@
<attributes_kjc/>
</entry>
<entry>
- <name>中止作业</name>
+ <name>中止作业 2</name>
<description/>
<type>ABORT</type>
<attributes/>
@@ -1116,12 +1082,12 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>768</xloc>
- <yloc>160</yloc>
+ <xloc>528</xloc>
+ <yloc>224</yloc>
<attributes_kjc/>
</entry>
<entry>
- <name>中止作业 2</name>
+ <name>中止作业 3</name>
<description/>
<type>ABORT</type>
<attributes/>
@@ -1129,12 +1095,12 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>528</xloc>
+ <xloc>144</xloc>
<yloc>224</yloc>
<attributes_kjc/>
</entry>
<entry>
- <name>中止作业 3</name>
+ <name>中止作业 4</name>
<description/>
<type>ABORT</type>
<attributes/>
@@ -1142,12 +1108,110 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>144</xloc>
- <yloc>224</yloc>
+ <xloc>368</xloc>
+ <yloc>560</yloc>
<attributes_kjc/>
</entry>
<entry>
- <name>中止作业 4</name>
+ <name>core</name>
+ <description/>
+ <type>JOB</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <job_object_id/>
+ <filename/>
+ <jobname>core</jobname>
+ <directory>/intelligent/union_yuejuan/transfer</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Nothing</loglevel>
+ <slave_server_name/>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <expand_remote_job>N</expand_remote_job>
+ <create_parent_folder>N</create_parent_folder>
+ <pass_export>N</pass_export>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <set_append_logfile>N</set_append_logfile>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1168</xloc>
+ <yloc>16</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>transfer_core</name>
+ <description/>
+ <type>SET_VARIABLES</type>
+ <attributes/>
+ <replacevars>Y</replacevars>
+ <filename/>
+ <file_variable_type>JVM</file_variable_type>
+ <fields>
+ <field>
+ <variable_name>stage</variable_name>
+ <variable_value>transfer_core</variable_value>
+ <variable_type>JVM</variable_type>
+ </field>
+ </fields>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1024</xloc>
+ <yloc>16</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>write_log_unsuccess 1</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>write_log_unsuccess</transname>
+ <directory>/intelligent/union_yuejuan/analysis/total_control</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1312</xloc>
+ <yloc>16</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>中止作业 5</name>
<description/>
<type>ABORT</type>
<attributes/>
@@ -1155,22 +1219,74 @@
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
- <xloc>368</xloc>
- <yloc>560</yloc>
+ <xloc>1440</xloc>
+ <yloc>16</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>write_log_success 1</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>write_log_success</transname>
+ <directory>/intelligent/union_yuejuan/analysis/total_control</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1168</xloc>
+ <yloc>112</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>stage_roll_back</name>
+ <description/>
+ <type>SET_VARIABLES</type>
+ <attributes/>
+ <replacevars>Y</replacevars>
+ <filename/>
+ <file_variable_type>JVM</file_variable_type>
+ <fields>
+ <field>
+ <variable_name>stage</variable_name>
+ <variable_value>roll_back</variable_value>
+ <variable_type>JVM</variable_type>
+ </field>
+ </fields>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1168</xloc>
+ <yloc>224</yloc>
<attributes_kjc/>
</entry>
</entries>
<hops>
<hop>
- <from>stage_roll_back</from>
- <to>roll_back</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>fundamental_stage</from>
<to>fundamental</to>
<from_nr>0</from_nr>
@@ -1216,15 +1332,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>update_yuejuan_state</from>
- <to>Shell</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>report</from>
<to>write_log_success 5</to>
<from_nr>0</from_nr>
@@ -1243,15 +1350,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>Shell</from>
- <to>Success 2</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>write_log_success 3</from>
<to>adm_stage</to>
<from_nr>0</from_nr>
@@ -1279,15 +1377,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>set_variable</from>
- <to>stage_roll_back</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>adm_stage</from>
<to>adm</to>
<from_nr>0</from_nr>
@@ -1387,8 +1476,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>write_log_unsuccess 2</from>
- <to>中止作业</to>
+ <from>write_log_unsuccess 3</from>
+ <to>中止作业 2</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1396,8 +1485,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>write_log_unsuccess 3</from>
- <to>中止作业 2</to>
+ <from>write_log_unsuccess 2</from>
+ <to>中止作业</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1422,6 +1511,78 @@
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
+ <hop>
+ <from>set_variable</from>
+ <to>transfer_core</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>transfer_core</from>
+ <to>core</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>core</from>
+ <to>write_log_success 1</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>write_log_success 1</from>
+ <to>stage_roll_back</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>stage_roll_back</from>
+ <to>roll_back</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>core</from>
+ <to>write_log_unsuccess 1</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>write_log_unsuccess 1</from>
+ <to>中止作业 5</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>update_yuejuan_state</from>
+ <to>Success 2</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
</hops>
<notepads>
</notepads>
diff --git a/intelligent/union_yuejuan/analysis/fundamental/fundamental.ktr b/intelligent/union_yuejuan/analysis/fundamental/fundamental.ktr
index 5eb41da..3dad4c7 100644
--- a/intelligent/union_yuejuan/analysis/fundamental/fundamental.ktr
+++ b/intelligent/union_yuejuan/analysis/fundamental/fundamental.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:56.153</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:49:17.745</modified_date>
+ <modified_date>2021/08/16 16:03:04.713</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -511,6 +511,7 @@ select union_yuejuan_fundamental.union_subject_type(${exam_id},${task_type},${ty
select union_yuejuan_fundamental.union_total_subject(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_segment10(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_segment50(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
+select union_yuejuan_fundamental.union_exam_subject(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_q_k_relation(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_fufen(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_subject_score_rank(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
@@ -519,7 +520,7 @@ select union_yuejuan_fundamental.union_total_score_rank(${exam_id},${task_type},
select union_yuejuan_fundamental.union_exam_student(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_question_details(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_segment_structure_config(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
-select union_yuejuan_fundamental.union_exam_subject(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
+
select union_yuejuan_fundamental.union_score_entrust_config(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_proportion_structure_config(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select union_yuejuan_fundamental.union_zero_absent(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});</sql>
diff --git a/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable.ktr b/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable.ktr
index ff02a3b..986d107 100644
--- a/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable.ktr
+++ b/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:55:15.087</modified_date>
+ <modified_date>2021/08/03 16:00:00.423</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -609,22 +609,21 @@
a.id as task_id,
a.type as task_type,
a.type_id,
-a.include_zero,
-a.include_absent,
-a.show_student_rank,
-a.default_score,
+c.include_zero,
+c.include_absent,
+c.show_student_rank,
+c.default_score,
a.exam_id,
--a.model,
-b.exam_type as model,
-b.exam_type,
+a.model,
+a.model as exam_type,
a.create_time as end_time,
case when (select count(*) from union_yuejuan_source_process.task_list where task_status=2)>0
then (select max(create_time) from union_yuejuan_source_process.task_list where task_status=2)
else '2000-01-01 00:00:00' end start_time
from union_yuejuan_source_process.task_list a
-inner join union_yuejuan_source_process.bus_exam b
-on a.exam_id=b.id
-where a.task_status=1 and a.del_flag=0 and b.del_flag=0
+inner join union_yuejuan_source_process.bus_score_param_config c on a.exam_id=c.exam_id and a.type_id=c.type_id
+where a.task_status=1 and a.del_flag=0 and c.del_flag=0
order by a.create_time limit 1</sql>
<limit>0</limit>
<lookup/>
@@ -640,7 +639,7 @@ order by a.create_time limit 1</sql>
</output>
</remotesteps>
<GUI>
- <xloc>224</xloc>
+ <xloc>208</xloc>
<yloc>112</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr b/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr
index 9dcdfa3..05f5e39 100644
--- a/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr
+++ b/intelligent/union_yuejuan/analysis/total_control/set_variable/set_variable_is_run.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:17.611</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:55:23.811</modified_date>
+ <modified_date>2021/08/11 15:09:17.037</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -539,7 +539,7 @@
<schema_name/>
</partitioning>
<connection>intelligent_greenplum_neiwang</connection>
- <sql>select case when (select count(*) from union_yuejuan_source_process.task_list where task_status=1)>0 then 1 else 0 end is_run</sql>
+ <sql>select case when (select count(*) from union_yuejuan_source_process.task_list where task_status=1 and del_flag=0)>0 then 1 else 0 end is_run</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
diff --git a/intelligent/union_yuejuan/analysis/total_control/update_fenxi_state.ktr b/intelligent/union_yuejuan/analysis/total_control/update_fenxi_state.ktr
index 87cceb3..310619d 100644
--- a/intelligent/union_yuejuan/analysis/total_control/update_fenxi_state.ktr
+++ b/intelligent/union_yuejuan/analysis/total_control/update_fenxi_state.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:38.865</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:54:40.386</modified_date>
+ <modified_date>2021/08/04 13:34:32.249</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -504,7 +504,7 @@
<single_statement>Y</single_statement>
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
- <sql>update union_yuejuan_source_process.task_list set task_status=2 where id=${task_id}</sql>
+ <sql>update union_yuejuan_source_process.task_list set task_status=2 where id=${task_id} and del_flag=0</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
diff --git a/intelligent/union_yuejuan/analysis/total_control/update_yuejuan_state.ktr b/intelligent/union_yuejuan/analysis/total_control/update_yuejuan_state.ktr
index 015e8b1..c667fda 100644
--- a/intelligent/union_yuejuan/analysis/total_control/update_yuejuan_state.ktr
+++ b/intelligent/union_yuejuan/analysis/total_control/update_yuejuan_state.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:03:29.811</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/03/04 10:40:57.478</modified_date>
+ <modified_date>2021/08/03 16:50:15.283</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -516,7 +516,7 @@
<single_statement>Y</single_statement>
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
- <sql>update task_list set task_status=4 where exam_id=${exam_id} and del_flag=0</sql>
+ <sql>update bus_exam set status=3 where id=${exam_id} and del_flag=0</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
diff --git a/intelligent/union_yuejuan/transfer/core.kjb b/intelligent/union_yuejuan/transfer/core.kjb
index 8a6e223..ae517c5 100644
--- a/intelligent/union_yuejuan/transfer/core.kjb
+++ b/intelligent/union_yuejuan/transfer/core.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:21:41.533</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/03/09 16:20:59.865</modified_date>
+ <modified_date>2021/07/28 13:34:01.983</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -324,57 +324,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Success</name>
- <description/>
- <type>SUCCESS</type>
- <attributes/>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>384</xloc>
- <yloc>112</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
- <name>monitor_exam</name>
- <description/>
- <type>TRANS</type>
- <attributes/>
- <specification_method>rep_name</specification_method>
- <trans_object_id/>
- <filename/>
- <transname>monitor_exam</transname>
- <directory>/intelligent/union_yuejuan/transfer</directory>
- <arg_from_previous>N</arg_from_previous>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <clear_rows>N</clear_rows>
- <clear_files>N</clear_files>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <loglevel>Basic</loglevel>
- <cluster>N</cluster>
- <slave_server_name/>
- <set_append_logfile>N</set_append_logfile>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
- <create_parent_folder>N</create_parent_folder>
- <logging_remote_work>N</logging_remote_work>
- <run_configuration>Pentaho local</run_configuration>
- <parameters>
- <pass_all_parameters>Y</pass_all_parameters>
- </parameters>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>80</xloc>
- <yloc>304</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>stage_roll_back</name>
<description/>
<type>SET_VARIABLES</type>
@@ -551,82 +500,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>update_state</name>
- <description/>
- <type>TRANS</type>
- <attributes/>
- <specification_method>rep_name</specification_method>
- <trans_object_id/>
- <filename/>
- <transname>update_state</transname>
- <directory>/intelligent/union_yuejuan/transfer/total_control</directory>
- <arg_from_previous>N</arg_from_previous>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <clear_rows>N</clear_rows>
- <clear_files>N</clear_files>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <loglevel>Basic</loglevel>
- <cluster>N</cluster>
- <slave_server_name/>
- <set_append_logfile>N</set_append_logfile>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
- <create_parent_folder>N</create_parent_folder>
- <logging_remote_work>N</logging_remote_work>
- <run_configuration>Pentaho local</run_configuration>
- <parameters>
- <pass_all_parameters>Y</pass_all_parameters>
- </parameters>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>208</xloc>
- <yloc>304</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
- <name>set_variable</name>
- <description/>
- <type>JOB</type>
- <attributes/>
- <specification_method>rep_name</specification_method>
- <job_object_id/>
- <filename/>
- <jobname>set_variable</jobname>
- <directory>/intelligent/union_yuejuan/transfer/total_control</directory>
- <arg_from_previous>N</arg_from_previous>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <loglevel>Nothing</loglevel>
- <slave_server_name/>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
- <expand_remote_job>N</expand_remote_job>
- <create_parent_folder>N</create_parent_folder>
- <pass_export>N</pass_export>
- <run_configuration>Pentaho local</run_configuration>
- <parameters>
- <pass_all_parameters>Y</pass_all_parameters>
- </parameters>
- <set_append_logfile>N</set_append_logfile>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>256</xloc>
- <yloc>32</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>START</name>
<description/>
<type>SPECIAL</type>
@@ -649,52 +522,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Set variables</name>
- <description/>
- <type>SET_VARIABLES</type>
- <attributes/>
- <replacevars>Y</replacevars>
- <filename/>
- <file_variable_type>ROOT_JOB</file_variable_type>
- <fields>
- <field>
- <variable_name>stage</variable_name>
- <variable_value>start</variable_value>
- <variable_type>ROOT_JOB</variable_type>
- </field>
- </fields>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>128</xloc>
- <yloc>32</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
- <name>Simple evaluation</name>
- <description/>
- <type>SIMPLE_EVAL</type>
- <attributes/>
- <valuetype>variable</valuetype>
- <fieldname/>
- <variablename>is_run</variablename>
- <fieldtype>number</fieldtype>
- <mask/>
- <comparevalue>1</comparevalue>
- <minvalue/>
- <maxvalue/>
- <successcondition>equal</successcondition>
- <successnumbercondition>equal</successnumbercondition>
- <successbooleancondition>false</successbooleancondition>
- <successwhenvarset>N</successwhenvarset>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>384</xloc>
- <yloc>32</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>source_stage</name>
<description/>
<type>SET_VARIABLES</type>
@@ -1000,51 +827,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>set_variable</from>
- <to>Simple evaluation</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
- <from>monitor_exam</from>
- <to>Success 2</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
- <from>write_log_success</from>
- <to>stage_roll_back</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
- <from>Simple evaluation</from>
- <to>source_stage</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
- <from>Set variables</from>
- <to>set_variable</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>source</from>
<to>write_log_unsuccess</to>
<from_nr>0</from_nr>
@@ -1063,24 +845,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>START</from>
- <to>Set variables</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>Y</unconditional>
- </hop>
- <hop>
- <from>update_state</from>
- <to>monitor_exam</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>write_log_success (3)</from>
<to>fundamental_stage</to>
<from_nr>0</from_nr>
@@ -1090,8 +854,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>write_log_success (2)</from>
- <to>update_state</to>
+ <from>write_log_success</from>
+ <to>stage_roll_back</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1108,15 +872,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>Simple evaluation</from>
- <to>Success</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>N</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>write_log_unsuccess</from>
<to>中止作业</to>
<from_nr>0</from_nr>
@@ -1143,6 +898,24 @@
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
+ <hop>
+ <from>START</from>
+ <to>source_stage</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>write_log_success (2)</from>
+ <to>Success 2</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
</hops>
<notepads>
</notepads>
diff --git a/intelligent/union_yuejuan/transfer/fundamental/area.ktr b/intelligent/union_yuejuan/transfer/fundamental/area.ktr
index 255d6c6..162fa4f 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/area.ktr
+++ b/intelligent/union_yuejuan/transfer/fundamental/area.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:34.169</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:00:47.997</modified_date>
+ <modified_date>2021/07/26 10:55:08.265</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -503,31 +503,29 @@
<single_statement>N</single_statement>
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
- <sql>insert into union_yuejuan_source_process.area
-( id,
- name,
- child_count,
- parent_id,
- full_name,
- level,
- modify_time,
- create_time,
- lng,
- lat,
- position)
+ <sql>insert into single_yuejuan_source_process.area
+(id,
+created_time,
+deleted,
+modified_time,
+child_count,
+full_name,
+level,
+name,
+parent_id,
+ordinal)
select
- id,
- name,
- child_count,
- parent_id,
- full_name,
- level,
- modify_time,
- create_time,
- lng,
- lat,
- position
-from union_yuejuan_source.area</sql>
+id,
+created_time,
+deleted,
+modified_time,
+child_count,
+full_name,
+level,
+name,
+parent_id,
+ordinal
+from single_yuejuan_source.area</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
diff --git a/intelligent/union_yuejuan/transfer/fundamental/bus_exam_school.ktr b/intelligent/union_yuejuan/transfer/fundamental/bus_exam_school.ktr
index 91fc836..1a9d4c5 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/bus_exam_school.ktr
+++ b/intelligent/union_yuejuan/transfer/fundamental/bus_exam_school.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:35.307</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:00:31.332</modified_date>
+ <modified_date>2021/07/26 10:57:17.232</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -510,8 +510,6 @@ exam_id,
school_id,
detail_name,
name,
-manager,
-manager_phone,
pre_code,
create_id,
create_time,
@@ -523,8 +521,6 @@ exam_id,
school_id,
detail_name,
name,
-manager,
-manager_phone,
pre_code,
create_id,
create_time,
diff --git a/intelligent/union_yuejuan/transfer/fundamental/bus_exam_student.ktr b/intelligent/union_yuejuan/transfer/fundamental/bus_exam_student.ktr
index e533b65..68224d3 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/bus_exam_student.ktr
+++ b/intelligent/union_yuejuan/transfer/fundamental/bus_exam_student.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:03:57.584</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:00:24.711</modified_date>
+ <modified_date>2021/07/26 10:58:06.674</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -515,6 +515,7 @@ class_id,
class_name,
student_id,
student_name,
+login_name,
student_number,
exam_number,
student_type,
@@ -535,6 +536,7 @@ class_id,
class_name,
student_id,
student_name,
+login_name,
student_number,
exam_number,
student_type,
diff --git a/intelligent/union_yuejuan/transfer/fundamental/bus_marking_person.ktr b/intelligent/union_yuejuan/transfer/fundamental/bus_marking_person.ktr
index 0b01c53..2f39ca8 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/bus_marking_person.ktr
+++ b/intelligent/union_yuejuan/transfer/fundamental/bus_marking_person.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:38.325</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:59:38.234</modified_date>
+ <modified_date>2021/07/26 13:29:42.107</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -507,6 +507,7 @@
( id,
exam_id,
user_id,
+login_name,
name,
phone,
school_id,
@@ -520,6 +521,7 @@ select
id,
exam_id,
user_id,
+login_name,
name,
phone,
school_id,
diff --git a/intelligent/union_yuejuan/transfer/fundamental/class.ktr b/intelligent/union_yuejuan/transfer/fundamental/class.ktr
deleted file mode 100644
index e868bf5..0000000
--- a/intelligent/union_yuejuan/transfer/fundamental/class.ktr
+++ /dev/null
@@ -1,563 +0,0 @@
-<transformation>
- <info>
- <name>class</name>
- <description/>
- <extended_description/>
- <trans_version/>
- <trans_type>Normal</trans_type>
- <trans_status>0</trans_status>
- <directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
- <parameters>
- </parameters>
- <log>
- <trans-log-table>
- <connection/>
- <schema/>
- <table/>
- <size_limit_lines/>
- <interval/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STATUS</id>
- <enabled>Y</enabled>
- <name>STATUS</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- <subject/>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- <subject/>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- <subject/>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- <subject/>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- <subject/>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- <subject/>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>STARTDATE</id>
- <enabled>Y</enabled>
- <name>STARTDATE</name>
- </field>
- <field>
- <id>ENDDATE</id>
- <enabled>Y</enabled>
- <name>ENDDATE</name>
- </field>
- <field>
- <id>LOGDATE</id>
- <enabled>Y</enabled>
- <name>LOGDATE</name>
- </field>
- <field>
- <id>DEPDATE</id>
- <enabled>Y</enabled>
- <name>DEPDATE</name>
- </field>
- <field>
- <id>REPLAYDATE</id>
- <enabled>Y</enabled>
- <name>REPLAYDATE</name>
- </field>
- <field>
- <id>LOG_FIELD</id>
- <enabled>Y</enabled>
- <name>LOG_FIELD</name>
- </field>
- <field>
- <id>EXECUTING_SERVER</id>
- <enabled>N</enabled>
- <name>EXECUTING_SERVER</name>
- </field>
- <field>
- <id>EXECUTING_USER</id>
- <enabled>N</enabled>
- <name>EXECUTING_USER</name>
- </field>
- <field>
- <id>CLIENT</id>
- <enabled>N</enabled>
- <name>CLIENT</name>
- </field>
- </trans-log-table>
- <perf-log-table>
- <connection/>
- <schema/>
- <table/>
- <interval/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>SEQ_NR</id>
- <enabled>Y</enabled>
- <name>SEQ_NR</name>
- </field>
- <field>
- <id>LOGDATE</id>
- <enabled>Y</enabled>
- <name>LOGDATE</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STEPNAME</id>
- <enabled>Y</enabled>
- <name>STEPNAME</name>
- </field>
- <field>
- <id>STEP_COPY</id>
- <enabled>Y</enabled>
- <name>STEP_COPY</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>INPUT_BUFFER_ROWS</id>
- <enabled>Y</enabled>
- <name>INPUT_BUFFER_ROWS</name>
- </field>
- <field>
- <id>OUTPUT_BUFFER_ROWS</id>
- <enabled>Y</enabled>
- <name>OUTPUT_BUFFER_ROWS</name>
- </field>
- </perf-log-table>
- <channel-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>LOGGING_OBJECT_TYPE</id>
- <enabled>Y</enabled>
- <name>LOGGING_OBJECT_TYPE</name>
- </field>
- <field>
- <id>OBJECT_NAME</id>
- <enabled>Y</enabled>
- <name>OBJECT_NAME</name>
- </field>
- <field>
- <id>OBJECT_COPY</id>
- <enabled>Y</enabled>
- <name>OBJECT_COPY</name>
- </field>
- <field>
- <id>REPOSITORY_DIRECTORY</id>
- <enabled>Y</enabled>
- <name>REPOSITORY_DIRECTORY</name>
- </field>
- <field>
- <id>FILENAME</id>
- <enabled>Y</enabled>
- <name>FILENAME</name>
- </field>
- <field>
- <id>OBJECT_ID</id>
- <enabled>Y</enabled>
- <name>OBJECT_ID</name>
- </field>
- <field>
- <id>OBJECT_REVISION</id>
- <enabled>Y</enabled>
- <name>OBJECT_REVISION</name>
- </field>
- <field>
- <id>PARENT_CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>PARENT_CHANNEL_ID</name>
- </field>
- <field>
- <id>ROOT_CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>ROOT_CHANNEL_ID</name>
- </field>
- </channel-log-table>
- <step-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STEPNAME</id>
- <enabled>Y</enabled>
- <name>STEPNAME</name>
- </field>
- <field>
- <id>STEP_COPY</id>
- <enabled>Y</enabled>
- <name>STEP_COPY</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>LOG_FIELD</id>
- <enabled>N</enabled>
- <name>LOG_FIELD</name>
- </field>
- </step-log-table>
- <metrics-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>METRICS_DATE</id>
- <enabled>Y</enabled>
- <name>METRICS_DATE</name>
- </field>
- <field>
- <id>METRICS_CODE</id>
- <enabled>Y</enabled>
- <name>METRICS_CODE</name>
- </field>
- <field>
- <id>METRICS_DESCRIPTION</id>
- <enabled>Y</enabled>
- <name>METRICS_DESCRIPTION</name>
- </field>
- <field>
- <id>METRICS_SUBJECT</id>
- <enabled>Y</enabled>
- <name>METRICS_SUBJECT</name>
- </field>
- <field>
- <id>METRICS_TYPE</id>
- <enabled>Y</enabled>
- <name>METRICS_TYPE</name>
- </field>
- <field>
- <id>METRICS_VALUE</id>
- <enabled>Y</enabled>
- <name>METRICS_VALUE</name>
- </field>
- </metrics-log-table>
- </log>
- <maxdate>
- <connection/>
- <table/>
- <field/>
- <offset>0.0</offset>
- <maxdiff>0.0</maxdiff>
- </maxdate>
- <size_rowset>10000</size_rowset>
- <sleep_time_empty>50</sleep_time_empty>
- <sleep_time_full>50</sleep_time_full>
- <unique_connections>N</unique_connections>
- <feedback_shown>Y</feedback_shown>
- <feedback_size>50000</feedback_size>
- <using_thread_priorities>Y</using_thread_priorities>
- <shared_objects_file/>
- <capture_step_performance>N</capture_step_performance>
- <step_performance_capturing_delay>1000</step_performance_capturing_delay>
- <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
- <dependencies>
- </dependencies>
- <partitionschemas>
- </partitionschemas>
- <slaveservers>
- </slaveservers>
- <clusterschemas>
- </clusterschemas>
- <created_user>admin</created_user>
- <created_date>2020/08/08 13:04:26.997</created_date>
- <modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:58:25.776</modified_date>
- <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
- <is_key_private>N</is_key_private>
- </info>
- <notepads>
- </notepads>
- <connection>
- <name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
- <type>POSTGRESQL</type>
- <access>Native</access>
- <database>intelligent_dev</database>
- <port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
- <servername/>
- <data_tablespace/>
- <index_tablespace/>
- <attributes>
- <attribute>
- <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>FORCE_IDENTIFIERS_TO_UPPERCASE</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>IS_CLUSTERED</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>PORT_NUMBER</code>
- <attribute>5432</attribute>
- </attribute>
- <attribute>
- <code>PRESERVE_RESERVED_WORD_CASE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>QUOTE_ALL_FIELDS</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>SUPPORTS_TIMESTAMP_DATA_TYPE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>USE_POOLING</code>
- <attribute>N</attribute>
- </attribute>
- </attributes>
- </connection>
- <order>
- </order>
- <step>
- <name>class</name>
- <type>ExecSQL</type>
- <description/>
- <distribute>Y</distribute>
- <custom_distribution/>
- <copies>1</copies>
- <partitioning>
- <method>none</method>
- <schema_name/>
- </partitioning>
- <connection>intelligent_greenplum_neiwang</connection>
- <execute_each_row>N</execute_each_row>
- <single_statement>N</single_statement>
- <replace_variables>Y</replace_variables>
- <quoteString>N</quoteString>
- <sql>insert into union_yuejuan_source_process.class
-(id,
-school_id,
-class_name,
-grade,
-grade_id,
-entry_year,
-class_type,
-class_category_id,
-class_room_id,
-class_teacher_id,
-state,
-modify_time,
-create_time)
-select
-id,
-school_id,
-class_name,
-grade,
-grade_id,
-entry_year,
-class_type,
-class_category_id,
-class_room_id,
-class_teacher_id,
-state,
-modify_time,
-create_time
-from union_yuejuan_source.class</sql>
- <set_params>N</set_params>
- <insert_field/>
- <update_field/>
- <delete_field/>
- <read_field/>
- <arguments>
- </arguments>
- <attributes/>
- <cluster_schema/>
- <remotesteps>
- <input>
- </input>
- <output>
- </output>
- </remotesteps>
- <GUI>
- <xloc>208</xloc>
- <yloc>112</yloc>
- <draw>Y</draw>
- </GUI>
- </step>
- <step_error_handling>
- </step_error_handling>
- <slave-step-copy-partition-distribution>
- </slave-step-copy-partition-distribution>
- <slave_transformation>N</slave_transformation>
- <attributes/>
-</transformation>
diff --git a/intelligent/union_yuejuan/transfer/fundamental/fundamental.kjb b/intelligent/union_yuejuan/transfer/fundamental/fundamental.kjb
index ec41deb..549f564 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/fundamental.kjb
+++ b/intelligent/union_yuejuan/transfer/fundamental/fundamental.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:07:42.552</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/03/04 11:47:49.703</modified_date>
+ <modified_date>2021/07/26 13:52:40.854</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -287,45 +287,6 @@
<shared_objects_file/>
<entries>
<entry>
- <name>fundamental</name>
- <description/>
- <type>TRANS</type>
- <attributes/>
- <specification_method>rep_name</specification_method>
- <trans_object_id/>
- <filename/>
- <transname>fundamental</transname>
- <directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
- <arg_from_previous>N</arg_from_previous>
- <params_from_previous>N</params_from_previous>
- <exec_per_row>N</exec_per_row>
- <clear_rows>N</clear_rows>
- <clear_files>N</clear_files>
- <set_logfile>N</set_logfile>
- <logfile/>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <loglevel>Basic</loglevel>
- <cluster>N</cluster>
- <slave_server_name/>
- <set_append_logfile>N</set_append_logfile>
- <wait_until_finished>Y</wait_until_finished>
- <follow_abort_remote>N</follow_abort_remote>
- <create_parent_folder>N</create_parent_folder>
- <logging_remote_work>N</logging_remote_work>
- <run_configuration>Pentaho local</run_configuration>
- <parameters>
- <pass_all_parameters>Y</pass_all_parameters>
- </parameters>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>688</xloc>
- <yloc>272</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>bus_exam_subject_relation</name>
<description/>
<type>TRANS</type>
@@ -504,14 +465,14 @@
<attributes_kjc/>
</entry>
<entry>
- <name>student_info</name>
+ <name>student</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>student_info</transname>
+ <transname>student</transname>
<directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -660,14 +621,14 @@
<attributes_kjc/>
</entry>
<entry>
- <name>class</name>
+ <name>school_class</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>class</transname>
+ <transname>school_class</transname>
<directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -894,18 +855,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Success</name>
- <description/>
- <type>SUCCESS</type>
- <attributes/>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>480</xloc>
- <yloc>384</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>bus_relation_student_class</name>
<description/>
<type>TRANS</type>
@@ -1256,6 +1205,135 @@
<yloc>272</yloc>
<attributes_kjc/>
</entry>
+ <entry>
+ <name>fundamental</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>fundamental</transname>
+ <directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>400</xloc>
+ <yloc>528</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>Success</name>
+ <description/>
+ <type>SUCCESS</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>560</xloc>
+ <yloc>528</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>user</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>user</transname>
+ <directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>416</xloc>
+ <yloc>384</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>header_teacher</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>header_teacher</transname>
+ <directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>240</xloc>
+ <yloc>384</yloc>
+ <attributes_kjc/>
+ </entry>
</entries>
<hops>
<hop>
@@ -1277,7 +1355,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>student_info</from>
+ <from>student</from>
<to>bus_marking_person</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
@@ -1323,7 +1401,7 @@
</hop>
<hop>
<from>bus_subjective_question_config</from>
- <to>class</to>
+ <to>school_class</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1350,16 +1428,7 @@
</hop>
<hop>
<from>tenant</from>
- <to>student_info</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
- <from>teacher</from>
- <to>fundamental</to>
+ <to>student</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1439,8 +1508,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>zh_subject_spilt_score</from>
- <to>Success</to>
+ <from>school_class</from>
+ <to>dic_question_type</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1448,8 +1517,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>class</from>
- <to>dic_question_type</to>
+ <from>bus_exam_student</from>
+ <to>bus_exam_subject</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1457,8 +1526,8 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>bus_exam_student</from>
- <to>bus_exam_subject</to>
+ <from>dic_question_type</from>
+ <to>dic_select_subject</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1466,7 +1535,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>fundamental</from>
+ <from>teacher</from>
<to>area</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
@@ -1475,8 +1544,35 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>dic_question_type</from>
- <to>dic_select_subject</to>
+ <from>zh_subject_spilt_score</from>
+ <to>user</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>user</from>
+ <to>header_teacher</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>header_teacher</from>
+ <to>fundamental</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>fundamental</from>
+ <to>Success</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
diff --git a/intelligent/union_yuejuan/transfer/fundamental/fundamental.ktr b/intelligent/union_yuejuan/transfer/fundamental/fundamental.ktr
index 925821d..369c784 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/fundamental.ktr
+++ b/intelligent/union_yuejuan/transfer/fundamental/fundamental.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:18:01.920</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:57:15.561</modified_date>
+ <modified_date>2021/07/30 10:31:43.112</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -508,7 +508,7 @@
select union_yuejuan_source_process.gp_exam_total_student(${exam_id});
select union_yuejuan_source_process.gp_exam_subject_score(${exam_id});
select union_yuejuan_source_process.gp_exam_class_relation(${exam_id});
-select union_yuejuan_source_process.gp_task_list(${exam_id}); </sql>
+</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
diff --git a/intelligent/union_yuejuan/transfer/fundamental/student_info.ktr b/intelligent/union_yuejuan/transfer/fundamental/student_info.ktr
deleted file mode 100644
index 393f616..0000000
--- a/intelligent/union_yuejuan/transfer/fundamental/student_info.ktr
+++ /dev/null
@@ -1,596 +0,0 @@
-<transformation>
- <info>
- <name>student_info</name>
- <description/>
- <extended_description/>
- <trans_version/>
- <trans_type>Normal</trans_type>
- <directory>/intelligent/union_yuejuan/transfer/fundamental</directory>
- <parameters>
- </parameters>
- <log>
- <trans-log-table>
- <connection/>
- <schema/>
- <table/>
- <size_limit_lines/>
- <interval/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STATUS</id>
- <enabled>Y</enabled>
- <name>STATUS</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- <subject/>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- <subject/>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- <subject/>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- <subject/>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- <subject/>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- <subject/>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>STARTDATE</id>
- <enabled>Y</enabled>
- <name>STARTDATE</name>
- </field>
- <field>
- <id>ENDDATE</id>
- <enabled>Y</enabled>
- <name>ENDDATE</name>
- </field>
- <field>
- <id>LOGDATE</id>
- <enabled>Y</enabled>
- <name>LOGDATE</name>
- </field>
- <field>
- <id>DEPDATE</id>
- <enabled>Y</enabled>
- <name>DEPDATE</name>
- </field>
- <field>
- <id>REPLAYDATE</id>
- <enabled>Y</enabled>
- <name>REPLAYDATE</name>
- </field>
- <field>
- <id>LOG_FIELD</id>
- <enabled>Y</enabled>
- <name>LOG_FIELD</name>
- </field>
- <field>
- <id>EXECUTING_SERVER</id>
- <enabled>N</enabled>
- <name>EXECUTING_SERVER</name>
- </field>
- <field>
- <id>EXECUTING_USER</id>
- <enabled>N</enabled>
- <name>EXECUTING_USER</name>
- </field>
- <field>
- <id>CLIENT</id>
- <enabled>N</enabled>
- <name>CLIENT</name>
- </field>
- </trans-log-table>
- <perf-log-table>
- <connection/>
- <schema/>
- <table/>
- <interval/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>SEQ_NR</id>
- <enabled>Y</enabled>
- <name>SEQ_NR</name>
- </field>
- <field>
- <id>LOGDATE</id>
- <enabled>Y</enabled>
- <name>LOGDATE</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STEPNAME</id>
- <enabled>Y</enabled>
- <name>STEPNAME</name>
- </field>
- <field>
- <id>STEP_COPY</id>
- <enabled>Y</enabled>
- <name>STEP_COPY</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>INPUT_BUFFER_ROWS</id>
- <enabled>Y</enabled>
- <name>INPUT_BUFFER_ROWS</name>
- </field>
- <field>
- <id>OUTPUT_BUFFER_ROWS</id>
- <enabled>Y</enabled>
- <name>OUTPUT_BUFFER_ROWS</name>
- </field>
- </perf-log-table>
- <channel-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>LOGGING_OBJECT_TYPE</id>
- <enabled>Y</enabled>
- <name>LOGGING_OBJECT_TYPE</name>
- </field>
- <field>
- <id>OBJECT_NAME</id>
- <enabled>Y</enabled>
- <name>OBJECT_NAME</name>
- </field>
- <field>
- <id>OBJECT_COPY</id>
- <enabled>Y</enabled>
- <name>OBJECT_COPY</name>
- </field>
- <field>
- <id>REPOSITORY_DIRECTORY</id>
- <enabled>Y</enabled>
- <name>REPOSITORY_DIRECTORY</name>
- </field>
- <field>
- <id>FILENAME</id>
- <enabled>Y</enabled>
- <name>FILENAME</name>
- </field>
- <field>
- <id>OBJECT_ID</id>
- <enabled>Y</enabled>
- <name>OBJECT_ID</name>
- </field>
- <field>
- <id>OBJECT_REVISION</id>
- <enabled>Y</enabled>
- <name>OBJECT_REVISION</name>
- </field>
- <field>
- <id>PARENT_CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>PARENT_CHANNEL_ID</name>
- </field>
- <field>
- <id>ROOT_CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>ROOT_CHANNEL_ID</name>
- </field>
- </channel-log-table>
- <step-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STEPNAME</id>
- <enabled>Y</enabled>
- <name>STEPNAME</name>
- </field>
- <field>
- <id>STEP_COPY</id>
- <enabled>Y</enabled>
- <name>STEP_COPY</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>LOG_FIELD</id>
- <enabled>N</enabled>
- <name>LOG_FIELD</name>
- </field>
- </step-log-table>
- <metrics-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>METRICS_DATE</id>
- <enabled>Y</enabled>
- <name>METRICS_DATE</name>
- </field>
- <field>
- <id>METRICS_CODE</id>
- <enabled>Y</enabled>
- <name>METRICS_CODE</name>
- </field>
- <field>
- <id>METRICS_DESCRIPTION</id>
- <enabled>Y</enabled>
- <name>METRICS_DESCRIPTION</name>
- </field>
- <field>
- <id>METRICS_SUBJECT</id>
- <enabled>Y</enabled>
- <name>METRICS_SUBJECT</name>
- </field>
- <field>
- <id>METRICS_TYPE</id>
- <enabled>Y</enabled>
- <name>METRICS_TYPE</name>
- </field>
- <field>
- <id>METRICS_VALUE</id>
- <enabled>Y</enabled>
- <name>METRICS_VALUE</name>
- </field>
- </metrics-log-table>
- </log>
- <maxdate>
- <connection/>
- <table/>
- <field/>
- <offset>0.0</offset>
- <maxdiff>0.0</maxdiff>
- </maxdate>
- <size_rowset>10000</size_rowset>
- <sleep_time_empty>50</sleep_time_empty>
- <sleep_time_full>50</sleep_time_full>
- <unique_connections>N</unique_connections>
- <feedback_shown>Y</feedback_shown>
- <feedback_size>50000</feedback_size>
- <using_thread_priorities>Y</using_thread_priorities>
- <shared_objects_file/>
- <capture_step_performance>N</capture_step_performance>
- <step_performance_capturing_delay>1000</step_performance_capturing_delay>
- <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
- <dependencies>
- </dependencies>
- <partitionschemas>
- </partitionschemas>
- <slaveservers>
- </slaveservers>
- <clusterschemas>
- </clusterschemas>
- <created_user>admin</created_user>
- <created_date>2021/03/03 10:44:46.831</created_date>
- <modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:01:17.797</modified_date>
- <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
- <is_key_private>N</is_key_private>
- </info>
- <notepads>
- </notepads>
- <connection>
- <name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
- <type>POSTGRESQL</type>
- <access>Native</access>
- <database>intelligent_dev</database>
- <port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
- <servername/>
- <data_tablespace/>
- <index_tablespace/>
- <attributes>
- <attribute>
- <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>FORCE_IDENTIFIERS_TO_UPPERCASE</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>IS_CLUSTERED</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>PORT_NUMBER</code>
- <attribute>5432</attribute>
- </attribute>
- <attribute>
- <code>PRESERVE_RESERVED_WORD_CASE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>QUOTE_ALL_FIELDS</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>SUPPORTS_TIMESTAMP_DATA_TYPE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>USE_POOLING</code>
- <attribute>N</attribute>
- </attribute>
- </attributes>
- </connection>
- <order>
- </order>
- <step>
- <name>student_info</name>
- <type>ExecSQL</type>
- <description/>
- <distribute>Y</distribute>
- <custom_distribution/>
- <copies>1</copies>
- <partitioning>
- <method>none</method>
- <schema_name/>
- </partitioning>
- <connection>intelligent_greenplum_neiwang</connection>
- <execute_each_row>N</execute_each_row>
- <single_statement>N</single_statement>
- <replace_variables>Y</replace_variables>
- <quoteString>N</quoteString>
- <sql>insert into union_yuejuan_source_process.student_info
-( id,
- school_id,
- student_num,
- name,
- card_num,
- birthday,
- entry_time,
- international,
- native_place,
- phone_num,
- student_code,
- nation,
- politic_countenance,
- card_area_id,
- card_detail_id,
- home_address_area,
- home_detail_address,
- left_behind_children,
- only_child,
- is_subsidy,
- disability_type,
- is_orphan,
- mode_of_study,
- gender,
- student_type,
- select_subject,
- grade,
- state,
- modify_time,
- create_time)
-select
- id,
- school_id,
- student_num,
- name,
- card_num,
- birthday,
- entry_time,
- international,
- native_place,
- phone_num,
- student_code,
- nation,
- politic_countenance,
- card_area_id,
- card_detail_id,
- home_address_area,
- home_detail_address,
- left_behind_children,
- only_child,
- is_subsidy,
- disability_type,
- is_orphan,
- mode_of_study,
- gender,
- student_type,
- select_subject,
- grade,
- state,
- modify_time,
- create_time
-from union_yuejuan_source.student_info</sql>
- <set_params>N</set_params>
- <insert_field/>
- <update_field/>
- <delete_field/>
- <read_field/>
- <arguments>
- </arguments>
- <attributes/>
- <cluster_schema/>
- <remotesteps>
- <input>
- </input>
- <output>
- </output>
- </remotesteps>
- <GUI>
- <xloc>212</xloc>
- <yloc>138</yloc>
- <draw>Y</draw>
- </GUI>
- </step>
- <step_error_handling>
- </step_error_handling>
- <slave-step-copy-partition-distribution>
- </slave-step-copy-partition-distribution>
- <slave_transformation>N</slave_transformation>
- <attributes/>
-</transformation>
diff --git a/intelligent/union_yuejuan/transfer/fundamental/teacher.ktr b/intelligent/union_yuejuan/transfer/fundamental/teacher.ktr
index 52dab5b..47c3751 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/teacher.ktr
+++ b/intelligent/union_yuejuan/transfer/fundamental/teacher.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:04:43.521</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:01:30.099</modified_date>
+ <modified_date>2021/07/26 13:47:37.564</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -505,57 +505,25 @@
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
<sql>insert into union_yuejuan_source_process.teacher
-(id,
-school_id,
-job_num,
-phone_num,
-gender,
-name,
-card_num,
-card_area_id,
-card_detail_id,
-home_address_area,
-home_detail_address,
-high_education,
-marital_status,
-nation_id,
-politic_countenance,
-post_id,
-entry_date,
-birth_day,
-professional_qualificationl_id,
-incumbency,
-emergency_contact,
-emergency_contact_phone,
-user_state,
-modify_time,
-create_time)
+(user_id,
+job_number,
+created_by,
+created_time,
+deleted,
+modified_time,
+job_status,
+position_id,
+station_id)
select
-id,
-school_id,
-job_num,
-phone_num,
-gender,
-name,
-card_num,
-card_area_id,
-card_detail_id,
-home_address_area,
-home_detail_address,
-high_education,
-marital_status,
-nation_id,
-politic_countenance,
-post_id,
-entry_date,
-birth_day,
-professional_qualificationl_id,
-incumbency,
-emergency_contact,
-emergency_contact_phone,
-user_state,
-modify_time,
-create_time
+user_id,
+job_number,
+created_by,
+created_time,
+deleted,
+modified_time,
+job_status,
+position_id,
+station_id
from union_yuejuan_source.teacher</sql>
<set_params>N</set_params>
<insert_field/>
diff --git a/intelligent/union_yuejuan/transfer/fundamental/tenant.ktr b/intelligent/union_yuejuan/transfer/fundamental/tenant.ktr
index 3ce2528..7ab24e6 100644
--- a/intelligent/union_yuejuan/transfer/fundamental/tenant.ktr
+++ b/intelligent/union_yuejuan/transfer/fundamental/tenant.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:48.037</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 10:56:57.974</modified_date>
+ <modified_date>2021/07/26 13:47:57.300</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -504,37 +504,31 @@
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
<sql>insert into union_yuejuan_source_process.tenant
-( id,
- tenant_name,
- another_name,
- open_flag,
- init_flag,
- open_time,
- remark,
- tenant_type,
- address_area_id,
- address_detail,
- postal_code,
- state,
- modify_time,
- create_time,
- use_type)
+(id,
+created_by,
+created_time,
+deleted,
+modified_time,
+address_id,
+alias,
+name,
+remark,
+state,
+type,
+english)
select
- id,
- tenant_name,
- another_name,
- open_flag,
- init_flag,
- open_time,
- remark,
- tenant_type,
- address_area_id,
- address_detail,
- postal_code,
- state,
- modify_time,
- create_time,
- use_type
+id,
+created_by,
+created_time,
+deleted,
+modified_time,
+address_id,
+alias,
+name,
+remark,
+state,
+type,
+english
from union_yuejuan_source.tenant</sql>
<set_params>N</set_params>
<insert_field/>
diff --git a/intelligent/union_yuejuan/transfer/roll_back/source_fundamental.ktr b/intelligent/union_yuejuan/transfer/roll_back/source_fundamental.ktr
index ccd1576..f037115 100644
--- a/intelligent/union_yuejuan/transfer/roll_back/source_fundamental.ktr
+++ b/intelligent/union_yuejuan/transfer/roll_back/source_fundamental.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:18:01.920</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/01/12 09:10:40.296</modified_date>
+ <modified_date>2021/08/17 10:58:08.129</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.104.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -523,18 +523,25 @@ delete from union_yuejuan_source_process.dic_question_type where id in (select i
delete from union_yuejuan_source_process.dic_select_subject where id in (select id from union_yuejuan_source.dic_select_subject);
delete from union_yuejuan_source_process.report_exam_subject where exam_id = ${exam_id};
delete from union_yuejuan_source_process.bus_exam_subject where id in (select id from union_yuejuan_source.bus_exam_subject);
-delete from union_yuejuan_source_process.class where id in (select id from union_yuejuan_source.class);
-delete from union_yuejuan_source_process.teacher where id in (select id from union_yuejuan_source.teacher);
+
-----------------------------------------
delete from union_yuejuan_source_process.bus_marking_person where exam_id = ${exam_id};
-delete from union_yuejuan_source_process.student_info where id in (select id from union_yuejuan_source.student_info);
+
+delete from union_yuejuan_source_process.student where user_id in (select user_id from union_yuejuan_source.student);
+delete from union_yuejuan_source_process.user where id in (select id from union_yuejuan_source.user);
delete from union_yuejuan_source_process.tenant where id in (select id from union_yuejuan_source.tenant);
+delete from union_yuejuan_source_process.school_class where id in (select id from union_yuejuan_source.school_class);
delete from union_yuejuan_source_process.area where id in (select id from union_yuejuan_source.area);
+delete from union_yuejuan_source_process.teacher where user_id in (select user_id from union_yuejuan_source.teacher);
+delete from union_yuejuan_source_process.header_teacher where id in (select id from union_yuejuan_source.header_teacher);
-------------
delete from union_yuejuan_source_process.bus_scan_model where exam_id = ${exam_id};
delete from union_yuejuan_source_process.bus_scan_student_paper where exam_id = ${exam_id};
delete from union_yuejuan_source_process.bus_subjective_question_coordinate where exam_id = ${exam_id};
-delete from union_yuejuan_source_process.zh_subject_spilt_score where id = ${exam_id};
+delete from union_yuejuan_source_process.zh_subject_spilt_score where exam_id = ${exam_id};
+
+
+
@@ -556,13 +563,15 @@ vacuum union_yuejuan_source_process.bus_student_obj_ques_score;
vacuum union_yuejuan_source_process.bus_student_subj_ques_score;
vacuum union_yuejuan_source_process.bus_subjective_question_config;
vacuum union_yuejuan_source_process.report_exam_subject;
-vacuum union_yuejuan_source_process.class;
vacuum union_yuejuan_source_process.teacher;
-----------------
-vacuum union_yuejuan_source_process.bus_marking_person;
-vacuum union_yuejuan_source_process.student_info;
-vacuum union_yuejuan_source_process.tenant;
-vacuum union_yuejuan_source_process.area;
+vacuum single_yuejuan_source_process.bus_marking_person;
+vacuum single_yuejuan_source_process.area;
+vacuum single_yuejuan_source_process.student;
+vacuum single_yuejuan_source_process.tenant;
+vacuum single_yuejuan_source_process.user;
+vacuum single_yuejuan_source_process.school_class;
+vacuum single_yuejuan_source_process.header_teacher;
---------------
vacuum union_yuejuan_source_process.bus_scan_model;
vacuum union_yuejuan_source_process.bus_scan_student_paper;
diff --git a/intelligent/union_yuejuan/transfer/source/area.ktr b/intelligent/union_yuejuan/transfer/source/area.ktr
index b48a808..ccd326c 100644
--- a/intelligent/union_yuejuan/transfer/source/area.ktr
+++ b/intelligent/union_yuejuan/transfer/source/area.ktr
@@ -428,34 +428,26 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:49.867</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:07:03.690</modified_date>
+ <modified_date>2021/08/23 16:57:59.430</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>school_yuejuan_base</name>
- <server>192.168.2.244</server>
+ <name>school_yuejuan_base_archive</name>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>base_resource_test</database>
+ <database>jty_archive</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>read_only</username>
+ <password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
<attributes>
<attribute>
- <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
- <attribute>500</attribute>
- </attribute>
- <attribute>
- <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
- <attribute>true</attribute>
- </attribute>
- <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -500,6 +492,11 @@
<order>
<hop>
<from>area</from>
+ <to>字段选择</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>字段选择</from>
<to>Text file output</to>
<enabled>Y</enabled>
</hop>
@@ -529,7 +526,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/area</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/area</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -556,7 +553,7 @@
</output>
</remotesteps>
<GUI>
- <xloc>352</xloc>
+ <xloc>512</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
@@ -572,21 +569,20 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>school_yuejuan_base</connection>
+ <connection>school_yuejuan_base_archive</connection>
<sql>select
- id,
- name,
- child_count,
- parent_id,
- full_name,
- level,
- modify_time,
- create_time,
- lng,
- lat,
- position
+id,
+created_time,
+deleted,
+modified_time,
+child_count,
+full_name,
+level,
+name,
+parent_id,
+ordinal
from area
-where (create_time>'${start_time}' and create_time<='${end_time}') or (modify_time>'${start_time}' and modify_time<='${end_time}')</sql>
+</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
@@ -606,6 +602,234 @@ where (create_time>'${start_time}' and create_time<='${end_time}') or (modify
<draw>Y</draw>
</GUI>
</step>
+ <step>
+ <name>字段选择</name>
+ <type>SelectValues</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <fields>
+ <field>
+ <name>id</name>
+ </field>
+ <field>
+ <name>created_time</name>
+ </field>
+ <field>
+ <name>deleted</name>
+ </field>
+ <field>
+ <name>modified_time</name>
+ </field>
+ <field>
+ <name>child_count</name>
+ </field>
+ <field>
+ <name>full_name</name>
+ </field>
+ <field>
+ <name>level</name>
+ </field>
+ <field>
+ <name>name</name>
+ </field>
+ <field>
+ <name>parent_id</name>
+ </field>
+ <field>
+ <name>ordinal</name>
+ </field>
+ <select_unspecified>N</select_unspecified>
+ <meta>
+ <name>id</name>
+ <rename>id</rename>
+ <type>None</type>
+ <length>20</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>created_time</name>
+ <rename>created_time</rename>
+ <type>None</type>
+ <length>0</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>deleted</name>
+ <rename>deleted</rename>
+ <type>Integer</type>
+ <length>-2</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>modified_time</name>
+ <rename>modified_time</rename>
+ <type>None</type>
+ <length>0</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>child_count</name>
+ <rename>child_count</rename>
+ <type>None</type>
+ <length>9</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>full_name</name>
+ <rename>full_name</rename>
+ <type>None</type>
+ <length>255</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>level</name>
+ <rename>level</rename>
+ <type>None</type>
+ <length>10</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>name</name>
+ <rename>name</rename>
+ <type>None</type>
+ <length>100</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>parent_id</name>
+ <rename>parent_id</rename>
+ <type>None</type>
+ <length>20</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>ordinal</name>
+ <rename>ordinal</rename>
+ <type>None</type>
+ <length>9</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ </fields>
+ <attributes/>
+ <cluster_schema/>
+ <remotesteps>
+ <input>
+ </input>
+ <output>
+ </output>
+ </remotesteps>
+ <GUI>
+ <xloc>320</xloc>
+ <yloc>128</yloc>
+ <draw>Y</draw>
+ </GUI>
+ </step>
<step_error_handling>
</step_error_handling>
<slave-step-copy-partition-distribution>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_exam.ktr b/intelligent/union_yuejuan/transfer/source/bus_exam.ktr
index 2bc2916..bfb119c 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_exam.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_exam.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:06:53.149</modified_date>
+ <modified_date>2021/08/23 16:57:52.501</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_exam</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_exam</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -590,7 +590,8 @@ create_time,
modify_id,
modify_time,
exam_length,
-pre_length
+pre_length,
+source_type
from bus_exam
where id=${exam_id}</sql>
<limit>0</limit>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_exam_school.ktr b/intelligent/union_yuejuan/transfer/source/bus_exam_school.ktr
index d4c80fb..3f6e0c6 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_exam_school.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_exam_school.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:51.132</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:06:46.702</modified_date>
+ <modified_date>2021/08/23 16:57:46.492</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_exam_school</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_exam_school</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -580,8 +580,6 @@ exam_id,
school_id,
detail_name,
name,
-manager,
-manager_phone,
pre_code,
create_id,
create_time,
diff --git a/intelligent/union_yuejuan/transfer/source/bus_exam_student.ktr b/intelligent/union_yuejuan/transfer/source/bus_exam_student.ktr
index f7026d4..ea4fd15 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_exam_student.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_exam_student.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:06:38.997</modified_date>
+ <modified_date>2021/08/23 16:57:40.068</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_exam_student</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_exam_student</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -585,6 +585,7 @@ class_id,
class_name,
student_id,
student_name,
+login_name,
student_number,
exam_number,
student_type,
diff --git a/intelligent/union_yuejuan/transfer/source/bus_exam_subject.ktr b/intelligent/union_yuejuan/transfer/source/bus_exam_subject.ktr
index 40fed53..07e9fb0 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_exam_subject.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_exam_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:06:32.009</modified_date>
+ <modified_date>2021/08/23 16:57:33.911</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_exam_subject</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_exam_subject</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_exam_subject_relation.ktr b/intelligent/union_yuejuan/transfer/source/bus_exam_subject_relation.ktr
index fd6039f..d60e648 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_exam_subject_relation.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_exam_subject_relation.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:06:24.372</modified_date>
+ <modified_date>2021/08/23 16:57:26.909</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_exam_subject_relation</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_exam_subject_relation</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_exam_subject_student.ktr b/intelligent/union_yuejuan/transfer/source/bus_exam_subject_student.ktr
index 1556c97..034b4d2 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_exam_subject_student.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_exam_subject_student.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:06:16.793</modified_date>
+ <modified_date>2021/08/23 16:57:20.766</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_exam_subject_student</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_exam_subject_student</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -557,7 +557,7 @@
</output>
</remotesteps>
<GUI>
- <xloc>368</xloc>
+ <xloc>352</xloc>
<yloc>96</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_marking_person.ktr b/intelligent/union_yuejuan/transfer/source/bus_marking_person.ktr
index 4fe98d6..7463a2e 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_marking_person.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_marking_person.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:54.494</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:06:05.352</modified_date>
+ <modified_date>2021/08/23 16:57:13.412</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -529,7 +529,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_marking_person</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_marking_person</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -577,6 +577,7 @@
id,
exam_id,
user_id,
+login_name,
name,
phone,
school_id,
diff --git a/intelligent/union_yuejuan/transfer/source/bus_objective_question_config.ktr b/intelligent/union_yuejuan/transfer/source/bus_objective_question_config.ktr
index 60a5c98..ed54b8c 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_objective_question_config.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_objective_question_config.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/12/11 14:14:27.057</modified_date>
+ <modified_date>2021/08/23 16:57:07.204</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_objective_question_config</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_objective_question_config</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_relation_student_class.ktr b/intelligent/union_yuejuan/transfer/source/bus_relation_student_class.ktr
index 0dd8bed..0b0e043 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_relation_student_class.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_relation_student_class.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:04:39.258</modified_date>
+ <modified_date>2021/08/23 16:57:00.893</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_relation_student_class</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_relation_student_class</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_scan_model.ktr b/intelligent/union_yuejuan/transfer/source/bus_scan_model.ktr
index 979a8d7..59b6062 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_scan_model.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_scan_model.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:56.561</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/03/11 11:13:52.897</modified_date>
+ <modified_date>2021/08/23 16:56:54.068</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -529,7 +529,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_scan_model</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_scan_model</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_scan_student_paper.ktr b/intelligent/union_yuejuan/transfer/source/bus_scan_student_paper.ktr
index 9c7e7c9..c9a6cdd 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_scan_student_paper.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_scan_student_paper.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:57.228</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/03/11 11:15:15.051</modified_date>
+ <modified_date>2021/08/23 16:56:46.714</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -529,7 +529,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_scan_student_paper</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_scan_student_paper</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_subjective_question_config.ktr b/intelligent/union_yuejuan/transfer/source/bus_subjective_question_config.ktr
index c6b8f66..e4051a6 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_subjective_question_config.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_subjective_question_config.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/01/13 11:08:27.386</modified_date>
+ <modified_date>2021/08/23 16:56:40.197</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_subjective_question_config</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_subjective_question_config</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr b/intelligent/union_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr
index b69f4f6..253c2e4 100644
--- a/intelligent/union_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr
+++ b/intelligent/union_yuejuan/transfer/source/bus_subjective_question_coordinate.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:45:01.290</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/03/11 16:45:38.155</modified_date>
+ <modified_date>2021/08/23 16:56:33.997</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -503,8 +503,166 @@
<to>字段选择</to>
<enabled>Y</enabled>
</hop>
+ <hop>
+ <from>字段选择</from>
+ <to>Text file output</to>
+ <enabled>Y</enabled>
+ </hop>
</order>
<step>
+ <name>Text file output</name>
+ <type>TextFileOutput</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <separator>,</separator>
+ <enclosure>"</enclosure>
+ <enclosure_forced>N</enclosure_forced>
+ <enclosure_fix_disabled>N</enclosure_fix_disabled>
+ <header>N</header>
+ <footer>N</footer>
+ <format>UNIX</format>
+ <compression>None</compression>
+ <encoding>UTF-8</encoding>
+ <endedLine/>
+ <fileNameInField>N</fileNameInField>
+ <fileNameField/>
+ <create_parent_folder>Y</create_parent_folder>
+ <file>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/bus_subjective_question_coordinate</name>
+ <servlet_output>N</servlet_output>
+ <do_not_open_new_file_init>N</do_not_open_new_file_init>
+ <extention>csv</extention>
+ <append>N</append>
+ <split>N</split>
+ <haspartno>N</haspartno>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <SpecifyFormat>N</SpecifyFormat>
+ <date_time_format>yyyy-MM-dd HH:mm:ss</date_time_format>
+ <add_to_result_filenames>Y</add_to_result_filenames>
+ <pad>N</pad>
+ <fast_dump>N</fast_dump>
+ <splitevery/>
+ </file>
+ <fields>
+ <field>
+ <name>id</name>
+ <type>Integer</type>
+ <format>####0;-####0</format>
+ <currency/>
+ <decimal>.</decimal>
+ <group/>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>16</length>
+ <precision>0</precision>
+ </field>
+ <field>
+ <name>exam_id</name>
+ <type>Integer</type>
+ <format>####0;-####0</format>
+ <currency/>
+ <decimal>.</decimal>
+ <group>,</group>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>15</length>
+ <precision>0</precision>
+ </field>
+ <field>
+ <name>subject_id</name>
+ <type>Integer</type>
+ <format>####0;-####0</format>
+ <currency/>
+ <decimal>.</decimal>
+ <group>,</group>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>9</length>
+ <precision>0</precision>
+ </field>
+ <field>
+ <name>question_config_id</name>
+ <type>Integer</type>
+ <format>####0;-####0</format>
+ <currency/>
+ <decimal>.</decimal>
+ <group>,</group>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>15</length>
+ <precision>0</precision>
+ </field>
+ <field>
+ <name>page_num</name>
+ <type>Integer</type>
+ <format/>
+ <currency/>
+ <decimal/>
+ <group/>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>-1</length>
+ <precision>-1</precision>
+ </field>
+ <field>
+ <name>coordinate</name>
+ <type>String</type>
+ <format/>
+ <currency/>
+ <decimal/>
+ <group/>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>50</length>
+ <precision>-1</precision>
+ </field>
+ <field>
+ <name>create_time</name>
+ <type>Timestamp</type>
+ <format/>
+ <currency/>
+ <decimal/>
+ <group/>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>0</length>
+ <precision>-1</precision>
+ </field>
+ <field>
+ <name>modify_time</name>
+ <type>Timestamp</type>
+ <format/>
+ <currency/>
+ <decimal/>
+ <group/>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>0</length>
+ <precision>-1</precision>
+ </field>
+ </fields>
+ <attributes/>
+ <cluster_schema/>
+ <remotesteps>
+ <input>
+ </input>
+ <output>
+ </output>
+ </remotesteps>
+ <GUI>
+ <xloc>480</xloc>
+ <yloc>208</yloc>
+ <draw>Y</draw>
+ </GUI>
+ </step>
+ <step>
<name>bus_subjective_question_coordinate</name>
<type>TableInput</type>
<description/>
@@ -526,7 +684,7 @@ coordinate,
create_time,
modify_time
from bus_subjective_question_coordinate
-where exam_id=${exam_id}</sql>
+</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
@@ -655,8 +813,8 @@ where exam_id=${exam_id}</sql>
<name>page_num</name>
<rename>page_num</rename>
<type>Integer</type>
- <length>-2</length>
- <precision>-2</precision>
+ <length>2</length>
+ <precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
@@ -734,159 +892,6 @@ where exam_id=${exam_id}</sql>
<draw>Y</draw>
</GUI>
</step>
- <step>
- <name>Text file output</name>
- <type>TextFileOutput</type>
- <description/>
- <distribute>Y</distribute>
- <custom_distribution/>
- <copies>1</copies>
- <partitioning>
- <method>none</method>
- <schema_name/>
- </partitioning>
- <separator>,</separator>
- <enclosure>"</enclosure>
- <enclosure_forced>N</enclosure_forced>
- <enclosure_fix_disabled>N</enclosure_fix_disabled>
- <header>N</header>
- <footer>N</footer>
- <format>UNIX</format>
- <compression>None</compression>
- <encoding>UTF-8</encoding>
- <endedLine/>
- <fileNameInField>N</fileNameInField>
- <fileNameField/>
- <create_parent_folder>Y</create_parent_folder>
- <file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/bus_subjective_question_coordinate</name>
- <servlet_output>N</servlet_output>
- <do_not_open_new_file_init>N</do_not_open_new_file_init>
- <extention>csv</extention>
- <append>N</append>
- <split>N</split>
- <haspartno>N</haspartno>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <SpecifyFormat>N</SpecifyFormat>
- <date_time_format>yyyy-MM-dd HH:mm:ss</date_time_format>
- <add_to_result_filenames>Y</add_to_result_filenames>
- <pad>N</pad>
- <fast_dump>N</fast_dump>
- <splitevery/>
- </file>
- <fields>
- <field>
- <name>id</name>
- <type>Integer</type>
- <format>####0;-####0</format>
- <currency/>
- <decimal>.</decimal>
- <group/>
- <nullif/>
- <trim_type>none</trim_type>
- <length>16</length>
- <precision>0</precision>
- </field>
- <field>
- <name>exam_id</name>
- <type>Integer</type>
- <format>####0;-####0</format>
- <currency/>
- <decimal>.</decimal>
- <group>,</group>
- <nullif/>
- <trim_type>none</trim_type>
- <length>15</length>
- <precision>0</precision>
- </field>
- <field>
- <name>subject_id</name>
- <type>Integer</type>
- <format>####0;-####0</format>
- <currency/>
- <decimal>.</decimal>
- <group>,</group>
- <nullif/>
- <trim_type>none</trim_type>
- <length>9</length>
- <precision>0</precision>
- </field>
- <field>
- <name>question_config_id</name>
- <type>Integer</type>
- <format>####0;-####0</format>
- <currency/>
- <decimal>.</decimal>
- <group>,</group>
- <nullif/>
- <trim_type>none</trim_type>
- <length>15</length>
- <precision>0</precision>
- </field>
- <field>
- <name>page_num</name>
- <type>Integer</type>
- <format/>
- <currency/>
- <decimal/>
- <group/>
- <nullif/>
- <trim_type>none</trim_type>
- <length>-1</length>
- <precision>-1</precision>
- </field>
- <field>
- <name>coordinate</name>
- <type>String</type>
- <format/>
- <currency/>
- <decimal/>
- <group/>
- <nullif/>
- <trim_type>none</trim_type>
- <length>50</length>
- <precision>-1</precision>
- </field>
- <field>
- <name>create_time</name>
- <type>Timestamp</type>
- <format/>
- <currency/>
- <decimal/>
- <group/>
- <nullif/>
- <trim_type>none</trim_type>
- <length>0</length>
- <precision>-1</precision>
- </field>
- <field>
- <name>modify_time</name>
- <type>Timestamp</type>
- <format/>
- <currency/>
- <decimal/>
- <group/>
- <nullif/>
- <trim_type>none</trim_type>
- <length>0</length>
- <precision>-1</precision>
- </field>
- </fields>
- <attributes/>
- <cluster_schema/>
- <remotesteps>
- <input>
- </input>
- <output>
- </output>
- </remotesteps>
- <GUI>
- <xloc>480</xloc>
- <yloc>208</yloc>
- <draw>Y</draw>
- </GUI>
- </step>
<step_error_handling>
</step_error_handling>
<slave-step-copy-partition-distribution>
diff --git a/intelligent/union_yuejuan/transfer/source/class.ktr b/intelligent/union_yuejuan/transfer/source/class.ktr
deleted file mode 100644
index 06d50bd..0000000
--- a/intelligent/union_yuejuan/transfer/source/class.ktr
+++ /dev/null
@@ -1,618 +0,0 @@
-<transformation>
- <info>
- <name>class</name>
- <description/>
- <extended_description/>
- <trans_version/>
- <trans_type>Normal</trans_type>
- <trans_status>0</trans_status>
- <directory>/intelligent/union_yuejuan/transfer/source</directory>
- <parameters>
- </parameters>
- <log>
- <trans-log-table>
- <connection/>
- <schema/>
- <table/>
- <size_limit_lines/>
- <interval/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STATUS</id>
- <enabled>Y</enabled>
- <name>STATUS</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- <subject/>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- <subject/>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- <subject/>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- <subject/>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- <subject/>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- <subject/>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>STARTDATE</id>
- <enabled>Y</enabled>
- <name>STARTDATE</name>
- </field>
- <field>
- <id>ENDDATE</id>
- <enabled>Y</enabled>
- <name>ENDDATE</name>
- </field>
- <field>
- <id>LOGDATE</id>
- <enabled>Y</enabled>
- <name>LOGDATE</name>
- </field>
- <field>
- <id>DEPDATE</id>
- <enabled>Y</enabled>
- <name>DEPDATE</name>
- </field>
- <field>
- <id>REPLAYDATE</id>
- <enabled>Y</enabled>
- <name>REPLAYDATE</name>
- </field>
- <field>
- <id>LOG_FIELD</id>
- <enabled>Y</enabled>
- <name>LOG_FIELD</name>
- </field>
- <field>
- <id>EXECUTING_SERVER</id>
- <enabled>N</enabled>
- <name>EXECUTING_SERVER</name>
- </field>
- <field>
- <id>EXECUTING_USER</id>
- <enabled>N</enabled>
- <name>EXECUTING_USER</name>
- </field>
- <field>
- <id>CLIENT</id>
- <enabled>N</enabled>
- <name>CLIENT</name>
- </field>
- </trans-log-table>
- <perf-log-table>
- <connection/>
- <schema/>
- <table/>
- <interval/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>SEQ_NR</id>
- <enabled>Y</enabled>
- <name>SEQ_NR</name>
- </field>
- <field>
- <id>LOGDATE</id>
- <enabled>Y</enabled>
- <name>LOGDATE</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STEPNAME</id>
- <enabled>Y</enabled>
- <name>STEPNAME</name>
- </field>
- <field>
- <id>STEP_COPY</id>
- <enabled>Y</enabled>
- <name>STEP_COPY</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>INPUT_BUFFER_ROWS</id>
- <enabled>Y</enabled>
- <name>INPUT_BUFFER_ROWS</name>
- </field>
- <field>
- <id>OUTPUT_BUFFER_ROWS</id>
- <enabled>Y</enabled>
- <name>OUTPUT_BUFFER_ROWS</name>
- </field>
- </perf-log-table>
- <channel-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>LOGGING_OBJECT_TYPE</id>
- <enabled>Y</enabled>
- <name>LOGGING_OBJECT_TYPE</name>
- </field>
- <field>
- <id>OBJECT_NAME</id>
- <enabled>Y</enabled>
- <name>OBJECT_NAME</name>
- </field>
- <field>
- <id>OBJECT_COPY</id>
- <enabled>Y</enabled>
- <name>OBJECT_COPY</name>
- </field>
- <field>
- <id>REPOSITORY_DIRECTORY</id>
- <enabled>Y</enabled>
- <name>REPOSITORY_DIRECTORY</name>
- </field>
- <field>
- <id>FILENAME</id>
- <enabled>Y</enabled>
- <name>FILENAME</name>
- </field>
- <field>
- <id>OBJECT_ID</id>
- <enabled>Y</enabled>
- <name>OBJECT_ID</name>
- </field>
- <field>
- <id>OBJECT_REVISION</id>
- <enabled>Y</enabled>
- <name>OBJECT_REVISION</name>
- </field>
- <field>
- <id>PARENT_CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>PARENT_CHANNEL_ID</name>
- </field>
- <field>
- <id>ROOT_CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>ROOT_CHANNEL_ID</name>
- </field>
- </channel-log-table>
- <step-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>TRANSNAME</id>
- <enabled>Y</enabled>
- <name>TRANSNAME</name>
- </field>
- <field>
- <id>STEPNAME</id>
- <enabled>Y</enabled>
- <name>STEPNAME</name>
- </field>
- <field>
- <id>STEP_COPY</id>
- <enabled>Y</enabled>
- <name>STEP_COPY</name>
- </field>
- <field>
- <id>LINES_READ</id>
- <enabled>Y</enabled>
- <name>LINES_READ</name>
- </field>
- <field>
- <id>LINES_WRITTEN</id>
- <enabled>Y</enabled>
- <name>LINES_WRITTEN</name>
- </field>
- <field>
- <id>LINES_UPDATED</id>
- <enabled>Y</enabled>
- <name>LINES_UPDATED</name>
- </field>
- <field>
- <id>LINES_INPUT</id>
- <enabled>Y</enabled>
- <name>LINES_INPUT</name>
- </field>
- <field>
- <id>LINES_OUTPUT</id>
- <enabled>Y</enabled>
- <name>LINES_OUTPUT</name>
- </field>
- <field>
- <id>LINES_REJECTED</id>
- <enabled>Y</enabled>
- <name>LINES_REJECTED</name>
- </field>
- <field>
- <id>ERRORS</id>
- <enabled>Y</enabled>
- <name>ERRORS</name>
- </field>
- <field>
- <id>LOG_FIELD</id>
- <enabled>N</enabled>
- <name>LOG_FIELD</name>
- </field>
- </step-log-table>
- <metrics-log-table>
- <connection/>
- <schema/>
- <table/>
- <timeout_days/>
- <field>
- <id>ID_BATCH</id>
- <enabled>Y</enabled>
- <name>ID_BATCH</name>
- </field>
- <field>
- <id>CHANNEL_ID</id>
- <enabled>Y</enabled>
- <name>CHANNEL_ID</name>
- </field>
- <field>
- <id>LOG_DATE</id>
- <enabled>Y</enabled>
- <name>LOG_DATE</name>
- </field>
- <field>
- <id>METRICS_DATE</id>
- <enabled>Y</enabled>
- <name>METRICS_DATE</name>
- </field>
- <field>
- <id>METRICS_CODE</id>
- <enabled>Y</enabled>
- <name>METRICS_CODE</name>
- </field>
- <field>
- <id>METRICS_DESCRIPTION</id>
- <enabled>Y</enabled>
- <name>METRICS_DESCRIPTION</name>
- </field>
- <field>
- <id>METRICS_SUBJECT</id>
- <enabled>Y</enabled>
- <name>METRICS_SUBJECT</name>
- </field>
- <field>
- <id>METRICS_TYPE</id>
- <enabled>Y</enabled>
- <name>METRICS_TYPE</name>
- </field>
- <field>
- <id>METRICS_VALUE</id>
- <enabled>Y</enabled>
- <name>METRICS_VALUE</name>
- </field>
- </metrics-log-table>
- </log>
- <maxdate>
- <connection/>
- <table/>
- <field/>
- <offset>0.0</offset>
- <maxdiff>0.0</maxdiff>
- </maxdate>
- <size_rowset>10000</size_rowset>
- <sleep_time_empty>50</sleep_time_empty>
- <sleep_time_full>50</sleep_time_full>
- <unique_connections>N</unique_connections>
- <feedback_shown>Y</feedback_shown>
- <feedback_size>50000</feedback_size>
- <using_thread_priorities>Y</using_thread_priorities>
- <shared_objects_file/>
- <capture_step_performance>N</capture_step_performance>
- <step_performance_capturing_delay>1000</step_performance_capturing_delay>
- <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
- <dependencies>
- </dependencies>
- <partitionschemas>
- </partitionschemas>
- <slaveservers>
- </slaveservers>
- <clusterschemas>
- </clusterschemas>
- <created_user>admin</created_user>
- <created_date>2020/01/04 14:16:40.236</created_date>
- <modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:03:44.608</modified_date>
- <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
- <is_key_private>N</is_key_private>
- </info>
- <notepads>
- </notepads>
- <connection>
- <name>school_yuejuan_base</name>
- <server>192.168.2.244</server>
- <type>MYSQL</type>
- <access>Native</access>
- <database>base_resource_test</database>
- <port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
- <servername/>
- <data_tablespace/>
- <index_tablespace/>
- <attributes>
- <attribute>
- <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
- <attribute>500</attribute>
- </attribute>
- <attribute>
- <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
- <attribute>true</attribute>
- </attribute>
- <attribute>
- <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>FORCE_IDENTIFIERS_TO_UPPERCASE</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>IS_CLUSTERED</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>PORT_NUMBER</code>
- <attribute>3306</attribute>
- </attribute>
- <attribute>
- <code>PRESERVE_RESERVED_WORD_CASE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>QUOTE_ALL_FIELDS</code>
- <attribute>N</attribute>
- </attribute>
- <attribute>
- <code>STREAM_RESULTS</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>SUPPORTS_TIMESTAMP_DATA_TYPE</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
- <code>USE_POOLING</code>
- <attribute>N</attribute>
- </attribute>
- </attributes>
- </connection>
- <order>
- <hop>
- <from>class</from>
- <to>Text file output</to>
- <enabled>Y</enabled>
- </hop>
- </order>
- <step>
- <name>Text file output</name>
- <type>TextFileOutput</type>
- <description/>
- <distribute>Y</distribute>
- <custom_distribution/>
- <copies>1</copies>
- <partitioning>
- <method>none</method>
- <schema_name/>
- </partitioning>
- <separator>,</separator>
- <enclosure>"</enclosure>
- <enclosure_forced>N</enclosure_forced>
- <enclosure_fix_disabled>N</enclosure_fix_disabled>
- <header>N</header>
- <footer>N</footer>
- <format>UNIX</format>
- <compression>None</compression>
- <encoding>UTF-8</encoding>
- <endedLine/>
- <fileNameInField>N</fileNameInField>
- <fileNameField/>
- <create_parent_folder>Y</create_parent_folder>
- <file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/class</name>
- <servlet_output>N</servlet_output>
- <do_not_open_new_file_init>N</do_not_open_new_file_init>
- <extention>csv</extention>
- <append>N</append>
- <split>N</split>
- <haspartno>N</haspartno>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <SpecifyFormat>N</SpecifyFormat>
- <date_time_format>yyyy-MM-dd HH:mm:ss</date_time_format>
- <add_to_result_filenames>Y</add_to_result_filenames>
- <pad>N</pad>
- <fast_dump>N</fast_dump>
- <splitevery/>
- </file>
- <fields>
- </fields>
- <attributes/>
- <cluster_schema/>
- <remotesteps>
- <input>
- </input>
- <output>
- </output>
- </remotesteps>
- <GUI>
- <xloc>368</xloc>
- <yloc>96</yloc>
- <draw>Y</draw>
- </GUI>
- </step>
- <step>
- <name>class</name>
- <type>TableInput</type>
- <description/>
- <distribute>Y</distribute>
- <custom_distribution/>
- <copies>1</copies>
- <partitioning>
- <method>none</method>
- <schema_name/>
- </partitioning>
- <connection>school_yuejuan_base</connection>
- <sql>select
-id,
-school_id,
-class_name,
-grade,
-grade_id,
-entry_year,
-class_type,
-class_category_id,
-class_room_id,
-class_teacher_id,
-state,
-modify_time,
-create_time
-from class
-where (create_time>'${start_time}' and create_time<='${end_time}') or (modify_time>'${start_time}' and modify_time<='${end_time}')</sql>
- <limit>0</limit>
- <lookup/>
- <execute_each_row>N</execute_each_row>
- <variables_active>Y</variables_active>
- <lazy_conversion_active>N</lazy_conversion_active>
- <attributes/>
- <cluster_schema/>
- <remotesteps>
- <input>
- </input>
- <output>
- </output>
- </remotesteps>
- <GUI>
- <xloc>192</xloc>
- <yloc>96</yloc>
- <draw>Y</draw>
- </GUI>
- </step>
- <step_error_handling>
- </step_error_handling>
- <slave-step-copy-partition-distribution>
- </slave-step-copy-partition-distribution>
- <slave_transformation>N</slave_transformation>
- <attributes/>
-</transformation>
diff --git a/intelligent/union_yuejuan/transfer/source/dic_question_type.ktr b/intelligent/union_yuejuan/transfer/source/dic_question_type.ktr
index 738bef7..9b6c060 100644
--- a/intelligent/union_yuejuan/transfer/source/dic_question_type.ktr
+++ b/intelligent/union_yuejuan/transfer/source/dic_question_type.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:03:53.106</modified_date>
+ <modified_date>2021/08/23 16:56:27.103</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/dic_question_type</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/dic_question_type</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/dic_select_subject.ktr b/intelligent/union_yuejuan/transfer/source/dic_select_subject.ktr
index bbdce2a..a4dcbc4 100644
--- a/intelligent/union_yuejuan/transfer/source/dic_select_subject.ktr
+++ b/intelligent/union_yuejuan/transfer/source/dic_select_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:03:36.796</modified_date>
+ <modified_date>2021/08/23 16:56:20.622</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/dic_select_subject</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/dic_select_subject</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/report_exam_subject.ktr b/intelligent/union_yuejuan/transfer/source/report_exam_subject.ktr
index b5971e3..b455f53 100644
--- a/intelligent/union_yuejuan/transfer/source/report_exam_subject.ktr
+++ b/intelligent/union_yuejuan/transfer/source/report_exam_subject.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:07:17.151</modified_date>
+ <modified_date>2021/08/23 16:56:04.692</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -530,7 +530,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/report_exam_subject</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/report_exam_subject</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/source.kjb b/intelligent/union_yuejuan/transfer/source/source.kjb
index 01975ae..39b09f8 100644
--- a/intelligent/union_yuejuan/transfer/source/source.kjb
+++ b/intelligent/union_yuejuan/transfer/source/source.kjb
@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:08:10.767</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/03/04 13:56:50.471</modified_date>
+ <modified_date>2021/08/24 09:16:03.540</modified_date>
<parameters>
</parameters>
<slaveservers>
@@ -777,31 +777,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Shell</name>
- <description/>
- <type>SHELL</type>
- <attributes/>
- <filename>/home/gpadmin/kettle/python_pkgs_new/bigdata_etl_test/jobs/intelligent_test/union_yuejuan/intelligent_test_union.sh</filename>
- <work_directory/>
- <arg_from_previous>N</arg_from_previous>
- <exec_per_row>N</exec_per_row>
- <set_logfile>N</set_logfile>
- <logfile/>
- <set_append_logfile>N</set_append_logfile>
- <logext/>
- <add_date>N</add_date>
- <add_time>N</add_time>
- <insertScript>N</insertScript>
- <script/>
- <loglevel>Basic</loglevel>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>1168</xloc>
- <yloc>352</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>zh_subject_spilt_score</name>
<description/>
<type>TRANS</type>
@@ -919,18 +894,6 @@
<attributes_kjc/>
</entry>
<entry>
- <name>Success</name>
- <description/>
- <type>SUCCESS</type>
- <attributes/>
- <parallel>N</parallel>
- <draw>Y</draw>
- <nr>0</nr>
- <xloc>1312</xloc>
- <yloc>352</yloc>
- <attributes_kjc/>
- </entry>
- <entry>
<name>teacher</name>
<description/>
<type>TRANS</type>
@@ -970,14 +933,14 @@
<attributes_kjc/>
</entry>
<entry>
- <name>student_info</name>
+ <name>student</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>student_info</transname>
+ <transname>student</transname>
<directory>/intelligent/union_yuejuan/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -1048,14 +1011,14 @@
<attributes_kjc/>
</entry>
<entry>
- <name>class</name>
+ <name>school_class</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
- <transname>class</transname>
+ <transname>school_class</transname>
<directory>/intelligent/union_yuejuan/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
@@ -1203,6 +1166,121 @@
<yloc>240</yloc>
<attributes_kjc/>
</entry>
+ <entry>
+ <name>Shell</name>
+ <description/>
+ <type>SHELL</type>
+ <attributes/>
+ <filename>/home/wljty/etl_total/python_pkgs/bigdata_etl/jobs/intelligent/union_yuejuan/intelligent_union.sh</filename>
+ <work_directory/>
+ <arg_from_previous>N</arg_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <set_append_logfile>N</set_append_logfile>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <insertScript>N</insertScript>
+ <script/>
+ <loglevel>Basic</loglevel>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1024</xloc>
+ <yloc>464</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>Success</name>
+ <description/>
+ <type>SUCCESS</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>880</xloc>
+ <yloc>464</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>header_teacher</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>header_teacher</transname>
+ <directory>/intelligent/union_yuejuan/transfer/source</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1184</xloc>
+ <yloc>352</yloc>
+ <attributes_kjc/>
+ </entry>
+ <entry>
+ <name>user</name>
+ <description/>
+ <type>TRANS</type>
+ <attributes/>
+ <specification_method>rep_name</specification_method>
+ <trans_object_id/>
+ <filename/>
+ <transname>user</transname>
+ <directory>/intelligent/union_yuejuan/transfer/source</directory>
+ <arg_from_previous>N</arg_from_previous>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <cluster>N</cluster>
+ <slave_server_name/>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <follow_abort_remote>N</follow_abort_remote>
+ <create_parent_folder>N</create_parent_folder>
+ <logging_remote_work>N</logging_remote_work>
+ <run_configuration>Pentaho local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <draw>Y</draw>
+ <nr>0</nr>
+ <xloc>1184</xloc>
+ <yloc>464</yloc>
+ <attributes_kjc/>
+ </entry>
</entries>
<hops>
<hop>
@@ -1251,7 +1329,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>student_info</from>
+ <from>student</from>
<to>bus_marking_person</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
@@ -1314,15 +1392,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>bus_marking_person</from>
- <to>Shell</to>
- <from_nr>0</from_nr>
- <to_nr>0</to_nr>
- <enabled>Y</enabled>
- <evaluation>Y</evaluation>
- <unconditional>N</unconditional>
- </hop>
- <hop>
<from>dic_question_type</from>
<to>dic_select_subject</to>
<from_nr>0</from_nr>
@@ -1360,7 +1429,7 @@
</hop>
<hop>
<from>area</from>
- <to>student_info</to>
+ <to>student</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1386,7 +1455,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>class</from>
+ <from>school_class</from>
<to>dic_question_type</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
@@ -1395,17 +1464,17 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>Shell</from>
- <to>Success</to>
+ <from>bus_subjective_question_config</from>
+ <to>school_class</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
- <enabled>N</enabled>
+ <enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
- <from>bus_subjective_question_config</from>
- <to>class</to>
+ <from>bus_exam_school</from>
+ <to>tenant</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
@@ -1413,8 +1482,35 @@
<unconditional>N</unconditional>
</hop>
<hop>
- <from>bus_exam_school</from>
- <to>tenant</to>
+ <from>bus_marking_person</from>
+ <to>header_teacher</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>header_teacher</from>
+ <to>user</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>user</from>
+ <to>Shell</to>
+ <from_nr>0</from_nr>
+ <to_nr>0</to_nr>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>Shell</from>
+ <to>Success</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
diff --git a/intelligent/union_yuejuan/transfer/source/student_info.ktr b/intelligent/union_yuejuan/transfer/source/student_info.ktr
index ca5279a..179c778 100644
--- a/intelligent/union_yuejuan/transfer/source/student_info.ktr
+++ b/intelligent/union_yuejuan/transfer/source/student_info.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:45:04.804</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:07:23.059</modified_date>
+ <modified_date>2021/08/23 16:55:46.254</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>school_yuejuan_base</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>base_resource_test</database>
+ <database>jty_basic</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>read_only</username>
+ <password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -529,7 +529,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/student_info</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/student_info</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/source/teacher.ktr b/intelligent/union_yuejuan/transfer/source/teacher.ktr
index f984ba1..65367c9 100644
--- a/intelligent/union_yuejuan/transfer/source/teacher.ktr
+++ b/intelligent/union_yuejuan/transfer/source/teacher.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:07:27.950</modified_date>
+ <modified_date>2021/08/23 16:55:40.238</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>school_yuejuan_base</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>base_resource_test</database>
+ <database>jty_basic</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>read_only</username>
+ <password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -501,6 +501,11 @@
<order>
<hop>
<from>teacher</from>
+ <to>字段选择</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>字段选择</from>
<to>Text file output</to>
<enabled>Y</enabled>
</hop>
@@ -530,7 +535,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/teacher</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/teacher</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -557,8 +562,8 @@
</output>
</remotesteps>
<GUI>
- <xloc>368</xloc>
- <yloc>96</yloc>
+ <xloc>400</xloc>
+ <yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
@@ -575,33 +580,17 @@
</partitioning>
<connection>school_yuejuan_base</connection>
<sql>select
-id,
-school_id,
-job_num,
-phone_num,
-gender,
-name,
-card_num,
-card_area_id,
-card_detail_id,
-home_address_area,
-home_detail_address,
-high_education,
-marital_status,
-nation_id,
-politic_countenance,
-post_id,
-entry_date,
-birth_day,
-professional_qualificationl_id,
-incumbency,
-emergency_contact,
-emergency_contact_phone,
-user_state,
-modify_time,
-create_time
+user_id,
+job_number,
+created_by,
+created_time,
+deleted,
+modified_time,
+job_status,
+position_id,
+station_id
from teacher
-where (create_time>'${start_time}' and create_time<='${end_time}') or (modify_time>'${start_time}' and modify_time<='${end_time}')</sql>
+where (created_time>'${start_time}' and created_time<='${end_time}') or (modified_time>'${start_time}' and modified_time<='${end_time}')</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
@@ -616,8 +605,216 @@ where (create_time>'${start_time}' and create_time<='${end_time}') or (modify
</output>
</remotesteps>
<GUI>
- <xloc>192</xloc>
- <yloc>96</yloc>
+ <xloc>128</xloc>
+ <yloc>128</yloc>
+ <draw>Y</draw>
+ </GUI>
+ </step>
+ <step>
+ <name>字段选择</name>
+ <type>SelectValues</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <fields>
+ <field>
+ <name>user_id</name>
+ </field>
+ <field>
+ <name>job_number</name>
+ </field>
+ <field>
+ <name>created_by</name>
+ </field>
+ <field>
+ <name>created_time</name>
+ </field>
+ <field>
+ <name>deleted</name>
+ </field>
+ <field>
+ <name>modified_time</name>
+ </field>
+ <field>
+ <name>job_status</name>
+ </field>
+ <field>
+ <name>position_id</name>
+ </field>
+ <field>
+ <name>station_id</name>
+ </field>
+ <select_unspecified>N</select_unspecified>
+ <meta>
+ <name>user_id</name>
+ <rename>user_id</rename>
+ <type>None</type>
+ <length>15</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>job_number</name>
+ <rename>job_number</rename>
+ <type>None</type>
+ <length>50</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>created_by</name>
+ <rename>created_by</rename>
+ <type>None</type>
+ <length>15</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>created_time</name>
+ <rename>created_time</rename>
+ <type>None</type>
+ <length>0</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>deleted</name>
+ <rename>deleted</rename>
+ <type>Integer</type>
+ <length>-2</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>modified_time</name>
+ <rename>modified_time</rename>
+ <type>None</type>
+ <length>0</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>job_status</name>
+ <rename>job_status</rename>
+ <type>None</type>
+ <length>50</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>position_id</name>
+ <rename>position_id</rename>
+ <type>None</type>
+ <length>9</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>station_id</name>
+ <rename>station_id</rename>
+ <type>None</type>
+ <length>9</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ </fields>
+ <attributes/>
+ <cluster_schema/>
+ <remotesteps>
+ <input>
+ </input>
+ <output>
+ </output>
+ </remotesteps>
+ <GUI>
+ <xloc>256</xloc>
+ <yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
diff --git a/intelligent/union_yuejuan/transfer/source/tenant.ktr b/intelligent/union_yuejuan/transfer/source/tenant.ktr
index ee82938..cf7b34e 100644
--- a/intelligent/union_yuejuan/transfer/source/tenant.ktr
+++ b/intelligent/union_yuejuan/transfer/source/tenant.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:45:06.232</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/10/28 11:07:33.320</modified_date>
+ <modified_date>2021/08/23 16:55:33.685</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>school_yuejuan_base</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
- <database>base_resource_test</database>
+ <database>jty_basic</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>read_only</username>
+ <password>Encrypted 2becacaa90ef89d8aa7008e67d2c3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -500,6 +500,11 @@
<order>
<hop>
<from>tenant</from>
+ <to>字段选择</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>字段选择</from>
<to>Text file output</to>
<enabled>Y</enabled>
</hop>
@@ -529,7 +534,7 @@
<fileNameField/>
<create_parent_folder>Y</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/tenant</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/tenant</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
@@ -575,22 +580,19 @@
<connection>school_yuejuan_base</connection>
<sql>select
id,
-tenant_name,
-another_name,
-open_flag,
-init_flag,
-open_time,
+created_by,
+created_time,
+deleted,
+modified_time,
+address_id,
+alias,
+name,
remark,
-tenant_type,
-address_area_id,
-address_detail,
-postal_code,
state,
-modify_time,
-create_time,
-use_type
+type,
+english
from tenant
-where (create_time>'${start_time}' and create_time<='${end_time}') or (modify_time>'${start_time}' and modify_time<='${end_time}')</sql>
+where (created_time>'${start_time}' and created_time<='${end_time}') or (modified_time>'${start_time}' and modified_time<='${end_time}')</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
@@ -605,7 +607,275 @@ where (create_time>'${start_time}' and create_time<='${end_time}') or (modify
</output>
</remotesteps>
<GUI>
- <xloc>208</xloc>
+ <xloc>96</xloc>
+ <yloc>128</yloc>
+ <draw>Y</draw>
+ </GUI>
+ </step>
+ <step>
+ <name>字段选择</name>
+ <type>SelectValues</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <fields>
+ <field>
+ <name>id</name>
+ </field>
+ <field>
+ <name>created_by</name>
+ </field>
+ <field>
+ <name>created_time</name>
+ </field>
+ <field>
+ <name>deleted</name>
+ </field>
+ <field>
+ <name>modified_time</name>
+ </field>
+ <field>
+ <name>address_id</name>
+ </field>
+ <field>
+ <name>alias</name>
+ </field>
+ <field>
+ <name>name</name>
+ </field>
+ <field>
+ <name>remark</name>
+ </field>
+ <field>
+ <name>state</name>
+ </field>
+ <field>
+ <name>type</name>
+ </field>
+ <field>
+ <name>english</name>
+ </field>
+ <select_unspecified>N</select_unspecified>
+ <meta>
+ <name>id</name>
+ <rename>id</rename>
+ <type>None</type>
+ <length>15</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>created_by</name>
+ <rename>created_by</rename>
+ <type>None</type>
+ <length>15</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>created_time</name>
+ <rename>created_time</rename>
+ <type>None</type>
+ <length>0</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>deleted</name>
+ <rename>deleted</rename>
+ <type>Integer</type>
+ <length>-2</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>modified_time</name>
+ <rename>modified_time</rename>
+ <type>None</type>
+ <length>0</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>address_id</name>
+ <rename>address_id</rename>
+ <type>None</type>
+ <length>9</length>
+ <precision>0</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>alias</name>
+ <rename>alias</rename>
+ <type>None</type>
+ <length>100</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>name</name>
+ <rename>name</rename>
+ <type>None</type>
+ <length>100</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>remark</name>
+ <rename>remark</rename>
+ <type>None</type>
+ <length>100</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>state</name>
+ <rename>state</rename>
+ <type>None</type>
+ <length>50</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>type</name>
+ <rename>type</rename>
+ <type>None</type>
+ <length>50</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ <meta>
+ <name>english</name>
+ <rename>english</rename>
+ <type>None</type>
+ <length>100</length>
+ <precision>-2</precision>
+ <conversion_mask/>
+ <date_format_lenient>false</date_format_lenient>
+ <date_format_locale/>
+ <date_format_timezone/>
+ <lenient_string_to_number>false</lenient_string_to_number>
+ <encoding/>
+ <decimal_symbol/>
+ <grouping_symbol/>
+ <currency_symbol/>
+ <storage_type/>
+ </meta>
+ </fields>
+ <attributes/>
+ <cluster_schema/>
+ <remotesteps>
+ <input>
+ </input>
+ <output>
+ </output>
+ </remotesteps>
+ <GUI>
+ <xloc>224</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
diff --git a/intelligent/union_yuejuan/transfer/source/zh_subject_spilt_score.ktr b/intelligent/union_yuejuan/transfer/source/zh_subject_spilt_score.ktr
index 68f87d1..5c3d6f2 100644
--- a/intelligent/union_yuejuan/transfer/source/zh_subject_spilt_score.ktr
+++ b/intelligent/union_yuejuan/transfer/source/zh_subject_spilt_score.ktr
@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:45:06.943</created_date>
<modified_user>-</modified_user>
- <modified_date>2021/01/12 16:19:32.663</modified_date>
+ <modified_date>2021/08/23 16:55:21.068</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>rm-8vb7o8w90t4itw6p8.mysql.zhangbei.rds.aliyuncs.com</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <username>wl_admin</username>
+ <password>Encrypted 2be98afc81dcbad85af14a77efec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -529,7 +529,7 @@
<fileNameField/>
<create_parent_folder>N</create_parent_folder>
<file>
- <name>/home/gpadmin/gpfdist/intelligent/union_yuejuan/zh_subject_spilt_score</name>
+ <name>/home/wljty/etl_total/data/intelligent/union_yuejuan/zh_subject_spilt_score</name>
<servlet_output>N</servlet_output>
<do_not_open_new_file_init>N</do_not_open_new_file_init>
<extention>csv</extention>
diff --git a/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable.ktr b/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable.ktr
index e581c74..38ba849 100644
--- a/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable.ktr
+++ b/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/01/09 16:05:15.709</modified_date>
+ <modified_date>2021/07/23 17:51:28.946</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -573,8 +573,8 @@
id as task_id,
exam_id,
create_time as end_time,
-case when (select count(*) from task_list where task_status>1)>0
-then (select max(create_time) from task_list where task_status>1)
+case when (select count(*) from task_list where task_status>1 and source_type=3)>0
+then (select max(create_time) from task_list where task_status>1 and source_type=3)
else '2000-01-01 00:00:00' end start_time
from task_list
where task_status in (0,1) and del_flag=0 and source_type=3
diff --git a/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr b/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr
index ddfa64d..c4e5467 100644
--- a/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr
+++ b/intelligent/union_yuejuan/transfer/total_control/set_variable/set_variable_neiwang.ktr
@@ -429,34 +429,26 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
- <modified_date>2021/01/11 13:33:56.728</modified_date>
+ <modified_date>2021/08/05 15:48:05.372</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
<notepads>
</notepads>
<connection>
- <name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
- <type>MYSQL</type>
+ <name>intelligent_greenplum_neiwang</name>
+ <server>10.1.103.241</server>
+ <type>POSTGRESQL</type>
<access>Native</access>
- <database>union_yuejuan_yun</database>
- <port>3306</port>
- <username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <database>intelligent</database>
+ <port>5432</port>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
<attributes>
<attribute>
- <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
- <attribute>500</attribute>
- </attribute>
- <attribute>
- <code>EXTRA_OPTION_MYSQL.useCursorFetch</code>
- <attribute>true</attribute>
- </attribute>
- <attribute>
<code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute>
</attribute>
@@ -470,7 +462,7 @@
</attribute>
<attribute>
<code>PORT_NUMBER</code>
- <attribute>3306</attribute>
+ <attribute>5432</attribute>
</attribute>
<attribute>
<code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -481,10 +473,6 @@
<attribute>N</attribute>
</attribute>
<attribute>
- <code>STREAM_RESULTS</code>
- <attribute>Y</attribute>
- </attribute>
- <attribute>
<code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
<attribute>Y</attribute>
</attribute>
@@ -568,16 +556,17 @@
<method>none</method>
<schema_name/>
</partitioning>
- <connection>intelligent_union_yuejuan_neiwang</connection>
+ <connection>intelligent_greenplum_neiwang</connection>
<sql>select
-id as task_id,
-exam_id,
-create_time as end_time,
-case when (select count(*) from task_list where task_status>1)>0
-then (select max(create_time) from task_list where task_status>1)
+a.id as task_id,
+a.exam_id,
+a.create_time as end_time,
+case when (select count(*) from union_yuejuan_source_process.task_list where task_status=2)>0
+then (select max(create_time) from union_yuejuan_source_process.task_list where task_status=2)
else '2000-01-01 00:00:00' end start_time
-from task_list
-where task_status=1 and del_flag=0 and source_type=3</sql>
+from union_yuejuan_source_process.task_list a
+where a.del_flag=0 and task_status=1
+order by a.create_time limit 1</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
diff --git a/intelligent/union_yuejuan/transfer/total_control/write_log_unsuccess.ktr b/intelligent/union_yuejuan/transfer/total_control/write_log_unsuccess.ktr
index 517d368..2e1f8b3 100644
--- a/intelligent/union_yuejuan/transfer/total_control/write_log_unsuccess.ktr
+++ b/intelligent/union_yuejuan/transfer/total_control/write_log_unsuccess.ktr
@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:52.787</created_date>
<modified_user>admin</modified_user>
- <modified_date>2020/12/10 14:09:27.903</modified_date>
+ <modified_date>2021/08/03 13:52:48.017</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
- <server>192.168.4.248</server>
+ <server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
- <database>intelligent_dev</database>
+ <database>intelligent</database>
<port>5432</port>
- <username>yuejuan</username>
- <password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
+ <username>gpadmin</username>
+ <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -488,13 +488,13 @@
</connection>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
- <server>192.168.2.244</server>
+ <server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
- <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
+ <password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
@@ -612,8 +612,7 @@
<quoteString>N</quoteString>
<sql>insert into public.job_log (task_id,stage,is_success,task_type)
values (${task_id},'${stage}',0,'union_yuejuan_transfer');
-
-delete from union_yuejuan_source_process.task_list where exam_id=${exam_id} and del_flag=0;</sql>
+</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>