生产环境bug修复

@@ -51,19 +51,27 @@ public abstract class BaseController {
         if (CollectionUtils.isEmpty(errorList)) {
             return false;
         }
-        Map<Integer, String> errorMap = errorList.stream().collect(Collectors.groupingBy(ExcelErrorMessage::getRowNum,
-                Collectors.mapping(ExcelErrorMessage::getMessage, Collectors.joining(";"))));
-
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFSheet sheet = workbook.createSheet("错误信息");
-        Integer rowNumIndex = 0;
-        for (Integer rowNum : errorMap.keySet()) {
-            XSSFRow row = sheet.createRow(rowNumIndex);
-            String errotMsg = "第" + rowNum + "行:" + errorMap.get(rowNum);
+        if (errorList.size() == 1 && errorList.get(0).getRowNum() == null) {
+            XSSFRow row = sheet.createRow(0);
+            String errotMsg = errorList.get(0).getMessage();
             row.createCell(0).setCellValue(errotMsg);
-            rowNumIndex++;
+        } else {
+            Map<Integer, String> errorMap = errorList.stream().collect(Collectors.groupingBy(ExcelErrorMessage::getRowNum,
+                    Collectors.mapping(ExcelErrorMessage::getMessage, Collectors.joining(";"))));
+
+
+            int rowNumIndex = 0;
+            for (Integer rowNum : errorMap.keySet()) {
+                XSSFRow row = sheet.createRow(rowNumIndex);
+                String errotMsg = "第" + rowNum + "行:" + errorMap.get(rowNum);
+                row.createCell(0).setCellValue(errotMsg);
+                rowNumIndex++;
+            }
         }
 
+
         FileOutputStream outputStream = new FileOutputStream(filePath);
 
         try {

+package com.ash.base.excelOpt;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.converters.WriteConverterContext;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+public class DatetimeConverter implements Converter<Date> {
+    private static  final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd HH:mm:ss";
+
+
+    @Override
+    public Class<Date> supportJavaTypeKey() {
+        return Date.class;
+    }
+
+
+    @Override
+    public Date convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String value = cellData.getStringValue();
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_YYYY_MM_DD);
+        return sdf.parse(value);
+    }
+
+
+    @Override
+    public WriteCellData<String> convertToExcelData(WriteConverterContext<Date> context) throws Exception {
+        Date date = context.getValue();
+        if (date == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_YYYY_MM_DD);
+        return new WriteCellData<>(sdf.format(date));
+    }
+}

@@ -13,6 +13,7 @@ import com.ash.enums.AnalysisStatusEnum;
 import com.ash.enums.FileDataTypeEnum;
 import com.ash.enums.ReviewStatusEnum;
 import com.ash.excelData.CaseExcelData;
+import com.ash.excelData.CaseExportExcelData;
 import com.ash.service.CaseAnalysisService;
 import com.ash.service.CaseService;
 import com.ash.service.FileDataService;
@@ -109,8 +110,6 @@ public class CaseController extends BaseController {
                     return JsonResult.error("生成文件错误!");
                 }
             }
-        } catch (ExcelDataConvertException e) {
-            return JsonResult.error("导入模板错误或数据格式错误!");
         } catch (Exception e) {
             return JsonResult.error("系统异常!");
         }
@@ -168,10 +167,23 @@ public class CaseController extends BaseController {
         params.setEndTime(endTime);
         List<Case> dataList = caseService.list(params);
 
-        List<CaseExcelData> dedList = Optional.ofNullable(dataList).map(all ->
+        List<CaseExportExcelData> dedList = Optional.ofNullable(dataList).map(all ->
                 all.stream().map(e -> {
-                    CaseExcelData ed = new CaseExcelData();
+                    CaseExportExcelData ed = new CaseExportExcelData();
                     BeanUtils.copyProperties(e, ed);
+                    CaseAnalysis analysis = e.getAnalysis();
+                    if(analysis!=null){
+                        ed.setArea(analysis.getArea());
+                        ed.setCounty(analysis.getCounty());
+                        ed.setTotalAmount(analysis.getTotalAmount());
+                        ed.setAge(analysis.getAge());
+                        ed.setSex(analysis.getSex());
+                        ed.setCareer(analysis.getCareer());
+                        ed.setFraudType(analysis.getFraudType());
+                        ed.setRainageMethod(analysis.getRainageMethod());
+                        ed.setPayMethod(analysis.getPayMethod());
+                    }
+
                     return ed;
                 }).collect(Collectors.toList())).orElse(new ArrayList<>());
 
@@ -180,7 +192,7 @@ public class CaseController extends BaseController {
         response.setCharacterEncoding("utf8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
         ServletOutputStream outputStream = response.getOutputStream();
-        EasyExcel.write(outputStream, CaseExcelData.class)
+        EasyExcel.write(outputStream, CaseExportExcelData.class)
                 .sheet("案件列表")
                 .doWrite(dedList);
 

@@ -349,6 +349,7 @@ public class StatisticsController extends BaseController {
                     }
                     totalLoss += caseInfo.getTotalAmount();
                 }
+                totalLoss = totalLoss / 10000.0;
                 avgLoss = totalLoss * 1.0 / dataList.size();
             }
 

@@ -14,6 +14,7 @@ import com.ash.enums.AnalysisStatusEnum;
 import com.ash.enums.FileDataTypeEnum;
 import com.ash.enums.ReviewStatusEnum;
 import com.ash.excelData.WarningInstanceExcelData;
+import com.ash.excelData.WarningInstanceExportExcelData;
 import com.ash.service.FileDataService;
 import com.ash.service.WarningInstanceAnalysisService;
 import com.ash.service.WarningInstanceService;
@@ -118,10 +119,8 @@ public class WarningInstanceController extends BaseController {
                 }
 
             }
-        } catch (
-                ExcelDataConvertException e) {
-            return JsonResult.error("导入模板错误或数据格式错误!");
         } catch (Exception e) {
+            e.printStackTrace();
             return JsonResult.error("系统异常!");
         }
 
