完成 费用自定义创建功能

java110-bean/src/main/java/com/java110/entity/assetImport/ImportCustomCreateFeeDto.java

@@ -0,0 +1,146 @@
+package com.java110.entity.assetImport;
+
+import java.io.Serializable;
+
+public class ImportCustomCreateFeeDto implements Serializable {
+
+    public static final String TYPE_ROOM = "1001";
+    public static final String TYPE_CAR = "2002";
+
+    private String payObjId;
+    private String floorNum;
+    private String unitNum;
+    private String roomNum;
+    private String carNum;
+
+    private String objName;
+    private String objType;
+    private String configId;
+    private String configName;
+    private String createTime;
+    private String startTime;
+    private String communityId;
+    private String ownerId;
+    private String ownerName;
+    private String ownerLink;
+
+    public String getPayObjId() {
+        return payObjId;
+    }
+
+    public void setPayObjId(String payObjId) {
+        this.payObjId = payObjId;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
+
+    public String getObjType() {
+        return objType;
+    }
+
+    public void setObjType(String objType) {
+        this.objType = objType;
+    }
+
+    public String getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(String configId) {
+        this.configId = configId;
+    }
+
+    public String getConfigName() {
+        return configName;
+    }
+
+    public void setConfigName(String configName) {
+        this.configName = configName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getOwnerLink() {
+        return ownerLink;
+    }
+
+    public void setOwnerLink(String ownerLink) {
+        this.ownerLink = ownerLink;
+    }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+}

java110-interface/src/main/java/com/java110/intf/community/IRoomInnerServiceSMO.java

@@ -2,6 +2,7 @@ package com.java110.intf.community;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.RoomDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
 import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.po.room.RoomPo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -104,4 +105,12 @@ public interface IRoomInnerServiceSMO {
      */
     @RequestMapping(value = "/freshRoomIds", method = RequestMethod.POST)
     List<ImportRoomFee> freshRoomIds(@RequestBody List<ImportRoomFee> importRoomFees);
+
+    /**
+     * <p>根据业主查询房屋信息</p>
+     *
+     * @param importCustomCreateFeeDtos 数据对象分享
+     */
+    @RequestMapping(value = "/freshRoomIdsByImportCustomCreateFee", method = RequestMethod.POST)
+    List<ImportCustomCreateFeeDto> freshRoomIdsByImportCustomCreateFee(@RequestBody List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos);
 }

java110-interface/src/main/java/com/java110/intf/user/IOwnerCarInnerServiceSMO.java

@@ -2,6 +2,7 @@ package com.java110.intf.user;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.owner.OwnerCarDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
 import com.java110.entity.assetImport.ImportRoomFee;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -44,7 +45,8 @@ public interface IOwnerCarInnerServiceSMO {
     @RequestMapping(value = "/freshCarIds", method = RequestMethod.POST)
     List<ImportRoomFee> freshCarIds(@RequestBody List<ImportRoomFee> tmpImportCarFees);
 
-
+    @RequestMapping(value = "/freshCarIdsByImportCustomCreateFee", method = RequestMethod.POST)
+    List<ImportCustomCreateFeeDto> freshCarIdsByImportCustomCreateFee(@RequestBody List<ImportCustomCreateFeeDto> tmpImportCarFees);
     /**
      * <p>查询业主车位数</p>
      *

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

@@ -1,6 +1,7 @@
 package com.java110.api.components.assetImport;
 
 import com.java110.api.smo.assetExport.IExportRoomSMO;
+import com.java110.api.smo.assetImport.IImportCustomCreateFeeSMO;
 import com.java110.api.smo.assetImport.IImportRoomFeeSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
@@ -22,7 +23,7 @@ public class ImportAndExportFeeComponent {
 
 
     @Autowired
-    private IImportRoomFeeSMO importRoomFeeSMOImpl;
+    private IImportCustomCreateFeeSMO importCustomCreateFeeSMOImpl;
 
     @Autowired
     private IExportRoomSMO exportRoomSMOImpl;
@@ -35,7 +36,7 @@ public class ImportAndExportFeeComponent {
      */
     public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception {
 
-        return importRoomFeeSMOImpl.importExcelData(pd, uploadFile);
+        return importCustomCreateFeeSMOImpl.importCustomExcelData(pd, uploadFile);
     }
 
 

service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportRoomSMOImpl.java

@@ -9,11 +9,13 @@ import com.java110.core.log.LoggerFactory;
 import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.parking.ParkingSpaceDto;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.community.IRoomV1InnerServiceSMO;
 import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
 import org.apache.poi.ss.usermodel.*;
@@ -31,6 +33,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -49,6 +52,8 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
     public static final String TYPE_PARKSPACE = "2002";
     public static final String TYPE_CONTRACT = "3003"; //合同
 
+    public static final int DEFAULT_ROW = 500;
+
     @Autowired
     private RestTemplate restTemplate;
 
@@ -61,6 +66,9 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
     @Autowired
     private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
     @Override
     public ResponseEntity<Object> exportExcelData(IPageData pd) throws Exception {
 
@@ -186,6 +194,12 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) {
             return;
         }
+
+        //查询车牌号
+        List<OwnerCarDto> ownerCarDtos = getOwnerCars(parkingSpaceDtos);
+        if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
+            return;
+        }
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setConfigIds(paramIn.getString("configIds").split(","));
         feeConfigDto.setCommunityId(paramIn.getString("communityId"));
@@ -196,10 +210,10 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         }
 
         int roomIndex = 2;
-        for (ParkingSpaceDto tmpParkingSpaceDto : parkingSpaceDtos) {
+        for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
             for (FeeConfigDto tmpFeeConfigDto : feeConfigDtos) {
                 row = sheet.createRow(roomIndex);
-                row.createCell(0).setCellValue(tmpParkingSpaceDto.getAreaNum() + "-" + tmpParkingSpaceDto.getNum());
+                row.createCell(0).setCellValue(tmpOwnerCarDto.getCarNum());
                 row.createCell(1).setCellValue("2002");
                 row.createCell(2).setCellValue(tmpFeeConfigDto.getConfigId());
                 row.createCell(3).setCellValue(tmpFeeConfigDto.getFeeName());
@@ -213,6 +227,31 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         sheet.addMergedRegion(region);
     }
 
+    private List<OwnerCarDto> getOwnerCars(List<ParkingSpaceDto> parkingSpaceDtos) {
+        List<String> psIds = new ArrayList<>();
+        List<OwnerCarDto> tmpOwnerCarDtos = new ArrayList<>();
+        for (int roomIndex = 0; roomIndex < parkingSpaceDtos.size(); roomIndex++) {
+            psIds.add(parkingSpaceDtos.get(roomIndex).getPsId());
+            if (roomIndex % DEFAULT_ROW == 0 && roomIndex != 0) {
+                // 处理房屋费用
+                OwnerCarDto ownerCarDto = new OwnerCarDto();
+                ownerCarDto.setPsIds(psIds.toArray(new String[psIds.size()]));
+                ownerCarDto.setCommunityId(parkingSpaceDtos.get(roomIndex).getCommunityId());
+                tmpOwnerCarDtos.addAll(ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto));
+
+                psIds = new ArrayList<>();
+            }
+        }
+        if (psIds != null && psIds.size() > 0) {
+            OwnerCarDto ownerCarDto = new OwnerCarDto();
+            ownerCarDto.setPsIds(psIds.toArray(new String[psIds.size()]));
+            ownerCarDto.setCommunityId(parkingSpaceDtos.get(0).getCommunityId());
+            tmpOwnerCarDtos.addAll(ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto));
+        }
+        return tmpOwnerCarDtos;
+
+    }
+
     private void getRoomAndConfigs(JSONObject paramIn, Workbook workbook) {
         Sheet sheet = workbook.createSheet("创建费用");
         Row row = sheet.createRow(0);

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

@@ -0,0 +1,25 @@
+package com.java110.api.smo.assetImport;
+
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @ClassName IAssetImportSMO
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2019/9/23 23:13
+ * @Version 1.0
+ * add by wuxw 2019/9/23
+ **/
+public interface IImportCustomCreateFeeSMO {
+
+
+    /**
+     * 导入excel数据
+     * @param pd 前台数据封装
+     * @param uploadFile excel 文件
+     * @return ResponseEntity
+     */
+    public ResponseEntity<String> importCustomExcelData(IPageData pd,  MultipartFile uploadFile) throws Exception;
+}

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

@@ -25,4 +25,5 @@ public interface IImportRoomFeeSMO {
     public ResponseEntity<String> importFile(MultipartFile uploadFile) throws Exception;
 
     ResponseEntity<String> importTempData(IPageData pd);
+
 }

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

@@ -0,0 +1,436 @@
+package com.java110.api.smo.assetImport.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
+import com.java110.api.smo.assetImport.IImportCustomCreateFeeSMO;
+import com.java110.config.properties.code.Java110Properties;
+import com.java110.core.client.FtpUploadTemplate;
+import com.java110.core.client.OssUploadTemplate;
+import com.java110.core.context.IPageData;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.fee.FeeAttrDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.fee.FeeAttrPo;
+import com.java110.po.fee.PayFeePo;
+import com.java110.po.importFeeDetail.ImportFeeDetailPo;
+import com.java110.po.payFeeBatch.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 com.java110.vo.ResultVo;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+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;
+
+/**
+ * @ClassName AssetImportSmoImpl
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2019/9/23 23:14
+ * @Version 1.0
+ * add by wuxw 2019/9/23
+ **/
+@Service("importCustomCreateFeeSMOImpl")
+public class ImportCustomCreateFeeSMOImpl extends DefaultAbstractComponentSMO implements IImportCustomCreateFeeSMO {
+    private final static Logger logger = LoggerFactory.getLogger(ImportCustomCreateFeeSMOImpl.class);
+
+    private static final int DEFAULT_ADD_FEE_COUNT = 500;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private FtpUploadTemplate ftpUploadTemplate;
+
+    @Autowired
+    private Java110Properties java110Properties;
+
+    @Autowired
+    private OssUploadTemplate ossUploadTemplate;
+
+    @Autowired
+    private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Autowired
+    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeConfigV1InnerServiceSMO payFeeConfigV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+
+    @Autowired
+    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+    @Override
+    public ResponseEntity<String> importCustomExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
+
+        try {
+            ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+            JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+            Assert.hasKeyAndValue(paramIn, "communityId", "请求中未包含小区");
+
+            //InputStream is = uploadFile.getInputStream();
+
+            Workbook workbook = ImportExcelUtils.createWorkbook(uploadFile);  //工作簿
+
+
+            List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos = new ArrayList<ImportCustomCreateFeeDto>();
+            //获取楼信息
+            getImportCustomCreateFeeDtos(workbook, importCustomCreateFeeDtos, result);
+            // 保存数据
+            return dealExcelData(pd, importCustomCreateFeeDtos, result);
+
+        } catch (Exception e) {
+            logger.error("导入失败 ", e);
+            return new ResponseEntity<String>("非常抱歉，您填写的模板数据有误：" + e.getMessage(), HttpStatus.BAD_REQUEST);
+        }
+
+    }
+
+    /**
+     * 处理ExcelData数据
+     *
+     * @param importCustomCreateFeeDtos 房屋费用
+     */
+    private ResponseEntity<String> dealExcelData(IPageData pd,
+                                                 List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos,
+                                                 ComponentValidateResult result) {
+        ResponseEntity<String> responseEntity = null;
+        //保存单元信息 和 楼栋信息
+        if (importCustomCreateFeeDtos.size() < 1) {
+            throw new IllegalArgumentException("没有数据需要处理");
+        }
+
+        JSONObject paramOut = new JSONObject();
+        paramOut.put("successCount", 0);
+        paramOut.put("errorCount", 0);
+        //生成批次
+        String batchId = generatorBatch(result.getCommunityId(), result.getUserId());
+
+        List<ImportCustomCreateFeeDto> tmpImportCustomCreateFeeDtos = new ArrayList<>();
+        for (int roomIndex = 0; roomIndex < importCustomCreateFeeDtos.size(); roomIndex++) {
+            tmpImportCustomCreateFeeDtos.add(importCustomCreateFeeDtos.get(roomIndex));
+            if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
+                // 处理房屋费用
+                doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
+                doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
+
+                tmpImportCustomCreateFeeDtos = new ArrayList<>();
+            }
+        }
+        if (tmpImportCustomCreateFeeDtos != null && tmpImportCustomCreateFeeDtos.size() > 0) {
+
+            doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
+            doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
+
+        }
+
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "成功");
+    }
+
+    /**
+     * 创建房屋费用
+     *
+     * @param importCustomCreateFeeDtos
+     * @param batchId
+     */
+    private void doImportCarCreateFee(List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos, String batchId, ComponentValidateResult result) {
+        int successCount = 0;
+        int errorCount = 0;
+        List<ImportCustomCreateFeeDto> cars = new ArrayList<>();
+
+        for (ImportCustomCreateFeeDto importCustomCreateFeeDto : importCustomCreateFeeDtos) {
+            if (!ImportCustomCreateFeeDto.TYPE_CAR.equals(importCustomCreateFeeDto.getObjType())) {
+                continue;
+            }
+            cars.add(importCustomCreateFeeDto);
+        }
+
+        if (cars.size() < 1) {
+            return;
+        }
+
+        importCustomCreateFeeDtos = ownerCarInnerServiceSMOImpl.freshCarIdsByImportCustomCreateFee(cars);
+
+        doCreateFeeAndAttrs(importCustomCreateFeeDtos, batchId, result, successCount, errorCount);
+    }
+
+
+    /**
+     * 创建房屋费用
+     *
+     * @param importCustomCreateFeeDtos
+     * @param batchId
+     */
+    private void doImportRoomCreateFee(List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos, String batchId, ComponentValidateResult result) {
+        int successCount = 0;
+        int errorCount = 0;
+        List<ImportCustomCreateFeeDto> rooms = new ArrayList<>();
+        String[] objNames;
+        for (ImportCustomCreateFeeDto importCustomCreateFeeDto : importCustomCreateFeeDtos) {
+            if (!ImportCustomCreateFeeDto.TYPE_ROOM.equals(importCustomCreateFeeDto.getObjType())) {
+                continue;
+            }
+            objNames = importCustomCreateFeeDto.getObjName().split("-");
+            if (objNames.length != 3) {
+                continue;
+            }
+            importCustomCreateFeeDto.setFloorNum(objNames[0]);
+            importCustomCreateFeeDto.setUnitNum(objNames[1]);
+            importCustomCreateFeeDto.setRoomNum(objNames[2]);
+            rooms.add(importCustomCreateFeeDto);
+        }
+
+        if (rooms.size() < 1) {
+            return;
+        }
+
+        importCustomCreateFeeDtos = roomInnerServiceSMOImpl.freshRoomIdsByImportCustomCreateFee(rooms);
+        List<String> roomIds = new ArrayList<>();
+        for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
+            roomIds.add(importRoomFee.getPayObjId());
+        }
+        OwnerDto ownerDto = new OwnerDto();
+        ownerDto.setCommunityId(importCustomCreateFeeDtos.get(0).getCommunityId());
+        ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
+        for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
+            for (OwnerDto tmpOwnerDto : ownerDtos) {
+                if (importRoomFee.getPayObjId().equals(tmpOwnerDto.getRoomId())) {
+                    importRoomFee.setOwnerId(tmpOwnerDto.getOwnerId());
+                    importRoomFee.setOwnerName(tmpOwnerDto.getName());
+                    importRoomFee.setOwnerLink(tmpOwnerDto.getLink());
+                }
+            }
+        }
+        doCreateFeeAndAttrs(importCustomCreateFeeDtos, batchId, result, successCount, errorCount);
+    }
+
+
+    private void doCreateFeeAndAttrs(List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos, String batchId, ComponentValidateResult result, int successCount, int errorCount) {
+        List<PayFeePo> payFeePos = new ArrayList<>();
+        List<FeeAttrPo> feeAttrPos = new ArrayList<>();
+        PayFeePo payFeePo = null;
+        ImportFeeDetailPo importFeeDetailPo = null;
+        for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
+            if (StringUtil.isEmpty(importRoomFee.getPayObjId())) {
+                errorCount++;
+                continue;
+            }
+            FeeConfigDto feeConfigDto = new FeeConfigDto();
+            feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
+            feeConfigDto.setConfigId(importRoomFee.getConfigId());
+            List<FeeConfigDto> feeConfigDtos = payFeeConfigV1InnerServiceSMOImpl.queryPayFeeConfigs(feeConfigDto);
+            if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+                continue;
+            }
+            successCount++;
+            payFeePo = new PayFeePo();
+            payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+            payFeePo.setEndTime(importRoomFee.getStartTime());
+            payFeePo.setState(FeeDto.STATE_DOING);
+            payFeePo.setCommunityId(importRoomFee.getCommunityId());
+            payFeePo.setConfigId(importRoomFee.getConfigId());
+            payFeePo.setPayerObjId(importRoomFee.getPayObjId());
+            payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+            payFeePo.setUserId(result.getUserId());
+            payFeePo.setIncomeObjId(result.getStoreId());
+            payFeePo.setFeeTypeCd(feeConfigDtos.get(0).getFeeTypeCd());
+            payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
+            payFeePo.setAmount("-1");
+            payFeePo.setBatchId(batchId);
+            payFeePo.setEndTime(importRoomFee.getStartTime());
+            payFeePo.setStartTime(importRoomFee.getCreateTime());
+
+            payFeePos.add(payFeePo);
+
+            FeeAttrPo feeAttrPo = new FeeAttrPo();
+            feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
+            feeAttrPo.setValue(feeConfigDtos.get(0).getFeeName());
+            feeAttrPo.setFeeId(payFeePo.getFeeId());
+            feeAttrPos.add(feeAttrPo);
+
+
+            if (!StringUtil.isEmpty(importRoomFee.getOwnerId())) {
+                feeAttrPo = new FeeAttrPo();
+                feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
+                feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+                feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
+                feeAttrPo.setValue(importRoomFee.getOwnerId());
+                feeAttrPo.setFeeId(payFeePo.getFeeId());
+                feeAttrPos.add(feeAttrPo);
+
+                feeAttrPo = new FeeAttrPo();
+                feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
+                feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+                feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
+                feeAttrPo.setValue(importRoomFee.getOwnerName());
+                feeAttrPo.setFeeId(payFeePo.getFeeId());
+                feeAttrPos.add(feeAttrPo);
+
+                feeAttrPo = new FeeAttrPo();
+                feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
+                feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+                feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
+                feeAttrPo.setValue(importRoomFee.getOwnerLink());
+                feeAttrPo.setFeeId(payFeePo.getFeeId());
+                feeAttrPos.add(feeAttrPo);
+            }
+        }
+
+        feeInnerServiceSMOImpl.saveFee(payFeePos);
+
+        feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
+    }
+
+    /**
+     * 获取 房屋信息
+     *
+     * @param workbook
+     * @param importCustomCreateFeeDtos
+     */
+    private void getImportCustomCreateFeeDtos(Workbook workbook, List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos, ComponentValidateResult result) {
+        Sheet sheet = null;
+        sheet = ImportExcelUtils.getSheet(workbook, "创建费用");
+        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+        ImportCustomCreateFeeDto importRoomFee = null;
+        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+            Object[] os = oList.get(osIndex);
+            if (osIndex == 0 || osIndex == 1) { // 第一行是 头部信息 直接跳过
+                continue;
+            }
+            if (StringUtil.isNullOrNone(os[0])) {
+                continue;
+            }
+
+            //费用名称没有填写，默认跳过
+            if (StringUtil.isNullOrNone(os[5])) {
+                continue;
+            }
+            Assert.hasValue(os[0], (osIndex + 1) + "行房号/车牌号不能为空");
+            Assert.hasValue(os[1], (osIndex + 1) + "行类型不能为空");
+            Assert.hasValue(os[2], (osIndex + 1) + "行费用项ID不能为空");
+            Assert.hasValue(os[3], (osIndex + 1) + "行收费项目不能为空");
+            Assert.hasValue(os[4], (osIndex + 1) + "行建账时间不能为空");
+            Assert.hasValue(os[5], (osIndex + 1) + "行计费起始时间不能为空");
+
+            String createTime = excelDoubleToDate(os[4].toString());
+            String startTime = excelDoubleToDate(os[5].toString());
+            Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行建账时间格式错误 请填写YYYY-MM-DD 文本格式");
+            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行计费起始时间格式错误 请填写YYYY-MM-DD 文本格式");
+
+
+            importRoomFee = new ImportCustomCreateFeeDto();
+            importRoomFee.setObjName(os[0].toString());
+            importRoomFee.setObjType(os[1].toString());
+            importRoomFee.setConfigId(os[2].toString());
+            importRoomFee.setConfigName(os[3].toString());
+            importRoomFee.setStartTime(startTime);
+            importRoomFee.setCreateTime(createTime);
+            importRoomFee.setCommunityId(result.getCommunityId());
+            importCustomCreateFeeDtos.add(importRoomFee);
+        }
+    }
+
+    /**
+     * 生成批次号
+     *
+     * @param userId
+     */
+    private String generatorBatch(String communityId, String userId) {
+        PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
+        payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
+        payFeeBatchPo.setCommunityId(communityId);
+        payFeeBatchPo.setCreateUserId(userId);
+        UserDto userDto = new UserDto();
+        userDto.setUserId(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("生成批次失败");
+        }
+
+        return payFeeBatchPo.getBatchId();
+    }
+
+
+    //解析Excel日期格式
+    public static String excelDoubleToDate(String strDate) {
+        if (strDate.length() == 5) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                Date tDate = DoubleToDate(Double.parseDouble(strDate));
+                return sdf.format(tDate);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return strDate;
+            }
+        }
+        return strDate;
+    }
+
+    //解析Excel日期格式
+    public static Date DoubleToDate(Double dVal) {
+        Date tDate = new Date();
+        long localOffset = tDate.getTimezoneOffset() * 60000; //系统时区偏移 1900/1/1 到 1970/1/1 的 25569 天
+        tDate.setTime((long) ((dVal - 25569) * 24 * 3600 * 1000 + localOffset));
+
+        return tDate;
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

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

@@ -9,9 +9,11 @@ import com.java110.core.client.FtpUploadTemplate;
 import com.java110.core.client.OssUploadTemplate;
 import com.java110.core.context.IPageData;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.payFeeBatch.PayFeeBatchDto;
 import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
 import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
@@ -23,7 +25,6 @@ import com.java110.vo.ResultVo;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;

service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -4,10 +4,12 @@ package com.java110.community.smo.impl;
 import com.java110.community.dao.IRoomAttrServiceDao;
 import com.java110.community.dao.IRoomServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.log.LoggerFactory;
 import com.java110.dto.PageDto;
 import com.java110.dto.RoomAttrDto;
 import com.java110.dto.RoomDto;
 import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
 import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
@@ -17,7 +19,6 @@ import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -313,6 +314,21 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
         return importRoomFees;
     }
 
