Commit 86534e94 by luofeng

Merge remote-tracking branch 'origin/shi_test' into shi_test

parents c400c71e 4ce2b64a
<?xml version="1.0" encoding="UTF-8"?>
<job> <job>
<name>core</name> <name>core</name>
<description/> <description/>
<extended_description/> <extended_description/>
<job_version/> <job_version/>
<job_status>0</job_status> <job_status>0</job_status>
<directory>/intelligent/single_yuejuan/analysis</directory> <directory>/</directory>
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:21:41.533</created_date> <created_date>2020/01/04 14:21:41.533</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
...@@ -313,9 +314,9 @@ ...@@ -313,9 +314,9 @@
<description/> <description/>
<type>JOB</type> <type>JOB</type>
<attributes/> <attributes/>
<specification_method>rep_name</specification_method> <specification_method>filename</specification_method>
<job_object_id/> <job_object_id/>
<filename/> <filename>/intelligent/single_yuejuan/analysis/adm/adm.kjb</filename>
<jobname>adm</jobname> <jobname>adm</jobname>
<directory>/intelligent/single_yuejuan/analysis/adm</directory> <directory>/intelligent/single_yuejuan/analysis/adm</directory>
<arg_from_previous>N</arg_from_previous> <arg_from_previous>N</arg_from_previous>
...@@ -374,6 +375,7 @@ ...@@ -374,6 +375,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -425,6 +427,7 @@ ...@@ -425,6 +427,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -440,9 +443,9 @@ ...@@ -440,9 +443,9 @@
<description/> <description/>
<type>JOB</type> <type>JOB</type>
<attributes/> <attributes/>
<specification_method>rep_name</specification_method> <specification_method>filename</specification_method>
<job_object_id/> <job_object_id/>
<filename/> <filename>/intelligent/single_yuejuan/analysis/fundamental/fundamental.kjb</filename>
<jobname>fundamental</jobname> <jobname>fundamental</jobname>
<directory>/intelligent/single_yuejuan/analysis/fundamental</directory> <directory>/intelligent/single_yuejuan/analysis/fundamental</directory>
<arg_from_previous>N</arg_from_previous> <arg_from_previous>N</arg_from_previous>
...@@ -501,6 +504,7 @@ ...@@ -501,6 +504,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -540,6 +544,7 @@ ...@@ -540,6 +544,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -579,6 +584,7 @@ ...@@ -579,6 +584,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -618,6 +624,7 @@ ...@@ -618,6 +624,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -679,6 +686,7 @@ ...@@ -679,6 +686,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -718,6 +726,7 @@ ...@@ -718,6 +726,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -745,9 +754,9 @@ ...@@ -745,9 +754,9 @@
<description/> <description/>
<type>JOB</type> <type>JOB</type>
<attributes/> <attributes/>
<specification_method>rep_name</specification_method> <specification_method>filename</specification_method>
<job_object_id/> <job_object_id/>
<filename/> <filename>/intelligent/single_yuejuan/analysis/roll_back/roll_back.kjb</filename>
<jobname>roll_back</jobname> <jobname>roll_back</jobname>
<directory>/intelligent/single_yuejuan/analysis/roll_back</directory> <directory>/intelligent/single_yuejuan/analysis/roll_back</directory>
<arg_from_previous>N</arg_from_previous> <arg_from_previous>N</arg_from_previous>
...@@ -782,9 +791,9 @@ ...@@ -782,9 +791,9 @@
<description/> <description/>
<type>JOB</type> <type>JOB</type>
<attributes/> <attributes/>
<specification_method>rep_name</specification_method> <specification_method>filename</specification_method>
<job_object_id/> <job_object_id/>
<filename/> <filename>/intelligent/single_yuejuan/analysis/report/report.kjb</filename>
<jobname>report</jobname> <jobname>report</jobname>
<directory>/intelligent/single_yuejuan/analysis/report</directory> <directory>/intelligent/single_yuejuan/analysis/report</directory>
<arg_from_previous>N</arg_from_previous> <arg_from_previous>N</arg_from_previous>
...@@ -843,6 +852,7 @@ ...@@ -843,6 +852,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -904,6 +914,7 @@ ...@@ -904,6 +914,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -943,6 +954,7 @@ ...@@ -943,6 +954,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -1006,6 +1018,7 @@ ...@@ -1006,6 +1018,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -1117,9 +1130,9 @@ ...@@ -1117,9 +1130,9 @@
<description/> <description/>
<type>JOB</type> <type>JOB</type>
<attributes/> <attributes/>
<specification_method>rep_name</specification_method> <specification_method>filename</specification_method>
<job_object_id/> <job_object_id/>
<filename/> <filename>/intelligent/single_yuejuan/transfer/core.kjb</filename>
<jobname>core</jobname> <jobname>core</jobname>
<directory>/intelligent/single_yuejuan/transfer</directory> <directory>/intelligent/single_yuejuan/transfer</directory>
<arg_from_previous>N</arg_from_previous> <arg_from_previous>N</arg_from_previous>
...@@ -1200,6 +1213,7 @@ ...@@ -1200,6 +1213,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -1274,6 +1288,7 @@ ...@@ -1274,6 +1288,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
......
<?xml version="1.0" encoding="UTF-8"?>
<transformation> <transformation>
<info> <info>
<name>fundamental</name> <name>fundamental</name>
...@@ -6,7 +7,7 @@ ...@@ -6,7 +7,7 @@
<trans_version/> <trans_version/>
<trans_type>Normal</trans_type> <trans_type>Normal</trans_type>
<trans_status>0</trans_status> <trans_status>0</trans_status>
<directory>/intelligent/single_yuejuan/analysis/fundamental</directory> <directory>/</directory>
<parameters> <parameters>
</parameters> </parameters>
<log> <log>
...@@ -505,6 +506,7 @@ ...@@ -505,6 +506,7 @@
<replace_variables>Y</replace_variables> <replace_variables>Y</replace_variables>
<quoteString>N</quoteString> <quoteString>N</quoteString>
<sql>select single_yuejuan_fundamental.bus_exam_student(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank}); <sql>select single_yuejuan_fundamental.bus_exam_student(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select single_yuejuan_fundamental.exam_subject_select_type(${exam_id},${model});
select single_yuejuan_fundamental.subject_split(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank}); select single_yuejuan_fundamental.subject_split(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select single_yuejuan_fundamental.exam_class(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank}); select single_yuejuan_fundamental.exam_class(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
select single_yuejuan_fundamental.subject_type(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank}); select single_yuejuan_fundamental.subject_type(${exam_id},${task_type},${type_id},${model},${include_zero},${include_absent},${default_score},${show_student_rank});
......
...@@ -423,13 +423,26 @@ ...@@ -423,13 +423,26 @@
<partitionschemas> <partitionschemas>
</partitionschemas> </partitionschemas>
<slaveservers> <slaveservers>
<slaveserver>
<name>10.1.104.244</name>
<hostname>10.1.104.244</hostname>
<port>8081</port>
<webAppName/>
<username>carte</username>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<proxy_hostname/>
<proxy_port/>
<non_proxy_hosts/>
<master>N</master>
<sslMode>N</sslMode>
</slaveserver>
</slaveservers> </slaveservers>
<clusterschemas> <clusterschemas>
</clusterschemas> </clusterschemas>
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:31:23.420</created_date> <created_date>2020/08/14 09:31:23.420</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2021/07/02 10:24:01.163</modified_date> <modified_date>2021/09/22 09:20:23.863</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -437,10 +450,10 @@ ...@@ -437,10 +450,10 @@
</notepads> </notepads>
<connection> <connection>
<name>intelligent_greenplum_neiwang</name> <name>intelligent_greenplum_neiwang</name>
<server>10.1.103.241</server> <server>10.1.104.241</server>
<type>POSTGRESQL</type> <type>POSTGRESQL</type>
<access>Native</access> <access>Native</access>
<database>intelligent</database> <database>intelligent_dev</database>
<port>5432</port> <port>5432</port>
<username>gpadmin</username> <username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password> <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
...@@ -543,7 +556,7 @@ a.modify_id, ...@@ -543,7 +556,7 @@ a.modify_id,
a.modify_time, a.modify_time,
a.exam_length, a.exam_length,
a.pre_length, a.pre_length,
a.source_type 1
from single_yuejuan_source.bus_exam a from single_yuejuan_source.bus_exam a
inner join (select exam_id,school_id,school_name from single_yuejuan_source.bus_exam_student group by exam_id,school_id,school_name) b on a.id=b.exam_id</sql> inner join (select exam_id,school_id,school_name from single_yuejuan_source.bus_exam_student group by exam_id,school_id,school_name) b on a.id=b.exam_id</sql>
<set_params>N</set_params> <set_params>N</set_params>
......
<?xml version="1.0" encoding="UTF-8"?>
<job> <job>
<name>roll_back</name> <name>roll_back</name>
<description/> <description/>
<extended_description/> <extended_description/>
<job_version/> <job_version/>
<job_status>0</job_status> <job_status>0</job_status>
<directory>/intelligent/single_yuejuan/transfer/roll_back</directory> <directory>/</directory>
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:35:53.635</created_date> <created_date>2020/08/14 09:35:53.635</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
...@@ -349,6 +350,7 @@ ...@@ -349,6 +350,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<trans_version/> <trans_version/>
<trans_type>Normal</trans_type> <trans_type>Normal</trans_type>
<trans_status>0</trans_status> <trans_status>0</trans_status>
<directory>/intelligent/single_yuejuan/transfer/roll_back</directory> <directory>/</directory>
<parameters> <parameters>
</parameters> </parameters>
<log> <log>
...@@ -423,13 +423,26 @@ ...@@ -423,13 +423,26 @@
<partitionschemas> <partitionschemas>
</partitionschemas> </partitionschemas>
<slaveservers> <slaveservers>
<slaveserver>
<name>10.1.104.244</name>
<hostname>10.1.104.244</hostname>
<port>8081</port>
<webAppName/>
<username>carte</username>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<proxy_hostname/>
<proxy_port/>
<non_proxy_hosts/>
<master>N</master>
<sslMode>N</sslMode>
</slaveserver>
</slaveservers> </slaveservers>
<clusterschemas> <clusterschemas>
</clusterschemas> </clusterschemas>
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:18:01.920</created_date> <created_date>2020/01/04 14:18:01.920</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2021/08/17 10:58:09.847</modified_date> <modified_date>2021/09/17 12:16:55.139</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -440,7 +453,7 @@ ...@@ -440,7 +453,7 @@
<server>10.1.104.241</server> <server>10.1.104.241</server>
<type>POSTGRESQL</type> <type>POSTGRESQL</type>
<access>Native</access> <access>Native</access>
<database>intelligent</database> <database>intelligent_dev</database>
<port>5432</port> <port>5432</port>
<username>gpadmin</username> <username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password> <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
...@@ -512,8 +525,10 @@ delete from single_yuejuan_source_process.bus_exam_class_relation where exam_id ...@@ -512,8 +525,10 @@ delete from single_yuejuan_source_process.bus_exam_class_relation where exam_id
delete from single_yuejuan_source_process.bus_exam where 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_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_student where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_exam_student_select 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_relation where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_exam_subject_student where exam_id = ${exam_id}; delete from single_yuejuan_source_process.bus_exam_subject_student where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_exam_subject_student_select where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_objective_question_config where exam_id = ${exam_id}; delete from single_yuejuan_source_process.bus_objective_question_config where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_relation_student_class where exam_id = ${exam_id}; delete from single_yuejuan_source_process.bus_relation_student_class where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_student_obj_ques_score where exam_id = ${exam_id}; delete from single_yuejuan_source_process.bus_student_obj_ques_score where exam_id = ${exam_id};
...@@ -523,6 +538,7 @@ delete from single_yuejuan_source_process.report_exam_subject where exam_id = ${ ...@@ -523,6 +538,7 @@ delete from single_yuejuan_source_process.report_exam_subject where exam_id = ${
delete from single_yuejuan_source_process.bus_exam_subject where id in (select id from single_yuejuan_source.bus_exam_subject); delete from single_yuejuan_source_process.bus_exam_subject where id in (select id from single_yuejuan_source.bus_exam_subject);
delete from single_yuejuan_source_process.dic_question_type where id in (select id from single_yuejuan_source.dic_question_type); delete from single_yuejuan_source_process.dic_question_type where id in (select id from single_yuejuan_source.dic_question_type);
delete from single_yuejuan_source_process.dic_select_subject where id in (select id from single_yuejuan_source.dic_select_subject); delete from single_yuejuan_source_process.dic_select_subject where id in (select id from single_yuejuan_source.dic_select_subject);
delete from single_yuejuan_source_process.dic_subject_select_type where subject_type_code in(select subject_type_code from single_yuejuan_source.dic_subject_select_type);
--------------------------- ---------------------------
delete from single_yuejuan_source_process.bus_marking_person where exam_id = ${exam_id}; delete from single_yuejuan_source_process.bus_marking_person where exam_id = ${exam_id};
------------------- -------------------
...@@ -548,6 +564,8 @@ vacuum single_yuejuan_source_process.bus_exam_class_relation; ...@@ -548,6 +564,8 @@ vacuum single_yuejuan_source_process.bus_exam_class_relation;
vacuum single_yuejuan_source_process.bus_exam; vacuum single_yuejuan_source_process.bus_exam;
vacuum single_yuejuan_source_process.bus_exam_school; vacuum single_yuejuan_source_process.bus_exam_school;
vacuum single_yuejuan_source_process.bus_exam_student; vacuum single_yuejuan_source_process.bus_exam_student;
vacuum single_yuejuan_source_process.bus_exam_student_select;
vacuum single_yuejuan_source_process.bus_exam_subject_student_select;
vacuum single_yuejuan_source_process.bus_exam_subject_relation; vacuum single_yuejuan_source_process.bus_exam_subject_relation;
vacuum single_yuejuan_source_process.bus_exam_subject_student; vacuum single_yuejuan_source_process.bus_exam_subject_student;
vacuum single_yuejuan_source_process.bus_objective_question_config; vacuum single_yuejuan_source_process.bus_objective_question_config;
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date> <created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2021/07/02 10:23:43.774</modified_date> <modified_date>2021/09/16 12:26:02.782</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -437,7 +437,7 @@ ...@@ -437,7 +437,7 @@
</notepads> </notepads>
<connection> <connection>
<name>intelligent_single_yuejuan_neiwang</name> <name>intelligent_single_yuejuan_neiwang</name>
<server>10.1.103.251</server> <server>10.1.104.23</server>
<type>MYSQL</type> <type>MYSQL</type>
<access>Native</access> <access>Native</access>
<database>union_yuejuan_yun</database> <database>union_yuejuan_yun</database>
...@@ -590,8 +590,7 @@ create_time, ...@@ -590,8 +590,7 @@ create_time,
modify_id, modify_id,
modify_time, modify_time,
exam_length, exam_length,
pre_length, pre_length
source_type
from bus_exam from bus_exam
where id=${exam_id}</sql> where id=${exam_id}</sql>
<limit>0</limit> <limit>0</limit>
...@@ -599,6 +598,8 @@ where id=${exam_id}</sql> ...@@ -599,6 +598,8 @@ where id=${exam_id}</sql>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active> <variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active> <lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta/>
<attributes/> <attributes/>
<cluster_schema/> <cluster_schema/>
<remotesteps> <remotesteps>
......
<?xml version="1.0" encoding="UTF-8"?>
<job> <job>
<name>set_variable</name> <name>set_variable</name>
<description/> <description/>
<extended_description/> <extended_description/>
<job_version/> <job_version/>
<job_status>0</job_status> <job_status>0</job_status>
<directory>/intelligent/single_yuejuan/transfer/total_control</directory> <directory>/</directory>
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:36:23.704</created_date> <created_date>2020/08/14 09:36:23.704</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
...@@ -315,6 +316,7 @@ ...@@ -315,6 +316,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -376,6 +378,7 @@ ...@@ -376,6 +378,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
...@@ -415,6 +418,7 @@ ...@@ -415,6 +418,7 @@
<create_parent_folder>N</create_parent_folder> <create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work> <logging_remote_work>N</logging_remote_work>
<run_configuration>Pentaho local</run_configuration> <run_configuration>Pentaho local</run_configuration>
<suppress_result_data>N</suppress_result_data>
<parameters> <parameters>
<pass_all_parameters>Y</pass_all_parameters> <pass_all_parameters>Y</pass_all_parameters>
</parameters> </parameters>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<trans_version/> <trans_version/>
<trans_type>Normal</trans_type> <trans_type>Normal</trans_type>
<trans_status>0</trans_status> <trans_status>0</trans_status>
<directory>/intelligent/single_yuejuan/transfer/total_control/set_variable</directory> <directory>/</directory>
<parameters> <parameters>
</parameters> </parameters>
<log> <log>
...@@ -423,40 +423,45 @@ ...@@ -423,40 +423,45 @@
<partitionschemas> <partitionschemas>
</partitionschemas> </partitionschemas>
<slaveservers> <slaveservers>
<slaveserver>
<name>10.1.104.244</name>
<hostname>10.1.104.244</hostname>
<port>8081</port>
<webAppName/>
<username>carte</username>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<proxy_hostname/>
<proxy_port/>
<non_proxy_hosts/>
<master>N</master>
<sslMode>N</sslMode>
</slaveserver>
</slaveservers> </slaveservers>
<clusterschemas> <clusterschemas>
</clusterschemas> </clusterschemas>
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date> <created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2021/06/08 13:59:17.180</modified_date> <modified_date>2021/09/17 10:19:24.474</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
<notepads> <notepads>
</notepads> </notepads>
<connection> <connection>
<name>intelligent_single_yuejuan_neiwang</name> <name>intelligent_greenplum_neiwang</name>
<server>10.1.103.251</server> <server>10.1.104.241</server>
<type>MYSQL</type> <type>POSTGRESQL</type>
<access>Native</access> <access>Native</access>
<database>union_yuejuan_yun</database> <database>intelligent_dev</database>
<port>3306</port> <port>5432</port>
<username>dev</username> <username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password> <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/> <servername/>
<data_tablespace/> <data_tablespace/>
<index_tablespace/> <index_tablespace/>
<attributes> <attributes>
<attribute> <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> <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute> <attribute>N</attribute>
</attribute> </attribute>
...@@ -470,7 +475,7 @@ ...@@ -470,7 +475,7 @@
</attribute> </attribute>
<attribute> <attribute>
<code>PORT_NUMBER</code> <code>PORT_NUMBER</code>
<attribute>3306</attribute> <attribute>5432</attribute>
</attribute> </attribute>
<attribute> <attribute>
<code>PRESERVE_RESERVED_WORD_CASE</code> <code>PRESERVE_RESERVED_WORD_CASE</code>
...@@ -481,10 +486,6 @@ ...@@ -481,10 +486,6 @@
<attribute>N</attribute> <attribute>N</attribute>
</attribute> </attribute>
<attribute> <attribute>
<code>STREAM_RESULTS</code>
<attribute>Y</attribute>
</attribute>
<attribute>
<code>SUPPORTS_BOOLEAN_DATA_TYPE</code> <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
<attribute>Y</attribute> <attribute>Y</attribute>
</attribute> </attribute>
...@@ -568,22 +569,117 @@ ...@@ -568,22 +569,117 @@
<method>none</method> <method>none</method>
<schema_name/> <schema_name/>
</partitioning> </partitioning>
<connection>intelligent_single_yuejuan_neiwang</connection> <connection>intelligent_greenplum_neiwang</connection>
<sql>select <sql>select
id as task_id, id as task_id,
exam_id, exam_id,
create_time as end_time, create_time as end_time,
case when (select count(*) from task_list where task_status>1)>0 case when (select count(*) from single_yuejuan_source_process.task_list where task_status>1)>0
then (select max(create_time) from task_list where task_status>1) then (select max(create_time) from single_yuejuan_source_process.task_list where task_status>1)
else '2000-01-01 00:00:00' end start_time else '2000-01-01 00:00:00' end start_time
from task_list from single_yuejuan_source_process.task_list
where task_status in (0,1) and del_flag=0 and source_type=1 where task_status in (0,1) and del_flag=0
order by create_time limit 1</sql> order by create_time limit 1</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<variables_active>N</variables_active> <variables_active>N</variables_active>
<lazy_conversion_active>N</lazy_conversion_active> <lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta>
<value-meta>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>task_id</name>
<length>15</length>
<precision>0</precision>
<origin>Table input</origin>
<comments>task_id</comments>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Integer</type>
<storagetype>normal</storagetype>
<name>exam_id</name>
<length>15</length>
<precision>0</precision>
<origin>Table input</origin>
<comments>exam_id</comments>
<conversion_Mask>####0;-####0</conversion_Mask>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Timestamp</type>
<storagetype>normal</storagetype>
<name>end_time</name>
<length>6</length>
<precision>-1</precision>
<origin>Table input</origin>
<comments>end_time</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
<value-meta>
<type>Timestamp</type>
<storagetype>normal</storagetype>
<name>start_time</name>
<length>6</length>
<precision>-1</precision>
<origin>Table input</origin>
<comments>start_time</comments>
<conversion_Mask/>
<decimal_symbol>.</decimal_symbol>
<grouping_symbol>,</grouping_symbol>
<currency_symbol/>
<trim_type>none</trim_type>
<case_insensitive>N</case_insensitive>
<collator_disabled>Y</collator_disabled>
<collator_strength>0</collator_strength>
<sort_descending>N</sort_descending>
<output_padding>N</output_padding>
<date_format_lenient>N</date_format_lenient>
<date_format_locale>zh_CN</date_format_locale>
<date_format_timezone>Asia/Shanghai</date_format_timezone>
<lenient_string_to_number>N</lenient_string_to_number>
</value-meta>
</row-meta>
<attributes/> <attributes/>
<cluster_schema/> <cluster_schema/>
<remotesteps> <remotesteps>
...@@ -593,7 +689,7 @@ order by create_time limit 1</sql> ...@@ -593,7 +689,7 @@ order by create_time limit 1</sql>
</output> </output>
</remotesteps> </remotesteps>
<GUI> <GUI>
<xloc>224</xloc> <xloc>208</xloc>
<yloc>112</yloc> <yloc>112</yloc>
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<trans_version/> <trans_version/>
<trans_type>Normal</trans_type> <trans_type>Normal</trans_type>
<trans_status>0</trans_status> <trans_status>0</trans_status>
<directory>/intelligent/single_yuejuan/transfer/total_control/set_variable</directory> <directory>/</directory>
<parameters> <parameters>
</parameters> </parameters>
<log> <log>
...@@ -423,40 +423,45 @@ ...@@ -423,40 +423,45 @@
<partitionschemas> <partitionschemas>
</partitionschemas> </partitionschemas>
<slaveservers> <slaveservers>
<slaveserver>
<name>10.1.104.244</name>
<hostname>10.1.104.244</hostname>
<port>8081</port>
<webAppName/>
<username>carte</username>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<proxy_hostname/>
<proxy_port/>
<non_proxy_hosts/>
<master>N</master>
<sslMode>N</sslMode>
</slaveserver>
</slaveservers> </slaveservers>
<clusterschemas> <clusterschemas>
</clusterschemas> </clusterschemas>
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:20:17.611</created_date> <created_date>2020/01/04 14:20:17.611</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2021/06/08 14:08:35.403</modified_date> <modified_date>2021/09/17 11:15:04.315</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
<notepads> <notepads>
</notepads> </notepads>
<connection> <connection>
<name>intelligent_single_yuejuan_neiwang</name> <name>intelligent_greenplum_neiwang</name>
<server>10.1.103.251</server> <server>10.1.104.241</server>
<type>MYSQL</type> <type>POSTGRESQL</type>
<access>Native</access> <access>Native</access>
<database>union_yuejuan_yun</database> <database>intelligent_dev</database>
<port>3306</port> <port>5432</port>
<username>dev</username> <username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password> <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/> <servername/>
<data_tablespace/> <data_tablespace/>
<index_tablespace/> <index_tablespace/>
<attributes> <attributes>
<attribute> <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> <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
<attribute>N</attribute> <attribute>N</attribute>
</attribute> </attribute>
...@@ -470,7 +475,7 @@ ...@@ -470,7 +475,7 @@
</attribute> </attribute>
<attribute> <attribute>
<code>PORT_NUMBER</code> <code>PORT_NUMBER</code>
<attribute>3306</attribute> <attribute>5432</attribute>
</attribute> </attribute>
<attribute> <attribute>
<code>PRESERVE_RESERVED_WORD_CASE</code> <code>PRESERVE_RESERVED_WORD_CASE</code>
...@@ -481,10 +486,6 @@ ...@@ -481,10 +486,6 @@
<attribute>N</attribute> <attribute>N</attribute>
</attribute> </attribute>
<attribute> <attribute>
<code>STREAM_RESULTS</code>
<attribute>Y</attribute>
</attribute>
<attribute>
<code>SUPPORTS_BOOLEAN_DATA_TYPE</code> <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
<attribute>Y</attribute> <attribute>Y</attribute>
</attribute> </attribute>
...@@ -550,13 +551,15 @@ ...@@ -550,13 +551,15 @@
<method>none</method> <method>none</method>
<schema_name/> <schema_name/>
</partitioning> </partitioning>
<connection>intelligent_single_yuejuan_neiwang</connection> <connection>intelligent_greenplum_neiwang</connection>
<sql>select case when (select count(*) from task_list where task_status=1 and id=${task_id} and del_flag=0 and source_type=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 id=${task_id} and del_flag=0 and source_type=1)>0 then 1 else 0 end is_run</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active> <variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active> <lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta/>
<attributes/> <attributes/>
<cluster_schema/> <cluster_schema/>
<remotesteps> <remotesteps>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<server>10.1.104.241</server> <server>10.1.104.241</server>
<type>POSTGRESQL</type> <type>POSTGRESQL</type>
<access>Native</access> <access>Native</access>
<database>intelligent</database> <database>intelligent_dev</database>
<port>5432</port> <port>5432</port>
<username>gpadmin</username> <username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password> <password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
......
...@@ -599,3 +599,44 @@ Save database : Modification by user ...@@ -599,3 +599,44 @@ Save database : Modification by user
Save repository element : intelligent_union_yuejuan_neiwang : Modification by user Save repository element : intelligent_union_yuejuan_neiwang : Modification by user
Save database : Modification by user Save database : Modification by user
Save repository element : intelligent_union_yuejuan_neiwang : Modification by user Save repository element : intelligent_union_yuejuan_neiwang : Modification by user
Save repository element : 10.1.104.244 : Creation of initial version
Save database : Modification by user
Save repository element : intelligent_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_single_yuejuan_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_single_yuejuan_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_monitor_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_monitor_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_monitor_test_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_monitor_test_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_monitor_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_monitor_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_single_yuejuan_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_single_yuejuan_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_union_yuejuan_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_union_yuejuan_neiwang : Modification by user
Save database : Modification by user
Save repository element : school_yuejuan_base : Modification by user
Save database : Modification by user
Save repository element : school_yuejuan_base : Modification by user
Save database : Modification by user
Save repository element : school_yuejuan_base_basic : Modification by user
Save database : Modification by user
Save repository element : school_yuejuan_base_basic : Modification by user
Save database : Modification by user
Save repository element : intelligent_greenplum_neiwang : Modification by user
Save database : Modification by user
Save repository element : intelligent_greenplum_neiwang : Modification by user
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<data_tablespace/> <data_tablespace/>
<index_tablespace/> <index_tablespace/>
<attributes> <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_LOWERCASE</code><attribute>N</attribute></attribute>
<attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</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>IS_CLUSTERED</code><attribute>N</attribute></attribute>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment