From 4c3fa7b1828d5e9bbd586a42fa00924e9f5a7c25 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期四, 12 三月 2026 11:41:30 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeV2DataCleaningAdapt.java | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeV2DataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeV2DataCleaningAdapt.java
index 185c25f..1906b44 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeV2DataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeV2DataCleaningAdapt.java
@@ -4,12 +4,15 @@
import com.java110.api.components.ValueUtil;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.importData.Vtil;
import com.java110.dto.meter.ImportExportMeterWaterDto;
+import com.java110.dto.meter.MeterTypeDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.fee.IMeterTypeV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.meter.MeterWaterPo;
@@ -21,10 +24,7 @@
import org.springframework.stereotype.Service;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 姘寸數鎶勮〃
@@ -35,6 +35,9 @@
@Autowired
private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMeterTypeV1InnerServiceSMO meterTypeV1InnerServiceSMOImpl;
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -51,6 +54,7 @@
Sheet sheet = null;
sheet = ImportExcelUtils.getSheet(workbook, "姘磋垂娴佹按妯℃澘");
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+ Map waterType = new HashMap();
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
if (osIndex < 10) {
continue;
@@ -63,12 +67,11 @@
MeterWaterPo po = new MeterWaterPo();
setCommunityId(po, os, maps);
po.setbId("-1");
- po.setMeterType(Vtil.defaultValue(os[7]));
+ setMeterType(os, po, waterType);
po.setObjType("3333");
setRoomDto(po, os);
- po.setPreDegrees(Vtil.defaultValue(os[21],null));
- po.setMeterType("102026011915731141");
- po.setCurDegrees(Vtil.defaultValue(os[22],null));
+ po.setPreDegrees(Vtil.defaultValueToDate(os[21]));
+ po.setCurDegrees(Vtil.defaultValueToDate(os[22]));
Date date = new Date();
date.setYear(defaultInteger(os[18]) - 1900);
date.setMonth(defaultInteger(os[19]));
@@ -91,15 +94,15 @@
po.setHouseholdName(Vtil.defaultValue(os[8]));
po.setRemark2(Vtil.defaultValue(os[41]));
po.setAddress(Vtil.defaultValue(os[17]));
- po.setWriteTime(Vtil.defaultValue(os[42]));
- po.setWriter(Vtil.defaultValue(os[43]));
- po.setAuditUserName(Vtil.defaultValue(os[44]));
+ po.setWriteTime(Vtil.defaultValueToDate(os[43]));
+ po.setWriter(Vtil.defaultValue(os[42]));
+ po.setAuditUserName(Vtil.defaultValueToDate(os[44]));
try {
- po.setCreateTime(DateUtil.getDateFromStringB(Vtil.defaultValue(os[45])));
+ po.setCreateTime(DateUtil.getDateFromStringB(Vtil.defaultValueToDate(os[45])));
} catch (Exception e) {
}
- po.setPayDate(Vtil.defaultValue(os[40]));
+ po.setPayDate(Vtil.defaultValueToDate(os[40]));
po.setCheckApplyCompanyName(Vtil.defaultValue(os[2]));
po.setCheckApplyDeptProject(Vtil.defaultValue(os[3]));
po.setWaterFeePayer(Vtil.defaultValue(os[4]));
@@ -119,6 +122,34 @@
return meterWaterPoList;
}
+
+ private void setMeterType(Object[] os, MeterWaterPo po, Map waterType) {
+ MeterTypeDto meterTypeDto = new MeterTypeDto();
+ meterTypeDto.setTypeName(Vtil.defaultValue(os[7],"瀵煎叆姘磋垂"));
+ meterTypeDto.setCommunityId(po.getCommunityId());
+ Object orDefault = waterType.getOrDefault(meterTypeDto.getTypeName(), "鏃犳暟鎹�");
+ if (!orDefault.equals("鏃犳暟鎹�")){
+ po.setMeterType(orDefault.toString());
+ }
+ else {
+ List<MeterTypeDto> meterTypeDtos = meterTypeV1InnerServiceSMOImpl.queryMeterTypes(meterTypeDto);
+ if (meterTypeDtos == null || meterTypeDtos.isEmpty()) {
+ meterTypeDto.setRemark(meterTypeDto.getTypeName());
+ meterTypeDto.setStatusCd("0");
+ meterTypeDto.setTypeId(GenerateCodeFactory.getGeneratorId("10"));
+ po.setMeterType(meterTypeDto.getTypeId());
+ int i = meterTypeV1InnerServiceSMOImpl.saveMeterTypeToDto(meterTypeDto);
+ if (i == 0) {
+ throw new IllegalArgumentException("瀵煎叆澶辫触");
+ }
+ } else {
+ po.setMeterType(meterTypeDtos.get(0).getTypeId());
+ }
+ }
+ waterType.put(meterTypeDto.getTypeName(), po.getMeterType());
+
+ }
+
private int defaultInteger(Object o) {
return o == null ? 0 : Integer.parseInt(o.toString());
}
--
Gitblit v1.8.0