@@ -178,10 +177,19 @@ public class WarningInstanceController extends BaseController {
         params.setEndTime(endTime);
         List<WarningInstance> dataList = warningInstanceService.list(params);
 
-        List<WarningInstanceExcelData> dedList = Optional.ofNullable(dataList).map(all ->
+        List<WarningInstanceExportExcelData> dedList = Optional.ofNullable(dataList).map(all ->
                 all.stream().map(e -> {
-                    WarningInstanceExcelData ed = new WarningInstanceExcelData();
+                    WarningInstanceExportExcelData ed = new WarningInstanceExportExcelData();
                     BeanUtils.copyProperties(e, ed);
+                    WarningInstanceAnalysis analysis = e.getAnalysis();
+                    if (analysis != null) {
+                        ed.setArea(analysis.getArea());
+                        ed.setAmount(analysis.getAmount());
+                        ed.setSex(analysis.getSex());
+                        ed.setCareer(analysis.getCareer());
+                        ed.setRainageMethod(analysis.getRainageMethod());
+                        ed.setPayMethod(analysis.getPayMethod());
+                    }
                     return ed;
                 }).collect(Collectors.toList())).orElse(new ArrayList<>());
 
@@ -190,7 +198,7 @@ public class WarningInstanceController extends BaseController {
         response.setCharacterEncoding("utf8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
         ServletOutputStream outputStream = response.getOutputStream();
-        EasyExcel.write(outputStream, WarningInstanceExcelData.class)
+        EasyExcel.write(outputStream, WarningInstanceExportExcelData.class)
                 .sheet("警情列表")
                 .doWrite(dedList);
 

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.ash.base.excelOpt.DatetimeConverter;
 import com.ash.base.excelOpt.ExcelCheck;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -48,13 +49,13 @@ public class CaseExcelData implements Serializable {
     private String caseDetail;
 
     @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "接警时间", index = 4)
+    @ExcelProperty(value = "接警时间", index = 4, converter = DatetimeConverter.class)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private Date alarmDate;
 
     @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "立案时间", index = 5)
+    @ExcelProperty(value = "立案时间", index = 5, converter = DatetimeConverter.class)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private Date filingDate;

+package com.ash.excelData;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.ash.base.excelOpt.DatetimeConverter;
+import com.ash.base.excelOpt.ExcelCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ContentRowHeight(15)
+@HeadRowHeight(20)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CaseExportExcelData implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ExcelCheck(canEmpty = false, canRepeat = false)
+    @ExcelProperty(value = "案件标识", index = 0)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String mark;
+
+    @ExcelCheck(canEmpty = false, canRepeat = false)
+    @ExcelProperty(value = "案件编号", index = 1)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String code;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "案件名称", index = 2)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String name;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "案件详情", index = 3)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String caseDetail;
+
+    @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "接警时间", index = 4, converter = DatetimeConverter.class)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private Date alarmDate;
+
+    @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "立案时间", index = 5, converter = DatetimeConverter.class)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private Date filingDate;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "立案单位", index = 6)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String filingUnit;
+
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "地区", index = 7)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String area;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "县区", index = 8)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String county;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "涉案总金额", index = 9)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private Double totalAmount;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "受害人性别", index = 10)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String sex;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "受害人年龄", index = 11)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private Integer age;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "受害人职业", index = 12)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String career;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "诈骗类型", index = 13)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String fraudType;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "引流方式", index = 14)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String rainageMethod;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "支付方式", index = 15)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String payMethod;
+}

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.ash.base.excelOpt.DatetimeConverter;
 import com.ash.base.excelOpt.ExcelCheck;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -30,7 +31,7 @@ public class WarningInstanceExcelData implements Serializable {
     private String code;
 
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "报警时间", index = 1)
+    @ExcelProperty(value = "报警时间", index = 1, converter = DatetimeConverter.class)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private Date alarmDate;

