Lianxun_Java.git

parent: 5d6e7f86 | 补丁 | 提交 | ignore whitespace

java110

2023-06-19 77a4883fbae1902c4890ec6302a3b18896969faa

optimize import

2个文件已删除

3个文件已修改

4 文件已重命名

6个文件已添加

	java110-bean/src/main/java/com/java110/dto/importData/ImportRoomFee.java	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/components/assetImport/ImportOwnerRoomComponent.java	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/importData/DefaultImportDataAdapt.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/importData/IImportDataCleaningAdapt.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java	167 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java	175 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataCleaningAdapt.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/importData/package-info.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java	232 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomHistoryFeeDetailQueueDataAdapt.java	245 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springboot/src/main/java/com/java110/boot/components/assetImport/ImportOwnerRoomComponent.java	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springboot/src/main/java/com/java110/boot/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java	168 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springboot/src/main/java/com/java110/boot/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java	176 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 java110-bean/src/main/java/com/java110/dto/importData/ImportRoomFee.java

@@ -40,6 +40,16 @@

    private String deductFrom;

    private String userId;

    private String storeId;

    private String batchId;

    private String objType;

    private String detailId;


    public String getFloorNum() {
        return floorNum;
@@ -196,4 +206,44 @@
    public void setRoomName(String roomName) {
        this.roomName = roomName;
    }

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public String getStoreId() {
        return storeId;
    }

    public void setStoreId(String storeId) {
        this.storeId = storeId;
    }

    public String getBatchId() {
        return batchId;
    }

    public void setBatchId(String batchId) {
        this.batchId = batchId;
    }

    public String getObjType() {
        return objType;
    }

    public void setObjType(String objType) {
        this.objType = objType;
    }

    public String getDetailId() {
        return detailId;
    }

    public void setDetailId(String detailId) {
        this.detailId = detailId;
    }
}

 service-api/src/main/java/com/java110/api/components/assetImport/ImportOwnerRoomComponent.java

File was deleted

 service-api/src/main/java/com/java110/api/importData/DefaultImportDataAdapt.java

File was renamed from service-api/src/main/java/importData/DefaultImportDataAdapt.java
@@ -1,4 +1,4 @@
package importData;
package com.java110.api.importData;

import java.text.SimpleDateFormat;
import java.util.Date;

 service-api/src/main/java/com/java110/api/importData/IImportDataCleaningAdapt.java

File was renamed from service-api/src/main/java/importData/IImportDataCleaningAdapt.java
@@ -1,4 +1,4 @@
package importData;
package com.java110.api.importData;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

 service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java

New file
@@ -0,0 +1,167 @@
package com.java110.api.importData.adapt;

import com.alibaba.fastjson.JSONObject;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.dto.user.UserDto;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
 * 历史缴费数据导入
 * <p>
 * 导入请求参数中必须包含
 * param.append('importAdapt', "importCarHistoryFeeDetail");
 * <p>
 * vc.http.upload(
 * 'assetImport',
 * 'importData',
 * param, {
 * emulateJSON: true,
 * //添加请求头
 * headers: {
 * "Content-Type": "multipart/form-data"
 * }
 * },
 * function(json, res) {
 * //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
 * let _json = JSON.parse(json);
 * if (_json.code == 0) {
 * //关闭model
 * // vc.toast(_json.data);
 * $('#importOwnerRoomModel').modal('hide');
 * $that.clearAddFeeConfigInfo();
 * <p>
 * vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importCarHistoryFeeDetail');
 * return;
 * }
 * vc.toast(_json.msg, 10000);
 * },
 * function(errInfo, error) {
 * console.log('请求失败处理');
 * vc.toast(errInfo, 10000);
 * });
 */
@Service("importCarHistoryFeeDetailDataCleaning")
public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


    @Autowired
    private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;


    @Override
    public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

        generatorBatch(paramIn);
        List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();

        //获取车辆信息
        getCars(workbook, rooms);


        for (ImportRoomFee importRoomFee : rooms) {
            importRoomFee.setBatchId(paramIn.getString("batchId"));
            importRoomFee.setUserId(paramIn.getString("userId"));
            importRoomFee.setStoreId(paramIn.getString("storeId"));
            importRoomFee.setObjType(paramIn.getString("objType"));
        }
        return rooms;
    }

    private void getCars(Workbook workbook, List<ImportRoomFee> rooms) {
        Sheet sheet = null;
        sheet = ImportExcelUtils.getSheet(workbook, "车辆缴费历史");
        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
        ImportRoomFee importRoomFee = null;
        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
            Object[] os = oList.get(osIndex);
            if (osIndex == 0) { // 第一行是 头部信息 直接跳过
                continue;
            }
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }

            //费用名称没有填写，默认跳过
            if (StringUtil.isNullOrNone(os[4])) {
                continue;
            }
            Assert.hasValue(os[0], (osIndex + 1) + "行车牌号不能为空");
            Assert.hasValue(os[1], (osIndex + 1) + "行收费项目不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "行缴费周期不能为空");
            Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
            Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
            Assert.hasValue(os[6], (osIndex + 1) + "行缴费金额不能为空");

//

            String startTime = excelDoubleToDate(os[3].toString());
            String endTime = excelDoubleToDate(os[4].toString());
            String createTime = excelDoubleToDate(os[5].toString());
            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");


            importRoomFee = new ImportRoomFee();
            importRoomFee.setCarNum(os[0].toString());
            importRoomFee.setFeeName(os[1].toString());
            importRoomFee.setCycle(os[2].toString());
            importRoomFee.setStartTime(startTime);
            importRoomFee.setEndTime(endTime);
            importRoomFee.setCreateTime(createTime);
            importRoomFee.setAmount(os[6].toString());
            importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
            rooms.add(importRoomFee);
        }
    }

    /**
     * 生成批次号
     *
     * @param reqJson
     */
    private void generatorBatch(JSONObject reqJson) {
        PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
        payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
        payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
        payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
        UserDto userDto = new UserDto();
        userDto.setUserId(reqJson.getString("userId"));
        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

        Assert.listOnlyOne(userDtos, "用户不存在");
        payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
        payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
        payFeeBatchPo.setMsg("正常");
        int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

        if (flag < 1) {
            throw new IllegalArgumentException("生成批次失败");
        }

        reqJson.put("batchId", payFeeBatchPo.getBatchId());
    }

}

 service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java

New file
@@ -0,0 +1,175 @@
package com.java110.api.importData.adapt;

import com.alibaba.fastjson.JSONObject;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.dto.user.UserDto;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
 * 历史缴费数据导入
 * <p>
 * 导入请求参数中必须包含
 * param.append('importAdapt', "importRoomHistoryFeeDetail");
 * <p>
 * vc.http.upload(
 * 'assetImport',
 * 'importData',
 * param, {
 * emulateJSON: true,
 * //添加请求头
 * headers: {
 * "Content-Type": "multipart/form-data"
 * }
 * },
 * function(json, res) {
 * //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
 * let _json = JSON.parse(json);
 * if (_json.code == 0) {
 * //关闭model
 * // vc.toast(_json.data);
 * $('#importOwnerRoomModel').modal('hide');
 * $that.clearAddFeeConfigInfo();
 * <p>
 * vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importRoomHistoryFeeDetail');
 * return;
 * }
 * vc.toast(_json.msg, 10000);
 * },
 * function(errInfo, error) {
 * console.log('请求失败处理');
 * vc.toast(errInfo, 10000);
 * });
 */
