第三方导入-增加excel页名异常处理

src/main/java/com/shkpr/service/alambizplugin/commtools/ExcelUtils.java

@@ -94,7 +94,7 @@ public class ExcelUtils {
             //结果
             Map<String, List<Map<String, String>>> results = new HashMap<>(workbook.getNumberOfSheets());
             //遍历页,并解析
-            for (Sheet sheet : workbook) results.put(sheet.getSheetName(), parseSheet(sheet, headerRowNum, dataRowNum));
+            for (Sheet sheet : workbook) results.put(sheet.getSheetName().trim(), parseSheet(sheet, headerRowNum, dataRowNum));
             return results;
         } catch (IOException e) {
             LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR, mBizType, mStrClassName
@@ -209,7 +209,7 @@ public class ExcelUtils {
             Map<String, List<E>> results = new HashMap<>(workbook.getNumberOfSheets());
             //遍历页,并解析
             for (Sheet sheet : workbook)
-                results.put(sheet.getSheetName(), parseSheet(sheet, clazz, headerRowNum, dataRowNum));
+                results.put(sheet.getSheetName().trim(), parseSheet(sheet, clazz, headerRowNum, dataRowNum));
             return results;
         } catch (IOException e) {
             LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR, mBizType, mStrClassName

src/main/java/com/shkpr/service/alambizplugin/components/GisSurveyThirdImporter.java

@@ -152,6 +152,8 @@ public class GisSurveyThirdImporter {
 
             //解析excel
             parseExcel(inputStreams, points, lines);
+            if (CollectionUtils.isEmpty(points)) result.getMessages().add(GisSurveyExcelDefine.MESSAGE.EMPTY_POINTS);
+            if (CollectionUtils.isEmpty(lines)) result.getMessages().add(GisSurveyExcelDefine.MESSAGE.EMPTY_LINES);
 
             //项目约束条件
             List<GisSurveyCondition> projectConstraints = projectInfoService.findConstraintsByJobId(params.getJobId());

src/main/java/com/shkpr/service/alambizplugin/constants/GisSurveyExcelDefine.java

@@ -67,6 +67,14 @@ public interface GisSurveyExcelDefine {
      */
     interface MESSAGE {
         /**
+         * 点空数据
+         */
+        String EMPTY_POINTS = "点数据为空,请检查点数据或excel页名";
+        /**
+         * 线空数据
+         */
+        String EMPTY_LINES = "线数据为空,请检查线数据或excel页名";
+        /**
          * 无效图层
          */
         String INVALID_LAYERS = "未找到该图层,请检查点/线类型是否在模版配置中";

src/main/java/com/shkpr/service/alambizplugin/dto/CommAsyncResult.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -38,6 +39,10 @@ public class CommAsyncResult<T> {
      */
     private T data;
     /**
+     * 结果信息
+     */
+    private List<String> messages = new ArrayList<>();
+    /**
      * 请求检查时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh_CN", timezone = "Asia/Shanghai")