mdb文件上传

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -503,6 +503,8 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
         //字段名称
         List<String>  mdbTableFieldNameList = (List<String>) mdbTableFieldMap.get("column");
+        List<String> lowerCaseMdbTableFieldNameList = mdbTableFieldNameList.stream().map(String::toLowerCase).collect(Collectors.toList());
+
         //所有条数
         List<Map<String, String>> dataList = (List<Map<String, String>>) mdbTableFieldMap.get("rows");
 
@@ -518,7 +520,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         //这里移除校验字段（非属mdb中的字段）
         dbFieldNameList.remove("valid_flag");
         // 判断是否包含相同的元素（不考虑顺序）
-        boolean areCollectionsEqual = CollectionUtils.isEqualCollection(dbFieldNameList, mdbTableFieldNameList);
+        boolean areCollectionsEqual = CollectionUtils.isEqualCollection(dbFieldNameList, lowerCaseMdbTableFieldNameList);
         if (!areCollectionsEqual) {
             checkInfoList.add(mdbTableName + ":字段数据不一致！-" + dbFieldNameList);
             fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", mdbTableName + ":字段数据不一致！-" + dbFieldNameList, "info");
@@ -541,12 +543,10 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         }
         checkInfoVo.setCheckInfoList(checkInfoList);
         if(checkInfoVo.getCheckStatus().equals(true)){
-            checkInfoList.add("当前矢量数据："+mdbTableName + "---" + "数据格式为gdb");
-            checkInfoList.add("当前矢量数据："+mdbTableName + "---" + "坐标系是CGCS2000");
-            checkInfoList.add("当前矢量数据："+mdbTableName + "---" + "检查校验通过！");
-            fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", "当前矢量数据："+mdbTableName + "---" + "数据格式为gdb", "info");
-            fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", "当前矢量数据："+mdbTableName + "---" + "坐标系是CGCS2000", "info");
-            fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", "当前矢量数据："+mdbTableName + "---" + "检查校验通过！", "info");
+            checkInfoList.add("当前表格数据："+mdbTableName + "---" + "数据格式为mdb");
+            checkInfoList.add("当前表格数据："+mdbTableName + "---" + "检查校验通过！");
+            fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", "当前表格数据："+mdbTableName + "---" + "数据格式为mdb", "info");
+            fzssFxrwrzHandleService.insertFxrwrz(uploadId, "地籍库管理", "当前表格数据："+mdbTableName + "---" + "检查校验通过！", "info");
         }
         return checkInfoVo;
     }