@Service("importRoomHistoryFeeDetailDataCleaning")
public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


    @Autowired
    private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;


    @Override
    public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

        generatorBatch(paramIn);
        List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
        //获取楼信息
        getRooms(workbook, rooms);

        for (ImportRoomFee importRoomFee : rooms) {
            importRoomFee.setBatchId(paramIn.getString("batchId"));
            importRoomFee.setUserId(paramIn.getString("userId"));
            importRoomFee.setStoreId(paramIn.getString("storeId"));
            importRoomFee.setObjType(paramIn.getString("objType"));
        }
        return rooms;
    }

    /**
     * 获取 房屋信息
     *
     * @param workbook
     * @param rooms
     */
    private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) {
        Sheet sheet = null;
        sheet = ImportExcelUtils.getSheet(workbook, "房屋缴费历史");
        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
        ImportRoomFee importRoomFee = null;
        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
            Object[] os = oList.get(osIndex);
            if (osIndex == 0) { // 第一行是 头部信息 直接跳过
                continue;
            }
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }

            //费用名称没有填写，默认跳过
            if (StringUtil.isNullOrNone(os[4])) {
                continue;
            }
            Assert.hasValue(os[0], (osIndex + 1) + "行楼栋编号不能为空");
            Assert.hasValue(os[1], (osIndex + 1) + "行单元编号不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "行房屋编号不能为空");
            Assert.hasValue(os[3], (osIndex + 1) + "行收费项目不能为空");
            Assert.hasValue(os[4], (osIndex + 1) + "行缴费周期不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行开始时间不能为空");
            Assert.hasValue(os[6], (osIndex + 1) + "行结束时间不能为空");
            Assert.hasValue(os[7], (osIndex + 1) + "行缴费时间不能为空");
            Assert.hasValue(os[8], (osIndex + 1) + "行缴费金额不能为空");

//

            String startTime = excelDoubleToDate(os[5].toString());
            String endTime = excelDoubleToDate(os[6].toString());
            String createTime = excelDoubleToDate(os[7].toString());
            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");


            importRoomFee = new ImportRoomFee();
            importRoomFee.setFloorNum(os[0].toString());
            importRoomFee.setUnitNum(os[1].toString());
            importRoomFee.setRoomNum(os[2].toString());
            importRoomFee.setFeeName(os[3].toString());
            importRoomFee.setCycle(os[4].toString());
            importRoomFee.setStartTime(startTime);
            importRoomFee.setEndTime(endTime);
            importRoomFee.setCreateTime(createTime);
            importRoomFee.setAmount(os[8].toString());
            importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
            rooms.add(importRoomFee);
        }
    }

    /**
     * 生成批次号
     *
     * @param reqJson
     */
    private void generatorBatch(JSONObject reqJson) {
        PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
        payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
        payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
        payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
        UserDto userDto = new UserDto();
        userDto.setUserId(reqJson.getString("userId"));
        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

        Assert.listOnlyOne(userDtos, "用户不存在");
        payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
        payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
        payFeeBatchPo.setMsg("正常");
        int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

        if (flag < 1) {
            throw new IllegalArgumentException("生成批次失败");
        }

        reqJson.put("batchId", payFeeBatchPo.getBatchId());
    }

}

 service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataCleaningAdapt.java

File was renamed from service-api/src/main/java/importData/adapt/ImportRoomOwnerDataCleaningAdapt.java
@@ -1,6 +1,5 @@
package importData.adapt;
package com.java110.api.importData.adapt;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.importData.ImportOwnerRoomDto;
import com.java110.dto.owner.OwnerDto;
@@ -9,8 +8,8 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import importData.DefaultImportDataAdapt;
import importData.IImportDataCleaningAdapt;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.stereotype.Service;

 service-api/src/main/java/com/java110/api/importData/package-info.java

File was renamed from service-api/src/main/java/importData/package-info.java
@@ -1,4 +1,4 @@
/**
 * 数据导入 对象分装 校验处理类
 */
package importData;
package com.java110.api.importData;

 service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -15,7 +15,7 @@
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import importData.IImportDataCleaningAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
@@ -26,9 +26,7 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**

 service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java

New file
@@ -0,0 +1,232 @@
package com.java110.job.importData.adapt;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.log.AssetImportLogDetailDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.job.importData.DefaultImportData;
import com.java110.job.importData.IImportDataAdapt;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;

/**
 * 车辆缴费信息导入 适配器
 * 前端请求 时 必须传入
 * param.append('importAdapt', "importRoomOwner");
 */
@Service("importCarHistoryFeeDetailQueueData")
public class ImportCarHistoryFeeDetailQueueDataAdapt extends DefaultImportData implements IImportDataAdapt {


    @Autowired
    private IImportFeeDetailInnerServiceSMO importFeeDetailInnerServiceSMOImpl;

    @Autowired
    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;

    @Autowired
    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;

    @Autowired
    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;

    @Autowired
    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;

    @Autowired
    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

    @Autowired
    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;

    @Autowired
    private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;


    @Override
    public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
        importDatas(assetImportLogDetailDtos);
    }

    private void importDatas(List<AssetImportLogDetailDto> infos) {

        List<ImportRoomFee> importRoomFees = new ArrayList<>();
        for (AssetImportLogDetailDto assetImportLogDetailDto : infos) {
            JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
            ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
            importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
            importRoomFees.add(importRoomFee);
        }

        if (importRoomFees.size() < 1) {
            return;
        }

        importCarFeeDetails(importRoomFees.get(0).getStoreId(), importRoomFees.get(0).getUserId(), importRoomFees, importRoomFees.get(0).getBatchId());
    }

    private void importCarFeeDetails(String storeId, String userId, List<ImportRoomFee> importCarFees, String batchId) {

        importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
        for (ImportRoomFee importCarFee : importCarFees) {
            try {
                if (StringUtil.isEmpty(importCarFee.getCarId())) {
                    continue;
                }
                importCarFeeDetail(importCarFee, storeId, userId, batchId);
                updateImportLogDetailState(importCarFee.getDetailId());
            } catch (Exception e) {
                e.printStackTrace();
                updateImportLogDetailState(importCarFee.getDetailId(), e);
            }
        }
    }

    /**
     * 导入 费用历史
     *
     * @param importRoomFee
     */
    private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {

        FeeConfigDto feeConfigDto = new FeeConfigDto();
        feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
        feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);

        if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
            return;
        }

        FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);

        FeeDto feeDto = new FeeDto();
        feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
        feeDto.setCommunityId(importRoomFee.getCommunityId());
        feeDto.setPayerObjId(importRoomFee.getCarId());
        feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);

        List<PayFeePo> payFeePos = null;
        if (feeDtos == null || feeDtos.size() < 1) {
            PayFeePo payFeePo = new PayFeePo();
            payFeePo.setCommunityId(importRoomFee.getCommunityId());
            payFeePo.setConfigId(feeDto.getConfigId());
            payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
            payFeePo.setStartTime(importRoomFee.getStartTime());
            payFeePo.setEndTime(importRoomFee.getEndTime());
            payFeePo.setAmount(importRoomFee.getAmount());
            payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
            payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
            payFeePo.setIncomeObjId(storeId);
            payFeePo.setBatchId(batchId);
            if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
                payFeePo.setState(FeeDto.STATE_FINISH);
            } else {
                payFeePo.setState(FeeDto.STATE_DOING);
            }
            payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
            payFeePo.setPayerObjId(importRoomFee.getCarId());
            payFeePo.setUserId(userId);
            payFeePo.setCreateTime(importRoomFee.getCreateTime());
            payFeePos = new ArrayList<>();
            payFeePos.add(payFeePo);
            feeInnerServiceSMOImpl.saveFee(payFeePos);
            List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
            //查询业主信息
            if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
                feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
                        importRoomFee.getEndTime()));
            }
            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, importRoomFee.getOwnerId()));
            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, importRoomFee.getOwnerLink()));
            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, importRoomFee.getOwnerName()));
            feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
            feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
        }

        for (FeeDto tmpFeeDto : feeDtos) {
            doImportFeeDetail(tmpFeeDto, importRoomFee);
        }

    }

    public FeeAttrPo addFeeAttr(PayFeePo payFeePo, String specCd, String value) {
        FeeAttrPo feeAttrPo = new FeeAttrPo();
        feeAttrPo.setCommunityId(payFeePo.getCommunityId());
        feeAttrPo.setSpecCd(specCd);
        feeAttrPo.setValue(value);
        feeAttrPo.setFeeId(payFeePo.getFeeId());
        feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
        return feeAttrPo;
    }
    private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) {


        PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
        payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
        payFeeDetailPo.setReceivedAmount(importRoomFee.getAmount());
        payFeeDetailPo.setReceivableAmount(importRoomFee.getAmount());
        payFeeDetailPo.setCycles(importRoomFee.getCycle());
        payFeeDetailPo.setPrimeRate("1.0");
        payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
        payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
        String endTime = importRoomFee.getEndTime();
        //todo 周期性费用时时间自动加一天，因为物业统计的Excel 一般少一天
        if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            Calendar calendar = Calendar.getInstance();
            calendar.setTime(DateUtil.getDateFromStringB(endTime));
            calendar.add(Calendar.DAY_OF_MONTH, 1);
            endTime = DateUtil.getFormatTimeStringB(calendar.getTime());
            importRoomFee.setEndTime(endTime);
        }
        payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
        payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        payFeeDetailPo.setRemark(importRoomFee.getRemark());
        payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
        payFeeDetailPo.setState("1400");
        payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
        int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

        if (saved < 1) {
            return;
        }

        if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime()) {
            return;
        }

        //如果结束时间小于 缴费结束时间则延期
        PayFeePo payFeePo = new PayFeePo();
        payFeePo.setCommunityId(importRoomFee.getCommunityId());
        payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
        payFeePo.setFeeId(tmpFeeDto.getFeeId());
        payFeePo.setEndTime(importRoomFee.getEndTime());
        if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            payFeePo.setState(FeeDto.STATE_FINISH);
        }

        feeInnerServiceSMOImpl.updateFee(payFeePo);
    }


}

 service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomHistoryFeeDetailQueueDataAdapt.java

