费用导入逻辑变更2025/07/25

chengf

2025-07-25 ee4d1b668d1666cdec803b037ce8181763154bb6

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

@@ -1,6 +1,7 @@
package com.java110.api.smo.assetImport.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.assetImport.IAssetImportSMO;
import com.java110.core.context.IPageData;
@@ -15,7 +16,6 @@
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import com.java110.api.importData.IImportDataCleaningAdapt;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
@@ -45,7 +45,7 @@
    /**
     * 导入最大行数
     */
    public static final int MAX_LINE = 2000;
    public static final int MAX_LINE = 5000;

    /**
     * 导入最大行数
@@ -71,6 +71,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";

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

            Workbook workbook = null;  //工作簿
            //工作表
@@ -89,6 +91,7 @@

            // todo 适配器封装数据
            List datas = importDataCleaningAdapt.analysisExcel(workbook, paramIn, result);


            if (datas == null || datas.size() > MAX_LINE) {
                throw new IllegalArgumentException("数据为空，或者数据行数大于" + MAX_LINE);
@@ -108,8 +111,8 @@
     * @param datas 数据
     */
    private ResponseEntity<String> saveLogAndImportData(IPageData pd,
                                                 List datas,
                                                 ComponentValidateResult result, String logType) {
                                                        List datas,
                                                        ComponentValidateResult result, String logType) {
        ResponseEntity<String> responseEntity = null;

        String logId = GenerateCodeFactory.getGeneratorId("10");
@@ -160,7 +163,6 @@
        }
        return ResultVo.error("导入失败");
    }



}