+package com.ash.excelData;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.ash.base.excelOpt.DatetimeConverter;
+import com.ash.base.excelOpt.ExcelCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ContentRowHeight(15)
+@HeadRowHeight(20)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WarningInstanceExportExcelData implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ExcelCheck(canEmpty = false, canRepeat = false)
+    @ExcelProperty(value = "警情单编号", index = 0)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String code;
+
+    @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "报警时间", index = 1, converter = DatetimeConverter.class)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private Date alarmDate;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "报警电话", index = 2)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String phoneNum;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "所属市局", index = 3)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String municipalPolice;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "所属分县局", index = 4)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String countyPolice;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "管辖单位", index = 5)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String jurisdictionalUnit;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "所属区县", index = 6)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String county;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "事发地址", index = 7)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String address;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "报警内容", index = 8)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String content;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "接警警情类别", index = 9)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String alarmCategory;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "接警警情类型", index = 10)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String alarmType;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "接警警情细类", index = 11)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String alarmTypeDetail;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "接警警情子类", index = 12)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String alarmSubType;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "反馈内容", index = 13)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String feedbackContent;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "警情类别", index = 14)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String category;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "警情类型", index = 15)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String type;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "警情细类", index = 16)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String typeDetail;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "警情子类", index = 17)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String subType;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "处理结果", index = 18)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String result;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "地区", index = 19)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String area;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "案损金额", index = 20)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private Double amount;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "受害人性别", index = 21)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String sex;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "受害人职业", index = 22)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String career;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "引流方式", index = 23)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String rainageMethod;
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "支付方式", index = 24)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String payMethod;
+}

@@ -129,7 +129,14 @@ public class CaseService {
 
     public List<Case> list(Case params) {
         QueryWrapper<Case> queryWrapper = getCondition(params);
-        return caseMapper.selectList(queryWrapper);
+        List<Case> dataList = caseMapper.selectList(queryWrapper);
+        if(!CollectionUtils.isEmpty(dataList)){
+            List<String> caseIds = dataList
+                    .stream().map(Case::getId).collect(Collectors.toList());
+            Map<String, CaseAnalysis> caseAnalysisMap = caseAnalysisService.listByCaseId(caseIds);
+            dataList.forEach(e -> e.setAnalysis(caseAnalysisMap.get(e.getId())));
+        }
+        return dataList;
     }
 
     public List<Case> listUnAnalysis() {
@@ -651,11 +658,17 @@ public class CaseService {
         } catch (ExcelAnalysisException e) {
             return listener.getErrorList();
         } catch (ExcelDataConvertException e) {
-            throw e;
+            List<ExcelErrorMessage> errorList=new ArrayList<>();
+            ExcelErrorMessage eem = new ExcelErrorMessage().setMessage("模板错误");
+            errorList.add(eem);
+            return errorList;
         } catch (Exception ex) {
             ex.printStackTrace();
             log.info("导入失败,异常,", ex);
-            throw new RuntimeException("导入失败!");
+            List<ExcelErrorMessage> errorList=new ArrayList<>();
+            ExcelErrorMessage eem = new ExcelErrorMessage().setMessage("系统异常");
+            errorList.add(eem);
+            return errorList;
         }
 
         return null;

@@ -110,7 +110,14 @@ public class WarningInstanceService {
 
     public List<WarningInstance> list(WarningInstance params) {
         QueryWrapper<WarningInstance> queryWrapper = getCondition(params);
-        return warningInstanceMapper.selectList(queryWrapper);
+        List<WarningInstance> dataList = warningInstanceMapper.selectList(queryWrapper);
+        if (!CollectionUtils.isEmpty(dataList)) {
+            List<String> wiIds = dataList
+                    .stream().map(WarningInstance::getId).collect(Collectors.toList());
+            Map<String, WarningInstanceAnalysis> analysisMap = warningInstanceAnalysisService.listByWiId(wiIds);
+            dataList.forEach(e -> e.setAnalysis(analysisMap.get(e.getId())));
+        }
+        return dataList;
     }
 
     public List<WarningInstance> listUnAnalysis() {
@@ -372,11 +379,17 @@ public class WarningInstanceService {
         } catch (ExcelAnalysisException e) {
             return listener.getErrorList();
         } catch (ExcelDataConvertException e) {
-            throw e;
+            List<ExcelErrorMessage> errorList = new ArrayList<>();
+            ExcelErrorMessage eem = new ExcelErrorMessage().setMessage("模板错误");
+            errorList.add(eem);
+            return errorList;
         } catch (Exception ex) {
             ex.printStackTrace();
             log.info("导入失败,异常,", ex);
-            throw new RuntimeException("导入失败!");
+            List<ExcelErrorMessage> errorList = new ArrayList<>();
+            ExcelErrorMessage eem = new ExcelErrorMessage().setMessage("系统异常");
+            errorList.add(eem);
+            return errorList;
         }
 
         return null;