New file
@@ -0,0 +1,245 @@
package com.java110.job.importData.adapt;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.log.AssetImportLogDetailDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.job.importData.DefaultImportData;
import com.java110.job.importData.IImportDataAdapt;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;

/**
 * 房屋缴费信息导入 适配器
 * 前端请求 时 必须传入
 * param.append('importAdapt', "importRoomOwner");
 */
@Service("importRoomHistoryFeeDetailQueueData")
public class ImportRoomHistoryFeeDetailQueueDataAdapt extends DefaultImportData implements IImportDataAdapt {


    @Autowired
    private IImportFeeDetailInnerServiceSMO importFeeDetailInnerServiceSMOImpl;

    @Autowired
    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;

    @Autowired
    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;

    @Autowired
    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;

    @Autowired
    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;

    @Autowired
    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

    @Autowired
    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;

    @Autowired
    private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;


    @Override
    public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
        importDatas(assetImportLogDetailDtos);
    }

    private void importDatas(List<AssetImportLogDetailDto> infos) {

        List<ImportRoomFee> importRoomFees = new ArrayList<>();
        for (AssetImportLogDetailDto assetImportLogDetailDto : infos) {
            JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
            ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
            importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
            importRoomFees.add(importRoomFee);
        }

        if (importRoomFees.size() < 1) {
            return;
        }

        importFeeDetails(importRoomFees.get(0).getStoreId(), importRoomFees.get(0).getUserId(), importRoomFees, importRoomFees.get(0).getBatchId());


    }

    private void importFeeDetails(String storeId, String userId, List<ImportRoomFee> importRoomFees, String batchId) {

        importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees);
        for (ImportRoomFee importRoomFee : importRoomFees) {
            try {
                if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
                    continue;
                }
                importFeeDetail(importRoomFee, storeId, userId, batchId);
                updateImportLogDetailState(importRoomFee.getDetailId());
            } catch (Exception e) {
                e.printStackTrace();
                updateImportLogDetailState(importRoomFee.getDetailId(), e);
            }
        }
    }

    /**
     * 导入 费用历史
     *
     * @param importRoomFee
     */
    private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {

        FeeConfigDto feeConfigDto = new FeeConfigDto();
        feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
        feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);

        if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
            return;
        }

        FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);

        FeeDto feeDto = new FeeDto();
        feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
        feeDto.setCommunityId(importRoomFee.getCommunityId());
        feeDto.setPayerObjId(importRoomFee.getRoomId());
        feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);

        List<PayFeePo> payFeePos = null;
        if (feeDtos == null || feeDtos.size() < 1) {
            List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
            PayFeePo payFeePo = new PayFeePo();
            payFeePo.setCommunityId(importRoomFee.getCommunityId());
            payFeePo.setConfigId(feeDto.getConfigId());
            payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
            payFeePo.setStartTime(importRoomFee.getStartTime());
            payFeePo.setEndTime(importRoomFee.getEndTime());
            payFeePo.setAmount(importRoomFee.getAmount());
            payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
            payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
            payFeePo.setIncomeObjId(storeId);
            payFeePo.setBatchId(batchId);
            if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
                payFeePo.setState(FeeDto.STATE_FINISH);
            } else {
                payFeePo.setState(FeeDto.STATE_DOING);
            }
            payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
            payFeePo.setPayerObjId(importRoomFee.getRoomId());
            payFeePo.setUserId(userId);
            payFeePo.setCreateTime(importRoomFee.getCreateTime());
            payFeePos = new ArrayList<>();
            payFeePos.add(payFeePo);
            feeInnerServiceSMOImpl.saveFee(payFeePos);

            //查询业主信息
            OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
            ownerRoomRelDto.setRoomId(importRoomFee.getRoomId());
            List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
            if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
                if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
                    feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
                            importRoomFee.getEndTime()));
                }
                feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, ownerRoomRelDtos.get(0).getOwnerId()));
                feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, ownerRoomRelDtos.get(0).getLink()));
                feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, ownerRoomRelDtos.get(0).getOwnerName()));
                feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
            }


            feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
        }

        for (FeeDto tmpFeeDto : feeDtos) {
            doImportFeeDetail(tmpFeeDto, importRoomFee);
        }

    }

    public FeeAttrPo addFeeAttr(PayFeePo payFeePo, String specCd, String value) {
        FeeAttrPo feeAttrPo = new FeeAttrPo();
        feeAttrPo.setCommunityId(payFeePo.getCommunityId());
        feeAttrPo.setSpecCd(specCd);
        feeAttrPo.setValue(value);
        feeAttrPo.setFeeId(payFeePo.getFeeId());
        feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
        return feeAttrPo;

    }


    private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) {


        PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
        payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
        payFeeDetailPo.setReceivedAmount(importRoomFee.getAmount());
        payFeeDetailPo.setReceivableAmount(importRoomFee.getAmount());
        payFeeDetailPo.setCycles(importRoomFee.getCycle());
        payFeeDetailPo.setPrimeRate("1.0");
        payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
        payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
        String endTime = importRoomFee.getEndTime();
        //todo 周期性费用时时间自动加一天，因为物业统计的Excel 一般少一天
        if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            Calendar calendar = Calendar.getInstance();
            calendar.setTime(DateUtil.getDateFromStringB(endTime));
            calendar.add(Calendar.DAY_OF_MONTH, 1);
            endTime = DateUtil.getFormatTimeStringB(calendar.getTime());
            importRoomFee.setEndTime(endTime);
        }
        payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
        payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        payFeeDetailPo.setRemark(importRoomFee.getRemark());
        payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
        payFeeDetailPo.setState("1400");
        payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
        int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

        if (saved < 1) {
            return;
        }

        if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime()) {
            return;
        }

        //如果结束时间小于 缴费结束时间则延期
        PayFeePo payFeePo = new PayFeePo();
        payFeePo.setCommunityId(importRoomFee.getCommunityId());
        payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
        payFeePo.setFeeId(tmpFeeDto.getFeeId());
        payFeePo.setEndTime(importRoomFee.getEndTime());
        if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            payFeePo.setState(FeeDto.STATE_FINISH);
        }

        feeInnerServiceSMOImpl.updateFee(payFeePo);
    }


}

 springboot/src/main/java/com/java110/boot/components/assetImport/ImportOwnerRoomComponent.java

File was deleted

 springboot/src/main/java/com/java110/boot/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java

New file
@@ -0,0 +1,168 @@
package com.java110.boot.importData.adapt;

import com.alibaba.fastjson.JSONObject;
import com.java110.boot.importData.DefaultImportDataAdapt;
import com.java110.boot.importData.IImportDataCleaningAdapt;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.dto.user.UserDto;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
 * 历史缴费数据导入
 * <p>
 * 导入请求参数中必须包含
 * param.append('importAdapt', "importCarHistoryFeeDetail");
 * <p>
 * vc.http.upload(
 * 'assetImport',
 * 'importData',
 * param, {
 * emulateJSON: true,
 * //添加请求头
 * headers: {
 * "Content-Type": "multipart/form-data"
 * }
 * },
 * function(json, res) {
 * //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
 * let _json = JSON.parse(json);
 * if (_json.code == 0) {
 * //关闭model
 * // vc.toast(_json.data);
 * $('#importOwnerRoomModel').modal('hide');
 * $that.clearAddFeeConfigInfo();
 * <p>
 * vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importCarHistoryFeeDetail');
 * return;
 * }
 * vc.toast(_json.msg, 10000);
 * },
 * function(errInfo, error) {
 * console.log('请求失败处理');
 * vc.toast(errInfo, 10000);
 * });
 */
