Commit 7ab6aed4cacb09c8c2b8597ea682c4c3cbec44c6
Merge remote-tracking branch 'origin/pudong_jdk8' into pudong_jdk8
Showing
1 changed file
with
104 additions
and
46 deletions
src/main/resources/datatools/ktrs/vehicleDataSync.ktr
| @@ -166,6 +166,27 @@ | @@ -166,6 +166,27 @@ | ||
| 166 | <bordercolorblue>100</bordercolorblue> | 166 | <bordercolorblue>100</bordercolorblue> |
| 167 | <drawshadow>Y</drawshadow> | 167 | <drawshadow>Y</drawshadow> |
| 168 | </notepad> | 168 | </notepad> |
| 169 | + <notepad> | ||
| 170 | + <note>不管车辆是否配置了线路,都要保存车辆设备信息
在[报废车辆管理设备数据处理]step中会说明 </note> | ||
| 171 | + <xloc>551</xloc> | ||
| 172 | + <yloc>653</yloc> | ||
| 173 | + <width>274</width> | ||
| 174 | + <heigth>42</heigth> | ||
| 175 | + <fontname>YaHei Consolas Hybrid</fontname> | ||
| 176 | + <fontsize>12</fontsize> | ||
| 177 | + <fontbold>N</fontbold> | ||
| 178 | + <fontitalic>N</fontitalic> | ||
| 179 | + <fontcolorred>0</fontcolorred> | ||
| 180 | + <fontcolorgreen>0</fontcolorgreen> | ||
| 181 | + <fontcolorblue>0</fontcolorblue> | ||
| 182 | + <backgroundcolorred>255</backgroundcolorred> | ||
| 183 | + <backgroundcolorgreen>205</backgroundcolorgreen> | ||
| 184 | + <backgroundcolorblue>112</backgroundcolorblue> | ||
| 185 | + <bordercolorred>100</bordercolorred> | ||
| 186 | + <bordercolorgreen>100</bordercolorgreen> | ||
| 187 | + <bordercolorblue>100</bordercolorblue> | ||
| 188 | + <drawshadow>Y</drawshadow> | ||
| 189 | + </notepad> | ||
| 169 | </notepads> | 190 | </notepads> |
| 170 | <connection> | 191 | <connection> |
| 171 | <name>192.168.168.1_jwgl_dw</name> | 192 | <name>192.168.168.1_jwgl_dw</name> |
| @@ -528,6 +549,61 @@ | @@ -528,6 +549,61 @@ | ||
| 528 | </attributes> | 549 | </attributes> |
| 529 | </connection> | 550 | </connection> |
| 530 | <connection> | 551 | <connection> |
| 552 | + <name>wzk_mysql_jndi</name> | ||
| 553 | + <server/> | ||
| 554 | + <type>MYSQL</type> | ||
| 555 | + <access>JNDI</access> | ||
| 556 | + <database>wzk_mysql</database> | ||
| 557 | + <port>1521</port> | ||
| 558 | + <username/> | ||
| 559 | + <password>Encrypted </password> | ||
| 560 | + <servername/> | ||
| 561 | + <data_tablespace/> | ||
| 562 | + <index_tablespace/> | ||
| 563 | + <attributes> | ||
| 564 | + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> | ||
| 565 | + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> | ||
| 566 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 567 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 568 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 569 | + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute> | ||
| 570 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 571 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 572 | + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute> | ||
| 573 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 574 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 575 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 576 | + </attributes> | ||
| 577 | + </connection> | ||
| 578 | + <connection> | ||
| 579 | + <name>wzk(本机)</name> | ||
| 580 | + <server>localhost</server> | ||
| 581 | + <type>MYSQL</type> | ||
| 582 | + <access>Native</access> | ||
| 583 | + <database>pdgj_wzk_sys</database> | ||
| 584 | + <port>3306</port> | ||
| 585 | + <username>root</username> | ||
| 586 | + <password>Encrypted </password> | ||
| 587 | + <servername/> | ||
| 588 | + <data_tablespace/> | ||
| 589 | + <index_tablespace/> | ||
| 590 | + <attributes> | ||
| 591 | + <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute> | ||
| 592 | + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> | ||
| 593 | + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> | ||
| 594 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 595 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 596 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 597 | + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute> | ||
| 598 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 599 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 600 | + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute> | ||
| 601 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 602 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 603 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 604 | + </attributes> | ||
| 605 | + </connection> | ||
| 606 | + <connection> | ||
| 531 | <name>xlab_mysql_youle</name> | 607 | <name>xlab_mysql_youle</name> |
| 532 | <server>101.231.124.8</server> | 608 | <server>101.231.124.8</server> |
| 533 | <type>MYSQL</type> | 609 | <type>MYSQL</type> |
| @@ -680,7 +756,7 @@ | @@ -680,7 +756,7 @@ | ||
| 680 | </connection> | 756 | </connection> |
| 681 | <connection> | 757 | <connection> |
| 682 | <name>公司ygjw</name> | 758 | <name>公司ygjw</name> |
| 683 | - <server>192.168.168.1</server> | 759 | + <server>192.168.168.178</server> |
| 684 | <type>ORACLE</type> | 760 | <type>ORACLE</type> |
| 685 | <access>Native</access> | 761 | <access>Native</access> |
| 686 | <database>orcl</database> | 762 | <database>orcl</database> |
| @@ -703,6 +779,30 @@ | @@ -703,6 +779,30 @@ | ||
| 703 | </attributes> | 779 | </attributes> |
| 704 | </connection> | 780 | </connection> |
| 705 | <connection> | 781 | <connection> |
| 782 | + <name>公司机务_pdgj</name> | ||
| 783 | + <server>192.168.168.178</server> | ||
| 784 | + <type>ORACLE</type> | ||
| 785 | + <access>Native</access> | ||
| 786 | + <database>orcl</database> | ||
| 787 | + <port>1521</port> | ||
| 788 | + <username>pdgj</username> | ||
| 789 | + <password>Encrypted 2be98afc86aa7f2e4cb79ce10ce96a8d0</password> | ||
| 790 | + <servername/> | ||
| 791 | + <data_tablespace/> | ||
| 792 | + <index_tablespace/> | ||
| 793 | + <attributes> | ||
| 794 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 795 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 796 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 797 | + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute> | ||
| 798 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 799 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 800 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 801 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 802 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 803 | + </attributes> | ||
| 804 | + </connection> | ||
| 805 | + <connection> | ||
| 706 | <name>外网vpn临港机务oracle</name> | 806 | <name>外网vpn临港机务oracle</name> |
| 707 | <server>10.10.150.114</server> | 807 | <server>10.10.150.114</server> |
| 708 | <type>ORACLE</type> | 808 | <type>ORACLE</type> |
| @@ -825,10 +925,9 @@ | @@ -825,10 +925,9 @@ | ||
| 825 | <hop> <from>判定是否更新</from><to>待处理更新数据</to><enabled>Y</enabled> </hop> | 925 | <hop> <from>判定是否更新</from><to>待处理更新数据</to><enabled>Y</enabled> </hop> |
| 826 | <hop> <from>待处理更新数据</from><to>更新车辆数据输出</to><enabled>Y</enabled> </hop> | 926 | <hop> <from>待处理更新数据</from><to>更新车辆数据输出</to><enabled>Y</enabled> </hop> |
| 827 | <hop> <from>待处理更新数据</from><to>判断是否报废更新</to><enabled>Y</enabled> </hop> | 927 | <hop> <from>待处理更新数据</from><to>判断是否报废更新</to><enabled>Y</enabled> </hop> |
| 828 | - <hop> <from>判断是否报废更新</from><to>是否报废且曾经配置过线路</to><enabled>Y</enabled> </hop> | ||
| 829 | - <hop> <from>是否报废且曾经配置过线路</from><to>报废车辆管理设备数据处理</to><enabled>Y</enabled> </hop> | ||
| 830 | <hop> <from>公司,分公司名称代码数据</from><to>数据检验</to><enabled>Y</enabled> </hop> | 928 | <hop> <from>公司,分公司名称代码数据</from><to>数据检验</to><enabled>Y</enabled> </hop> |
| 831 | <hop> <from>公司,分公司名称代码数据</from><to>获取公司分公司编码</to><enabled>Y</enabled> </hop> | 929 | <hop> <from>公司,分公司名称代码数据</from><to>获取公司分公司编码</to><enabled>Y</enabled> </hop> |
| 930 | + <hop> <from>判断是否报废更新</from><to>报废车辆管理设备数据处理</to><enabled>Y</enabled> </hop> | ||
| 832 | </order> | 931 | </order> |
| 833 | <step> | 932 | <step> |
| 834 | <name>JavaScript解析json生成数据</name> | 933 | <name>JavaScript解析json生成数据</name> |
| @@ -1115,7 +1214,7 @@ | @@ -1115,7 +1214,7 @@ | ||
| 1115 | <method>none</method> | 1214 | <method>none</method> |
| 1116 | <schema_name/> | 1215 | <schema_name/> |
| 1117 | </partitioning> | 1216 | </partitioning> |
| 1118 | -<send_true_to>是否报废且曾经配置过线路</send_true_to> | 1217 | +<send_true_to>报废车辆管理设备数据处理</send_true_to> |
| 1119 | <send_false_to/> | 1218 | <send_false_to/> |
| 1120 | <compare> | 1219 | <compare> |
| 1121 | <condition> | 1220 | <condition> |
| @@ -1524,7 +1623,7 @@ | @@ -1524,7 +1623,7 @@ | ||
| 1524 | <optimizationLevel>9</optimizationLevel> | 1623 | <optimizationLevel>9</optimizationLevel> |
| 1525 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | 1624 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> |
| 1526 | <jsScript_name>Script 1</jsScript_name> | 1625 | <jsScript_name>Script 1</jsScript_name> |
| 1527 | - <jsScript_script>//Script here

