From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java
index 6ffc5f0..a779d16 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java
@@ -4,6 +4,7 @@
import com.java110.api.components.ValueUtil;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
+import com.java110.dto.PropertyWhiteListFlowDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.importData.Vtil;
import com.java110.dto.system.ComponentValidateResult;
@@ -79,6 +80,8 @@
po.setStatusCd("0");
po.setUserId(paramIn.getString("userId"));
po.setRemark(ValueUtil.defaultValue(os[28]));
+ po.setCommunityCode(Vtil.appendHyphenToRight(ValueUtil.defaultValue(os[0])));
+ po.setCommunityName(ValueUtil.defaultValue(os[1]));
try {
po.setPrice(Vtil.defaultDouble(os[26]));
} catch (Exception e) {
@@ -103,8 +106,8 @@
po.setRemark2(ValueUtil.defaultValue(os[34]));
po.setAddress(ValueUtil.defaultValue(os[16]));
po.setWriter(ValueUtil.defaultValue(os[35]));
- po.setWriteTime(ValueUtil.defaultValue(os[36]));
- po.setAuditUserName(ValueUtil.defaultValue(os[37]));
+ po.setWriteTime(ValueUtil.defaultValue(os,36));
+ po.setAuditUserName(ValueUtil.defaultValue(os,37));
try {
po.setCreateTime(DateUtil.getDateFromStringB(ValueUtil.defaultValue(os[38])));
} catch (Exception e) {
@@ -131,25 +134,31 @@
po.setObjName(po.getRoadName() + "-" + po.getFloorNum() + "-" + po.getUnitNum() + "-" + po.getRoomNum());
}
+
public void setCommunityId(MeterWaterPo po, Object[] os, List<Map<String, Object>> maps) {
for (Map<String, Object> map : maps) {
+ if (ValueUtil.defaultValue(os[0]).isEmpty() && ValueUtil.defaultValue(os[1]).isEmpty()){
+ throw new IllegalArgumentException("灏忓尯鍚嶇О鍜屽皬鍖虹紪鍙峰潎涓虹┖");
+ }
if (ValueUtil.defaultValue(os[0]).isEmpty()) {
- if (ValueUtil.defaultValue(os[1]).equals(map.get("name"))) {
+ if (Vtil.defaultValue(map.get("name")).contains(ValueUtil.defaultValue(os[1]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
} else if (ValueUtil.defaultValue(os[1]).isEmpty()){
- if (ValueUtil.defaultValue(os[0]).equals(map.get("communityCode"))) {
+ if (Vtil.defaultValue(map.get("communityCode")).equals(ValueUtil.defaultValue(os[0]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
} else {
- if (ValueUtil.defaultValue(os[0]).equals(map.get("communityCode")) && ValueUtil.defaultValue(os[1]).equals(map.get("name"))) {
+ if (Vtil.defaultValue(map.get("communityCode")).equals(ValueUtil.defaultValue(os[0])) && Vtil.defaultValue(map.get("name")).contains(ValueUtil.defaultValue(os[1]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
}
}
- throw new IllegalArgumentException("鏈煡璇㈠埌灏忓尯锛�" + Vtil.appendHyphenToRight(ValueUtil.defaultValue(os[0])) + ValueUtil.defaultValue(os[1]));
+ po.setCommunityId(null);
+ po.setCommunityCode(ValueUtil.defaultValue(os[0]));
+ po.setCommunityName(ValueUtil.defaultValue(os[1]));
}
}
--
Gitblit v1.8.0