@Service("importCarHistoryFeeDetailDataCleaning")
public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


    @Autowired
    private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;


    @Override
    public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

        generatorBatch(paramIn);
        List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();

        //获取车辆信息
        getCars(workbook, rooms);


        for (ImportRoomFee importRoomFee : rooms) {
            importRoomFee.setBatchId(paramIn.getString("batchId"));
            importRoomFee.setUserId(paramIn.getString("userId"));
            importRoomFee.setStoreId(paramIn.getString("storeId"));
            importRoomFee.setObjType(paramIn.getString("objType"));
        }
        return rooms;
    }

    private void getCars(Workbook workbook, List<ImportRoomFee> rooms) {
        Sheet sheet = null;
        sheet = ImportExcelUtils.getSheet(workbook, "车辆缴费历史");
        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
        ImportRoomFee importRoomFee = null;
        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
            Object[] os = oList.get(osIndex);
            if (osIndex == 0) { // 第一行是 头部信息 直接跳过
                continue;
            }
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }

            //费用名称没有填写，默认跳过
            if (StringUtil.isNullOrNone(os[4])) {
                continue;
            }
            Assert.hasValue(os[0], (osIndex + 1) + "行车牌号不能为空");
            Assert.hasValue(os[1], (osIndex + 1) + "行收费项目不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "行缴费周期不能为空");
            Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
            Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
            Assert.hasValue(os[6], (osIndex + 1) + "行缴费金额不能为空");

//

            String startTime = excelDoubleToDate(os[3].toString());
            String endTime = excelDoubleToDate(os[4].toString());
            String createTime = excelDoubleToDate(os[5].toString());
            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");


            importRoomFee = new ImportRoomFee();
            importRoomFee.setCarNum(os[0].toString());
            importRoomFee.setFeeName(os[1].toString());
            importRoomFee.setCycle(os[2].toString());
            importRoomFee.setStartTime(startTime);
            importRoomFee.setEndTime(endTime);
            importRoomFee.setCreateTime(createTime);
            importRoomFee.setAmount(os[6].toString());
            importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
            rooms.add(importRoomFee);
        }
    }

    /**
     * 生成批次号
     *
     * @param reqJson
     */
    private void generatorBatch(JSONObject reqJson) {
        PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
        payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
        payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
        payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
        UserDto userDto = new UserDto();
        userDto.setUserId(reqJson.getString("userId"));
        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

        Assert.listOnlyOne(userDtos, "用户不存在");
        payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
        payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
        payFeeBatchPo.setMsg("正常");
        int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

        if (flag < 1) {
            throw new IllegalArgumentException("生成批次失败");
        }

        reqJson.put("batchId", payFeeBatchPo.getBatchId());
    }

}

 springboot/src/main/java/com/java110/boot/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java

New file
@@ -0,0 +1,176 @@
package com.java110.boot.importData.adapt;

import com.alibaba.fastjson.JSONObject;
import com.java110.boot.importData.DefaultImportDataAdapt;
import com.java110.boot.importData.IImportDataCleaningAdapt;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.dto.user.UserDto;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
 * 历史缴费数据导入
 * <p>
 * 导入请求参数中必须包含
 * param.append('importAdapt', "importRoomHistoryFeeDetail");
 * <p>
 * vc.http.upload(
 * 'assetImport',
 * 'importData',
 * param, {
 * emulateJSON: true,
 * //添加请求头
 * headers: {
 * "Content-Type": "multipart/form-data"
 * }
 * },
 * function(json, res) {
 * //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
 * let _json = JSON.parse(json);
 * if (_json.code == 0) {
 * //关闭model
 * // vc.toast(_json.data);
 * $('#importOwnerRoomModel').modal('hide');
 * $that.clearAddFeeConfigInfo();
 * <p>
 * vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importRoomHistoryFeeDetail');
 * return;
 * }
 * vc.toast(_json.msg, 10000);
 * },
 * function(errInfo, error) {
 * console.log('请求失败处理');
 * vc.toast(errInfo, 10000);
 * });
 */
@Service("importRoomHistoryFeeDetailDataCleaning")
public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


    @Autowired
    private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;


    @Override
    public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

        generatorBatch(paramIn);
        List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
        //获取楼信息
        getRooms(workbook, rooms);

        for (ImportRoomFee importRoomFee : rooms) {
            importRoomFee.setBatchId(paramIn.getString("batchId"));
            importRoomFee.setUserId(paramIn.getString("userId"));
            importRoomFee.setStoreId(paramIn.getString("storeId"));
            importRoomFee.setObjType(paramIn.getString("objType"));
        }
        return rooms;
    }

    /**
     * 获取 房屋信息
     *
     * @param workbook
     * @param rooms
     */
    private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) {
        Sheet sheet = null;
        sheet = ImportExcelUtils.getSheet(workbook, "房屋缴费历史");
        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
        ImportRoomFee importRoomFee = null;
        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
            Object[] os = oList.get(osIndex);
            if (osIndex == 0) { // 第一行是 头部信息 直接跳过
                continue;
            }
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }

            //费用名称没有填写，默认跳过
            if (StringUtil.isNullOrNone(os[4])) {
                continue;
            }
            Assert.hasValue(os[0], (osIndex + 1) + "行楼栋编号不能为空");
            Assert.hasValue(os[1], (osIndex + 1) + "行单元编号不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "行房屋编号不能为空");
            Assert.hasValue(os[3], (osIndex + 1) + "行收费项目不能为空");
            Assert.hasValue(os[4], (osIndex + 1) + "行缴费周期不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行开始时间不能为空");
            Assert.hasValue(os[6], (osIndex + 1) + "行结束时间不能为空");
            Assert.hasValue(os[7], (osIndex + 1) + "行缴费时间不能为空");
            Assert.hasValue(os[8], (osIndex + 1) + "行缴费金额不能为空");

//

            String startTime = excelDoubleToDate(os[5].toString());
            String endTime = excelDoubleToDate(os[6].toString());
            String createTime = excelDoubleToDate(os[7].toString());
            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");


            importRoomFee = new ImportRoomFee();
            importRoomFee.setFloorNum(os[0].toString());
            importRoomFee.setUnitNum(os[1].toString());
            importRoomFee.setRoomNum(os[2].toString());
            importRoomFee.setFeeName(os[3].toString());
            importRoomFee.setCycle(os[4].toString());
            importRoomFee.setStartTime(startTime);
            importRoomFee.setEndTime(endTime);
            importRoomFee.setCreateTime(createTime);
            importRoomFee.setAmount(os[8].toString());
            importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
            rooms.add(importRoomFee);
        }
    }

    /**
     * 生成批次号
     *
     * @param reqJson
     */
    private void generatorBatch(JSONObject reqJson) {
        PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
        payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
        payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
        payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
        UserDto userDto = new UserDto();
        userDto.setUserId(reqJson.getString("userId"));
        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

        Assert.listOnlyOne(userDtos, "用户不存在");
        payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
        payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
        payFeeBatchPo.setMsg("正常");
        int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

        if (flag < 1) {
            throw new IllegalArgumentException("生成批次失败");
        }

        reqJson.put("batchId", payFeeBatchPo.getBatchId());
    }

}

 springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -72,6 +72,7 @@
    @Override
    public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
        paramIn.put("userId", pd.getUserId());
        Assert.hasKeyAndValue(paramIn, "importAdapt", "未包含模板");
        String importAdapt = paramIn.getString("importAdapt") + "DataCleaning";

