宗地图斑查询

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeAttachmentController.java

@@ -350,11 +350,12 @@ public class NodeAttachmentController extends BaseController {
 
             //这里先修改供地类型，再删除原有附件信息，增加新附件信息 （修复附件上传错误）
             TdgyUpdateVo updateVo = new TdgyUpdateVo();
+            gdType= "1".equals(gdType) ? "出让" : "2".equals(gdType)? "划拨":"出让";
+
             updateVo.setId(nodeId);
             updateVo.setGdType(gdType);
             tdgyService.update(updateVo);
 
-
             if (Objects.nonNull(tdgyRes)) {
                 //1.先删除当前节点
                 nodeAttachmentService.deleteByNodeId(nodeId);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -293,8 +293,12 @@ public class CadastreManageController extends BaseController {
     public R<List<Map<String,Object>>> selectTableRow2(@RequestParam("tableName") String tableName,@RequestParam("geomFlag") String geomFlag,
                                                        @RequestParam(value = "zddm",required = false,defaultValue = "") String zddm,
                                                        @RequestParam(value = "bdcdyh",required = false,defaultValue = "") String bdcdyh,
+                                                       @RequestParam(value = "zl",required = false,defaultValue = "") String zl,
+                                                       @RequestParam(value = "qlr",required = false,defaultValue = "") String qlr,
+                                                       @RequestParam(value = "cxfw",required = false,defaultValue = "") String cxfw,
                                                        @RequestParam(value = "bsm",required = false,defaultValue = "") String bsm,
                                                        @RequestParam(value = "ywh",required = false,defaultValue = "") String ywh) {
+
         try {
             if(StringUtils.isBlank(ywh)){
                 ywh +=  " 1=1 ";
@@ -305,6 +309,26 @@ public class CadastreManageController extends BaseController {
             if(StringUtils.isNotBlank(bdcdyh)){
                 ywh +=  " AND bdcdyh like '%" + bdcdyh + "%'";
             }
+            if(StringUtils.isNotBlank(zl) && "zrz".equalsIgnoreCase(tableName)){
+                    ywh +=  " AND lzzl like '%" + zl + "%'";
+            }else {
+                    ywh +=  " AND zl like '%" + zl + "%'";
+            }
+
+            if (StringUtils.isNotBlank(cxfw)) {
+                if (!cxfw.contains("SRID=")) {
+                    cxfw = "SRID=" + "4326" + ";" + cxfw;
+                }
+                //todo 这里根据不同的表使用图形查询交集，然后获取bsm，拼接ywh
+            }
+
+
+
+
+
+
+
+
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             return R.ok(res);
         } catch (Exception e) {

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

@@ -647,7 +647,9 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                         map.put(fieldName, feature.GetFieldAsString(i));
                     }
                 } else {
-                    map.put(fieldName, feature.GetFieldAsString(i));
+                    //这里兼容图层可能存在多出的字段不处理
+                    //map.put(fieldName, feature.GetFieldAsString(i));
+                    log.warn("当前图层-{}，多出字段-{}",layer.GetName(),fieldName);
                 }
             }