修改宗地报错sql报错

.gitignore

@@ -81,6 +81,6 @@ nbdist/
 /siwei-modules/siwei-apply/lib/jts-1.13.jar
 /lib/spire.doc.free-5.2.0.jar
 /siwei-modules/siwei-apply/lib/spire.doc.free-5.2.0.jar
-/.vscode/settings.json
+/.vscode/*
 /.workbuddy/*
 /siwei-modules/siwei-apply/lib/aspose-words-18.6-jdk16-crack.jar

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/third/OfferDataController.java

@@ -47,9 +47,8 @@ public class OfferDataController extends BaseController {
     private RedisService redisService;
 
 
-
     /**
-     *  国有建设用地使用权首次登记
+     * 国有建设用地使用权首次登记
      * 不动产土地登记完成后入参使用
      */
     @PostMapping("/third/landFirstRegistration")
@@ -68,24 +67,23 @@ public class OfferDataController extends BaseController {
 
     /**
      *
-     *    国有建设用地使用权及房屋所有权首次登记
-     *    landFirstParamVo
-     *    houseFirstParamVo
-     *    不动产土地登记完成后入参使用
+     * 国有建设用地使用权及房屋所有权首次登记
+     * landFirstParamVo
+     * houseFirstParamVo
+     * 不动产土地登记完成后入参使用
      */
     @PostMapping("/third/houseFirstRegistration")
     public R<Map<String, Object>> houseFirstRegistration(@RequestBody HouseFirstParamVo body) {
         try {
-                Map<String, Object> map = offerDataService.houseFirstRegistration(body);
-                map.put("id", map.get("id"));
-                return R.ok(map);
+            Map<String, Object> map = offerDataService.houseFirstRegistration(body);
+            map.put("id", map.get("id"));
+            return R.ok(map);
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }
     }
 
 
-
     /**
      * 按ID查询
      */
@@ -145,10 +143,10 @@ public class OfferDataController extends BaseController {
      */
     @GetMapping("/download/{signature}/{expireTime}/{attachmentId}/{dirName}/{fileName}")
     public ResponseEntity<Resource> uploadAttachment(@PathVariable("signature") String signature,
-            @PathVariable("expireTime") String expireTime,
-            @PathVariable("attachmentId") String attachmentId, @PathVariable("dirName") String dirName,
-            @PathVariable("fileName") String fileName,
-            HttpServletRequest request, HttpServletResponse response) {
+                                                     @PathVariable("expireTime") String expireTime,
+                                                     @PathVariable("attachmentId") String attachmentId, @PathVariable("dirName") String dirName,
+                                                     @PathVariable("fileName") String fileName,
+                                                     HttpServletRequest request, HttpServletResponse response) {
 
         try {
             if (StringUtils.isBlank(signature) || Objects.isNull(expireTime) || StringUtils.isBlank(attachmentId)
@@ -210,9 +208,9 @@ public class OfferDataController extends BaseController {
      * @return
      */
     @PostMapping("/download")
-    public ResponseEntity<Resource> uploadAttachment(@RequestBody Map<String,String> param, HttpServletRequest request, HttpServletResponse response) {
+    public ResponseEntity<Resource> uploadAttachment(@RequestBody Map<String, String> param, HttpServletRequest request, HttpServletResponse response) {
         try {
-            String filePath =  param.get("filePath");
+            String filePath = param.get("filePath");
             if (StringUtils.isBlank(filePath)) {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
             }
@@ -237,8 +235,6 @@ public class OfferDataController extends BaseController {
     }
 
 
-
-
     /**
      * 文件下载
      *
@@ -248,7 +244,7 @@ public class OfferDataController extends BaseController {
      */
     @GetMapping("/download/file222/{id}/{uploadId}")
     public ResponseEntity<Resource> uploadAttachment222(@PathVariable("id") String id,
-            @PathVariable("uploadId") String uploadId, HttpServletRequest request, HttpServletResponse response) {
+                                                        @PathVariable("uploadId") String uploadId, HttpServletRequest request, HttpServletResponse response) {
         try {
             String upload_id = "upliad_" + id + "_" + uploadId;
             String uploadFile = redisService.getCacheObject(upload_id);
@@ -287,8 +283,4 @@ public class OfferDataController extends BaseController {
     }
 
 
-
-
-
-
 }

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

@@ -1281,10 +1281,13 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         }
         List<Map<String,Object>> res = cadastreFileMapper.selectTableDataByCondition(validFlag,tableName,bsm,ywh);
         if(CollectionUtils.isNotEmpty(res)){ //去掉geom字段和valid_flag字段
-            //res.forEach(m -> m.keySet().removeIf(k -> "geom".equalsIgnoreCase(k)|| "valid_flag".equalsIgnoreCase(k)));
-            res.forEach(m -> m.keySet().removeIf(k -> "valid_flag".equalsIgnoreCase(k)));
+            List<Map<String, String>> dbFieldNameAndTypeList = cadastreFileMapper.selectTableCollumAndType(tableName.toLowerCase(Locale.ROOT));
+            List<Object> filterCollumList =  dbFieldNameAndTypeList.stream().filter(s->s.get("data_type").equals("bytea")).map(s->s.get("column_name")).collect(Collectors.toList());
+            filterCollumList.add("valid_flag");
+            //res.forEach(m -> m.keySet().removeIf(k -> "valid_flag".equalsIgnoreCase(k)));
+            res.forEach(m -> m.keySet().removeIf(filterCollumList::contains));
             if("0".equals(geomFlag)){
-                res.forEach(m -> m.keySet().removeIf(k -> "geom".equalsIgnoreCase(k)));
+                res.forEach(m -> m.keySet().removeIf("geom"::equalsIgnoreCase));
             }
            res.forEach(s -> {
                 if(s.get("geom") != null){