@@ -82,6 +83,7 @@
        }
        try {
            ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
            paramIn.put("storeId", result.getStoreId());

            Workbook workbook = null;  //工作簿
            //工作表

			@@ -40,6 +40,16 @@

			private String deductFrom;

			private String userId;

			private String storeId;

			private String batchId;

			private String objType;

			private String detailId;


			public String getFloorNum() {
			return floorNum;
			@@ -196,4 +206,44 @@
			public void setRoomName(String roomName) {
			this.roomName = roomName;
			}

			public String getUserId() {
			return userId;
			}

			public void setUserId(String userId) {
			this.userId = userId;
			}

			public String getStoreId() {
			return storeId;
			}

			public void setStoreId(String storeId) {
			this.storeId = storeId;
			}

			public String getBatchId() {
			return batchId;
			}

			public void setBatchId(String batchId) {
			this.batchId = batchId;
			}

			public String getObjType() {
			return objType;
			}

			public void setObjType(String objType) {
			this.objType = objType;
			}

			public String getDetailId() {
			return detailId;
			}

			public void setDetailId(String detailId) {
			this.detailId = detailId;
			}
			}

File was renamed from service-api/src/main/java/importData/DefaultImportDataAdapt.java
			@@ -1,4 +1,4 @@
			package importData;
			package com.java110.api.importData;

			import java.text.SimpleDateFormat;
			import java.util.Date;

New file
			@@ -0,0 +1,167 @@
			package com.java110.api.importData.adapt;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.api.importData.DefaultImportDataAdapt;
			import com.java110.api.importData.IImportDataCleaningAdapt;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.importData.ImportRoomFee;
			import com.java110.dto.payFee.PayFeeBatchDto;
			import com.java110.dto.system.ComponentValidateResult;
			import com.java110.dto.user.UserDto;
			import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
			import com.java110.intf.user.IUserInnerServiceSMO;
			import com.java110.po.payFee.PayFeeBatchPo;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.ImportExcelUtils;
			import com.java110.utils.util.StringUtil;
			import org.apache.poi.ss.usermodel.Sheet;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;

			/**
			* 历史缴费数据导入
			* <p>
			* 导入请求参数中必须包含
			* param.append('importAdapt', "importCarHistoryFeeDetail");
			* <p>
			* vc.http.upload(
			* 'assetImport',
			* 'importData',
			* param, {
			* emulateJSON: true,
			* //添加请求头
			* headers: {
			* "Content-Type": "multipart/form-data"
			* }
			* },
			* function(json, res) {
			* //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
			* let _json = JSON.parse(json);
			* if (_json.code == 0) {
			* //关闭model
			* // vc.toast(_json.data);
			* $('#importOwnerRoomModel').modal('hide');
			* $that.clearAddFeeConfigInfo();
			* <p>
			* vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importCarHistoryFeeDetail');
			* return;
			* }
			* vc.toast(_json.msg, 10000);
			* },
			* function(errInfo, error) {
			* console.log('请求失败处理');
			* vc.toast(errInfo, 10000);
			* });
			*/
			@Service("importCarHistoryFeeDetailDataCleaning")
			public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


			@Autowired
			private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

			@Autowired
			private IUserInnerServiceSMO userInnerServiceSMOImpl;


			@Override
			public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

			generatorBatch(paramIn);
			List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();

			//获取车辆信息
			getCars(workbook, rooms);


			for (ImportRoomFee importRoomFee : rooms) {
			importRoomFee.setBatchId(paramIn.getString("batchId"));
			importRoomFee.setUserId(paramIn.getString("userId"));
			importRoomFee.setStoreId(paramIn.getString("storeId"));
			importRoomFee.setObjType(paramIn.getString("objType"));
			}
			return rooms;
			}

			private void getCars(Workbook workbook, List<ImportRoomFee> rooms) {
			Sheet sheet = null;
			sheet = ImportExcelUtils.getSheet(workbook, "车辆缴费历史");
			List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
			ImportRoomFee importRoomFee = null;
			for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
			Object[] os = oList.get(osIndex);
			if (osIndex == 0) { // 第一行是头部信息直接跳过
			continue;
			}
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}

			//费用名称没有填写，默认跳过
			if (StringUtil.isNullOrNone(os[4])) {
			continue;
			}
			Assert.hasValue(os[0], (osIndex + 1) + "行车牌号不能为空");
			Assert.hasValue(os[1], (osIndex + 1) + "行收费项目不能为空");
			Assert.hasValue(os[2], (osIndex + 1) + "行缴费周期不能为空");
			Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
			Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
			Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
			Assert.hasValue(os[6], (osIndex + 1) + "行缴费金额不能为空");

			//

			String startTime = excelDoubleToDate(os[3].toString());
			String endTime = excelDoubleToDate(os[4].toString());
			String createTime = excelDoubleToDate(os[5].toString());
			Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");


			importRoomFee = new ImportRoomFee();
			importRoomFee.setCarNum(os[0].toString());
			importRoomFee.setFeeName(os[1].toString());
			importRoomFee.setCycle(os[2].toString());
			importRoomFee.setStartTime(startTime);
			importRoomFee.setEndTime(endTime);
			importRoomFee.setCreateTime(createTime);
			importRoomFee.setAmount(os[6].toString());
			importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
			rooms.add(importRoomFee);
			}
			}

			/**
			* 生成批次号
			*
			* @param reqJson
			*/
			private void generatorBatch(JSONObject reqJson) {
			PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
			payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
			payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
			payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
			UserDto userDto = new UserDto();
			userDto.setUserId(reqJson.getString("userId"));
			List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

			Assert.listOnlyOne(userDtos, "用户不存在");
			payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
			payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
			payFeeBatchPo.setMsg("正常");
			int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

			if (flag < 1) {
			throw new IllegalArgumentException("生成批次失败");
			}

			reqJson.put("batchId", payFeeBatchPo.getBatchId());
			}

			}

New file
			@@ -0,0 +1,175 @@
			package com.java110.api.importData.adapt;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.api.importData.DefaultImportDataAdapt;
			import com.java110.api.importData.IImportDataCleaningAdapt;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.importData.ImportRoomFee;
			import com.java110.dto.payFee.PayFeeBatchDto;
			import com.java110.dto.system.ComponentValidateResult;
			import com.java110.dto.user.UserDto;
			import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
			import com.java110.intf.user.IUserInnerServiceSMO;
			import com.java110.po.payFee.PayFeeBatchPo;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.ImportExcelUtils;
			import com.java110.utils.util.StringUtil;
			import org.apache.poi.ss.usermodel.Sheet;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;

			/**
			* 历史缴费数据导入
			* <p>
			* 导入请求参数中必须包含
			* param.append('importAdapt', "importRoomHistoryFeeDetail");
			* <p>
			* vc.http.upload(
			* 'assetImport',
			* 'importData',
			* param, {
			* emulateJSON: true,
			* //添加请求头
			* headers: {
			* "Content-Type": "multipart/form-data"
			* }
			* },
			* function(json, res) {
			* //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
			* let _json = JSON.parse(json);
			* if (_json.code == 0) {
			* //关闭model
			* // vc.toast(_json.data);
			* $('#importOwnerRoomModel').modal('hide');
			* $that.clearAddFeeConfigInfo();
			* <p>
			* vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importRoomHistoryFeeDetail');
			* return;
			* }
			* vc.toast(_json.msg, 10000);
			* },
			* function(errInfo, error) {
			* console.log('请求失败处理');
			* vc.toast(errInfo, 10000);
			* });
			*/
			@Service("importRoomHistoryFeeDetailDataCleaning")
			public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


			@Autowired
			private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

			@Autowired
			private IUserInnerServiceSMO userInnerServiceSMOImpl;


			@Override
			public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

			generatorBatch(paramIn);
			List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
			//获取楼信息
			getRooms(workbook, rooms);

			for (ImportRoomFee importRoomFee : rooms) {
			importRoomFee.setBatchId(paramIn.getString("batchId"));
			importRoomFee.setUserId(paramIn.getString("userId"));
			importRoomFee.setStoreId(paramIn.getString("storeId"));
			importRoomFee.setObjType(paramIn.getString("objType"));
			}
			return rooms;
			}

			/**
			* 获取房屋信息
			*
			* @param workbook
			* @param rooms
			*/
			private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) {
			Sheet sheet = null;
			sheet = ImportExcelUtils.getSheet(workbook, "房屋缴费历史");
			List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
			ImportRoomFee importRoomFee = null;
			for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
			Object[] os = oList.get(osIndex);
			if (osIndex == 0) { // 第一行是头部信息直接跳过
			continue;
			}
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}

			//费用名称没有填写，默认跳过
			if (StringUtil.isNullOrNone(os[4])) {
			continue;
			}
			Assert.hasValue(os[0], (osIndex + 1) + "行楼栋编号不能为空");
			Assert.hasValue(os[1], (osIndex + 1) + "行单元编号不能为空");
			Assert.hasValue(os[2], (osIndex + 1) + "行房屋编号不能为空");
			Assert.hasValue(os[3], (osIndex + 1) + "行收费项目不能为空");
			Assert.hasValue(os[4], (osIndex + 1) + "行缴费周期不能为空");
			Assert.hasValue(os[5], (osIndex + 1) + "行开始时间不能为空");
			Assert.hasValue(os[6], (osIndex + 1) + "行结束时间不能为空");
			Assert.hasValue(os[7], (osIndex + 1) + "行缴费时间不能为空");
			Assert.hasValue(os[8], (osIndex + 1) + "行缴费金额不能为空");

			//

			String startTime = excelDoubleToDate(os[5].toString());
			String endTime = excelDoubleToDate(os[6].toString());
			String createTime = excelDoubleToDate(os[7].toString());
			Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");


			importRoomFee = new ImportRoomFee();
			importRoomFee.setFloorNum(os[0].toString());
			importRoomFee.setUnitNum(os[1].toString());
			importRoomFee.setRoomNum(os[2].toString());
			importRoomFee.setFeeName(os[3].toString());
			importRoomFee.setCycle(os[4].toString());
			importRoomFee.setStartTime(startTime);
			importRoomFee.setEndTime(endTime);
			importRoomFee.setCreateTime(createTime);
			importRoomFee.setAmount(os[8].toString());
			importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
			rooms.add(importRoomFee);
			}
			}

			/**
			* 生成批次号
			*
			* @param reqJson
			*/
			private void generatorBatch(JSONObject reqJson) {
			PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
			payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
			payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
			payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
			UserDto userDto = new UserDto();
			userDto.setUserId(reqJson.getString("userId"));
			List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

			Assert.listOnlyOne(userDtos, "用户不存在");
			payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
			payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
			payFeeBatchPo.setMsg("正常");
			int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

			if (flag < 1) {
			throw new IllegalArgumentException("生成批次失败");
			}

			reqJson.put("batchId", payFeeBatchPo.getBatchId());
			}

			}

