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