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 | 78 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 31 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 72e553d..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,14 +158,14 @@
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());
roomDto.setCommunityId(ownerCarDto.getCommunityId());
roomDto.setUnitNum(ownerCarDto.getUnitNum());
roomDto.setRoomNum(ownerCarDto.getRoomNum());
- if (Vtil.defaultValue(roomDto.getRoomNum()).equals("")){
+ if (Vtil.defaultValue(roomDto.getRoomNum()) == null){
roomDto.setPropertyType("鍟嗛摵");
}
List<RoomDto> roomDtos = iroomInnerServiceSMOImpl.queryRooms(roomDto);
@@ -195,18 +195,6 @@
}
}
}
- } 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);
ownerCarDto.setLeaseType("H");
@@ -235,7 +223,7 @@
carDto.setCarNum(ownerCarDto.getCarNum());
communityDto.setCommunityCode(defaultValue(os[1]));
communityDto.setName(defaultValue(os[2]));
- if (communityDto.getCommunityCode().equals("") && communityDto.getName().equals("")) {
+ if (communityDto.getCommunityCode() == null && communityDto.getName() == null) {
throw new IllegalArgumentException("瀵煎叆澶辫触锛氬皬鍖虹紪鐮佸拰灏忓尯鍚嶇О閮戒负绌�");
}
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
@@ -288,10 +276,10 @@
// }
ownerCarPo.setCarTypeCd("1001"); //榛樿涓昏溅杈�
-
int i1 = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(carDto);
if (i1 > 0) {
carDto.setOwnerId(ownerCarDto.getOwnerId());
+ carDto.setCommunityId(ownerCarDto.getCommunityId());
carDto.setParkingType(Vtil.defaultValue(os[13]));
carDto.setCarNum(null);
carDto.setCarNumLikeRight_(ownerCarDto.getCarNum());
@@ -302,11 +290,7 @@
carDto.setCarTypeCd(ownerCarPo.getCarTypeCd());
carDto.setUnitPricePerMonth(defaultValue(os[18]));
int i2 = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(carDto);
- if (i2 > 0) {
- throw new IllegalArgumentException("閲嶅鐨勮溅杈�:" + ownerCarDto.getCarNum());
- } else {
- ownerCarDto.setCarNum(ownerCarDto.getCarNum() + "_" + i1);
- }
+ ownerCarPo.setCarNum(ownerCarDto.getCarNum() + "_" + (i2 + 1));
}
@@ -598,7 +582,11 @@
//瀵煎叆杞﹁締
- saveFee(ownerCarPo, os, ownerCarDto, assetImportLogDetailDto);
+ if (Vtil.processCount(ownerCarPo.getUnitPricePerMonth(), 2, null) == null) {
+ ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n鏈紶鍏ユ敹璐瑰崟浠�");
+ }else {
+ saveFee(ownerCarPo, os, ownerCarDto, assetImportLogDetailDto);
+ }
ownerCarPo.setParkingType(Vtil.defaultValue(os[12]));
ownerCarPo.setRoadName(defaultValue(os[3]));
@@ -606,7 +594,30 @@
ownerCarPo.setUnitNum(defaultValue(os[5]));
ownerCarPo.setRoomNum(defaultValue(os[6]));
ownerCarPo.setParkingLocation(defaultValue(os[12]));
- ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+ 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);
+
+ }
+
+ }
ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
parkingSpacePo.setPsId(psId); //杞︿綅id
parkingSpacePo.setState(ownerCarDto.getSpaceSate());
@@ -621,11 +632,12 @@
feeConfigDto.setSquarePrice(Vtil.processCount(ownerCarPo.getUnitPricePerMonth(), 2, null));
feeConfigDto.setFeeTypeCds(new String[]{"630000003","630000004","630000005"});
if (feeConfigDto.getSquarePrice() == null) {
- throw new IllegalArgumentException("鏈紶鍏ユ敹璐瑰崟浠�");
+ throw new IllegalArgumentException(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "鏈紶鍏ユ敹璐瑰崟浠�");
}
feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
if (feeDtos.isEmpty()) {
- throw new IllegalArgumentException("鍗曚环`"+ownerCarPo.getUnitPricePerMonth()+"`鏈煡璇㈠埌鏀惰垂椤�");
+ ownerCarPo.setRemark("鍗曚环`"+ownerCarPo.getUnitPricePerMonth()+"`鏈煡璇㈠埌鏀惰垂椤�");
+ return;
} else if (feeDtos.size() > 1) {
switch (Vtil.defaultValue(os[12])) {
case "鍦伴潰鍋滆溅": feeConfigDto.setFeeTypeCd("630000003");break;
@@ -635,7 +647,11 @@
feeDtos.removeIf(feeConfigDto1 -> !feeConfigDto1.getFeeTypeCd().equals(feeConfigDto.getFeeTypeCd()));
}
- if (feeDtos.size() > 1) {
+ if (feeDtos.isEmpty()) {
+ ownerCarPo.setRemark("鍗曚环`"+ownerCarPo.getUnitPricePerMonth()+"`鏈煡璇㈠埌鏀惰垂椤�");
+ return;
+ }
+ else if (feeDtos.size() > 1) {
throw new IllegalArgumentException("绯荤粺閿欒锛屾煡璇㈠埌鐨勮垂鐢ㄩ」瓒呰繃涓�涓�");
}
}
--
Gitblit v1.8.0