File was renamed from service-api/src/main/java/importData/adapt/ImportRoomOwnerDataCleaningAdapt.java
			@@ -1,6 +1,5 @@
			package importData.adapt;
			package com.java110.api.importData.adapt;

			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.java110.dto.importData.ImportOwnerRoomDto;
			import com.java110.dto.owner.OwnerDto;
			@@ -9,8 +8,8 @@
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.ImportExcelUtils;
			import com.java110.utils.util.StringUtil;
			import importData.DefaultImportDataAdapt;
			import importData.IImportDataCleaningAdapt;
			import com.java110.api.importData.DefaultImportDataAdapt;
			import com.java110.api.importData.IImportDataCleaningAdapt;
			import org.apache.poi.ss.usermodel.Sheet;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.springframework.stereotype.Service;

File was renamed from service-api/src/main/java/importData/package-info.java
			@@ -1,4 +1,4 @@
			/**
			* 数据导入对象分装校验处理类
			*/
			package importData;
			package com.java110.api.importData;

			@@ -15,7 +15,7 @@
			import com.java110.utils.factory.ApplicationContextFactory;
			import com.java110.utils.util.*;
			import com.java110.vo.ResultVo;
			import importData.IImportDataCleaningAdapt;
			import com.java110.api.importData.IImportDataCleaningAdapt;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.slf4j.Logger;
			import com.java110.core.log.LoggerFactory;
			@@ -26,9 +26,7 @@
			import org.springframework.web.client.RestTemplate;
			import org.springframework.web.multipart.MultipartFile;

			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			/**

New file
			@@ -0,0 +1,232 @@
			package com.java110.job.importData.adapt;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.fee.FeeAttrDto;
			import com.java110.dto.fee.FeeConfigDto;
			import com.java110.dto.fee.FeeDto;
			import com.java110.dto.importData.ImportRoomFee;
			import com.java110.dto.log.AssetImportLogDetailDto;
			import com.java110.dto.owner.OwnerRoomRelDto;
			import com.java110.intf.community.IRoomInnerServiceSMO;
			import com.java110.intf.fee.*;
			import com.java110.intf.user.IOwnerCarInnerServiceSMO;
			import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
			import com.java110.job.importData.DefaultImportData;
			import com.java110.job.importData.IImportDataAdapt;
			import com.java110.po.fee.FeeAttrPo;
			import com.java110.po.fee.PayFeeDetailPo;
			import com.java110.po.fee.PayFeePo;
			import com.java110.utils.constant.StatusConstant;
			import com.java110.utils.util.BeanConvertUtil;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.StringUtil;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.Calendar;
			import java.util.List;

			/**
			* 车辆缴费信息导入适配器
			* 前端请求时必须传入
			* param.append('importAdapt', "importRoomOwner");
			*/
			@Service("importCarHistoryFeeDetailQueueData")
			public class ImportCarHistoryFeeDetailQueueDataAdapt extends DefaultImportData implements IImportDataAdapt {


			@Autowired
			private IImportFeeDetailInnerServiceSMO importFeeDetailInnerServiceSMOImpl;

			@Autowired
			private IRoomInnerServiceSMO roomInnerServiceSMOImpl;

			@Autowired
			private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;

			@Autowired
			private IFeeInnerServiceSMO feeInnerServiceSMOImpl;

			@Autowired
			private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;

			@Autowired
			private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

			@Autowired
			private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;

			@Autowired
			private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;


			@Override
			public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
			importDatas(assetImportLogDetailDtos);
			}

			private void importDatas(List<AssetImportLogDetailDto> infos) {

			List<ImportRoomFee> importRoomFees = new ArrayList<>();
			for (AssetImportLogDetailDto assetImportLogDetailDto : infos) {
			JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
			ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
			importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
			importRoomFees.add(importRoomFee);
			}

			if (importRoomFees.size() < 1) {
			return;
			}

			importCarFeeDetails(importRoomFees.get(0).getStoreId(), importRoomFees.get(0).getUserId(), importRoomFees, importRoomFees.get(0).getBatchId());
			}

			private void importCarFeeDetails(String storeId, String userId, List<ImportRoomFee> importCarFees, String batchId) {

			importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
			for (ImportRoomFee importCarFee : importCarFees) {
			try {
			if (StringUtil.isEmpty(importCarFee.getCarId())) {
			continue;
			}
			importCarFeeDetail(importCarFee, storeId, userId, batchId);
			updateImportLogDetailState(importCarFee.getDetailId());
			} catch (Exception e) {
			e.printStackTrace();
			updateImportLogDetailState(importCarFee.getDetailId(), e);
			}
			}
			}

			/**
			* 导入费用历史
			*
			* @param importRoomFee
			*/
			private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {

			FeeConfigDto feeConfigDto = new FeeConfigDto();
			feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
			feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
			List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);

			if (feeConfigDtos == null \|\| feeConfigDtos.size() < 1) {
			return;
			}

			FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);

			FeeDto feeDto = new FeeDto();
			feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
			feeDto.setCommunityId(importRoomFee.getCommunityId());
			feeDto.setPayerObjId(importRoomFee.getCarId());
			feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
			List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);

			List<PayFeePo> payFeePos = null;
			if (feeDtos == null \|\| feeDtos.size() < 1) {
			PayFeePo payFeePo = new PayFeePo();
			payFeePo.setCommunityId(importRoomFee.getCommunityId());
			payFeePo.setConfigId(feeDto.getConfigId());
			payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
			payFeePo.setStartTime(importRoomFee.getStartTime());
			payFeePo.setEndTime(importRoomFee.getEndTime());
			payFeePo.setAmount(importRoomFee.getAmount());
			payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
			payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
			payFeePo.setIncomeObjId(storeId);
			payFeePo.setBatchId(batchId);
			if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
			payFeePo.setState(FeeDto.STATE_FINISH);
			} else {
			payFeePo.setState(FeeDto.STATE_DOING);
			}
			payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
			payFeePo.setPayerObjId(importRoomFee.getCarId());
			payFeePo.setUserId(userId);
			payFeePo.setCreateTime(importRoomFee.getCreateTime());
			payFeePos = new ArrayList<>();
			payFeePos.add(payFeePo);
			feeInnerServiceSMOImpl.saveFee(payFeePos);
			List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
			//查询业主信息
			if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
			importRoomFee.getEndTime()));
			}
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, importRoomFee.getOwnerId()));
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, importRoomFee.getOwnerLink()));
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, importRoomFee.getOwnerName()));
			feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
			feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
			}

			for (FeeDto tmpFeeDto : feeDtos) {
			doImportFeeDetail(tmpFeeDto, importRoomFee);
			}

			}

			public FeeAttrPo addFeeAttr(PayFeePo payFeePo, String specCd, String value) {
			FeeAttrPo feeAttrPo = new FeeAttrPo();
			feeAttrPo.setCommunityId(payFeePo.getCommunityId());
			feeAttrPo.setSpecCd(specCd);
			feeAttrPo.setValue(value);
			feeAttrPo.setFeeId(payFeePo.getFeeId());
			feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
			return feeAttrPo;
			}
			private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) {


			PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
			payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
			payFeeDetailPo.setReceivedAmount(importRoomFee.getAmount());
			payFeeDetailPo.setReceivableAmount(importRoomFee.getAmount());
			payFeeDetailPo.setCycles(importRoomFee.getCycle());
			payFeeDetailPo.setPrimeRate("1.0");
			payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
			payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
			String endTime = importRoomFee.getEndTime();
			//todo 周期性费用时时间自动加一天，因为物业统计的Excel 一般少一天
			if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(DateUtil.getDateFromStringB(endTime));
			calendar.add(Calendar.DAY_OF_MONTH, 1);
			endTime = DateUtil.getFormatTimeStringB(calendar.getTime());
			importRoomFee.setEndTime(endTime);
			}
			payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
			payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
			payFeeDetailPo.setRemark(importRoomFee.getRemark());
			payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
			payFeeDetailPo.setState("1400");
			payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
			int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

			if (saved < 1) {
			return;
			}

			if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime()) {
			return;
			}

			//如果结束时间小于缴费结束时间则延期
			PayFeePo payFeePo = new PayFeePo();
			payFeePo.setCommunityId(importRoomFee.getCommunityId());
			payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
			payFeePo.setFeeId(tmpFeeDto.getFeeId());
			payFeePo.setEndTime(importRoomFee.getEndTime());
			if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
			payFeePo.setState(FeeDto.STATE_FINISH);
			}

			feeInnerServiceSMOImpl.updateFee(payFeePo);
			}


			}

