From 64b14b0549344f13b191e2c26ed199f62655c43f Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 25 二月 2026 10:12:46 +0800
Subject: [PATCH] 导入测试
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportElectricityFeeV2QueueDataAdapt.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportElectricityFeeV2QueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportElectricityFeeV2QueueDataAdapt.java
index 57275d5..74003c7 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportElectricityFeeV2QueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportElectricityFeeV2QueueDataAdapt.java
@@ -87,8 +87,11 @@
payFeePo.setEndTime(po.getPreReadingTime());
payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
- payFeePo.setState(FeeDto.STATE_FINISH);
- int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCount(BeanConvertUtil.covertBean(BeanConvertUtil.beanCovertMap(po), MeterWaterDto.class));
+ payFeePo.setState(FeeDto.STATE_DOING);
+ if (po.getRemark3() != null){
+ po.setRemark(Vtil.defaultValue(po.getRemark()) + po.getRemark3());
+ }
+ int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCountByPo(po);
if (i > 0) {
throw new IllegalArgumentException("閲嶅鐨勭數璐瑰鍏�");
}
@@ -137,11 +140,16 @@
ownerDto.setRoomId(reqJson.getString("objId"));
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
+
if (ownerDtos != null && ownerDtos.size() > 0) {
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);
@@ -152,7 +160,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);
@@ -163,7 +175,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);
@@ -175,9 +191,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()) {
@@ -185,7 +201,10 @@
}
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() + "涓嶅瓨鍦紝璇ヨ垂鐢ㄥ瓨鍏ュ叕鍙歌处鎴�");
// ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//鎴垮眿
// importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
// importOwnerRoomDto.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
--
Gitblit v1.8.0