errorInfo

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java

@@ -15,4 +15,8 @@ public interface ImportErrorMsgConstants {
 
     String NEIGHBOR_HOOD_ERROR = "所属组织、所属网格、详细地址的值未填写，或者所填写信息在系统中未找到";
 
+    String HOUSE_ERROR_NAME = "导入失败的列表-房屋";
+    String BUILDING_ERROR_NAME = "导入失败的列表-楼宇";
+    String NEIGHBORHOOD_ERROR_NAME = "导入失败的列表-小区";
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -32,6 +32,7 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.ImportErrorMsgConstants;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.form.*;
@@ -271,6 +272,7 @@ public class HouseController implements ResultDataResolver {
             ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
             importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_HOUSE);
             importFormDTO.setOperatorId(formDTO.getUserId());
+            importFormDTO.setOriginFileName(ImportErrorMsgConstants.HOUSE_ERROR_NAME);
             Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
             if (!importTask.success()){
                 throw new EpmetException("创建任务失败");

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -18,6 +18,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.ImportErrorMsgConstants;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.*;
 import com.epmet.dto.BuildingTreeLevelDTO;
@@ -412,6 +413,7 @@ public class BuildingServiceImpl implements BuildingService {
             ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
             importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_NEIGHBOR_HOOD);
             importFormDTO.setOperatorId(formDTO.getUserId());
+            importFormDTO.setOriginFileName(ImportErrorMsgConstants.BUILDING_ERROR_NAME);
             Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
             if (!importTask.success()){
                 throw new EpmetException("创建任务失败");

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -41,6 +41,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
+import com.epmet.constant.ImportErrorMsgConstants;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.CustomerGridDao;
 import com.epmet.dao.IcBuildingDao;
@@ -65,12 +66,12 @@ import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.tomcat.util.http.fileupload.FileItemFactory;
-import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -418,6 +419,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
             importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_NEIGHBOR_HOOD);
             importFormDTO.setOperatorId(formDTO.getUserId());
+            importFormDTO.setOriginFileName(ImportErrorMsgConstants.NEIGHBORHOOD_ERROR_NAME);
             Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
             if (!importTask.success()){
                 throw new EpmetException("创建任务失败");
@@ -644,7 +646,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         String resultDescFileName = UUID.randomUUID().toString().concat(".xls");
 
         FileItemFactory factory = new DiskFileItemFactory(16, null);
-        FileItem fileItem = (FileItem) factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName);
+        FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName);
         OutputStream os = fileItem.getOutputStream();
         Result<UploadImgResultDTO> uploadResult = null;
         try {