New file
			@@ -0,0 +1,245 @@
			package com.java110.job.importData.adapt;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.fee.FeeAttrDto;
			import com.java110.dto.fee.FeeConfigDto;
			import com.java110.dto.fee.FeeDto;
			import com.java110.dto.importData.ImportRoomFee;
			import com.java110.dto.log.AssetImportLogDetailDto;
			import com.java110.dto.owner.OwnerRoomRelDto;
			import com.java110.intf.community.IRoomInnerServiceSMO;
			import com.java110.intf.fee.*;
			import com.java110.intf.user.IOwnerCarInnerServiceSMO;
			import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
			import com.java110.job.importData.DefaultImportData;
			import com.java110.job.importData.IImportDataAdapt;
			import com.java110.po.fee.FeeAttrPo;
			import com.java110.po.fee.PayFeeDetailPo;
			import com.java110.po.fee.PayFeePo;
			import com.java110.utils.constant.StatusConstant;
			import com.java110.utils.util.BeanConvertUtil;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.StringUtil;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.Calendar;
			import java.util.List;

			/**
			* 房屋缴费信息导入适配器
			* 前端请求时必须传入
			* param.append('importAdapt', "importRoomOwner");
			*/
			@Service("importRoomHistoryFeeDetailQueueData")
			public class ImportRoomHistoryFeeDetailQueueDataAdapt extends DefaultImportData implements IImportDataAdapt {


			@Autowired
			private IImportFeeDetailInnerServiceSMO importFeeDetailInnerServiceSMOImpl;

			@Autowired
			private IRoomInnerServiceSMO roomInnerServiceSMOImpl;

			@Autowired
			private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;

			@Autowired
			private IFeeInnerServiceSMO feeInnerServiceSMOImpl;

			@Autowired
			private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;

			@Autowired
			private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

			@Autowired
			private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;

			@Autowired
			private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;


			@Override
			public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
			importDatas(assetImportLogDetailDtos);
			}

			private void importDatas(List<AssetImportLogDetailDto> infos) {

			List<ImportRoomFee> importRoomFees = new ArrayList<>();
			for (AssetImportLogDetailDto assetImportLogDetailDto : infos) {
			JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
			ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
			importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
			importRoomFees.add(importRoomFee);
			}

			if (importRoomFees.size() < 1) {
			return;
			}

			importFeeDetails(importRoomFees.get(0).getStoreId(), importRoomFees.get(0).getUserId(), importRoomFees, importRoomFees.get(0).getBatchId());


			}

			private void importFeeDetails(String storeId, String userId, List<ImportRoomFee> importRoomFees, String batchId) {

			importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees);
			for (ImportRoomFee importRoomFee : importRoomFees) {
			try {
			if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
			continue;
			}
			importFeeDetail(importRoomFee, storeId, userId, batchId);
			updateImportLogDetailState(importRoomFee.getDetailId());
			} catch (Exception e) {
			e.printStackTrace();
			updateImportLogDetailState(importRoomFee.getDetailId(), e);
			}
			}
			}

			/**
			* 导入费用历史
			*
			* @param importRoomFee
			*/
			private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {

			FeeConfigDto feeConfigDto = new FeeConfigDto();
			feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
			feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
			List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);

			if (feeConfigDtos == null \|\| feeConfigDtos.size() < 1) {
			return;
			}

			FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);

			FeeDto feeDto = new FeeDto();
			feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
			feeDto.setCommunityId(importRoomFee.getCommunityId());
			feeDto.setPayerObjId(importRoomFee.getRoomId());
			feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
			List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);

			List<PayFeePo> payFeePos = null;
			if (feeDtos == null \|\| feeDtos.size() < 1) {
			List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
			PayFeePo payFeePo = new PayFeePo();
			payFeePo.setCommunityId(importRoomFee.getCommunityId());
			payFeePo.setConfigId(feeDto.getConfigId());
			payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
			payFeePo.setStartTime(importRoomFee.getStartTime());
			payFeePo.setEndTime(importRoomFee.getEndTime());
			payFeePo.setAmount(importRoomFee.getAmount());
			payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
			payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
			payFeePo.setIncomeObjId(storeId);
			payFeePo.setBatchId(batchId);
			if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
			payFeePo.setState(FeeDto.STATE_FINISH);
			} else {
			payFeePo.setState(FeeDto.STATE_DOING);
			}
			payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
			payFeePo.setPayerObjId(importRoomFee.getRoomId());
			payFeePo.setUserId(userId);
			payFeePo.setCreateTime(importRoomFee.getCreateTime());
			payFeePos = new ArrayList<>();
			payFeePos.add(payFeePo);
			feeInnerServiceSMOImpl.saveFee(payFeePos);

			//查询业主信息
			OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
			ownerRoomRelDto.setRoomId(importRoomFee.getRoomId());
			List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
			if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
			if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
			importRoomFee.getEndTime()));
			}
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, ownerRoomRelDtos.get(0).getOwnerId()));
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, ownerRoomRelDtos.get(0).getLink()));
			feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, ownerRoomRelDtos.get(0).getOwnerName()));
			feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
			}


			feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
			}

			for (FeeDto tmpFeeDto : feeDtos) {
			doImportFeeDetail(tmpFeeDto, importRoomFee);
			}

			}

			public FeeAttrPo addFeeAttr(PayFeePo payFeePo, String specCd, String value) {
			FeeAttrPo feeAttrPo = new FeeAttrPo();
			feeAttrPo.setCommunityId(payFeePo.getCommunityId());
			feeAttrPo.setSpecCd(specCd);
			feeAttrPo.setValue(value);
			feeAttrPo.setFeeId(payFeePo.getFeeId());
			feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
			return feeAttrPo;

			}


			private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) {


			PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
			payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
			payFeeDetailPo.setReceivedAmount(importRoomFee.getAmount());
			payFeeDetailPo.setReceivableAmount(importRoomFee.getAmount());
			payFeeDetailPo.setCycles(importRoomFee.getCycle());
			payFeeDetailPo.setPrimeRate("1.0");
			payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
			payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
			String endTime = importRoomFee.getEndTime();
			//todo 周期性费用时时间自动加一天，因为物业统计的Excel 一般少一天
			if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(DateUtil.getDateFromStringB(endTime));
			calendar.add(Calendar.DAY_OF_MONTH, 1);
			endTime = DateUtil.getFormatTimeStringB(calendar.getTime());
			importRoomFee.setEndTime(endTime);
			}
			payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
			payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
			payFeeDetailPo.setRemark(importRoomFee.getRemark());
			payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
			payFeeDetailPo.setState("1400");
			payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
			int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

			if (saved < 1) {
			return;
			}

			if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime()) {
			return;
			}

			//如果结束时间小于缴费结束时间则延期
			PayFeePo payFeePo = new PayFeePo();
			payFeePo.setCommunityId(importRoomFee.getCommunityId());
			payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
			payFeePo.setFeeId(tmpFeeDto.getFeeId());
			payFeePo.setEndTime(importRoomFee.getEndTime());
			if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
			payFeePo.setState(FeeDto.STATE_FINISH);
			}

			feeInnerServiceSMOImpl.updateFee(payFeePo);
			}


			}

