|
@@ -89,11 +89,11 @@ public class CarWeiZhangImportService {
|
|
|
*/
|
|
|
public List<Map<String, String>> readFile(Path path) throws IOException {
|
|
|
log.info("读取: {}", path);
|
|
|
- List<String> rawHeaders = Stream.of("账期", "车牌号", "单位", "二级单位", "三级单位", "违章时间", "违章地点",
|
|
|
- "违章详情", "扣分", "罚款", "处理时间", "违章未处理时长(天)", "线下实际处理状态(最终状态)").toList();
|
|
|
+ List<String> rawHeaders = Stream.of("账期", "车牌号", "一级单位", "二级单位", "三级单位", "车架号", "违章时间",
|
|
|
+ "违章地点", "违章详情", "扣分", "罚款", "三方处理状态", "处理时间", "违章未处理时长(天)").toList();
|
|
|
List<String> headers = Stream.of("year_month", "che_pai_hao", "raw_yi_ji", "raw_er_ji", "raw_san_ji",
|
|
|
- "wei_zhang_shi_jian", "wei_zhang_di_dian", "wei_zhang_xiang_qing", "kou_fen", "fa_kuan",
|
|
|
- "chu_li_shi_jian", "wei_zhang_wei_chu_li_shi_chang", "chu_li_zhuang_tai").toList();
|
|
|
+ "che_jia_hao", "wei_zhang_shi_jian", "wei_zhang_di_dian", "wei_zhang_xiang_qing", "kou_fen", "fa_kuan",
|
|
|
+ "chu_li_zhuang_tai", "chu_li_shi_jian", "wei_zhang_wei_chu_li_shi_chang").toList();
|
|
|
try (InputStream inputStream = Files.newInputStream(path);
|
|
|
Workbook workbook = new XSSFWorkbook(inputStream)
|
|
|
) {
|
|
@@ -285,7 +285,7 @@ public class CarWeiZhangImportService {
|
|
|
public void copyCsv(Path path) {
|
|
|
String dbTable = "car.car_wei_zhang";
|
|
|
String csv = path.toString();
|
|
|
- String columns = "(year_month,che_pai_hao,raw_yi_ji,raw_er_ji,raw_san_ji,wei_zhang_shi_jian,wei_zhang_di_dian,wei_zhang_xiang_qing,kou_fen,fa_kuan,chu_li_shi_jian,wei_zhang_wei_chu_li_shi_chang,chu_li_zhuang_tai,year_no,month_no,raw_che_pai_hao,che_pai_fail,first_unit,second_unit,third_unit,area_no,area_name,city_no,city_name,area_no2,area_name2,city_id,city,district_id,district,wei_zhang_nian_yue,chu_li_nian_yue,source)";
|
|
|
+ String columns = "(year_month,che_pai_hao,raw_yi_ji,raw_er_ji,raw_san_ji,che_jia_hao,wei_zhang_shi_jian,wei_zhang_di_dian,wei_zhang_xiang_qing,kou_fen,fa_kuan,chu_li_zhuang_tai,chu_li_shi_jian,wei_zhang_wei_chu_li_shi_chang,year_no,month_no,raw_che_pai_hao,che_pai_fail,first_unit,second_unit,third_unit,area_no,area_name,city_no,city_name,area_no2,area_name2,city_id,city,district_id,district,wei_zhang_nian_yue,chu_li_nian_yue,source)";
|
|
|
Long timeout = 60000L;
|
|
|
PsqlUtil.copyCsv(carDataImportConfig.getCopyScriptPath(), carDataImportConfig.getDbHost(),
|
|
|
carDataImportConfig.getDbPort(), carDataImportConfig.getDbUsername(), carDataImportConfig.getDbPassword(),
|