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/ImportMeterWaterFeeV2QueueDataAdapt.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportMeterWaterFeeV2QueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportMeterWaterFeeV2QueueDataAdapt.java
index 4124a6c..255b85a 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportMeterWaterFeeV2QueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportMeterWaterFeeV2QueueDataAdapt.java
@@ -73,9 +73,17 @@
private void doImportData(AssetImportLogDetailDto assetImportLogDetailDto) {
JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
MeterWaterPo po = BeanConvertUtil.covertBean(data, MeterWaterPo.class);
+ if (po.getCommunityId() == null) {
+ throw new IllegalArgumentException("鏈煡璇㈠埌灏忓尯锛�" + po.getCommunityCode() + po.getCommunityName());
+ }
validateRoom(po, assetImportLogDetailDto);
addFee(po, data, assetImportLogDetailDto.getLogId(), assetImportLogDetailDto);
int i = 1;
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
}
private void addFee(MeterWaterPo po, JSONObject reqJson, String batchId, AssetImportLogDetailDto assetImportLogDetailDto) {
@@ -93,10 +101,14 @@
payFeePo.setEndTime(po.getPreReadingTime());
payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
- payFeePo.setState(FeeDto.STATE_FINISH);
+ payFeePo.setState(FeeDto.STATE_DOING);
payFeePo.setIncomeObjId("102025062610470035");
- int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCount(BeanConvertUtil.covertBean(BeanConvertUtil.beanCovertMap(po), MeterWaterDto.class));
+ if (po.getRemark3() != null){
+ po.setRemark(Vtil.defaultValue(po.getRemark()) + po.getRemark3());
+ }
+
+ int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCountByPo(po);
if (i > 0) {
throw new IllegalArgumentException("閲嶅鐨勬按璐瑰鍏�");
}
@@ -147,7 +159,11 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(reqJson.getString("communityId"));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
- feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
+ if (ownerDtos.size() > 1) {
+ feeAttrPo.setValue("瀵煎叆淇℃伅涓笉瀛樺湪涓氫富");
+ }else {
+ feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
+ }
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -158,7 +174,11 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(reqJson.getString("communityId"));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
- feeAttrPo.setValue(ownerDtos.get(0).getLink());
+ if (ownerDtos.size() > 1) {
+ feeAttrPo.setValue("瀵煎叆淇℃伅涓笉瀛樺湪涓氫富");
+ }else {
+ feeAttrPo.setValue(ownerDtos.get(0).getLink());
+ }
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -169,7 +189,11 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(reqJson.getString("communityId"));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
- feeAttrPo.setValue(ownerDtos.get(0).getName());
+ if (ownerDtos.size() > 1) {
+ feeAttrPo.setValue("瀵煎叆淇℃伅涓笉瀛樺湪涓氫富");
+ }else {
+ feeAttrPo.setValue(ownerDtos.get(0).getName());
+ }
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -181,9 +205,9 @@
private void validateRoom(MeterWaterPo po, AssetImportLogDetailDto assetImportLogDetailDto) {
RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(po.getCommunityId());
roomDto.setRoadName(po.getRoadName());
roomDto.setFloorNum(Vtil.defaultValueToNumber(po.getFloorNum()));
- roomDto.setCommunityId(po.getCommunityId());
roomDto.setUnitNum(Vtil.defaultValueToNumber(po.getUnitNum()));
roomDto.setRoomNum(Vtil.defaultValueToNumber(po.getRoomNum()));
if (roomDto.getRoomNum().isEmpty()) {
@@ -191,7 +215,11 @@
}
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
if (roomDtos.isEmpty()) {
- throw new IllegalArgumentException("鏈煡璇㈠埌鎴垮眿锛�" + po.getObjName());
+ po.setObjId("1");
+ po.setRemark3("\n\n鎴垮眿锛�" +
+ roomDto.getCommunityId() + "-" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" +
+ roomDto.getRoomNum() + "涓嶅瓨鍦紝璇ヨ垂鐢ㄥ瓨鍏ュ叕鍙歌处鎴�");
+// throw new IllegalArgumentException("鏈煡璇㈠埌鎴垮眿锛�" + po.getObjName());
// ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//鎴垮眿
// importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
// importOwnerRoomDto.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
@@ -227,7 +255,10 @@
// }
// po.setObjId(importOwnerRoomDto.getRoomId());
} else if (roomDtos.size() > 1) {
- throw new IllegalArgumentException("瀛樺湪閲嶅鐨勬埧灞嬶細" + po.getObjName());
+ po.setObjId("1");
+ po.setRemark3("\n\n鎴垮眿锛�" +
+ roomDto.getCommunityId() + "-" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" +
+ roomDto.getRoomNum() + "瀛樺湪閲嶅鐨勬埧灞嬶紝璇ヨ垂鐢ㄥ瓨鍏ュ叕鍙歌处鎴�");
} else {
po.setObjId(roomDtos.get(0).getRoomId());
}
--
Gitblit v1.8.0