New file
			@@ -0,0 +1,168 @@
			package com.java110.boot.importData.adapt;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.boot.importData.DefaultImportDataAdapt;
			import com.java110.boot.importData.IImportDataCleaningAdapt;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.fee.FeeDto;
			import com.java110.dto.importData.ImportRoomFee;
			import com.java110.dto.payFee.PayFeeBatchDto;
			import com.java110.dto.system.ComponentValidateResult;
			import com.java110.dto.user.UserDto;
			import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
			import com.java110.intf.user.IUserInnerServiceSMO;
			import com.java110.po.payFee.PayFeeBatchPo;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.ImportExcelUtils;
			import com.java110.utils.util.StringUtil;
			import org.apache.poi.ss.usermodel.Sheet;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;

			/**
			* 历史缴费数据导入
			* <p>
			* 导入请求参数中必须包含
			* param.append('importAdapt', "importCarHistoryFeeDetail");
			* <p>
			* vc.http.upload(
			* 'assetImport',
			* 'importData',
			* param, {
			* emulateJSON: true,
			* //添加请求头
			* headers: {
			* "Content-Type": "multipart/form-data"
			* }
			* },
			* function(json, res) {
			* //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
			* let _json = JSON.parse(json);
			* if (_json.code == 0) {
			* //关闭model
			* // vc.toast(_json.data);
			* $('#importOwnerRoomModel').modal('hide');
			* $that.clearAddFeeConfigInfo();
			* <p>
			* vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importCarHistoryFeeDetail');
			* return;
			* }
			* vc.toast(_json.msg, 10000);
			* },
			* function(errInfo, error) {
			* console.log('请求失败处理');
			* vc.toast(errInfo, 10000);
			* });
			*/
			@Service("importCarHistoryFeeDetailDataCleaning")
			public class ImportCarHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


			@Autowired
			private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

			@Autowired
			private IUserInnerServiceSMO userInnerServiceSMOImpl;


			@Override
			public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

			generatorBatch(paramIn);
			List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();

			//获取车辆信息
			getCars(workbook, rooms);


			for (ImportRoomFee importRoomFee : rooms) {
			importRoomFee.setBatchId(paramIn.getString("batchId"));
			importRoomFee.setUserId(paramIn.getString("userId"));
			importRoomFee.setStoreId(paramIn.getString("storeId"));
			importRoomFee.setObjType(paramIn.getString("objType"));
			}
			return rooms;
			}

			private void getCars(Workbook workbook, List<ImportRoomFee> rooms) {
			Sheet sheet = null;
			sheet = ImportExcelUtils.getSheet(workbook, "车辆缴费历史");
			List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
			ImportRoomFee importRoomFee = null;
			for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
			Object[] os = oList.get(osIndex);
			if (osIndex == 0) { // 第一行是头部信息直接跳过
			continue;
			}
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}

			//费用名称没有填写，默认跳过
			if (StringUtil.isNullOrNone(os[4])) {
			continue;
			}
			Assert.hasValue(os[0], (osIndex + 1) + "行车牌号不能为空");
			Assert.hasValue(os[1], (osIndex + 1) + "行收费项目不能为空");
			Assert.hasValue(os[2], (osIndex + 1) + "行缴费周期不能为空");
			Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空");
			Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空");
			Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空");
			Assert.hasValue(os[6], (osIndex + 1) + "行缴费金额不能为空");

			//

			String startTime = excelDoubleToDate(os[3].toString());
			String endTime = excelDoubleToDate(os[4].toString());
			String createTime = excelDoubleToDate(os[5].toString());
			Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");


			importRoomFee = new ImportRoomFee();
			importRoomFee.setCarNum(os[0].toString());
			importRoomFee.setFeeName(os[1].toString());
			importRoomFee.setCycle(os[2].toString());
			importRoomFee.setStartTime(startTime);
			importRoomFee.setEndTime(endTime);
			importRoomFee.setCreateTime(createTime);
			importRoomFee.setAmount(os[6].toString());
			importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
			rooms.add(importRoomFee);
			}
			}

			/**
			* 生成批次号
			*
			* @param reqJson
			*/
			private void generatorBatch(JSONObject reqJson) {
			PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
			payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
			payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
			payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
			UserDto userDto = new UserDto();
			userDto.setUserId(reqJson.getString("userId"));
			List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

			Assert.listOnlyOne(userDtos, "用户不存在");
			payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
			payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
			payFeeBatchPo.setMsg("正常");
			int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

			if (flag < 1) {
			throw new IllegalArgumentException("生成批次失败");
			}

			reqJson.put("batchId", payFeeBatchPo.getBatchId());
			}

			}

New file
			@@ -0,0 +1,176 @@
			package com.java110.boot.importData.adapt;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.boot.importData.DefaultImportDataAdapt;
			import com.java110.boot.importData.IImportDataCleaningAdapt;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.fee.FeeDto;
			import com.java110.dto.importData.ImportRoomFee;
			import com.java110.dto.payFee.PayFeeBatchDto;
			import com.java110.dto.system.ComponentValidateResult;
			import com.java110.dto.user.UserDto;
			import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
			import com.java110.intf.user.IUserInnerServiceSMO;
			import com.java110.po.payFee.PayFeeBatchPo;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.ImportExcelUtils;
			import com.java110.utils.util.StringUtil;
			import org.apache.poi.ss.usermodel.Sheet;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;

			/**
			* 历史缴费数据导入
			* <p>
			* 导入请求参数中必须包含
			* param.append('importAdapt', "importRoomHistoryFeeDetail");
			* <p>
			* vc.http.upload(
			* 'assetImport',
			* 'importData',
			* param, {
			* emulateJSON: true,
			* //添加请求头
			* headers: {
			* "Content-Type": "multipart/form-data"
			* }
			* },
			* function(json, res) {
			* //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
			* let _json = JSON.parse(json);
			* if (_json.code == 0) {
			* //关闭model
			* // vc.toast(_json.data);
			* $('#importOwnerRoomModel').modal('hide');
			* $that.clearAddFeeConfigInfo();
			* <p>
			* vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importRoomHistoryFeeDetail');
			* return;
			* }
			* vc.toast(_json.msg, 10000);
			* },
			* function(errInfo, error) {
			* console.log('请求失败处理');
			* vc.toast(errInfo, 10000);
			* });
			*/
			@Service("importRoomHistoryFeeDetailDataCleaning")
			public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {


			@Autowired
			private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

			@Autowired
			private IUserInnerServiceSMO userInnerServiceSMOImpl;


			@Override
			public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {

			generatorBatch(paramIn);
			List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
			//获取楼信息
			getRooms(workbook, rooms);

			for (ImportRoomFee importRoomFee : rooms) {
			importRoomFee.setBatchId(paramIn.getString("batchId"));
			importRoomFee.setUserId(paramIn.getString("userId"));
			importRoomFee.setStoreId(paramIn.getString("storeId"));
			importRoomFee.setObjType(paramIn.getString("objType"));
			}
			return rooms;
			}

			/**
			* 获取房屋信息
			*
			* @param workbook
			* @param rooms
			*/
			private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) {
			Sheet sheet = null;
			sheet = ImportExcelUtils.getSheet(workbook, "房屋缴费历史");
			List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
			ImportRoomFee importRoomFee = null;
			for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
			Object[] os = oList.get(osIndex);
			if (osIndex == 0) { // 第一行是头部信息直接跳过
			continue;
			}
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}

			//费用名称没有填写，默认跳过
			if (StringUtil.isNullOrNone(os[4])) {
			continue;
			}
			Assert.hasValue(os[0], (osIndex + 1) + "行楼栋编号不能为空");
			Assert.hasValue(os[1], (osIndex + 1) + "行单元编号不能为空");
			Assert.hasValue(os[2], (osIndex + 1) + "行房屋编号不能为空");
			Assert.hasValue(os[3], (osIndex + 1) + "行收费项目不能为空");
			Assert.hasValue(os[4], (osIndex + 1) + "行缴费周期不能为空");
			Assert.hasValue(os[5], (osIndex + 1) + "行开始时间不能为空");
			Assert.hasValue(os[6], (osIndex + 1) + "行结束时间不能为空");
			Assert.hasValue(os[7], (osIndex + 1) + "行缴费时间不能为空");
			Assert.hasValue(os[8], (osIndex + 1) + "行缴费金额不能为空");

			//

			String startTime = excelDoubleToDate(os[5].toString());
			String endTime = excelDoubleToDate(os[6].toString());
			String createTime = excelDoubleToDate(os[7].toString());
			Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");


			importRoomFee = new ImportRoomFee();
			importRoomFee.setFloorNum(os[0].toString());
			importRoomFee.setUnitNum(os[1].toString());
			importRoomFee.setRoomNum(os[2].toString());
			importRoomFee.setFeeName(os[3].toString());
			importRoomFee.setCycle(os[4].toString());
			importRoomFee.setStartTime(startTime);
			importRoomFee.setEndTime(endTime);
			importRoomFee.setCreateTime(createTime);
			importRoomFee.setAmount(os[8].toString());
			importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
			rooms.add(importRoomFee);
			}
			}

			/**
			* 生成批次号
			*
			* @param reqJson
			*/
			private void generatorBatch(JSONObject reqJson) {
			PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
			payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
			payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
			payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
			UserDto userDto = new UserDto();
			userDto.setUserId(reqJson.getString("userId"));
			List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

			Assert.listOnlyOne(userDtos, "用户不存在");
			payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
			payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
			payFeeBatchPo.setMsg("正常");
			int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);

			if (flag < 1) {
			throw new IllegalArgumentException("生成批次失败");
			}

			reqJson.put("batchId", payFeeBatchPo.getBatchId());
			}

			}

			@@ -72,6 +72,7 @@
			@Override
			public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
			JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
			paramIn.put("userId", pd.getUserId());
			Assert.hasKeyAndValue(paramIn, "importAdapt", "未包含模板");
			String importAdapt = paramIn.getString("importAdapt") + "DataCleaning";

			@@ -82,6 +83,7 @@
			}
			try {
			ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
			paramIn.put("storeId", result.getStoreId());

			Workbook workbook = null; //工作簿
			//工作表