Commit c674d09c921af244819a96e752c7b5739fc9c890
1 parent
66abcc9f
Update
Showing
4 changed files
with
28 additions
and
2 deletions
src/main/java/com/bsth/entity/Cars.java
| ... | ... | @@ -53,7 +53,7 @@ public class Cars extends BEntity implements Serializable { |
| 53 | 53 | private String cgsbm; |
| 54 | 54 | |
| 55 | 55 | /** 车辆编码(TODO:在原系统里没有,这里暂时留着) */ |
| 56 | -// @Column(nullable = false) | |
| 56 | + @Column(nullable = false) | |
| 57 | 57 | private String carCode; |
| 58 | 58 | /** 车牌号 */ |
| 59 | 59 | @Column(nullable = false) | ... | ... |
src/main/java/com/bsth/service/schedule/utils/DataToolsServiceImpl.java
| ... | ... | @@ -42,7 +42,7 @@ public class DataToolsServiceImpl implements DataToolsService { |
| 42 | 42 | |
| 43 | 43 | private void initKettle() throws Exception { |
| 44 | 44 | if (flag.compareAndSet(false, true)) { |
| 45 | - LOGGER.info("kettle开始初始化......"); | |
| 45 | + LOGGER.info("kettle初始化......"); | |
| 46 | 46 | |
| 47 | 47 | // 初始化kettle环境(自定义) |
| 48 | 48 | ktrEnvironmentInit(); | ... | ... |
src/main/resources/datatools/ktrs/carsDataInput.ktr
| ... | ... | @@ -322,6 +322,18 @@ |
| 322 | 322 | <group/> |
| 323 | 323 | </field> |
| 324 | 324 | <field> |
| 325 | + <name>车辆编码</name> | |
| 326 | + <type>String</type> | |
| 327 | + <length>-1</length> | |
| 328 | + <precision>-1</precision> | |
| 329 | + <trim_type>none</trim_type> | |
| 330 | + <repeat>N</repeat> | |
| 331 | + <format/> | |
| 332 | + <currency/> | |
| 333 | + <decimal/> | |
| 334 | + <group/> | |
| 335 | + </field> | |
| 336 | + <field> | |
| 325 | 337 | <name>内部编码</name> |
| 326 | 338 | <type>String</type> |
| 327 | 339 | <length>-1</length> |
| ... | ... | @@ -468,6 +480,11 @@ |
| 468 | 480 | <update>Y</update> |
| 469 | 481 | </value> |
| 470 | 482 | <value> |
| 483 | + <name>car_code</name> | |
| 484 | + <rename>车辆编码</rename> | |
| 485 | + <update>Y</update> | |
| 486 | + </value> | |
| 487 | + <value> | |
| 471 | 488 | <name>inside_code</name> |
| 472 | 489 | <rename>内部编码</rename> |
| 473 | 490 | <update>Y</update> | ... | ... |
src/main/resources/datatools/ktrs/carsDataOutput.ktr
| ... | ... | @@ -316,6 +316,11 @@ |
| 316 | 316 | <format/> |
| 317 | 317 | </field> |
| 318 | 318 | <field> |
| 319 | + <name>车辆编码</name> | |
| 320 | + <type>String</type> | |
| 321 | + <format/> | |
| 322 | + </field> | |
| 323 | + <field> | |
| 319 | 324 | <name>内部编码</name> |
| 320 | 325 | <type>String</type> |
| 321 | 326 | <format/> |
| ... | ... | @@ -391,6 +396,10 @@ |
| 391 | 396 | <rename>车牌号</rename> |
| 392 | 397 | <length>-2</length> |
| 393 | 398 | <precision>-2</precision> |
| 399 | + </field> <field> <name>car_code</name> | |
| 400 | + <rename>车辆编码</rename> | |
| 401 | + <length>-2</length> | |
| 402 | + <precision>-2</precision> | |
| 394 | 403 | </field> <field> <name>inside_code</name> |
| 395 | 404 | <rename>内部编码</rename> |
| 396 | 405 | <length>-2</length> | ... | ... |