From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java | 132 ++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 46 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 5b2456e..72e553d 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
@@ -17,10 +17,7 @@
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.room.RoomDto;
import com.java110.fee.dao.IApplyRoomDiscountServiceDao;
-import com.java110.intf.community.ICommunityV1InnerServiceSMO;
-import com.java110.intf.community.IParkingAreaV1InnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceV1InnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.*;
import com.java110.intf.dev.IDictV1InnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
@@ -53,10 +50,7 @@
import java.math.BigDecimal;
import java.security.acl.Owner;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 杞﹁締瀵煎叆 閫傞厤鍣�
@@ -105,7 +99,7 @@
private IRoomInnerServiceSMO iroomInnerServiceSMOImpl;
@Autowired
- ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
+ ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
@Autowired
IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
@@ -127,6 +121,11 @@
OwnerCarDto ownerCarDto = null;
doImportData(assetImportLogDetailDto,ownerCarDto);
updateImportLogDetailState(assetImportLogDetailDto.getDetailId());
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
} catch (Exception e) {
e.printStackTrace();
@@ -171,7 +170,7 @@
}
List<RoomDto> roomDtos = iroomInnerServiceSMOImpl.queryRooms(roomDto);
if (roomDtos.isEmpty()) {
- ownerCarDto.setRemark("鎴垮眿锛�" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + Vtil.defaultValue(ownerCarDto.getRoomName()) + "鏈煡璇㈠埌");
+ ownerCarDto.setRemark("鎴垮眿锛�" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + Vtil.defaultValue(ownerCarDto.getRoomNum(),"绌�") + "鏈煡璇㈠埌");
// throw new IllegalArgumentException("鏈～鍐欎笟涓讳笖鎴垮眿涓嶅瓨鍦�");
} else if (roomDtos.size() > 1) {
ownerCarDto.setRemark("鎴垮眿锛�" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + Vtil.defaultValue(ownerCarDto.getRoomName()) + "鏌ヨ鍒板涓埧灞�");
@@ -183,7 +182,8 @@
if (ownerRoomRelDtos.isEmpty()) {
ownerCarDto.setRemark("鎴垮眿锛�" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + Vtil.defaultValue(ownerCarDto.getRoomName()) + "鏈煡璇㈠埌涓氫富");
// throw new IllegalArgumentException("鏈～鍐欎笟涓讳笖璇ユ埧灞嬫湭缁戝畾涓氫富");
- } else {
+ }
+ else {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
@@ -195,21 +195,52 @@
}
}
}
+ } 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");
CommunityDto communityDto = new CommunityDto();
- Object[] os = ownerCarDto.getOtherItem();
+ // 鍘熶唬鐮�
+ Object[] os2 = ownerCarDto.getOtherItem();
+ Object[] os = new Object[102];
+
+// 鏁扮粍澶嶅埗鏍稿績浠ｇ爜
+ if (os2.length > 101) {
+ throw new IllegalArgumentException("闀垮害瓒呰繃闄愬埗(100鍒�)");
+ }
+ if (os2 != null) { // 鍏堝垽绌猴紝閬垮厤绌烘寚閽堝紓甯�
+ // 鍙傛暟璇存槑锛氭簮鏁扮粍銆佹簮鏁扮粍璧峰浣嶇疆銆佺洰鏍囨暟缁勩�佺洰鏍囨暟缁勮捣濮嬩綅缃�佸鍒堕暱搴�
+ System.arraycopy(os2, 0, os, 0, os2.length);
+ }
+
String communityId = ownerCarDto.getCommunityId();
JSONArray objects = JSONObject.parseArray(otherItem);
+ while (objects.size() < 100) {
+ objects.add(null); // 涔熷彲浠ュ～ ""銆�0 绛夎嚜瀹氫箟榛樿鍊�
+ }
+
OwnerCarDto carDto = new OwnerCarDto();
carDto.setCommunityId(ownerCarDto.getCommunityId());
carDto.setCarNum(ownerCarDto.getCarNum());
communityDto.setCommunityCode(defaultValue(os[1]));
communityDto.setName(defaultValue(os[2]));
- List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
+ if (communityDto.getCommunityCode().equals("") && communityDto.getName().equals("")) {
+ throw new IllegalArgumentException("瀵煎叆澶辫触锛氬皬鍖虹紪鐮佸拰灏忓尯鍚嶇О閮戒负绌�");
+ }
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
if (communityDtos.isEmpty()) {
- throw new IllegalArgumentException("涓嶅瓨鍦ㄥ皬鍖虹紪鐮佷负锛�" + communityDto.getCommunityCode() + "鐨勫皬鍖�");
+ throw new IllegalArgumentException("涓嶅瓨鍦ㄧ殑灏忓尯锛�" + communityDto.getCommunityCode() + communityDto.getName() + "");
}
assetImportLogDetailDto.setCommunityId(communityDtos.get(0).getCommunityId());
ownerCarDto.setCommunityId(communityDtos.get(0).getCommunityId());
@@ -229,33 +260,34 @@
//鑾峰彇鎴垮眿鍚嶇О
- String carTypeCd = defaultValue(os[12]);
- if (!carTypeCd.equals("")){
- DictDto dictDto = new DictDto();
- dictDto.setTableName("owner_car");
- dictDto.setTableColumns("car_type_cd");
- dictDto.setName(carTypeCd);
- List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
- if (dictDtos.isEmpty()) {
- dictDto.setName(null);
- List<DictDto> dictDtos1 = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
- DictPo dictPo = new DictPo();
- dictPo.setTableName("owner_car");
- dictPo.setTableColumns("car_type_cd");
- dictPo.setName(carTypeCd);
- dictPo.setStatusCd(dictDtos1.get(dictDtos1.size() - 1).getStatusCd() + 100);
- int i = dictV1InnerServiceSMOImpl.saveDict(dictPo);
- if (i == 0) {
- throw new IllegalArgumentException("娣诲姞瀛楀吀澶辫触!");
- }
- } else {
- ownerCarPo.setCarTypeCd(dictDtos.get(0).getStatusCd());
- }
- }
- else {
- ownerCarPo.setCarTypeCd("1001"); //榛樿涓昏溅杈�
- }
+// String carTypeCd = defaultValue(os[12]);
+// if (!carTypeCd.equals("")){
+// DictDto dictDto = new DictDto();
+// dictDto.setTableName("owner_car");
+// dictDto.setTableColumns("car_type_cd");
+// dictDto.setName(carTypeCd);
+// List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
+// if (dictDtos.isEmpty()) {
+// dictDto.setName(null);
+// List<DictDto> dictDtos1 = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
+// DictPo dictPo = new DictPo();
+// dictPo.setTableName("owner_car");
+// dictPo.setTableColumns("car_type_cd");
+// dictPo.setName(carTypeCd);
+// dictPo.setStatusCd(String.valueOf(Integer.parseInt(dictDtos1.get(dictDtos1.size() - 1).getStatusCd()) + 100));
+// int i = dictV1InnerServiceSMOImpl.saveDict(dictPo);
+// if (i == 0) {
+// throw new IllegalArgumentException("娣诲姞瀛楀吀澶辫触!");
+// }
+// } else {
+// ownerCarPo.setCarTypeCd(dictDtos.get(0).getStatusCd());
+// }
+// }
+// else {
+// ownerCarPo.setCarTypeCd("1001"); //榛樿涓昏溅杈�
+// }
+ ownerCarPo.setCarTypeCd("1001"); //榛樿涓昏溅杈�
int i1 = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(carDto);
if (i1 > 0) {
@@ -573,6 +605,7 @@
ownerCarPo.setFloorNum(defaultValue(os[4]));
ownerCarPo.setUnitNum(defaultValue(os[5]));
ownerCarPo.setRoomNum(defaultValue(os[6]));
+ ownerCarPo.setParkingLocation(defaultValue(os[12]));
ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
parkingSpacePo.setPsId(psId); //杞︿綅id
@@ -586,17 +619,24 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(ownerCarPo.getCommunityId());
feeConfigDto.setSquarePrice(Vtil.processCount(ownerCarPo.getUnitPricePerMonth(), 2, null));
- switch (Vtil.defaultValue(os[12])) {
- case "鍦伴潰鍋滆溅": feeConfigDto.setFeeTypeCd("630000003");break;
- case "鍦颁笅鍋滆溅": feeConfigDto.setFeeTypeCd("630000004");break;
- default: feeConfigDto.setFeeTypeCds(new String[]{"630000003","630000004"});
- }
+ feeConfigDto.setFeeTypeCds(new String[]{"630000003","630000004","630000005"});
if (feeConfigDto.getSquarePrice() == null) {
- throw new IllegalArgumentException("鏈煡璇㈠埌鏀惰垂椤�");
+ throw new IllegalArgumentException("鏈紶鍏ユ敹璐瑰崟浠�");
}
feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
if (feeDtos.isEmpty()) {
throw new IllegalArgumentException("鍗曚环`"+ownerCarPo.getUnitPricePerMonth()+"`鏈煡璇㈠埌鏀惰垂椤�");
+ } else if (feeDtos.size() > 1) {
+ switch (Vtil.defaultValue(os[12])) {
+ case "鍦伴潰鍋滆溅": feeConfigDto.setFeeTypeCd("630000003");break;
+ case "鍦颁笅鍋滆溅": feeConfigDto.setFeeTypeCd("630000004");break;
+ default: feeConfigDto.setFeeTypeCd("630000005");break;
+ }
+ feeDtos.removeIf(feeConfigDto1 -> !feeConfigDto1.getFeeTypeCd().equals(feeConfigDto.getFeeTypeCd()));
+ }
+
+ if (feeDtos.size() > 1) {
+ throw new IllegalArgumentException("绯荤粺閿欒锛屾煡璇㈠埌鐨勮垂鐢ㄩ」瓒呰繃涓�涓�");
}
}
FeeConfigDto feeDto = feeDtos.get(0);
--
Gitblit v1.8.0