+    public List<ImportCustomCreateFeeDto> freshRoomIdsByImportCustomCreateFee(@RequestBody List<ImportCustomCreateFeeDto> importCustomCreateFeeDtos) {
+        for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
+            List<Map> infos = null;
+            infos = roomServiceDaoImpl.getRoomInfos(BeanConvertUtil.beanCovertMap(importRoomFee));
+            if (infos == null || infos.size() < 1) {
+                continue;
+            }
+            importRoomFee.setPayObjId(infos.get(0).get("roomId").toString());
+            importRoomFee.setFloorNum(infos.get(0).get("floorNum").toString());
+            importRoomFee.setUnitNum(infos.get(0).get("unitNum").toString());
+            importRoomFee.setRoomNum(infos.get(0).get("roomNum").toString());
+        }
+        return importCustomCreateFeeDtos;
+    }
+
     public IRoomServiceDao getRoomServiceDaoImpl() {
         return roomServiceDaoImpl;
     }

service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java

@@ -5,6 +5,7 @@ import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
 import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
@@ -119,6 +120,37 @@ public class OwnerCarInnerServiceSMOImpl extends BaseServiceSMO implements IOwne
         return tmpImportCarFees;
     }
 
+    public List<ImportCustomCreateFeeDto> freshCarIdsByImportCustomCreateFee(@RequestBody List<ImportCustomCreateFeeDto> tmpImportCarFees){
+        List<String> carNums = new ArrayList<>();
+        for (ImportCustomCreateFeeDto importRoomFee : tmpImportCarFees) {
+            if (StringUtil.isEmpty(importRoomFee.getCarNum())) {
+                continue;
+            }
+            carNums.add(importRoomFee.getCarNum());
+        }
+
+        if (carNums.size() < 1) {
+            return tmpImportCarFees;
+        }
+        Map<String, Object> info = new HashMap<>();
+        info.put("carNums", carNums.toArray(new String[carNums.size()]));
+        info.put("communityId", tmpImportCarFees.get(0).getCommunityId());
+        info.put("statusCd", "0");
+        List<OwnerCarDto> ownerCarDtos = BeanConvertUtil.covertBeanList(ownerCarServiceDaoImpl.getOwnerCarInfo(info), OwnerCarDto.class);
+
+        for (OwnerCarDto ownerCarDto : ownerCarDtos) {
+            for (ImportCustomCreateFeeDto importRoomFee : tmpImportCarFees) {
+                if (ownerCarDto.getCarNum().equals(importRoomFee.getCarNum())) {
+                    importRoomFee.setPayObjId(ownerCarDto.getCarId());
+                    importRoomFee.setOwnerId(ownerCarDto.getOwnerId());
+                    importRoomFee.setOwnerName(ownerCarDto.getOwnerName());
+                    importRoomFee.setOwnerLink(ownerCarDto.getLink());
+                }
+            }
+        }
+        return tmpImportCarFees;
+    }
+
     @Override
     public long queryOwnerParkingSpaceCount(@RequestBody OwnerCarDto ownerCarDto) {
         return ownerCarServiceDaoImpl.queryOwnerParkingSpaceCount(BeanConvertUtil.beanCovertMap(ownerCarDto));