浏览代码

mdb对比数据修复小写key取不到问题

chenendian 1 月之前
父节点
当前提交
7e24ef4d21

+ 1 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/MdbAndDbData.java

@@ -19,7 +19,7 @@ public class MdbAndDbData {
     private String currentTableName;
 
     /** 新增的数据 */
-    private List<Map<String,String>>  mdbFileDataList;
+    private List<Map<String,Object>>  mdbFileDataList;
 
     /** 数据库中的数据 */
     private List<Map<String,Object>>  dbDataList;

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

@@ -1203,12 +1203,12 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 ));
 
                 Map<String, Object> allMdbTableFieldMap = MdbUtil.MdbTableContent(gdbPath + "/" + cadastreFile.getName(), talbleName, "", "", 1, 1000);
-                List<Map<String, String>> theValueList = (List<Map<String, String>>) allMdbTableFieldMap.get("rows");
+                List<Map<String, Object>> theValueList = (List<Map<String, Object>>) allMdbTableFieldMap.get("rows");
                 List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0", talbleName);
 
                 //这里进行遍历dbDataList,判断是否存在bsm字段,且bsm字段是否存在于theValueList中
                 Set<String> mdbBsmSet = theValueList.stream()
-                        .map(v -> v.get("bsm"))
+                        .map(v -> v.get("bsm".toUpperCase(Locale.ROOT)))
                         .filter(bsm -> bsm != null)
                         .map(String::valueOf)
                         .collect(Collectors.toSet());