//---------------- 车辆报废时需要向设备表添加一条记录 -------------//
// TODO:没有配置过线路的车辆报废时,不添加车辆设备记录

var device_gsName = gsmc; // 公司名称
var device_company = gsdm; // 公司代码
var device_branch_company = fgsdm; // 分公司代码
var device_cl = id; // 车辆Id
var device_clzbh = clzbh; // 车辆自编号
var device_old_no = equipment_code; // 之前的设备编码
var device_new_no = equipmentCode_update; // 新的设备编码
var device_is_cancel = 1; // 是否删除
var device_create_date = new Date(); // 创建时间
var device_update_date = new Date(); // 更新日期
var device_qyrq = new Date(); // 启用日期
var device_xl = xl; // 线路Id
var device_xlName = name; // 线路名字
var device_xlbm = line_code; // 线路编码</jsScript_script> | 1626 | + <jsScript_script>//Script here

//---------------- 车辆报废时需要向设备表添加一条记录 -------------//
// 注意:没有配置过线路的车辆报废时,线路Id,线路名字,线路编码为空

var device_gsName = gsmc; // 公司名称
var device_company = gsdm; // 公司代码
var device_branch_company = fgsdm; // 分公司代码
var device_cl = id; // 车辆Id
var device_clzbh = clzbh; // 车辆自编号
var device_old_no = equipment_code; // 之前的设备编码
var device_new_no = equipmentCode_update; // 新的设备编码
var device_is_cancel = 1; // 是否删除
var device_create_date = new Date(); // 创建时间
var device_update_date = new Date(); // 更新日期
var device_qyrq = new Date(); // 启用日期
var device_xl = xl; // 线路Id
var device_xlName = name; // 线路名字
var device_xlbm = line_code; // 线路编码</jsScript_script> |
| 1528 | </jsScript> </jsScripts> <fields> <field> <name>device_gsName</name> | 1627 | </jsScript> </jsScripts> <fields> <field> <name>device_gsName</name> |
| 1529 | <rename>device_gsName</rename> | 1628 | <rename>device_gsName</rename> |
| 1530 | <type>String</type> | 1629 | <type>String</type> |
| @@ -2308,47 +2407,6 @@ | @@ -2308,47 +2407,6 @@ | ||
| 2308 | </step> | 2407 | </step> |
| 2309 | 2408 | ||
| 2310 | <step> | 2409 | <step> |
| 2311 | - <name>是否报废且曾经配置过线路</name> | ||
| 2312 | - <type>FilterRows</type> | ||
| 2313 | - <description/> | ||
| 2314 | - <distribute>Y</distribute> | ||
| 2315 | - <custom_distribution/> | ||
| 2316 | - <copies>1</copies> | ||
| 2317 | - <partitioning> | ||
| 2318 | - <method>none</method> | ||
| 2319 | - <schema_name/> | ||
| 2320 | - </partitioning> | ||
| 2321 | -<send_true_to>报废车辆管理设备数据处理</send_true_to> | ||
| 2322 | -<send_false_to/> | ||
| 2323 | - <compare> | ||
| 2324 | -<condition> | ||
| 2325 | - <negated>N</negated> | ||
| 2326 | - <conditions> | ||
| 2327 | - <condition> | ||
| 2328 | - <negated>N</negated> | ||
| 2329 | - <leftvalue>scrapState_update</leftvalue> | ||
| 2330 | - <function>=</function> | ||
| 2331 | - <rightvalue/> | ||
| 2332 | - <value><name>constant</name><type>String</type><text>1</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value> </condition> | ||
| 2333 | - <condition> | ||
| 2334 | - <negated>N</negated> | ||
| 2335 | - <operator>AND</operator> | ||
| 2336 | - <leftvalue>xl</leftvalue> | ||
| 2337 | - <function>IS NOT NULL</function> | ||
| 2338 | - <rightvalue/> | ||
| 2339 | - </condition> | ||
| 2340 | - </conditions> | ||
| 2341 | - </condition> | ||
| 2342 | - </compare> | ||
| 2343 | - <cluster_schema/> | ||
| 2344 | - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2345 | - <xloc>513</xloc> | ||
| 2346 | - <yloc>585</yloc> | ||
| 2347 | - <draw>Y</draw> | ||
| 2348 | - </GUI> | ||
| 2349 | - </step> | ||
| 2350 | - | ||
| 2351 | - <step> | ||
| 2352 | <name>更新数据处理</name> | 2410 | <name>更新数据处理</name> |
| 2353 | <type>ScriptValueMod</type> | 2411 | <type>ScriptValueMod</type> |
| 2354 | <description/> | 2412 | <description/> |