From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java
index d754a2b..5855cf5 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java
@@ -121,11 +121,11 @@
OwnerCarDto ownerCarDto = null;
doImportData(assetImportLogDetailDto,ownerCarDto);
updateImportLogDetailState(assetImportLogDetailDto.getDetailId());
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
+// try {
+// Thread.sleep(500);
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
} catch (Exception e) {
e.printStackTrace();
@@ -158,7 +158,7 @@
String otherItem = data.getString("otherItem");
data.put("otherItem", null);
ownerCarDto = BeanConvertUtil.covertBean(data, OwnerCarDto.class);
- if (ownerCarDto.getOwnerName() == null || "".equals(ownerCarDto.getOwnerName())) {
+ {
RoomDto roomDto = new RoomDto();
roomDto.setRoadName(ownerCarDto.getRoadName());
roomDto.setFloorNum(ownerCarDto.getFloorNum());
@@ -194,18 +194,6 @@
ownerCarDto.setOwnerName(ownerDtos.get(0).getName());
}
}
- }
- } else {
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setName(ownerCarDto.getOwnerName());
- ownerDto.setCommunityId(ownerCarDto.getCommunityId());
- List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
- if (ownerDtos.isEmpty()) {
- ownerCarDto.setRemark("鏈煡璇㈠埌涓氫富:" + ownerCarDto.getOwnerName());
- } else if (ownerDtos.size() > 1) {
- ownerCarDto.setRemark("瀛樺湪澶氫釜涓氫富:" + ownerCarDto.getOwnerName());
- } else {
- ownerCarDto.setOwnerId(ownerDtos.get(0).getOwnerId());
}
}
ownerCarDto.setOtherItem(o);
@@ -606,15 +594,30 @@
ownerCarPo.setUnitNum(defaultValue(os[5]));
ownerCarPo.setRoomNum(defaultValue(os[6]));
ownerCarPo.setParkingLocation(defaultValue(os[12]));
- if (Vtil.isValidDbDate(ownerCarPo.getStartTime())) {
- ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n鍚敤鏃ユ湡锛�" + ownerCarPo.getStartTime() + "鏍煎紡閿欒");
- ownerCarPo.setStartTime(null);
+ try {
+ ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+ } catch (Exception e) {
+ if (e.getMessage().contains("for column 'end_time' at row 1")){
+ ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n娉ㄩ攢鏃ユ湡锛�" + ownerCarPo.getEndTime() + "鏍煎紡閿欒");
+ ownerCarPo.setEndTime(null);
+ try {
+ ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+ } catch (Exception e2) {
+ if (e2.getMessage().contains("for column 'start_time' at row 1")) {
+ ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n鍚敤鏃ユ湡锛�" + ownerCarPo.getStartTime() + "鏍煎紡閿欒");
+ ownerCarPo.setStartTime(null);
+ ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+ }
+ }
+ }
+ else if (e.getMessage().contains("for column 'start_time' at row 1")){
+ ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n鍚敤鏃ユ湡锛�" + ownerCarPo.getStartTime() + "鏍煎紡閿欒");
+ ownerCarPo.setStartTime(null);
+ ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+
+ }
+
}
- if (Vtil.isValidDbDate(ownerCarPo.getEndTime())) {
- ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n娉ㄩ攢鏃ユ湡锛�" + ownerCarPo.getEndTime() + "鏍煎紡閿欒");
- ownerCarPo.setEndTime(null);
- }
- ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
parkingSpacePo.setPsId(psId); //杞︿綅id
parkingSpacePo.setState(ownerCarDto.getSpaceSate());
@@ -634,6 +637,7 @@
feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
if (feeDtos.isEmpty()) {
ownerCarPo.setRemark("鍗曚环`"+ownerCarPo.getUnitPricePerMonth()+"`鏈煡璇㈠埌鏀惰垂椤�");
+ return;
} else if (feeDtos.size() > 1) {
switch (Vtil.defaultValue(os[12])) {
case "鍦伴潰鍋滆溅": feeConfigDto.setFeeTypeCd("630000003");break;
@@ -645,6 +649,7 @@
if (feeDtos.isEmpty()) {
ownerCarPo.setRemark("鍗曚环`"+ownerCarPo.getUnitPricePerMonth()+"`鏈煡璇㈠埌鏀惰垂椤�");
+ return;
}
else if (feeDtos.size() > 1) {
throw new IllegalArgumentException("绯荤粺閿欒锛屾煡璇㈠埌鐨勮垂鐢ㄩ」瓒呰繃涓�涓�");
--
Gitblit v1.8.0