添加中图代码

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtCqBcbzListController.java

@@ -33,7 +33,7 @@ import com.onemap.common.core.web.page.TableDataInfo;
  * @date 2024-08-13
  */
 @RestController
-@RequestMapping("/cqbcbz")
+@RequestMapping("/cqbczd")
 public class ZtCqBcbzListController extends BaseController
 {
     @Autowired

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtZdBcbzListController.java

@@ -98,7 +98,7 @@ public class ZtZdBcbzListController extends BaseController
      */
     @Log(title = "征地补偿标准", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Integer[] ids)
+    public AjaxResult remove(@PathVariable String[] ids)
     {
         return toAjax(ztZdBcbzListService.deleteZtZdBcbzListByIds(ids));
     }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/business/ZtZdProjectListController.java

@@ -105,6 +105,9 @@ public class ZtZdProjectListController extends BaseController
 //                log.info("征收补偿预估报告数据为空,导出失败!");
                 return;
             }
+            ztZdProjectList.setTotalZDMJ(setPrecision2(ztZdProjectList.getTotalZDMJ()));
+            ztZdProjectList.setJtMJ(setPrecision2(ztZdProjectList.getJtMJ()));
+            ztZdProjectList.setGyMJ(setPrecision2(ztZdProjectList.getGyMJ()));
             List<PicData> picList = new ArrayList<>();
 ////            List<String> picBase64List = Arrays.asList(ztZdProjectList.getImageData().split(","));
 //            ObjectMapper objectMapper=new ObjectMapper();
@@ -145,7 +148,7 @@ public class ZtZdProjectListController extends BaseController
             }
             //拆迁结果
             // 拆迁房屋列表
-                       ObjectMapper mapper = new ObjectMapper();
+            ObjectMapper mapper = new ObjectMapper();
             ZtZdCqReultList zdCqReultList = new ZtZdCqReultList();
             zdCqReultList.setProjectId(ztZdProjectList.getId());
             List<ZtZdCqReultList> list1=new ArrayList<>();
@@ -153,11 +156,15 @@ public class ZtZdProjectListController extends BaseController
                 list1= ztZdCqReultListService.selectZtZdCqReultListList(zdCqReultList);
                 if (list1 != null && list1.size() > 0) {
                     zdCqReultList = list1.get(0);
-
                 }
             }
             else
                 zdCqReultList=ztZdProjectList.getCqResult();
+            zdCqReultList.setTotalPay(setPrecision2(zdCqReultList.getTotalPay()));
+            zdCqReultList.setJtJZMJ(setPrecision2(zdCqReultList.getJtJZMJ()));
+            zdCqReultList.setGyJZMJ(setPrecision2(zdCqReultList.getGyJZMJ()));
+
+            ztZdProjectList.setCqResult(zdCqReultList);
             //国有房屋
             zdCqReultList.setGyFWData(mapper.readValue(zdCqReultList.getGyList(), new TypeReference<List<FWItem>>() {
             }));
@@ -165,10 +172,6 @@ public class ZtZdProjectListController extends BaseController
             zdCqReultList.setJtFWData(mapper.readValue(zdCqReultList.getJtList(), new TypeReference<List<FWItem>>() {
             }));
             ztZdProjectList.setCqResult(zdCqReultList);
-
-
-
-
             //征地结果
             ZtZdDlResultList zdReultList = new ZtZdDlResultList();
             zdReultList.setProjectId(ztZdProjectList.getId());
@@ -180,8 +183,6 @@ public class ZtZdProjectListController extends BaseController
             }
             else
                 zdReultList=ztZdProjectList.getZdResult();
-
-
                 //国有地类
                 zdReultList.setGydlData(mapper.readValue(zdReultList.getGydlList(), new TypeReference<List<DLItem>>() {
                 }));
@@ -198,12 +199,17 @@ public class ZtZdProjectListController extends BaseController
                 List<ZtZdQmResultList> list3 = ztZdQmResultListService.selectZtZdQmResultListList(qmReultList);
                 if (list3 != null && list3.size() > 0)
                 {
-                    ztZdProjectList.setQmResult(list3.get(0));
+                    qmReultList=list3.get(0);
                 }
             }
             else
                 qmReultList=ztZdProjectList.getQmResult();
-
+            qmReultList.setNzwMJ(setPrecision2((qmReultList.getNzwMJ())));
+            qmReultList.setJjzwMJ(setPrecision2((qmReultList.getJjzwMJ())));
+            qmReultList.setTotalMJ(setPrecision2(qmReultList.getTotalMJ()));
+            qmReultList.setJjzwPay(setPrecision2(qmReultList.getJjzwPay()));
+            qmReultList.setNzwPay(setPrecision2(qmReultList.getNzwPay()));
+            ztZdProjectList.setQmResult(qmReultList);
             //权属
             ZtZdQsResultList qsResultList=new ZtZdQsResultList();
             qsResultList.setProjectId(ztZdProjectList.getId());
@@ -218,7 +224,7 @@ public class ZtZdProjectListController extends BaseController
                     }));
                     qsResultList.setJtUData(mapper.readValue(qsResultList.getCollectiveUsedList(), new TypeReference<List<QSItem>>() {
                     }));
-                    ztZdProjectList.setQsResult(qsResultList);
+
                 }
             }else{
 
@@ -229,10 +235,9 @@ public class ZtZdProjectListController extends BaseController
                 }));
                 qsResultList.setJtUData(mapper.readValue(qsResultList.getCollectiveUsedList(), new TypeReference<List<QSItem>>() {
                 }));
-                ztZdProjectList.setQsResult(qsResultList);
             }
 
-
+            ztZdProjectList.setQsResult(qsResultList);
             //总费用
             Double totalZDBC =ztZdProjectList.getZdResult()==null?0.0:ztZdProjectList.getZdResult().getTotalPay();
             Double totalCQBC = ztZdProjectList.getQmResult()==null?0.0:ztZdProjectList.getQmResult().getTotalPay() ;
@@ -270,6 +275,7 @@ public class ZtZdProjectListController extends BaseController
 //            log.error("征收补偿预估报告导出异常,{}" + e);
         }
     }
+
     private void writeWord(HttpServletResponse response, String temDir, String wordName, XWPFTemplate template) throws Exception {
         // 生成的word格式
         String formatSuffix = ".docx";
@@ -298,7 +304,12 @@ public class ZtZdProjectListController extends BaseController
     /**
      * 获取征地拆迁补偿分析结果列详细信息
      */
-
+    private   Double  setPrecision2(Double data)
+    {
+        java.text.DecimalFormat   df   =new   java.text.DecimalFormat("#.00");
+        String result =   df.format(data);
+        return Double.parseDouble(result);
+    }
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/BdcController.java

@@ -23,10 +23,10 @@ import com.onemap.common.core.utils.poi.ExcelUtil;
 import com.onemap.common.core.web.page.TableDataInfo;
 
 /**
- * 不动产Controller
+ * 建筑矢量Controller
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @RestController
 @RequestMapping("/bdc")
@@ -36,9 +36,9 @@ public class BdcController extends BaseController
     private IBdcService bdcService;
 
     /**
-     * 查询不动产列表
+     * 查询建筑矢量列表
      */
-    @RequiresPermissions("onemap-sanya:bdc:list")
+    @RequiresPermissions("system:bdc:list")
     @GetMapping("/list")
     public TableDataInfo list(Bdc bdc)
     {
@@ -48,33 +48,33 @@ public class BdcController extends BaseController
     }
 
     /**
-     * 导出不动产列表
+     * 导出建筑矢量列表
      */
-    @RequiresPermissions("onemap-sanya:bdc:export")
-    @Log(title = "不动产", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:bdc:export")
+    @Log(title = "建筑矢量", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Bdc bdc)
     {
         List<Bdc> list = bdcService.selectBdcList(bdc);
         ExcelUtil<Bdc> util = new ExcelUtil<Bdc>(Bdc.class);
-        util.exportExcel(response, list, "不动产数据");
+        util.exportExcel(response, list, "建筑矢量数据");
     }
 
     /**
-     * 获取不动产详细信息
+     * 获取建筑矢量详细信息
      */
-    @RequiresPermissions("onemap-sanya:bdc:query")
-    @GetMapping(value = "/{gid}")
-    public AjaxResult getInfo(@PathVariable("gid") Integer gid)
+    @RequiresPermissions("system:bdc:query")
+    @GetMapping(value = "/{smid}")
+    public AjaxResult getInfo(@PathVariable("smid") Integer smid)
     {
-        return success(bdcService.selectBdcByGid(gid));
+        return success(bdcService.selectBdcBySmid(smid));
     }
 
     /**
-     * 新增不动产
+     * 新增建筑矢量
      */
-    @RequiresPermissions("onemap-sanya:bdc:add")
-    @Log(title = "不动产", businessType = BusinessType.INSERT)
+    @RequiresPermissions("system:bdc:add")
+    @Log(title = "建筑矢量", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Bdc bdc)
     {
@@ -82,10 +82,10 @@ public class BdcController extends BaseController
     }
 
     /**
-     * 修改不动产
+     * 修改建筑矢量
      */
-    @RequiresPermissions("onemap-sanya:bdc:edit")
-    @Log(title = "不动产", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("system:bdc:edit")
+    @Log(title = "建筑矢量", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Bdc bdc)
     {
@@ -93,13 +93,13 @@ public class BdcController extends BaseController
     }
 
     /**
-     * 删除不动产
+     * 删除建筑矢量
      */
-    @RequiresPermissions("onemap-sanya:bdc:remove")
-    @Log(title = "不动产", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{gids}")
-    public AjaxResult remove(@PathVariable Integer[] gids)
+    @RequiresPermissions("system:bdc:remove")
+    @Log(title = "建筑矢量", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{smids}")
+    public AjaxResult remove(@PathVariable Integer[] smids)
     {
-        return toAjax(bdcService.deleteBdcByGids(gids));
+        return toAjax(bdcService.deleteBdcBySmids(smids));
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/DltbController.java

@@ -24,9 +24,9 @@ import com.onemap.common.core.web.page.TableDataInfo;
 
 /**
  * 地类图斑Controller
- * 
+ *
  * @author ruoyi
- * @date 2024-08-27
+ * @date 2024-08-30
  */
 @RestController
 @RequestMapping("/dltb")
@@ -38,7 +38,6 @@ public class DltbController extends BaseController
     /**
      * 查询地类图斑列表
      */
-
     @GetMapping("/list")
     public TableDataInfo list(Dltb dltb)
     {
@@ -50,7 +49,6 @@ public class DltbController extends BaseController
     /**
      * 导出地类图斑列表
      */
-
     @Log(title = "地类图斑", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Dltb dltb)
@@ -63,11 +61,10 @@ public class DltbController extends BaseController
     /**
      * 获取地类图斑详细信息
      */
-
-    @GetMapping(value = "/{gid}")
-    public AjaxResult getInfo(@PathVariable("gid") Integer gid)
+    @GetMapping(value = "/{smid}")
+    public AjaxResult getInfo(@PathVariable("smid") Integer smid)
     {
-        return success(dltbService.selectDltbByGid(gid));
+        return success(dltbService.selectDltbBySmid(smid));
     }
 
     /**
@@ -84,7 +81,6 @@ public class DltbController extends BaseController
     /**
      * 修改地类图斑
      */
-
     @Log(title = "地类图斑", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Dltb dltb)
@@ -95,11 +91,10 @@ public class DltbController extends BaseController
     /**
      * 删除地类图斑
      */
-
     @Log(title = "地类图斑", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{gids}")
-    public AjaxResult remove(@PathVariable Integer[] gids)
+    @DeleteMapping("/{smids}")
+    public AjaxResult remove(@PathVariable Integer[] smids)
     {
-        return toAjax(dltbService.deleteDltbByGids(gids));
+        return toAjax(dltbService.deleteDltbBySmids(smids));
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/GysyqController.java

@@ -23,10 +23,10 @@ import com.onemap.common.core.utils.poi.ExcelUtil;
 import com.onemap.common.core.web.page.TableDataInfo;
 
 /**
- * 国有使用权Controller
+ * 国有所有权Controller
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @RestController
 @RequestMapping("/gysyq")
@@ -36,9 +36,9 @@ public class GysyqController extends BaseController
     private IGysyqService gysyqService;
 
     /**
-     * 查询国有使用权列表
+     * 查询国有所有权列表
      */
-
+    @RequiresPermissions("system:gysyq:list")
     @GetMapping("/list")
     public TableDataInfo list(Gysyq gysyq)
     {
@@ -48,33 +48,33 @@ public class GysyqController extends BaseController
     }
 
     /**
-     * 导出国有使用权列表
+     * 导出国有所有权列表
      */
-
-    @Log(title = "国有使用权", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("system:gysyq:export")
+    @Log(title = "国有所有权", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Gysyq gysyq)
     {
         List<Gysyq> list = gysyqService.selectGysyqList(gysyq);
         ExcelUtil<Gysyq> util = new ExcelUtil<Gysyq>(Gysyq.class);
-        util.exportExcel(response, list, "国有使用权数据");
+        util.exportExcel(response, list, "国有所有权数据");
     }
 
     /**
-     * 获取国有使用权详细信息
+     * 获取国有所有权详细信息
      */
-
-    @GetMapping(value = "/{gid}")
-    public AjaxResult getInfo(@PathVariable("gid") Integer gid)
+    @RequiresPermissions("system:gysyq:query")
+    @GetMapping(value = "/{smid}")
+    public AjaxResult getInfo(@PathVariable("smid") Integer smid)
     {
-        return success(gysyqService.selectGysyqByGid(gid));
+        return success(gysyqService.selectGysyqBySmid(smid));
     }
 
     /**
-     * 新增国有使用权
+     * 新增国有所有权
      */
-
-    @Log(title = "国有使用权", businessType = BusinessType.INSERT)
+    @RequiresPermissions("system:gysyq:add")
+    @Log(title = "国有所有权", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Gysyq gysyq)
     {
@@ -82,10 +82,10 @@ public class GysyqController extends BaseController
     }
 
     /**
-     * 修改国有使用权
+     * 修改国有所有权
      */
-
-    @Log(title = "国有使用权", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("system:gysyq:edit")
+    @Log(title = "国有所有权", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Gysyq gysyq)
     {
@@ -93,13 +93,13 @@ public class GysyqController extends BaseController
     }
 
     /**
-     * 删除国有使用权
+     * 删除国有所有权
      */
-
-    @Log(title = "国有使用权", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{gids}")
-    public AjaxResult remove(@PathVariable Integer[] gids)
+    @RequiresPermissions("system:gysyq:remove")
+    @Log(title = "国有所有权", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{smids}")
+    public AjaxResult remove(@PathVariable Integer[] smids)
     {
-        return toAjax(gysyqService.deleteGysyqByGids(gids));
+        return toAjax(gysyqService.deleteGysyqBySmids(smids));
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/JtownerController.java

@@ -26,7 +26,7 @@ import com.onemap.common.core.web.page.TableDataInfo;
  * 集体所有权Controller
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @RestController
 @RequestMapping("/jtowner")
@@ -38,7 +38,7 @@ public class JtownerController extends BaseController
     /**
      * 查询集体所有权列表
      */
-
+    @RequiresPermissions("system:jtowner:list")
     @GetMapping("/list")
     public TableDataInfo list(Jtowner jtowner)
     {
@@ -50,7 +50,7 @@ public class JtownerController extends BaseController
     /**
      * 导出集体所有权列表
      */
-
+    @RequiresPermissions("system:jtowner:export")
     @Log(title = "集体所有权", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Jtowner jtowner)
@@ -63,17 +63,17 @@ public class JtownerController extends BaseController
     /**
      * 获取集体所有权详细信息
      */
-
-    @GetMapping(value = "/{gid}")
-    public AjaxResult getInfo(@PathVariable("gid") Integer gid)
+    @RequiresPermissions("system:jtowner:query")
+    @GetMapping(value = "/{smid}")
+    public AjaxResult getInfo(@PathVariable("smid") Integer smid)
     {
-        return success(jtownerService.selectJtownerByGid(gid));
+        return success(jtownerService.selectJtownerBySmid(smid));
     }
 
     /**
      * 新增集体所有权
      */
-
+    @RequiresPermissions("system:jtowner:add")
     @Log(title = "集体所有权", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Jtowner jtowner)
@@ -84,7 +84,7 @@ public class JtownerController extends BaseController
     /**
      * 修改集体所有权
      */
-
+    @RequiresPermissions("system:jtowner:edit")
     @Log(title = "集体所有权", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Jtowner jtowner)
@@ -95,11 +95,11 @@ public class JtownerController extends BaseController
     /**
      * 删除集体所有权
      */
-
+    @RequiresPermissions("system:jtowner:remove")
     @Log(title = "集体所有权", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{gids}")
-    public AjaxResult remove(@PathVariable Integer[] gids)
+	@DeleteMapping("/{smids}")
+    public AjaxResult remove(@PathVariable Integer[] smids)
     {
-        return toAjax(jtownerService.deleteJtownerByGids(gids));
+        return toAjax(jtownerService.deleteJtownerBySmids(smids));
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/JtuseController.java

@@ -3,6 +3,9 @@ package com.onemap.sanya.controller.spatial;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.onemap.sanya.domain.spatial.Jtuse;
+import com.onemap.sanya.service.IJtuseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.onemap.common.log.annotation.Log;
 import com.onemap.common.log.enums.BusinessType;
 import com.onemap.common.security.annotation.RequiresPermissions;
-import com.onemap.sanya.domain.spatial.Jtuse;
-import com.onemap.sanya.service.IJtuseService;
+
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.utils.poi.ExcelUtil;
@@ -26,7 +28,7 @@ import com.onemap.common.core.web.page.TableDataInfo;
  * 集体使用权Controller
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @RestController
 @RequestMapping("/jtuse")
@@ -38,7 +40,7 @@ public class JtuseController extends BaseController
     /**
      * 查询集体使用权列表
      */
-
+    @RequiresPermissions("system:jtuse:list")
     @GetMapping("/list")
     public TableDataInfo list(Jtuse jtuse)
     {
@@ -50,7 +52,7 @@ public class JtuseController extends BaseController
     /**
      * 导出集体使用权列表
      */
-
+    @RequiresPermissions("system:jtuse:export")
     @Log(title = "集体使用权", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Jtuse jtuse)
@@ -63,17 +65,17 @@ public class JtuseController extends BaseController
     /**
      * 获取集体使用权详细信息
      */
-
-    @GetMapping(value = "/{gid}")
-    public AjaxResult getInfo(@PathVariable("gid") Integer gid)
+    @RequiresPermissions("system:jtuse:query")
+    @GetMapping(value = "/{smid}")
+    public AjaxResult getInfo(@PathVariable("smid") Integer smid)
     {
-        return success(jtuseService.selectJtuseByGid(gid));
+        return success(jtuseService.selectJtuseBySmid(smid));
     }
 
     /**
      * 新增集体使用权
      */
-
+    @RequiresPermissions("system:jtuse:add")
     @Log(title = "集体使用权", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Jtuse jtuse)
@@ -84,7 +86,7 @@ public class JtuseController extends BaseController
     /**
      * 修改集体使用权
      */
-
+    @RequiresPermissions("system:jtuse:edit")
     @Log(title = "集体使用权", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Jtuse jtuse)
@@ -95,11 +97,11 @@ public class JtuseController extends BaseController
     /**
      * 删除集体使用权
      */
-
+    @RequiresPermissions("system:jtuse:remove")
     @Log(title = "集体使用权", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{gids}")
-    public AjaxResult remove(@PathVariable Integer[] gids)
+	@DeleteMapping("/{smids}")
+    public AjaxResult remove(@PathVariable Integer[] smids)
     {
-        return toAjax(jtuseService.deleteJtuseByGids(gids));
+        return toAjax(jtuseService.deleteJtuseBySmids(smids));
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/ZDAnalyseController.java

@@ -1,15 +1,13 @@
 package com.onemap.sanya.controller.spatial;
 
-import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.onemap.common.core.annotation.Excel;
 import com.onemap.common.core.web.controller.BaseController;
-import com.onemap.sanya.domain.JsonConvert;
 import com.onemap.sanya.domain.business.*;
 import com.onemap.sanya.domain.spatial.*;
 import com.onemap.sanya.service.*;
-import io.swagger.annotations.ApiModelProperty;
 import org.jetbrains.annotations.NotNull;
 import org.locationtech.jts.geom.*;
 import com.onemap.sanya.utils.*;
@@ -18,13 +16,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import static com.onemap.sanya.utils.SpatialOperate.getFieldAnnotation;
 
 /**
  * 征地补偿分析Controller
@@ -37,7 +34,7 @@ import java.util.Map;
 public class ZDAnalyseController extends BaseController {
 
     @Autowired
-   private IDltbService dltbService;
+    private IDltbService dltbService;
     @Autowired
     private IGysyqService gysyqService;
     @Autowired
@@ -46,66 +43,163 @@ public class ZDAnalyseController extends BaseController {
     private IJtuseService jtuseService;
     @Autowired
     private IBdcService bdcService;
-    List<Dltb> dltbs=new ArrayList<>();
-    List<Bdc> bdcs=new ArrayList<>();
 
-    List<Gysyq> gysyqs=new ArrayList<>();
+    @Autowired
+    private IZtQmBcbzListService qmBcbzListService;
+
+    @Autowired
+    private IZtCqBcbzItemService cqBcbzItemService;
+    @Autowired
+    private  IZtCqBcbzListService cqBcbzListService;
+    @Autowired
+    private IZtZdBcbzListService ztZdBcbzListService;
+    List<Dltb> dltbs = new ArrayList<>();
+    List<Bdc> bdcs = new ArrayList<>();
+
+    List<Gysyq> gysyqs = new ArrayList<>();
 
-    List<Jtowner> jtowners=new ArrayList<>();
-    List<Jtuse> jtuses=new ArrayList<>();
-    String [] jtLikes={
-        "村","村民" };
+    List<Jtowner> jtowners = new ArrayList<>();
+    List<Jtuse> jtuses = new ArrayList<>();
+    String[] jtLikes = {
+            "村", "村民"};
 
-    String smfl="乔木林地,竹林地,灌木林地,其他林地";
-    String jjzwfl="果园,茶园,橡胶园,其他园地";
-    String nzwfl="水田,水浇地，旱地";
+    String smfl = "乔木林地,竹林地,灌木林地,其他林地";
+    String jjzwfl = "果园,茶园,橡胶园,其他园地";
+    String nzwfl = "水田,水浇地，旱地";
 
 
-    ObjectMapper objectMapper=new ObjectMapper();
-    ZtZdProjectList zdProjectList=new ZtZdProjectList();
-    ZtZdBcbzList zdBcbzList=new ZtZdBcbzList();
-    Polygon polygon=null;
+    ObjectMapper objectMapper = new ObjectMapper();
+    ZtZdProjectList zdProjectList = new ZtZdProjectList();
+//    ZtZdBcbzList zdBcbzList=new ZtZdBcbzList();
+//    List<ZtCqBcbzItem> cqBcbzList=new ArrayList<>();
+
+    Polygon polygon = null;
+
     @PostMapping("/getAnalyseResult")
-    public  ZtZdProjectList  getAnalyseResult(ZtZdProjectList projectList) throws JsonProcessingException {
-        List<Coordinate> pointArray=objectMapper.readValue(projectList.getRegions(), new TypeReference<List<Coordinate>>(){});
-        if (pointArray == null || pointArray.size() == 0)
-            return zdProjectList;
-         polygon = SpatialOperate.createPolygon(pointArray);
-        if(polygon==null)
-            return zdProjectList;
-        zdProjectList.setTotalZDMJ(polygon.getArea());
-        String str = SpatialOperate.geometry2Wkt(polygon);
-        //地类图斑选择集
-        dltbs = dltbService.selectDltbByPolygon(str);
-        bdcs = bdcService.selectBdcByPolygon(str);
-        gysyqs = gysyqService.selectGysyqByPolygon(str);
-        jtowners = jtownerService.selectJtownerByPolygon(str);
-        jtuses = jtuseService.selectJtuseByPolygon(str);
-        return  projectList;
+    public ZtZdProjectList getAnalyseResult(ZDPost zdPost) throws JsonProcessingException {
+        try {
+
+            List<Coordinate> pointArray = objectMapper.readValue(zdPost.getRegions(), new TypeReference<List<Coordinate>>() {
+            });
+            if (pointArray == null || pointArray.size() == 0)
+                return zdProjectList;
+            polygon = SpatialOperate.createPolygon(pointArray);
+            if (polygon == null)
+                return zdProjectList;
+            Double area=   setPrecision2(SpatialOperate.getGeometryArea(polygon)/666.66);
+            zdProjectList.setTotalZDMJ(area);
+            //设置征地补偿标准
+            initParams(zdPost);
+            String str = SpatialOperate.geometry2Wkt(polygon);
+            //地类图斑选择集
+            dltbs = dltbService.selectDltbByPolygon(str);
+            bdcs = bdcService.selectBdcByPolygon(str);
+            gysyqs = gysyqService.selectGysyqByPolygon(str);
+            jtowners = jtownerService.selectJtownerByPolygon(str);
+            jtuses = jtuseService.selectJtuseByPolygon(str);
+            qsComputer();
+            zdComputer();
+            jzComputer();
+            zdProjectList.setTotalZDBC(zdProjectList.getZdResult().getTotalPay());
+            zdProjectList.setTotalQMBC(zdProjectList.getQmResult().getTotalPay());
+            zdProjectList.setTotalCQBC(zdProjectList.getCqResult().getTotalPay());
+        } catch (Exception err) {
+            System.out.print(err.toString());
+        }
+        return zdProjectList;
     }
-    public void zdComputer() throws ParseException, org.locationtech.jts.io.ParseException, JsonProcessingException {
-        if(dltbs==null||dltbs.size()==0)
-            return;
-        //分析结果类
-        ZtZdQsResultList qsResultList=new ZtZdQsResultList();
-        ZtZdQmResultList ztZdQmResultList=new ZtZdQmResultList();
-        ZtZdDlResultList ztZdDlResultList=new ZtZdDlResultList();
-        ZtZdCqReultList zdCqReultList=new ZtZdCqReultList();
+    /**
+     * 参数初始化 设置补偿标准
+     * @param zdPost
+     */
+    public void initParams(ZDPost zdPost) {
+        String qmValue = zdPost.getQmValue();
+        String cqValue = zdPost.getCqValue();
+        String zdValue = zdPost.getZdValue();
+
+        //青苗补偿标准
+        ZtQmBcbzList qmBcbzList=null;
+         if(qmValue==null||qmValue=="")
+         {
+             List<ZtQmBcbzList> items= qmBcbzListService.selectZtQmBcbzListList(new ZtQmBcbzList());
+             if(items!=null&&items.size()>0)
+             {
+                 qmBcbzList=   items.get(0);
+                 qmValue=qmBcbzList.getId();
+                 zdProjectList.setQmValue(qmValue);
+             }
+         }
+         else
+             qmBcbzList= qmBcbzListService.selectZtQmBcbzListById(qmValue);
+         //征地补偿标准
+        ZtZdBcbzList zdBcbzList=null;
+        if(zdValue==null||zdValue=="") {
+            List<ZtZdBcbzList> items= ztZdBcbzListService.selectZtZdBcbzListList(new ZtZdBcbzList());
+            if(items!=null&&items.size()>0) {
+                zdBcbzList=   items.get(0);
+                zdValue=zdBcbzList.getId();
+                zdProjectList.setZdValue(zdValue);
+            }
+        }
+        else
+            zdBcbzList=  ztZdBcbzListService.selectZtZdBcbzListById(zdValue);
+        //拆迁补偿标准
+        ZtCqBcbzList cqBcbzList=null;
+        List<ZtCqBcbzItem> cqBcbzItemList=null;
+        ZtCqBcbzItem cqBcbzItem=new ZtCqBcbzItem();
+        if(cqValue==null||cqValue=="") {
+            List<ZtCqBcbzList> items=cqBcbzListService.selectZtCqBcbzListList(new ZtCqBcbzList());
+            if(items!=null&&items.size()>0) {
+                cqBcbzList=   items.get(0);
+                cqValue=zdBcbzList.getId();
+                zdProjectList.setZdValue(cqValue);
+                cqBcbzItem.setPid(cqValue);
+                cqBcbzItemList= cqBcbzItemService.selectZtCqBcbzItemList(cqBcbzItem);
+            }
+        }
+        else
+        {
+            cqBcbzList=cqBcbzListService.selectZtCqBcbzListById(cqValue);
+            ZtCqBcbzItem item=new ZtCqBcbzItem();
+            item.setPid(cqValue);
+            cqBcbzItemList=cqBcbzItemService.selectZtCqBcbzItemList(item);
+        }
+        zdProjectList.setCqBcbz(cqBcbzList);
+        zdProjectList.setCqBcbzItems(cqBcbzItemList);
+        zdProjectList.setQmBcbz(qmBcbzList);
+        zdProjectList.setZdBcbz(zdBcbzList);
 
-        //相交面积
-        Double instertArea=0.00;
+    }
 
+    /**
+     * 权属信息计算
+     *
+     * @throws ParseException
+     * @throws org.locationtech.jts.io.ParseException
+     * @throws JsonProcessingException
+     */
+    public void qsComputer() throws ParseException, org.locationtech.jts.io.ParseException, JsonProcessingException, IllegalAccessException {
+        //相交面积
+        Double instertArea = 0.00;
+        Double gyMJ = 0.00;
+        Double jtOMj = 0.00;
+        Double jtUMj = 0.00;
         //权属变量
-        List<QSItem> gyUData=new ArrayList<>();
-        List<QSItem> jtOData=new ArrayList<>();
-        List<QSItem> jtUData=new ArrayList<>();
+        List<QSItem> gyUData = new ArrayList<>();
+        List<QSItem> jtOData = new ArrayList<>();
+        List<QSItem> jtUData = new ArrayList<>();
+        List<SuperMapFreature> gyFeatures= new ArrayList<>();
+        List<SuperMapFreature> jtOFeatures= new ArrayList<>();
+        List<SuperMapFreature> jtUFeatures= new ArrayList<>();
+        ZtZdQsResultList qsResultList = new ZtZdQsResultList();
 
         //国有权属及面积计算
         for (int i = 0; i < gysyqs.size(); i++) {
             Gysyq feature1 = gysyqs.get(i);
-            String qsdwmc =feature1.getRightOwne();
-            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature1.getGeom());
-            instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
+            String qsdwmc = feature1.getRightOwne();
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            instertArea =  setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
+         SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
             Integer index = -1;
             for (Integer j = 0; j < gyUData.size(); j++) {
                 if (qsdwmc.toUpperCase() == gyUData.get(j).getQsdwmc().toUpperCase()) {
@@ -113,6 +207,7 @@ public class ZDAnalyseController extends BaseController {
                     break;
                 }
             }
+            gyMJ += instertArea;
             if (index > -1) {
                 Double area = gyUData.get(index).getMj() + instertArea;
                 gyUData.get(index).setMj(area + instertArea);
@@ -122,18 +217,17 @@ public class ZDAnalyseController extends BaseController {
                 qsItem.setQsdwmc(qsdwmc);
                 gyUData.add(qsItem);
             }
+            gyFeatures.add(superMapFreature);
         }
-        qsResultList.setGyUData(gyUData);
-        gyUData=null;
-
         //集体所有及面积
         for (int i = 0; i < jtowners.size(); i++) {
             Jtowner feature1 = jtowners.get(i);
-            String qsdwmc =feature1.getQlr();
-            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature1.getGeom());
-            instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
+            String qsdwmc = feature1.getQlr();
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
             Integer index = -1;
-            for (Integer j = 0; j < gyUData.size(); j++) {
+            SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
+            for (Integer j = 0; j < jtOData .size(); j++) {
                 if (qsdwmc.toUpperCase() == jtOData.get(j).getQsdwmc().toUpperCase()) {
                     index = j;
                     break;
@@ -148,144 +242,233 @@ public class ZDAnalyseController extends BaseController {
                 qsItem.setQsdwmc(qsdwmc);
                 jtOData.add(qsItem);
             }
+            jtOMj += instertArea;
+            jtOFeatures.add(superMapFreature);
         }
-        qsResultList.setGyUData(jtOData);
-        jtOData=null;
-
         //集体使用权及面积
         for (int i = 0; i < jtuses.size(); i++) {
             Jtuse feature1 = jtuses.get(i);
 
-            String qsdwmc =feature1.getSyqr();
-            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature1.getGeom());
-            instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
+            String qsdwmc = feature1.getSyqr();
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
             Integer index = -1;
-            for (Integer j = 0; j < gyUData.size(); j++) {
-                if (qsdwmc.toUpperCase() == jtOData.get(j).getQsdwmc().toUpperCase()) {
+            SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
+            for (Integer j = 0; j < jtUData.size(); j++) {
+                if (qsdwmc.toUpperCase() == jtUData.get(j).getQsdwmc().toUpperCase()) {
                     index = j;
                     break;
                 }
             }
             if (index > -1) {
-                Double area = jtOData.get(index).getMj() + instertArea;
-                jtOData.get(index).setMj(area + instertArea);
+                Double area = jtUData.get(index).getMj() + instertArea;
+                jtUData.get(index).setMj(area + instertArea);
             } else {
                 QSItem qsItem = new QSItem();
                 qsItem.setMj(instertArea);
                 qsItem.setQsdwmc(qsdwmc);
                 jtUData.add(qsItem);
             }
+            jtUMj += instertArea;
+            jtUFeatures.add(superMapFreature);
         }
-        qsResultList.setGyUData(jtUData);
-        jtUData=null;
+        //国有集体总面积
+        qsResultList.setStateUsedMJ(gyMJ);
+        qsResultList.setCollectiveOwnerMJ(jtOMj);
+        qsResultList.setCollectiveUsedMJ(jtUMj);
+        //国有集体统计信息
+        qsResultList.setGyUData(gyUData);
+        qsResultList.setStateUsedList(objectMapper.writeValueAsString(gyUData));
+
+        qsResultList.setJtOData(jtOData);
+        qsResultList.setCollectiveOwnerList(objectMapper.writeValueAsString(jtOData));
+
+        qsResultList.setJtUData(jtUData);
+        qsResultList.setCollectiveUsedList(objectMapper.writeValueAsString(jtUData));
+        //国有集体要素信息
+        qsResultList.setCollectiveUsedFeatures(objectMapper.writeValueAsString(gyFeatures));
+        qsResultList.setCollectiveOwnerFeatures(objectMapper.writeValueAsString(jtOFeatures));
+        qsResultList.setCollectiveUsedFeatures(objectMapper.writeValueAsString(jtUFeatures));
+
+
+
+        Gysyq gysyq = new Gysyq();
+        Jtuse jtuse = new Jtuse();
+        Jtowner jtowner = new Jtowner();
+
+        List<FldInfo> gyFldInfos = getFieldAnnotation(gysyq);
+        List<FldInfo> jtOFldInfos = getFieldAnnotation(jtuse);
+        List<FldInfo> gyUldInfos = getFieldAnnotation(jtowner);
+
+        qsResultList.setStateUsedFieldInfos(objectMapper.writeValueAsString(gyFldInfos));
+        qsResultList.setCollectiveOwnerFieldInfos(objectMapper.writeValueAsString(jtOFldInfos));
+        qsResultList.setCollectiveUsedFieldInfos(objectMapper.writeValueAsString(gyUldInfos));
+        zdProjectList.setQsResult(qsResultList);
+        zdProjectList.setGyMJ(setPrecision2(gyMJ));
+        zdProjectList.setJtMJ(setPrecision2(jtOMj+jtUMj));
+
+        gyFldInfos = null;
+        jtOFldInfos = null;
+        gyUldInfos = null;
+
+        gyUData = null;
+        jtUData = null;
+        jtOData = null;
+
+    }
+
+    /**
+     * 征地及青苗计算
+     *
+     * @throws ParseException
+     * @throws org.locationtech.jts.io.ParseException
+     * @throws JsonProcessingException
+     */
+    public void zdComputer() throws ParseException, org.locationtech.jts.io.ParseException, JsonProcessingException, IllegalAccessException {
+        if (dltbs == null || dltbs.size() == 0)
+            return;
+        //分析结果类
+        ZtZdQmResultList ztZdQmResultList = new ZtZdQmResultList();
+        ZtZdDlResultList ztZdDlResultList = new ZtZdDlResultList();
+
+        //相交面积
+        Double instertArea = 0.00;
         //地类统计
-        List<DLItem> jtdlData=new ArrayList<>();
-        List<DLItem> gydlData=new ArrayList<>();
-        List<Dltb> gyFeatures=new ArrayList<>();
-        List<Dltb> jtFeatures=new ArrayList<>();
-        Double gymj=0.00;
-        Double jtmj=0.00;
+        List<DLItem> jtdlData = new ArrayList<>();
+        List<DLItem> gydlData = new ArrayList<>();
+        List<SuperMapFreature> gyFeatures = new ArrayList<>();
+        List<SuperMapFreature> jtFeatures = new ArrayList<>();
+        Double gymj = 0.00;
+        Double jtmj = 0.00;
+        Double azPay=0.00;
+        Double zdPay=0.00;
+        Double bchjPay=0.00;
+        Double gyPay=0.00;
+        Double jtPay=0.00;
         //青苗相关参数
-        Double smMj=0.00;
-        Double jjzwMj=0.00;
-        Double nzwMj=0.00;
-        List<Dltb> qmFreatures=new ArrayList<>();
+        Double smPay=0.00;
+        Double jjzwPay=0.00;
+        Double nzwPay=0.00;
+        Double smMj = 0.00;
+        Double jjzwMj = 0.00;
+        Double nzwMj = 0.00;
+        List<SuperMapFreature> qmFreatures = new ArrayList<>();
+
         for (int i = 0; i < dltbs.size(); i++) {
-            Dltb feature=dltbs.get(i);
-            String dlmc=feature.getDlmc();
-            Polygon geom = (Polygon) SpatialOperate.createPolygonByWkt(feature.getGeom());
-            instertArea = SpatialOperate.getIntersectsArea(polygon, geom) ;
-            if(instertArea==0)
-                continue;;
-            Integer index=-1;
-            if(isValueInList(jtLikes,dlmc))
-            {
+            Dltb feature = dltbs.get(i);
+            String dlmc = feature.getDlmc();
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getSmgeometry());
+            instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom)) ;
+            if (instertArea == 0)
+                continue;
+            Integer index = -1;
+            SuperMapFreature superMapFreature=  SpatialOperate.  Feature2Supermap(feature,geom);
+            //集体或者国有地类判断 权属字段包含 村/村民 为集体 否则为国有
+            if (isValueInList(jtLikes, dlmc)) {
                 jtmj = getaDouble(instertArea, jtdlData, jtmj, dlmc, index);
-                jtFeatures.add(feature);
-            }
-            else {
+                jtFeatures.add(superMapFreature);
+                //青苗判断
+                if (smfl.indexOf(dlmc) > -1) {
+                    smMj += instertArea;
+                    qmFreatures.add(superMapFreature);
+                } else if (nzwfl.indexOf(dlmc) > -1) {
+                    jjzwMj += instertArea;
+                    qmFreatures.add(superMapFreature);
+                } else if (jjzwfl.indexOf(dlmc) > -1) {
+                    nzwMj += instertArea;
+                    qmFreatures.add(superMapFreature);
+
+                }
+            } else {
                 gymj = getaDouble(instertArea, gydlData, gymj, dlmc, index);
-                gyFeatures.add(feature);
-            }
-            //青苗判断
-            if(smfl.indexOf(dlmc)>-1)
-            {
-                smMj+=instertArea;
-                qmFreatures.add(feature);
-            }
-            else  if(nzwfl.indexOf(dlmc)>-1)
-            {
-                jjzwMj+=instertArea;
-                qmFreatures.add(feature);
-            }
-            else  if(jjzwfl.indexOf(dlmc)>-1)
-            {
-                nzwMj+=instertArea;
-                qmFreatures.add(feature);
+                gyFeatures.add(superMapFreature);
             }
+
+        }
+        //青苗补偿
+        ZtQmBcbzList qmBcbz= zdProjectList.getQmBcbz();
+        if(qmBcbz!=null)
+        {
+            smPay=setPrecision2((smMj*qmBcbz.getSm()));
+            jjzwPay=setPrecision2(jjzwMj*qmBcbz.getJjzw());
+            nzwPay=setPrecision2(nzwMj*qmBcbz.getNzw());
         }
+        ZtZdBcbzList zdbcbz= zdProjectList.getZdBcbz();
+        if(zdbcbz!=null) {
+            zdPay =setPrecision2(zdbcbz.getTdcz() * (jtmj));
+            azPay = setPrecision2(zdbcbz.getAzbcf() * (jtmj));
+            bchjPay=setPrecision2(zdbcbz.getBchj()* (jtmj));
 
+        }
+        //征地补偿
+        ztZdDlResultList.setTotalAZPay(azPay);
+        ztZdDlResultList.setTotalZDPay(zdPay);
+        ztZdDlResultList.setTotalPay(bchjPay);
         //地类统计
         //国有用地统计
-        ztZdDlResultList.setGyMJ(gymj);
-        ztZdDlResultList.setJtMJ(jtmj);
+        ztZdDlResultList.setGyMJ(setPrecision2(gymj));
+        ztZdDlResultList.setJtMJ(setPrecision2(jtmj));
         ztZdDlResultList.setGydlData(gydlData);
         ztZdDlResultList.setGydlList(objectMapper.writeValueAsString(gydlData));
-        gydlData=null;
+        gydlData = null;
         ztZdDlResultList.setGyfeatures(objectMapper.writeValueAsString(gyFeatures));
-        gyFeatures=null;
+        gyFeatures = null;
         //集体用地统计
         ztZdDlResultList.setJtdlData(jtdlData);
         ztZdDlResultList.setJtdlList(objectMapper.writeValueAsString(jtdlData));
-        jtdlData=null;
+        jtdlData = null;
         ztZdDlResultList.setJtfeatures(objectMapper.writeValueAsString(jtFeatures));
-        jtFeatures=null;
+        jtFeatures = null;
 
         //青苗补偿计算
-       ZtQmBcbzList qmbcbz= zdProjectList.getQmBcbz();
-       if(qmbcbz!=null)
-       {
-           Float jjzwbz= qmbcbz.getJjzw();
-           Float nzwbz= qmbcbz.getNzw();
-           Float smbz= qmbcbz.getSm();
-
-           Double jjzwPay=(long)(jjzwbz*jjzwMj*100)/100D;
-           ztZdQmResultList.setJjzwMJ((long)(jjzwMj*100)/100D);
-           ztZdQmResultList.setJjzwPay(jjzwPay);
-
-           Double nzwPay=(long)(nzwbz*nzwMj*100)/100D;
-           ztZdQmResultList.setNzwMJ(nzwMj*10/10D);
-           ztZdQmResultList.setNzwPay(nzwPay);
-
-           Double smPay=(long)(smbz*smMj*100)/100D;
-           ztZdQmResultList.setSmMJ(smMj*10/10D);
-           ztZdQmResultList.setSmPay(smPay);
-       }
+        ZtQmBcbzList qmbcbz = zdProjectList.getQmBcbz();
+        if (qmbcbz != null) {
+            Float jjzwbz = qmbcbz.getJjzw();
+            Float nzwbz = qmbcbz.getNzw();
+            Float smbz = qmbcbz.getSm();
+
+            jjzwPay = setPrecision2(jjzwbz * jjzwMj);
+            ztZdQmResultList.setJjzwMJ(setPrecision2(jjzwMj));
+            ztZdQmResultList.setJjzwPay(setPrecision2(jjzwPay));
+
+            nzwPay = setPrecision2(nzwbz * nzwMj);
+            ztZdQmResultList.setNzwMJ(setPrecision2(nzwMj));
+            ztZdQmResultList.setNzwPay(setPrecision2(nzwPay));
+
+            smPay = setPrecision2( (smbz * smMj));
+            ztZdQmResultList.setSmMJ( setPrecision2( smMj));
+            ztZdQmResultList.setSmPay(smPay);
+        }
+        //青苗补偿
+        ztZdQmResultList.setSmPay(smPay);
+        ztZdQmResultList.setSmMJ(smMj);
+        ztZdQmResultList.setNzwMJ(nzwMj);
+        ztZdQmResultList.setNzwPay(nzwPay);
+        ztZdQmResultList.setJjzwMJ(jjzwMj);
+        ztZdQmResultList.setJjzwPay(jjzwPay);
+
         ztZdQmResultList.setFeatures(objectMapper.writeValueAsString(qmFreatures));
 
-        zdProjectList.setQsResult(qsResultList);
+        Dltb dltb = new Dltb();
+        List<FldInfo> dltbFldInfos = getFieldAnnotation(dltb);
+        ztZdQmResultList.setFieldInfos(objectMapper.writeValueAsString(dltbFldInfos));
+        ztZdDlResultList.setFieldInfos(objectMapper.writeValueAsString(dltbFldInfos));
+
         zdProjectList.setQmResult(ztZdQmResultList);
-        zdProjectList.setCqResult(zdCqReultList);
         zdProjectList.setZdResult(ztZdDlResultList);
-
-
-
-
-
-
     }
-
-    public void  QMComputer(Dltb feature)
+    //保留2位小数
+    private   Double  setPrecision2(Double data)
     {
-
-
+        java.text.DecimalFormat   df   =new   java.text.DecimalFormat("#.00");
+        String result =   df.format(data);
+        return Double.parseDouble(result);
     }
-
     @NotNull
     private Double getaDouble(Double instertArea, List<DLItem> jtdlData, Double jtmj, String dlmc, Integer index) {
-        jtmj+=instertArea;
+        jtmj += instertArea;
         for (Integer j = 0; j < jtdlData.size(); j++) {
-            if (dlmc.toUpperCase() == jtdlData.get(j).getDlmc().toUpperCase()) {
+            if (jtdlData.get(j).getDlmc().toUpperCase().equals(dlmc.toUpperCase())) {
                 index = j;
                 break;
             }
@@ -302,40 +485,169 @@ public class ZDAnalyseController extends BaseController {
         return jtmj;
     }
 
-    public  void  jzComputer()
-    {
+    public void jzComputer() throws ParseException, org.locationtech.jts.io.ParseException, JsonProcessingException, IllegalAccessException {
+        if (dltbs == null || dltbs.size() == 0)
+            return;
+        Double gymj = 0.00;
+        Double jtmj = 0.00;
+        Double gyPay = 0.0;
+        Double jtPay = 0.00;
+        Double average = 0.00;
+        ZtZdCqReultList cqReultList = new ZtZdCqReultList();
+        List<ZtCqBcbzItem> cqBcbzItems = zdProjectList.getCqBcbzItems();
+        List<SuperMapFreature> gyFeatures = new ArrayList<>();
+        List<SuperMapFreature> jtFeatyres = new ArrayList<>();
+        List<FWItem> gyList = new ArrayList<>();
+        List<FWItem> jtList = new ArrayList<>();
+        for (int i = 0; i < bdcs.size(); i++) {
+            Bdc feature = bdcs.get(i);
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getSmgeometry());
+            //占地面积
+            Double zdmj =  setPrecision2(SpatialOperate.getGeometryArea(geom));
+            //高度
+            Double height = feature.getHeight() == null ? 0 : feature.getHeight();
+            //层数
+            Integer floor = 1;
+            Boolean isgy = false;
+            String gyqsdwmc = "";
+            String jtOqsdwmc = "";
+            String jtUqsdwmc = "";
+            for (int i1 = 0; i1 < gysyqs.size(); i1++) {
+                Gysyq temfeature = gysyqs.get(i1);
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                if (polygon1.intersects(geom)) {
+                    gyqsdwmc = temfeature.getRightOwne();
+                    isgy = true;
+                    feature.setCqr(gyqsdwmc);
+                }
+            }
+            for (int j = 0; j < jtowners.size(); j++) {
+                Jtowner temfeature = jtowners.get(j);
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                if (polygon1.intersects(geom)) {
+                    isgy=false;
+                    jtOqsdwmc = temfeature.getQlr();
+                    feature.setCqr(jtOqsdwmc);
+                }
+            }
+            for (int i1 = 0; i1 < jtuses.size(); i1++) {
+                Jtuse temfeature = jtuses.get(i1);
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                if (polygon1.intersects(geom)) {
+                    jtUqsdwmc = temfeature.getSyqr();
+                    isgy=false;
+                    feature.setCqr(jtUqsdwmc);
+                }
+            }
+            SuperMapFreature superMapFreature= SpatialOperate.Feature2Supermap(feature,geom);
+            if (height > 0) {
+                floor = (int) (height / 3);
+                if (floor == 0)
+                    floor = 1;
+            }
+            floor = feature.getFloor() == null ? 1 : feature.getFloor();
+            //建筑面积
+            Double jzmj = 0.00;
+            if (feature.getJzmj() == null || feature.getJzmj() == 0) {
+                jzmj = floor * zdmj;
+            } else
+                jzmj = feature.getJzmj();
+            Integer grade = feature.getGrade() == null ? 1 : feature.getGrade();
+            if (grade == 0)
+                grade = 1;
+            String jg = feature.getJg() == null ? "混合结构" : feature.getJg();
+            ZtCqBcbzItem bcbzItem = new ZtCqBcbzItem();
+            Double signalPay = 0.00;
+            if (cqBcbzItems != null) {
+                Integer finalGrade = grade;
+                List<ZtCqBcbzItem> itemList= cqBcbzItems.stream().filter((item) ->
+                        item.getJg().equals(jg) &&item.getGrade().equals(finalGrade)).collect(Collectors.toList());
+                if(itemList.size()>0)
+                    bcbzItem = cqBcbzItems.get(0);
+                signalPay = bcbzItem.getBz() * jzmj/10000;
+                signalPay=Double.parseDouble(  String.format("%.2f",signalPay));
+            }
+            String crq = feature.getCqr();
+            String address = feature.getAddress();
+            FWItem item = new FWItem();
+            item.setCqr(crq);
+            item.setAddress(address);
+            item.setFloor(floor);
+            item.setGrade(grade);
+            item.setId(feature.getSmid().toString());
+            item.setJg(jg);
+            item.setJzmj(jzmj);
+            item.setPay(signalPay);
+            item.setZdmj(zdmj);
+            //集体赔偿
+            if (isgy == false) {
+                jtmj+=jzmj;
+                jtPay += signalPay;
+                jtFeatyres.add(superMapFreature);
+                jtList.add(item);
+            } else {
+                gymj+=jzmj;
+                gyPay += signalPay;
+                gyFeatures.add(superMapFreature);
+                jtList.add(item);
+            }
+        }
+        cqReultList.setJtFWData(jtList);
+        cqReultList.setGyFWData(gyList);
+        cqReultList.setGyList(objectMapper.writeValueAsString(gyList));
+        cqReultList.setJtList(objectMapper.writeValueAsString(jtList));
+        cqReultList.setCount(bdcs.size());
+
+        cqReultList.setGyJZMJ(setPrecision2(gymj));
+        cqReultList.setJtJZMJ(setPrecision2(jtmj));
+
+        cqReultList.setGyfeatures(objectMapper.writeValueAsString(gyFeatures));
+        cqReultList.setJtfeatures(objectMapper.writeValueAsString(jtFeatyres));
+        cqReultList.setGyCount(gyList.size());
+        cqReultList.setJtCount(jtList.size());
+
+        cqReultList.setTotalPay(setPrecision2(jtPay + gyPay));
+        cqReultList.setTotalJZMJ(setPrecision2(jtmj + gymj));
+        average = setPrecision2 ((jtPay + gyPay)*10000 / (jtmj + gymj));
+        cqReultList.setAverage(average);
+        List<FldInfo> fldInfos=getFieldAnnotation(new Bdc());
+        cqReultList.setFieldInfos(objectMapper.writeValueAsString(fldInfos));
+        zdProjectList.setCqResult(cqReultList);
+
     }
+
     /**
      * 查询字段索引
+     *
      * @param fldInfos
      * @param fld
-     * @return
      * @param <T>
+     * @return
      */
-    public <T> Integer getFldInfosIndex(List<T> fldInfos, String fld)
-    {
-        Integer index=-1;
-        return  index;
+    public <T> Integer getFldInfosIndex(List<T> fldInfos, String fld) {
+        Integer index = -1;
+        return index;
     }
+
     /**
      * 判断列表中是否存在 指定内容
+     *
      * @param arr
      * @param var
      * @return
      */
-    public  Boolean isValueInList(String [] arr ,String var) {
+    public Boolean isValueInList(String[] arr, String var) {
         Boolean isExit = false;
-        if (arr == null || arr.length==0)
+        if (arr == null || arr.length == 0)
             isExit = false;
         if (var == null || var.toString().length() == 0)
             isExit = false;
-        Integer index =-1;
-        for (int i = 0; i <arr.length ; i++) {
-           if( var.indexOf(arr[i])>-1)
-           {
-               index=i;
-               break;
-           }
+        Integer index = -1;
+        for (int i = 0; i < arr.length; i++) {
+            if (var.indexOf(arr[i]) > -1) {
+                index = i;
+                break;
+            }
         }
         if (index == -1)
             isExit = false;
@@ -344,23 +656,5 @@ public class ZDAnalyseController extends BaseController {
         return isExit;
     }
 
-    /**
-     * 根据类生成字段列表
-     * @param object
-     * @return
-     */
-    public static List<FldInfo> getFieldAnnotation(Object object) {
-        Field[] fields = object.getClass().getDeclaredFields();
-        List<FldInfo> fldInfos =new ArrayList<>();
-        for (Field field : fields) {
-            // 是否引用ApiModelProperty注解
-
-            boolean bool = field.isAnnotationPresent(ApiModelProperty.class);
-            if (bool) {
-                String value = field.getAnnotation(ApiModelProperty.class).value();
-//                fldInfos.add(new FldInfo(value);
-            }
-        }
-        return fldInfos;
-    }
+
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/Bdc.java

@@ -1,66 +1,76 @@
 package com.onemap.sanya.domain.spatial;
 
 import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
 import com.onemap.common.core.web.domain.BaseEntity;
-
 /**
- * 不动产对象 bdc
+ * 建筑矢量对象 bdc
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
-
 public class Bdc extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer gid;
-
+    private Integer smid;
     /** $column.columnComment */
-    @Excel(name = "smuserid")
     private Integer smuserid;
 
-    /** id */
-    private Integer id;
+    /** $column.columnComment */
+
+    private Double smarea;
+
+    /** $column.columnComment */
+
+    private Double smperimeter;
+
+    /** $column.columnComment */
+
+    private String smgeometry;
+
+    /** 建筑高度(米) */
+    @Excel(name = "建筑高度(米)")
+    private Double height;
 
     /** 层数 */
     @Excel(name = "层数")
     private Integer floor;
 
-    /** $column.columnComment */
+    /** 产权人 */
+    @Excel(name = "房屋结构")
+    private String jg;
+    /** 产权人 */
     @Excel(name = "产权人")
     private String cqr;
 
-    /** $column.columnComment */
-    @Excel(name = "占地面积")
-    private BigDecimal zdmj;
-
-    /** $column.columnComment */
-    @Excel(name = "建筑面积")
-    private BigDecimal jzmj;
-
-    /** $column.columnComment */
+    /** 地址 */
     @Excel(name = "地址")
     private String address;
 
-    /** $column.columnComment */
-    @Excel(name = "空间实体")
-    private String geom;
+    /** 等级 */
+    @Excel(name = "等级")
+    private Integer grade;
+
+    /** 占地面积(平方米) */
+    @Excel(name = "占地面积(平方米)")
+    private Double zdmj;
 
-    public void setGid(Integer gid) 
+    /** 建筑面积(平方米) */
+    @Excel(name = "建筑面积(平方米)")
+    private Double jzmj;
+
+    public void setSmid(Integer smid) 
     {
-        this.gid = gid;
+        this.smid = smid;
     }
 
-    public Integer getGid() 
+    public Integer getSmid() 
     {
-        return gid;
+        return smid;
     }
     public void setSmuserid(Integer smuserid) 
     {
@@ -71,14 +81,41 @@ public class Bdc extends BaseEntity
     {
         return smuserid;
     }
-    public void setId(Integer id) 
+    public void setSmarea(Double smarea) 
     {
-        this.id = id;
+        this.smarea = smarea;
     }
 
-    public Integer getId() 
+    public Double getSmarea() 
     {
-        return id;
+        return smarea;
+    }
+    public void setSmperimeter(Double smperimeter) 
+    {
+        this.smperimeter = smperimeter;
+    }
+
+    public Double getSmperimeter() 
+    {
+        return smperimeter;
+    }
+    public void setSmgeometry(String smgeometry) 
+    {
+        this.smgeometry = smgeometry;
+    }
+
+    public String getSmgeometry() 
+    {
+        return smgeometry;
+    }
+    public void setHeight(Double height) 
+    {
+        this.height = height;
+    }
+
+    public Double getHeight() 
+    {
+        return height;
     }
     public void setFloor(Integer floor) 
     {
@@ -98,55 +135,66 @@ public class Bdc extends BaseEntity
     {
         return cqr;
     }
-    public void setZdmj(BigDecimal zdmj) 
+    public void setAddress(String address) 
     {
-        this.zdmj = zdmj;
+        this.address = address;
     }
 
-    public BigDecimal getZdmj() 
+    public String getAddress() 
     {
-        return zdmj;
+        return address;
     }
-    public void setJzmj(BigDecimal jzmj) 
+    public void setGrade(Integer grade) 
     {
-        this.jzmj = jzmj;
+        this.grade = grade;
     }
 
-    public BigDecimal getJzmj() 
+    public Integer getGrade() 
     {
-        return jzmj;
+        return grade;
     }
-    public void setAddress(String address) 
+    public void setZdmj(Double zdmj) 
     {
-        this.address = address;
+        this.zdmj = zdmj;
     }
 
-    public String getAddress() 
+    public Double getZdmj() 
     {
-        return address;
+        return zdmj;
     }
-    public void setGeom(String geom) 
+    public void setJzmj(Double jzmj) 
     {
-        this.geom = geom;
+        this.jzmj = jzmj;
     }
 
-    public String getGeom() 
+    public Double getJzmj() 
     {
-        return geom;
+        return jzmj;
+    }
+
+    public String getJg() {
+        return jg;
+    }
+
+    public void setJg(String jg) {
+        this.jg = jg;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("gid", getGid())
+            .append("smid", getSmid())
             .append("smuserid", getSmuserid())
-            .append("id", getId())
+            .append("smarea", getSmarea())
+            .append("smperimeter", getSmperimeter())
+            .append("smgeometry", getSmgeometry())
+            .append("height", getHeight())
             .append("floor", getFloor())
             .append("cqr", getCqr())
+            .append("address", getAddress())
+            .append("grade", getGrade())
             .append("zdmj", getZdmj())
             .append("jzmj", getJzmj())
-            .append("address", getAddress())
-            .append("geom", getGeom())
             .toString();
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/Dltb.java

@@ -17,35 +17,46 @@ public class Dltb extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer gid;
+    private Integer smid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer smuserid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
+    private Double smarea;
+
+    /** $column.columnComment */
+
+    private Double smperimeter;
+
+    /** $column.columnComment */
+
+    private String smgeometry;
+
+    /** $column.columnComment */
+
     private Integer objectid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fidDltb2;
 
     /** 标识码 */
     @Excel(name = "标识码")
-
     private String bsm;
 
-    /** 要素代码 */
-    @Excel(name = "要素代码")
+    /** 要素编码 */
+    @Excel(name = "要素编码")
     private String ysdm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** 图斑预编码 */
+    @Excel(name = "图斑预编码")
     private String tbybh;
 
-    /** 图斑编号 */
-    @Excel(name = "图斑编号")
+    /** 图斑编码 */
+    @Excel(name = "图斑编码")
     private String tbbh;
 
     /** 地类编码 */
@@ -78,7 +89,7 @@ public class Dltb extends BaseEntity
 
     /** 图斑面积 */
     @Excel(name = "图斑面积")
-    private BigDecimal tbmj;
+    private Double tbmj;
 
     /** 扣除地类编码 */
     @Excel(name = "扣除地类编码")
@@ -86,15 +97,15 @@ public class Dltb extends BaseEntity
 
     /** 扣除地类系数 */
     @Excel(name = "扣除地类系数")
-    private BigDecimal kcxs;
+    private Double kcxs;
 
-    /** 扣除面积 */
-    @Excel(name = "扣除面积")
-    private BigDecimal kcmj;
+    /** 扣除地类面积 */
+    @Excel(name = "扣除地类面积")
+    private Double kcmj;
 
     /** 图斑地类面积 */
     @Excel(name = "图斑地类面积")
-    private BigDecimal tbdlmj;
+    private Double tbdlmj;
 
     /** 耕地类型 */
     @Excel(name = "耕地类型")
@@ -106,7 +117,7 @@ public class Dltb extends BaseEntity
 
     /** 线性图斑宽度 */
     @Excel(name = "线性图斑宽度")
-    private BigDecimal xzdwkd;
+    private Double xzdwkd;
 
     /** 图斑细化代码 */
     @Excel(name = "图斑细化代码")
@@ -116,12 +127,12 @@ public class Dltb extends BaseEntity
     @Excel(name = "图斑细化名称")
     private String tbxhmc;
 
-    /** 种植属性代码 */
-    @Excel(name = "种植属性代码")
+    /** 耕地种植属性代码 */
+    @Excel(name = "耕地种植属性代码")
     private String zzsxdm;
 
-    /** 种植属性名称 */
-    @Excel(name = "种植属性名称")
+    /** 耕地种植属性名称 */
+    @Excel(name = "耕地种植属性名称")
     private String zzsxmc;
 
     /** 耕地级别 */
@@ -141,52 +152,48 @@ public class Dltb extends BaseEntity
     private Integer sjnf;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String mssm;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String hdmc;
 
-    /** 备注 */
-    @Excel(name = "备注")
+    /** $column.columnComment */
+
     private String bz;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal shapeLeng;
+
+    private Double shapeLeng;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fidNewSh;
 
     /** $column.columnComment */
     private Integer id;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal ss;
+
+    private Double ss;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal shapeLe1;
+
+    private Double shapeLength;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal shapeArea;
 
-    /** 空间实体 */
-    @Excel(name = "空间实体")
-    private String geom;
+    private Double shapeArea;
 
-    public void setGid(Integer gid)
+    public void setSmid(Integer smid)
     {
-        this.gid = gid;
+        this.smid = smid;
     }
 
-    public Integer getGid()
+    public Integer getSmid()
     {
-        return gid;
+        return smid;
     }
     public void setSmuserid(Integer smuserid)
     {
@@ -197,6 +204,33 @@ public class Dltb extends BaseEntity
     {
         return smuserid;
     }
+    public void setSmarea(Double smarea)
+    {
+        this.smarea = smarea;
+    }
+
+    public Double getSmarea()
+    {
+        return smarea;
+    }
+    public void setSmperimeter(Double smperimeter)
+    {
+        this.smperimeter = smperimeter;
+    }
+
+    public Double getSmperimeter()
+    {
+        return smperimeter;
+    }
+    public void setSmgeometry(String smgeometry)
+    {
+        this.smgeometry = smgeometry;
+    }
+
+    public String getSmgeometry()
+    {
+        return smgeometry;
+    }
     public void setObjectid(Integer objectid)
     {
         this.objectid = objectid;
@@ -314,12 +348,12 @@ public class Dltb extends BaseEntity
     {
         return zldwmc;
     }
-    public void setTbmj(BigDecimal tbmj)
+    public void setTbmj(Double tbmj)
     {
         this.tbmj = tbmj;
     }
 
-    public BigDecimal getTbmj()
+    public Double getTbmj()
     {
         return tbmj;
     }
@@ -332,30 +366,30 @@ public class Dltb extends BaseEntity
     {
         return kcdlbm;
     }
-    public void setKcxs(BigDecimal kcxs)
+    public void setKcxs(Double kcxs)
     {
         this.kcxs = kcxs;
     }
 
-    public BigDecimal getKcxs()
+    public Double getKcxs()
     {
         return kcxs;
     }
-    public void setKcmj(BigDecimal kcmj)
+    public void setKcmj(Double kcmj)
     {
         this.kcmj = kcmj;
     }
 
-    public BigDecimal getKcmj()
+    public Double getKcmj()
     {
         return kcmj;
     }
-    public void setTbdlmj(BigDecimal tbdlmj)
+    public void setTbdlmj(Double tbdlmj)
     {
         this.tbdlmj = tbdlmj;
     }
 
-    public BigDecimal getTbdlmj()
+    public Double getTbdlmj()
     {
         return tbdlmj;
     }
@@ -377,12 +411,12 @@ public class Dltb extends BaseEntity
     {
         return gdpdjb;
     }
-    public void setXzdwkd(BigDecimal xzdwkd)
+    public void setXzdwkd(Double xzdwkd)
     {
         this.xzdwkd = xzdwkd;
     }
 
-    public BigDecimal getXzdwkd()
+    public Double getXzdwkd()
     {
         return xzdwkd;
     }
@@ -485,12 +519,12 @@ public class Dltb extends BaseEntity
     {
         return bz;
     }
-    public void setShapeLeng(BigDecimal shapeLeng)
+    public void setShapeLeng(Double shapeLeng)
     {
         this.shapeLeng = shapeLeng;
     }
 
-    public BigDecimal getShapeLeng()
+    public Double getShapeLeng()
     {
         return shapeLeng;
     }
@@ -512,48 +546,42 @@ public class Dltb extends BaseEntity
     {
         return id;
     }
-    public void setSs(BigDecimal ss)
+    public void setSs(Double ss)
     {
         this.ss = ss;
     }
 
-    public BigDecimal getSs()
+    public Double getSs()
     {
         return ss;
     }
-    public void setShapeLe1(BigDecimal shapeLe1)
+    public void setShapeLength(Double shapeLength)
     {
-        this.shapeLe1 = shapeLe1;
+        this.shapeLength = shapeLength;
     }
 
-    public BigDecimal getShapeLe1()
+    public Double getShapeLength()
     {
-        return shapeLe1;
+        return shapeLength;
     }
-    public void setShapeArea(BigDecimal shapeArea)
+    public void setShapeArea(Double shapeArea)
     {
         this.shapeArea = shapeArea;
     }
 
-    public BigDecimal getShapeArea()
+    public Double getShapeArea()
     {
         return shapeArea;
     }
-    public void setGeom(String geom)
-    {
-        this.geom = geom;
-    }
-
-    public String getGeom()
-    {
-        return geom;
-    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("gid", getGid())
+                .append("smid", getSmid())
                 .append("smuserid", getSmuserid())
+                .append("smarea", getSmarea())
+                .append("smperimeter", getSmperimeter())
+                .append("smgeometry", getSmgeometry())
                 .append("objectid", getObjectid())
                 .append("fidDltb2", getFidDltb2())
                 .append("bsm", getBsm())
@@ -590,9 +618,8 @@ public class Dltb extends BaseEntity
                 .append("fidNewSh", getFidNewSh())
                 .append("id", getId())
                 .append("ss", getSs())
-                .append("shapeLe1", getShapeLe1())
+                .append("shapeLength", getShapeLength())
                 .append("shapeArea", getShapeArea())
-                .append("geom", getGeom())
                 .toString();
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/Gysyq.java

@@ -1,30 +1,39 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
 import com.onemap.common.core.web.domain.BaseEntity;
 
 /**
- * 国有使用权对象 gysyq
+ * 国有所有权对象 gysyq
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public class Gysyq extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer gid;
+    private Integer smid;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer smuserid;
 
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Double smarea;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Double smperimeter;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String smgeometry;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer objectid1;
@@ -231,15 +240,15 @@ public class Gysyq extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String 处理类;
+    private String 处理类型;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String 坐标变;
+    private String 坐标变化;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String 融合方;
+    private String 融合方式;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -247,11 +256,11 @@ public class Gysyq extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date createdTi;
+    private String createdTi;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date lastModif;
+    private String lastModif;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -279,24 +288,20 @@ public class Gysyq extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeLeng;
+    private Double shapeLength;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Double shapeArea;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String geom;
-
-    public void setGid(Integer gid) 
+    public void setSmid(Integer smid) 
     {
-        this.gid = gid;
+        this.smid = smid;
     }
 
-    public Integer getGid() 
+    public Integer getSmid() 
     {
-        return gid;
+        return smid;
     }
     public void setSmuserid(Integer smuserid) 
     {
@@ -307,6 +312,33 @@ public class Gysyq extends BaseEntity
     {
         return smuserid;
     }
+    public void setSmarea(Double smarea) 
+    {
+        this.smarea = smarea;
+    }
+
+    public Double getSmarea() 
+    {
+        return smarea;
+    }
+    public void setSmperimeter(Double smperimeter) 
+    {
+        this.smperimeter = smperimeter;
+    }
+
+    public Double getSmperimeter() 
+    {
+        return smperimeter;
+    }
+    public void setSmgeometry(String smgeometry) 
+    {
+        this.smgeometry = smgeometry;
+    }
+
+    public String getSmgeometry() 
+    {
+        return smgeometry;
+    }
     public void setObjectid1(Integer objectid1) 
     {
         this.objectid1 = objectid1;
@@ -334,12 +366,12 @@ public class Gysyq extends BaseEntity
     {
         return districtid;
     }
-    public void setLotId(Double lotId)
+    public void setLotId(Double lotId) 
     {
         this.lotId = lotId;
     }
 
-    public Double getLotId()
+    public Double getLotId() 
     {
         return lotId;
     }
@@ -352,16 +384,16 @@ public class Gysyq extends BaseEntity
     {
         return lotNumber;
     }
-    public void setIsRight(Double isRight)
+    public void setIsRight(Double isRight) 
     {
         this.isRight = isRight;
     }
 
-    public Double getIsRight()
+    public Double getIsRight() 
     {
         return isRight;
     }
-    public void setCertNo(String certNo)
+    public void setCertNo(String certNo) 
     {
         this.certNo = certNo;
     }
@@ -370,30 +402,30 @@ public class Gysyq extends BaseEntity
     {
         return certNo;
     }
-    public void setRefX(Double refX)
+    public void setRefX(Double refX) 
     {
         this.refX = refX;
     }
 
-    public Double getRefX()
+    public Double getRefX() 
     {
         return refX;
     }
-    public void setRefY(Double refY)
+    public void setRefY(Double refY) 
     {
         this.refY = refY;
     }
 
-    public Double getRefY()
+    public Double getRefY() 
     {
         return refY;
     }
-    public void setAtqy(Double atqy)
+    public void setAtqy(Double atqy) 
     {
         this.atqy = atqy;
     }
 
-    public Double getAtqy()
+    public Double getAtqy() 
     {
         return atqy;
     }
@@ -658,12 +690,12 @@ public class Gysyq extends BaseEntity
     {
         return fYdfw;
     }
-    public void setfYdmj(Double fYdmj)
+    public void setfYdmj(Double fYdmj) 
     {
         this.fYdmj = fYdmj;
     }
 
-    public Double getfYdmj()
+    public Double getfYdmj() 
     {
         return fYdmj;
     }
@@ -766,32 +798,32 @@ public class Gysyq extends BaseEntity
     {
         return exportBz;
     }
-    public void set处理类(String 处理类) 
+    public void set处理类型(String 处理类型) 
     {
-        this.处理类 = 处理类;
+        this.处理类型 = 处理类型;
     }
 
-    public String get处理类() 
+    public String get处理类型() 
     {
-        return 处理类;
+        return 处理类型;
     }
-    public void set坐标变(String 坐标变) 
+    public void set坐标变化(String 坐标变化) 
     {
-        this.坐标变 = 坐标变;
+        this.坐标变化 = 坐标变化;
     }
 
-    public String get坐标变() 
+    public String get坐标变化() 
     {
-        return 坐标变;
+        return 坐标变化;
     }
-    public void set融合方(String 融合方) 
+    public void set融合方式(String 融合方式) 
     {
-        this.融合方 = 融合方;
+        this.融合方式 = 融合方式;
     }
 
-    public String get融合方() 
+    public String get融合方式() 
     {
-        return 融合方;
+        return 融合方式;
     }
     public void setObjectidB(Integer objectidB) 
     {
@@ -802,21 +834,21 @@ public class Gysyq extends BaseEntity
     {
         return objectidB;
     }
-    public void setCreatedTi(Date createdTi) 
+    public void setCreatedTi(String createdTi) 
     {
         this.createdTi = createdTi;
     }
 
-    public Date getCreatedTi() 
+    public String getCreatedTi() 
     {
         return createdTi;
     }
-    public void setLastModif(Date lastModif) 
+    public void setLastModif(String lastModif) 
     {
         this.lastModif = lastModif;
     }
 
-    public Date getLastModif() 
+    public String getLastModif() 
     {
         return lastModif;
     }
@@ -874,39 +906,33 @@ public class Gysyq extends BaseEntity
     {
         return sjglbsm;
     }
-    public void setShapeLeng(Double shapeLeng)
+    public void setShapeLength(Double shapeLength) 
     {
-        this.shapeLeng = shapeLeng;
+        this.shapeLength = shapeLength;
     }
 
-    public Double getShapeLeng()
+    public Double getShapeLength() 
     {
-        return shapeLeng;
+        return shapeLength;
     }
-    public void setShapeArea(Double shapeArea)
+    public void setShapeArea(Double shapeArea) 
     {
         this.shapeArea = shapeArea;
     }
 
-    public Double getShapeArea()
+    public Double getShapeArea() 
     {
         return shapeArea;
     }
-    public void setGeom(String geom) 
-    {
-        this.geom = geom;
-    }
-
-    public String getGeom() 
-    {
-        return geom;
-    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("gid", getGid())
+            .append("smid", getSmid())
             .append("smuserid", getSmuserid())
+            .append("smarea", getSmarea())
+            .append("smperimeter", getSmperimeter())
+            .append("smgeometry", getSmgeometry())
             .append("objectid1", getObjectid1())
             .append("objectid", getObjectid())
             .append("districtid", getDistrictid())
@@ -958,9 +984,9 @@ public class Gysyq extends BaseEntity
             .append("fQlbz", getfQlbz())
             .append("yzbx", getYzbx())
             .append("exportBz", getExportBz())
-            .append("处理类", get处理类())
-            .append("坐标变", get坐标变())
-            .append("融合方", get融合方())
+            .append("处理类型", get处理类型())
+            .append("坐标变化", get坐标变化())
+            .append("融合方式", get融合方式())
             .append("objectidB", getObjectidB())
             .append("createdTi", getCreatedTi())
             .append("lastModif", getLastModif())
@@ -970,9 +996,8 @@ public class Gysyq extends BaseEntity
             .append("oldCertN", getOldCertN())
             .append("clearupSt", getClearupSt())
             .append("sjglbsm", getSjglbsm())
-            .append("shapeLeng", getShapeLeng())
+            .append("shapeLength", getShapeLength())
             .append("shapeArea", getShapeArea())
-            .append("geom", getGeom())
             .toString();
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/Jtowner.java

@@ -1,8 +1,6 @@
 package com.onemap.sanya.domain.spatial;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -12,19 +10,31 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 集体所有权对象 jtowner
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public class Jtowner extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer gid;
+    private Integer smid;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer smuserid;
 
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Double smarea;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Double smperimeter;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String smgeometry;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer objectid1;
@@ -67,19 +77,19 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal scmj;
+    private Double scmj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal fzmj;
+    private Double fzmj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal jzrjl;
+    private Double jzrjl;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal jzmd;
+    private Double jzmd;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -87,11 +97,11 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal sbdj;
+    private Double sbdj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal qdjg;
+    private Double qdjg;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -111,7 +121,7 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date jcrq;
+    private String jcrq;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -127,7 +137,7 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date blrq;
+    private String blrq;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -135,7 +145,7 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date blsjjcrq;
+    private String blsjjcrq;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -147,7 +157,7 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date fzrq;
+    private String fzrq;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -219,11 +229,11 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date fCbqssj;
+    private String fCbqssj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date fCbjssj;
+    private String fCbjssj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -259,7 +269,7 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date fCreateT;
+    private String fCreateT;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -271,24 +281,20 @@ public class Jtowner extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal shapeLeng;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal shapeArea;
+    private Double shapeLength;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String geom;
+    private Double shapeArea;
 
-    public void setGid(Integer gid) 
+    public void setSmid(Integer smid) 
     {
-        this.gid = gid;
+        this.smid = smid;
     }
 
-    public Integer getGid() 
+    public Integer getSmid() 
     {
-        return gid;
+        return smid;
     }
     public void setSmuserid(Integer smuserid) 
     {
@@ -299,6 +305,33 @@ public class Jtowner extends BaseEntity
     {
         return smuserid;
     }
+    public void setSmarea(Double smarea) 
+    {
+        this.smarea = smarea;
+    }
+
+    public Double getSmarea() 
+    {
+        return smarea;
+    }
+    public void setSmperimeter(Double smperimeter) 
+    {
+        this.smperimeter = smperimeter;
+    }
+
+    public Double getSmperimeter() 
+    {
+        return smperimeter;
+    }
+    public void setSmgeometry(String smgeometry) 
+    {
+        this.smgeometry = smgeometry;
+    }
+
+    public String getSmgeometry() 
+    {
+        return smgeometry;
+    }
     public void setObjectid1(Integer objectid1) 
     {
         this.objectid1 = objectid1;
@@ -389,39 +422,39 @@ public class Jtowner extends BaseEntity
     {
         return syqlx;
     }
-    public void setScmj(BigDecimal scmj) 
+    public void setScmj(Double scmj) 
     {
         this.scmj = scmj;
     }
 
-    public BigDecimal getScmj() 
+    public Double getScmj() 
     {
         return scmj;
     }
-    public void setFzmj(BigDecimal fzmj) 
+    public void setFzmj(Double fzmj) 
     {
         this.fzmj = fzmj;
     }
 
-    public BigDecimal getFzmj() 
+    public Double getFzmj() 
     {
         return fzmj;
     }
-    public void setJzrjl(BigDecimal jzrjl) 
+    public void setJzrjl(Double jzrjl) 
     {
         this.jzrjl = jzrjl;
     }
 
-    public BigDecimal getJzrjl() 
+    public Double getJzrjl() 
     {
         return jzrjl;
     }
-    public void setJzmd(BigDecimal jzmd) 
+    public void setJzmd(Double jzmd) 
     {
         this.jzmd = jzmd;
     }
 
-    public BigDecimal getJzmd() 
+    public Double getJzmd() 
     {
         return jzmd;
     }
@@ -434,21 +467,21 @@ public class Jtowner extends BaseEntity
     {
         return tdjb;
     }
-    public void setSbdj(BigDecimal sbdj) 
+    public void setSbdj(Double sbdj) 
     {
         this.sbdj = sbdj;
     }
 
-    public BigDecimal getSbdj() 
+    public Double getSbdj() 
     {
         return sbdj;
     }
-    public void setQdjg(BigDecimal qdjg) 
+    public void setQdjg(Double qdjg) 
     {
         this.qdjg = qdjg;
     }
 
-    public BigDecimal getQdjg() 
+    public Double getQdjg() 
     {
         return qdjg;
     }
@@ -488,12 +521,12 @@ public class Jtowner extends BaseEntity
     {
         return jcr;
     }
-    public void setJcrq(Date jcrq) 
+    public void setJcrq(String jcrq) 
     {
         this.jcrq = jcrq;
     }
 
-    public Date getJcrq() 
+    public String getJcrq() 
     {
         return jcrq;
     }
@@ -524,12 +557,12 @@ public class Jtowner extends BaseEntity
     {
         return blr;
     }
-    public void setBlrq(Date blrq) 
+    public void setBlrq(String blrq) 
     {
         this.blrq = blrq;
     }
 
-    public Date getBlrq() 
+    public String getBlrq() 
     {
         return blrq;
     }
@@ -542,12 +575,12 @@ public class Jtowner extends BaseEntity
     {
         return blsjjcr;
     }
-    public void setBlsjjcrq(Date blsjjcrq) 
+    public void setBlsjjcrq(String blsjjcrq) 
     {
         this.blsjjcrq = blsjjcrq;
     }
 
-    public Date getBlsjjcrq() 
+    public String getBlsjjcrq() 
     {
         return blsjjcrq;
     }
@@ -569,12 +602,12 @@ public class Jtowner extends BaseEntity
     {
         return fzr;
     }
-    public void setFzrq(Date fzrq) 
+    public void setFzrq(String fzrq) 
     {
         this.fzrq = fzrq;
     }
 
-    public Date getFzrq() 
+    public String getFzrq() 
     {
         return fzrq;
     }
@@ -731,21 +764,21 @@ public class Jtowner extends BaseEntity
     {
         return fFbf;
     }
-    public void setfCbqssj(Date fCbqssj) 
+    public void setfCbqssj(String fCbqssj) 
     {
         this.fCbqssj = fCbqssj;
     }
 
-    public Date getfCbqssj() 
+    public String getfCbqssj() 
     {
         return fCbqssj;
     }
-    public void setfCbjssj(Date fCbjssj) 
+    public void setfCbjssj(String fCbjssj) 
     {
         this.fCbjssj = fCbjssj;
     }
 
-    public Date getfCbjssj() 
+    public String getfCbjssj() 
     {
         return fCbjssj;
     }
@@ -821,12 +854,12 @@ public class Jtowner extends BaseEntity
     {
         return fCreateB;
     }
-    public void setfCreateT(Date fCreateT) 
+    public void setfCreateT(String fCreateT) 
     {
         this.fCreateT = fCreateT;
     }
 
-    public Date getfCreateT() 
+    public String getfCreateT() 
     {
         return fCreateT;
     }
@@ -848,39 +881,33 @@ public class Jtowner extends BaseEntity
     {
         return sjglbsm;
     }
-    public void setShapeLeng(BigDecimal shapeLeng) 
+    public void setShapeLength(Double shapeLength) 
     {
-        this.shapeLeng = shapeLeng;
+        this.shapeLength = shapeLength;
     }
 
-    public BigDecimal getShapeLeng() 
+    public Double getShapeLength() 
     {
-        return shapeLeng;
+        return shapeLength;
     }
-    public void setShapeArea(BigDecimal shapeArea) 
+    public void setShapeArea(Double shapeArea) 
     {
         this.shapeArea = shapeArea;
     }
 
-    public BigDecimal getShapeArea() 
+    public Double getShapeArea() 
     {
         return shapeArea;
     }
-    public void setGeom(String geom) 
-    {
-        this.geom = geom;
-    }
-
-    public String getGeom() 
-    {
-        return geom;
-    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("gid", getGid())
+            .append("smid", getSmid())
             .append("smuserid", getSmuserid())
+            .append("smarea", getSmarea())
+            .append("smperimeter", getSmperimeter())
+            .append("smgeometry", getSmgeometry())
             .append("objectid1", getObjectid1())
             .append("objectid", getObjectid())
             .append("bsm", getBsm())
@@ -942,9 +969,8 @@ public class Jtowner extends BaseEntity
             .append("fCreateT", getfCreateT())
             .append("yzbx", getYzbx())
             .append("sjglbsm", getSjglbsm())
-            .append("shapeLeng", getShapeLeng())
+            .append("shapeLength", getShapeLength())
             .append("shapeArea", getShapeArea())
-            .append("geom", getGeom())
             .toString();
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/Jtuse.java

@@ -1,8 +1,6 @@
 package com.onemap.sanya.domain.spatial;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -12,19 +10,31 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 集体使用权对象 jtuse
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public class Jtuse extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer gid;
+    private Integer smid;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer smuserid;
 
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Double smarea;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Double smperimeter;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String smgeometry;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer objectid1;
@@ -47,7 +57,7 @@ public class Jtuse extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal zdmj;
+    private Double zdmj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -95,11 +105,11 @@ public class Jtuse extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date fCbqssj;
+    private String fCbqssj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date fCbjssj;
+    private String fCbjssj;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -135,7 +145,7 @@ public class Jtuse extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Date fCreateT;
+    private String fCreateT;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -147,24 +157,20 @@ public class Jtuse extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal shapeLeng;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private BigDecimal shapeArea;
+    private Double shapeLength;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String geom;
+    private Double shapeArea;
 
-    public void setGid(Integer gid) 
+    public void setSmid(Integer smid) 
     {
-        this.gid = gid;
+        this.smid = smid;
     }
 
-    public Integer getGid() 
+    public Integer getSmid() 
     {
-        return gid;
+        return smid;
     }
     public void setSmuserid(Integer smuserid) 
     {
@@ -175,6 +181,33 @@ public class Jtuse extends BaseEntity
     {
         return smuserid;
     }
+    public void setSmarea(Double smarea) 
+    {
+        this.smarea = smarea;
+    }
+
+    public Double getSmarea() 
+    {
+        return smarea;
+    }
+    public void setSmperimeter(Double smperimeter) 
+    {
+        this.smperimeter = smperimeter;
+    }
+
+    public Double getSmperimeter() 
+    {
+        return smperimeter;
+    }
+    public void setSmgeometry(String smgeometry) 
+    {
+        this.smgeometry = smgeometry;
+    }
+
+    public String getSmgeometry() 
+    {
+        return smgeometry;
+    }
     public void setObjectid1(Integer objectid1) 
     {
         this.objectid1 = objectid1;
@@ -220,12 +253,12 @@ public class Jtuse extends BaseEntity
     {
         return zdzl;
     }
-    public void setZdmj(BigDecimal zdmj) 
+    public void setZdmj(Double zdmj) 
     {
         this.zdmj = zdmj;
     }
 
-    public BigDecimal getZdmj() 
+    public Double getZdmj() 
     {
         return zdmj;
     }
@@ -328,21 +361,21 @@ public class Jtuse extends BaseEntity
     {
         return fFbf;
     }
-    public void setfCbqssj(Date fCbqssj) 
+    public void setfCbqssj(String fCbqssj) 
     {
         this.fCbqssj = fCbqssj;
     }
 
-    public Date getfCbqssj() 
+    public String getfCbqssj() 
     {
         return fCbqssj;
     }
-    public void setfCbjssj(Date fCbjssj) 
+    public void setfCbjssj(String fCbjssj) 
     {
         this.fCbjssj = fCbjssj;
     }
 
-    public Date getfCbjssj() 
+    public String getfCbjssj() 
     {
         return fCbjssj;
     }
@@ -418,12 +451,12 @@ public class Jtuse extends BaseEntity
     {
         return fCreateB;
     }
-    public void setfCreateT(Date fCreateT) 
+    public void setfCreateT(String fCreateT) 
     {
         this.fCreateT = fCreateT;
     }
 
-    public Date getfCreateT() 
+    public String getfCreateT() 
     {
         return fCreateT;
     }
@@ -445,39 +478,33 @@ public class Jtuse extends BaseEntity
     {
         return sjglbsm;
     }
-    public void setShapeLeng(BigDecimal shapeLeng) 
+    public void setShapeLength(Double shapeLength) 
     {
-        this.shapeLeng = shapeLeng;
+        this.shapeLength = shapeLength;
     }
 
-    public BigDecimal getShapeLeng() 
+    public Double getShapeLength() 
     {
-        return shapeLeng;
+        return shapeLength;
     }
-    public void setShapeArea(BigDecimal shapeArea) 
+    public void setShapeArea(Double shapeArea) 
     {
         this.shapeArea = shapeArea;
     }
 
-    public BigDecimal getShapeArea() 
+    public Double getShapeArea() 
     {
         return shapeArea;
     }
-    public void setGeom(String geom) 
-    {
-        this.geom = geom;
-    }
-
-    public String getGeom() 
-    {
-        return geom;
-    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("gid", getGid())
+            .append("smid", getSmid())
             .append("smuserid", getSmuserid())
+            .append("smarea", getSmarea())
+            .append("smperimeter", getSmperimeter())
+            .append("smgeometry", getSmgeometry())
             .append("objectid1", getObjectid1())
             .append("objectid", getObjectid())
             .append("syqr", getSyqr())
@@ -508,9 +535,8 @@ public class Jtuse extends BaseEntity
             .append("fCreateT", getfCreateT())
             .append("yzbx", getYzbx())
             .append("sjglbsm", getSjglbsm())
-            .append("shapeLeng", getShapeLeng())
+            .append("shapeLength", getShapeLength())
             .append("shapeArea", getShapeArea())
-            .append("geom", getGeom())
             .toString();
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/SuperMapFreature.java

@@ -0,0 +1,51 @@
+package com.onemap.sanya.domain.spatial;
+
+import java.util.List;
+
+public class SuperMapFreature {
+  private   String 	stringID;
+    private String [] fieldNames;
+    private   Integer  ID;
+    private String[] fieldValues;
+    private  SuperMapGeo geometry;
+
+    public Integer getID() {
+        return ID;
+    }
+
+    public String [] getFieldNames() {
+        return fieldNames;
+    }
+
+    public SuperMapGeo getGeometry() {
+        return geometry;
+    }
+
+    public String [] getFieldValues() {
+        return fieldValues;
+    }
+
+    public String getStringID() {
+        return stringID;
+    }
+
+    public void setFieldNames(String [] fieldNames) {
+        this.fieldNames = fieldNames;
+    }
+
+    public void setFieldValues(String [] fieldValues) {
+        this.fieldValues = fieldValues;
+    }
+
+    public void setGeometry(SuperMapGeo geometry) {
+        this.geometry = geometry;
+    }
+
+    public void setID(Integer ID) {
+        this.ID = ID;
+    }
+
+    public void setStringID(String stringID) {
+        this.stringID = stringID;
+    }
+}

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/spatial/SuperMapGeo.java

@@ -0,0 +1,82 @@
+package com.onemap.sanya.domain.spatial;
+
+import org.locationtech.jts.geom.Coordinate;
+
+import java.util.List;
+
+public class SuperMapGeo {
+    private   Coordinate  center;
+    private  Integer[] parts;
+    private  Integer[] partTopo;
+    private  Integer id;
+    private  String  style;
+    private  String  prjCoordSys;
+    private  String  type;
+    private List<Coordinate> points;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setCenter(Coordinate center) {
+        this.center = center;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public Coordinate getCenter() {
+        return center;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public Integer[] getParts() {
+        return parts;
+    }
+
+    public Integer[] getPartTopo() {
+        return partTopo;
+    }
+
+    public List<Coordinate> getPoints() {
+        return points;
+    }
+
+    public String getPrjCoordSys() {
+        return prjCoordSys;
+    }
+
+    public String getStyle() {
+        return style;
+    }
+
+    public void setParts(Integer[] parts) {
+        this.parts = parts;
+    }
+
+    public void setPartTopo(Integer[] partTopo) {
+        this.partTopo = partTopo;
+    }
+
+    public void setPoints(List<Coordinate> points) {
+        this.points = points;
+    }
+
+    public void setPrjCoordSys(String prjCoordSys) {
+        this.prjCoordSys = prjCoordSys;
+    }
+
+    public void setStyle(String style) {
+        this.style = style;
+    }
+}
+
+

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/ZtZdBcbzListMapper.java

@@ -49,7 +49,7 @@ public interface ZtZdBcbzListMapper
      * @param id 征地补偿标准主键
      * @return 结果
      */
-    public int deleteZtZdBcbzListById(Integer id);
+    public int deleteZtZdBcbzListById(String id);
 
     /**
      * 批量删除征地补偿标准
@@ -57,5 +57,5 @@ public interface ZtZdBcbzListMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteZtZdBcbzListByIds(Integer[] ids);
+    public int deleteZtZdBcbzListByIds(String[] ids);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/BdcMapper.java

@@ -2,60 +2,63 @@ package com.onemap.sanya.mapper.spatial;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.Bdc;
+import com.onemap.sanya.domain.spatial.Jtowner;
 
 /**
- * 不动产Mapper接口
+ * 建筑矢量Mapper接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface BdcMapper 
 {
     /**
-     * 查询不动产
+     * 查询建筑矢量
      * 
-     * @param gid 不动产主键
-     * @return 不动产
+     * @param smid 建筑矢量主键
+     * @return 建筑矢量
      */
-    public Bdc selectBdcByGid(Integer gid);
-    public  List<Bdc>  selectBdcByPolygon(String polygon);
+    public Bdc selectBdcBySmid(Integer smid);
+
+    public List<Bdc> selectBdcByPolygon(String polygon);
+
     /**
-     * 查询不动产列表
+     * 查询建筑矢量列表
      * 
-     * @param bdc 不动产
-     * @return 不动产集合
+     * @param bdc 建筑矢量
+     * @return 建筑矢量集合
      */
     public List<Bdc> selectBdcList(Bdc bdc);
 
     /**
-     * 新增不动产
+     * 新增建筑矢量
      * 
-     * @param bdc 不动产
+     * @param bdc 建筑矢量
      * @return 结果
      */
     public int insertBdc(Bdc bdc);
 
     /**
-     * 修改不动产
+     * 修改建筑矢量
      * 
-     * @param bdc 不动产
+     * @param bdc 建筑矢量
      * @return 结果
      */
     public int updateBdc(Bdc bdc);
 
     /**
-     * 删除不动产
+     * 删除建筑矢量
      * 
-     * @param gid 不动产主键
+     * @param smid 建筑矢量主键
      * @return 结果
      */
-    public int deleteBdcByGid(Integer gid);
+    public int deleteBdcBySmid(Integer smid);
 
     /**
-     * 批量删除不动产
+     * 批量删除建筑矢量
      * 
-     * @param gids 需要删除的数据主键集合
+     * @param smids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteBdcByGids(Integer[] gids);
+    public int deleteBdcBySmids(Integer[] smids);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/DltbMapper.java

@@ -3,6 +3,7 @@ package com.onemap.sanya.mapper.spatial;
 import java.util.List;
 import com.onemap.sanya.domain.spatial.Dltb;
 
+
 /**
  * 地类图斑Mapper接口
  * 
@@ -13,30 +14,28 @@ public interface DltbMapper
 {
     /**
      * 查询地类图斑
-     * 
-     * @param gid 地类图斑主键
+     *
+     * @param smid 地类图斑主键
      * @return 地类图斑
      */
-    public Dltb selectDltbByGid(Integer gid);
-
-    /**
-     * 查询地类图斑列表
-     * 
-     * @param dltb 地类图斑
-     * @return 地类图斑集合
-     */
-    public List<Dltb> selectDltbList(Dltb dltb);
-
+    public Dltb selectDltbBySmid(Integer smid);
     /**
      * 查询 多边形相交的 地类图斑
      * @param polygon
      * @return
      */
     public List<Dltb> selectDltbByPolygon(String polygon);
+    /**
+     * 查询地类图斑列表
+     *
+     * @param dltb 地类图斑
+     * @return 地类图斑集合
+     */
+    public List<Dltb> selectDltbList(Dltb dltb);
 
     /**
      * 新增地类图斑
-     * 
+     *
      * @param dltb 地类图斑
      * @return 结果
      */
@@ -44,7 +43,7 @@ public interface DltbMapper
 
     /**
      * 修改地类图斑
-     * 
+     *
      * @param dltb 地类图斑
      * @return 结果
      */
@@ -52,17 +51,17 @@ public interface DltbMapper
 
     /**
      * 删除地类图斑
-     * 
-     * @param gid 地类图斑主键
+     *
+     * @param smid 地类图斑主键
      * @return 结果
      */
-    public int deleteDltbByGid(Integer gid);
+    public int deleteDltbBySmid(Integer smid);
 
     /**
      * 批量删除地类图斑
-     * 
-     * @param gids 需要删除的数据主键集合
+     *
+     * @param smids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteDltbByGids(Integer[] gids);
+    public int deleteDltbBySmids(Integer[] smids);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/GysyqMapper.java

@@ -1,63 +1,70 @@
 package com.onemap.sanya.mapper.spatial;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Dltb;
 import com.onemap.sanya.domain.spatial.Gysyq;
 
 /**
- * 国有使用权Mapper接口
+ * 国有所有权Mapper接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface GysyqMapper 
 {
     /**
-     * 查询国有使用权
+     * 查询国有所有权
      * 
-     * @param gid 国有使用权主键
-     * @return 国有使用权
+     * @param smid 国有所有权主键
+     * @return 国有所有权
      */
-    public Gysyq selectGysyqByGid(Integer gid);
+    public Gysyq selectGysyqBySmid(Integer smid);
 
     /**
-     * 查询国有使用权列表
+     * 查询国有所有权列表
      * 
-     * @param gysyq 国有使用权
-     * @return 国有使用权集合
+     * @param gysyq 国有所有权
+     * @return 国有所有权集合
      */
     public List<Gysyq> selectGysyqList(Gysyq gysyq);
 
+    /**
+     * 查询 多边形相交的 地类图斑
+     * @param polygon
+     * @return
+     */
     public List<Gysyq> selectGysyqByPolygon(String polygon);
 
     /**
-     * 新增国有使用权
+     * 新增国有所有权
      * 
-     * @param gysyq 国有使用权
+     * @param gysyq 国有所有权
      * @return 结果
      */
     public int insertGysyq(Gysyq gysyq);
 
     /**
-     * 修改国有使用权
+     * 修改国有所有权
      * 
-     * @param gysyq 国有使用权
+     * @param gysyq 国有所有权
      * @return 结果
      */
     public int updateGysyq(Gysyq gysyq);
 
     /**
-     * 删除国有使用权
+     * 删除国有所有权
      * 
-     * @param gid 国有使用权主键
+     * @param smid 国有所有权主键
      * @return 结果
      */
-    public int deleteGysyqByGid(Integer gid);
+    public int deleteGysyqBySmid(Integer smid);
 
     /**
-     * 批量删除国有使用权
+     * 批量删除国有所有权
      * 
-     * @param gids 需要删除的数据主键集合
+     * @param smids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteGysyqByGids(Integer[] gids);
+    public int deleteGysyqBySmids(Integer[] smids);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/JtownerMapper.java

@@ -2,22 +2,23 @@ package com.onemap.sanya.mapper.spatial;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.Jtowner;
+import com.onemap.sanya.domain.spatial.Jtuse;
 
 /**
  * 集体所有权Mapper接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface JtownerMapper 
 {
     /**
      * 查询集体所有权
      * 
-     * @param gid 集体所有权主键
+     * @param smid 集体所有权主键
      * @return 集体所有权
      */
-    public Jtowner selectJtownerByGid(Integer gid);
+    public Jtowner selectJtownerBySmid(Integer smid);
     public List<Jtowner> selectJtownerByPolygon(String polygon);
     /**
      * 查询集体所有权列表
@@ -46,16 +47,16 @@ public interface JtownerMapper
     /**
      * 删除集体所有权
      * 
-     * @param gid 集体所有权主键
+     * @param smid 集体所有权主键
      * @return 结果
      */
-    public int deleteJtownerByGid(Integer gid);
+    public int deleteJtownerBySmid(Integer smid);
 
     /**
      * 批量删除集体所有权
      * 
-     * @param gids 需要删除的数据主键集合
+     * @param smids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteJtownerByGids(Integer[] gids);
+    public int deleteJtownerBySmids(Integer[] smids);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/mapper/spatial/JtuseMapper.java

@@ -7,18 +7,17 @@ import com.onemap.sanya.domain.spatial.Jtuse;
  * 集体使用权Mapper接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface JtuseMapper 
 {
     /**
      * 查询集体使用权
      * 
-     * @param gid 集体使用权主键
+     * @param smid 集体使用权主键
      * @return 集体使用权
      */
-    public Jtuse selectJtuseByGid(Integer gid);
-    public Jtuse selectJtuseByPolygon(String polygon);
+    public Jtuse selectJtuseBySmid(Integer smid);
 
     /**
      * 查询集体使用权列表
@@ -28,6 +27,8 @@ public interface JtuseMapper
      */
     public List<Jtuse> selectJtuseList(Jtuse jtuse);
 
+    public List<Jtuse> selectJtuseByPolygon(String polygon);
+
     /**
      * 新增集体使用权
      * 
@@ -47,16 +48,16 @@ public interface JtuseMapper
     /**
      * 删除集体使用权
      * 
-     * @param gid 集体使用权主键
+     * @param smid 集体使用权主键
      * @return 结果
      */
-    public int deleteJtuseByGid(Integer gid);
+    public int deleteJtuseBySmid(Integer smid);
 
     /**
      * 批量删除集体使用权
      * 
-     * @param gids 需要删除的数据主键集合
+     * @param smids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteJtuseByGids(Integer[] gids);
+    public int deleteJtuseBySmids(Integer[] smids);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IBdcService.java

@@ -1,63 +1,65 @@
 package com.onemap.sanya.service;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Dltb;
 import com.onemap.sanya.domain.spatial.Bdc;
 
 /**
- * 不动产Service接口
+ * 建筑矢量Service接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface IBdcService 
 {
     /**
-     * 查询不动产
+     * 查询建筑矢量
      * 
-     * @param gid 不动产主键
-     * @return 不动产
+     * @param smid 建筑矢量主键
+     * @return 建筑矢量
      */
-    public Bdc selectBdcByGid(Integer gid);
-    public List<Bdc> selectBdcByPolygon(String polygon);
+    public Bdc selectBdcBySmid(Integer smid);
 
+    public  List<Bdc> selectBdcByPolygon(String polygon);
 
     /**
-     * 查询不动产列表
+     * 查询建筑矢量列表
      * 
-     * @param bdc 不动产
-     * @return 不动产集合
+     * @param bdc 建筑矢量
+     * @return 建筑矢量集合
      */
     public List<Bdc> selectBdcList(Bdc bdc);
 
     /**
-     * 新增不动产
+     * 新增建筑矢量
      * 
-     * @param bdc 不动产
+     * @param bdc 建筑矢量
      * @return 结果
      */
     public int insertBdc(Bdc bdc);
 
     /**
-     * 修改不动产
+     * 修改建筑矢量
      * 
-     * @param bdc 不动产
+     * @param bdc 建筑矢量
      * @return 结果
      */
     public int updateBdc(Bdc bdc);
 
     /**
-     * 批量删除不动产
+     * 批量删除建筑矢量
      * 
-     * @param gids 需要删除的不动产主键集合
+     * @param smids 需要删除的建筑矢量主键集合
      * @return 结果
      */
-    public int deleteBdcByGids(Integer[] gids);
+    public int deleteBdcBySmids(Integer[] smids);
 
     /**
-     * 删除不动产信息
+     * 删除建筑矢量信息
      * 
-     * @param gid 不动产主键
+     * @param smid 建筑矢量主键
      * @return 结果
      */
-    public int deleteBdcByGid(Integer gid);
+    public int deleteBdcBySmid(Integer smid);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IDltbService.java

@@ -2,37 +2,34 @@ package com.onemap.sanya.service;
 
 import java.util.List;
 import com.onemap.sanya.domain.spatial.Dltb;
-
 /**
  * 地类图斑Service接口
- * 
+ *
  * @author ruoyi
- * @date 2024-08-27
+ * @date 2024-08-30
  */
-public interface IDltbService 
+public interface IDltbService
 {
     /**
      * 查询地类图斑
-     * 
-     * @param gid 地类图斑主键
+     *
+     * @param smid 地类图斑主键
      * @return 地类图斑
      */
-    public Dltb selectDltbByGid(Integer gid);
+    public Dltb selectDltbBySmid(Integer smid);
+    public  List<Dltb> selectDltbByPolygon(String polygon);
 
     /**
      * 查询地类图斑列表
-     * 
+     *
      * @param dltb 地类图斑
      * @return 地类图斑集合
      */
     public List<Dltb> selectDltbList(Dltb dltb);
 
-    public List<Dltb> selectDltbByPolygon(String polygon);
-
-
     /**
      * 新增地类图斑
-     * 
+     *
      * @param dltb 地类图斑
      * @return 结果
      */
@@ -40,7 +37,7 @@ public interface IDltbService
 
     /**
      * 修改地类图斑
-     * 
+     *
      * @param dltb 地类图斑
      * @return 结果
      */
@@ -48,17 +45,17 @@ public interface IDltbService
 
     /**
      * 批量删除地类图斑
-     * 
-     * @param gids 需要删除的地类图斑主键集合
+     *
+     * @param smids 需要删除的地类图斑主键集合
      * @return 结果
      */
-    public int deleteDltbByGids(Integer[] gids);
+    public int deleteDltbBySmids(Integer[] smids);
 
     /**
      * 删除地类图斑信息
-     * 
-     * @param gid 地类图斑主键
+     *
+     * @param smid 地类图斑主键
      * @return 结果
      */
-    public int deleteDltbByGid(Integer gid);
+    public int deleteDltbBySmid(Integer smid);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IGysyqService.java

@@ -1,65 +1,64 @@
 package com.onemap.sanya.service;
 
 import java.util.List;
+
 import com.onemap.sanya.domain.spatial.Gysyq;
 
 /**
- * 国有使用权Service接口
+ * 国有所有权Service接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface IGysyqService 
 {
     /**
-     * 查询国有使用权
+     * 查询国有所有权
      * 
-     * @param gid 国有使用权主键
-     * @return 国有使用权
+     * @param smid 国有所有权主键
+     * @return 国有所有权
      */
-    public Gysyq selectGysyqByGid(Integer gid);
-
-    public List<Gysyq> selectGysyqByPolygon(String polygon);
-
+    public Gysyq selectGysyqBySmid(Integer smid);
 
     /**
-     * 查询国有使用权列表
+     * 查询国有所有权列表
      * 
-     * @param gysyq 国有使用权
-     * @return 国有使用权集合
+     * @param gysyq 国有所有权
+     * @return 国有所有权集合
      */
     public List<Gysyq> selectGysyqList(Gysyq gysyq);
 
+    public List<Gysyq> selectGysyqByPolygon(String polygon);
 
     /**
-     * 新增国有使用权
+     * 新增国有所有权
      * 
-     * @param gysyq 国有使用权
+     * @param gysyq 国有所有权
      * @return 结果
      */
     public int insertGysyq(Gysyq gysyq);
 
     /**
-     * 修改国有使用权
+     * 修改国有所有权
      * 
-     * @param gysyq 国有使用权
+     * @param gysyq 国有所有权
      * @return 结果
      */
     public int updateGysyq(Gysyq gysyq);
 
     /**
-     * 批量删除国有使用权
+     * 批量删除国有所有权
      * 
-     * @param gids 需要删除的国有使用权主键集合
+     * @param smids 需要删除的国有所有权主键集合
      * @return 结果
      */
-    public int deleteGysyqByGids(Integer[] gids);
+    public int deleteGysyqBySmids(Integer[] smids);
 
     /**
-     * 删除国有使用权信息
+     * 删除国有所有权信息
      * 
-     * @param gid 国有使用权主键
+     * @param smid 国有所有权主键
      * @return 结果
      */
-    public int deleteGysyqByGid(Integer gid);
+    public int deleteGysyqBySmid(Integer smid);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IJtownerService.java

@@ -1,25 +1,27 @@
 package com.onemap.sanya.service;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Bdc;
 import com.onemap.sanya.domain.spatial.Jtowner;
 
 /**
  * 集体所有权Service接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface IJtownerService 
 {
     /**
      * 查询集体所有权
      * 
-     * @param gid 集体所有权主键
+     * @param smid 集体所有权主键
      * @return 集体所有权
      */
-    public Jtowner selectJtownerByGid(Integer gid);
+    public Jtowner selectJtownerBySmid(Integer smid);
 
-    public List<Jtowner> selectJtownerByPolygon(String polygon);
+    public  List<Jtowner> selectJtownerByPolygon(String polygon);
 
     /**
      * 查询集体所有权列表
@@ -48,16 +50,16 @@ public interface IJtownerService
     /**
      * 批量删除集体所有权
      * 
-     * @param gids 需要删除的集体所有权主键集合
+     * @param smids 需要删除的集体所有权主键集合
      * @return 结果
      */
-    public int deleteJtownerByGids(Integer[] gids);
+    public int deleteJtownerBySmids(Integer[] smids);
 
     /**
      * 删除集体所有权信息
      * 
-     * @param gid 集体所有权主键
+     * @param smid 集体所有权主键
      * @return 结果
      */
-    public int deleteJtownerByGid(Integer gid);
+    public int deleteJtownerBySmid(Integer smid);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IJtuseService.java

@@ -1,24 +1,28 @@
 package com.onemap.sanya.service;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Jtowner;
 import com.onemap.sanya.domain.spatial.Jtuse;
 
 /**
  * 集体使用权Service接口
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 public interface IJtuseService 
 {
     /**
      * 查询集体使用权
      * 
-     * @param gid 集体使用权主键
+     * @param smid 集体使用权主键
      * @return 集体使用权
      */
-    public Jtuse selectJtuseByGid(Integer gid);
-    public  List<Jtuse> selectJtuseByPolygon(String polygon);
+    public Jtuse selectJtuseBySmid(Integer smid);
+
+    public  List<Jtuse>  selectJtuseByPolygon(String polygon);
+
     /**
      * 查询集体使用权列表
      * 
@@ -46,16 +50,16 @@ public interface IJtuseService
     /**
      * 批量删除集体使用权
      * 
-     * @param gids 需要删除的集体使用权主键集合
+     * @param smids 需要删除的集体使用权主键集合
      * @return 结果
      */
-    public int deleteJtuseByGids(Integer[] gids);
+    public int deleteJtuseBySmids(Integer[] smids);
 
     /**
      * 删除集体使用权信息
      * 
-     * @param gid 集体使用权主键
+     * @param smid 集体使用权主键
      * @return 结果
      */
-    public int deleteJtuseByGid(Integer gid);
+    public int deleteJtuseBySmid(Integer smid);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/IZtZdBcbzListService.java

@@ -49,7 +49,7 @@ public interface IZtZdBcbzListService
      * @param ids 需要删除的征地补偿标准主键集合
      * @return 结果
      */
-    public int deleteZtZdBcbzListByIds(Integer[] ids);
+    public int deleteZtZdBcbzListByIds(String[] ids);
 
     /**
      * 删除征地补偿标准信息
@@ -57,5 +57,5 @@ public interface IZtZdBcbzListService
      * @param id 征地补偿标准主键
      * @return 结果
      */
-    public int deleteZtZdBcbzListById(Integer id);
+    public int deleteZtZdBcbzListById(String id);
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/BdcServiceImpl.java

@@ -1,6 +1,8 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Dltb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.BdcMapper;
@@ -8,10 +10,10 @@ import com.onemap.sanya.domain.spatial.Bdc;
 import com.onemap.sanya.service.IBdcService;
 
 /**
- * 不动产Service业务层处理
+ * 建筑矢量Service业务层处理
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @Service
 public class BdcServiceImpl implements IBdcService 
@@ -20,27 +22,27 @@ public class BdcServiceImpl implements IBdcService
     private BdcMapper bdcMapper;
 
     /**
-     * 查询不动产
+     * 查询建筑矢量
      * 
-     * @param gid 不动产主键
-     * @return 不动产
+     * @param smid 建筑矢量主键
+     * @return 建筑矢量
      */
     @Override
-    public Bdc selectBdcByGid(Integer gid)
+    public Bdc selectBdcBySmid(Integer smid)
     {
-        return bdcMapper.selectBdcByGid(gid);
+        return bdcMapper.selectBdcBySmid(smid);
     }
 
-    @Override
-    public List<Bdc> selectBdcByPolygon(String polygon) {
+    public  List<Bdc> selectBdcByPolygon(String polygon)
+    {
         return bdcMapper.selectBdcByPolygon(polygon);
     }
 
     /**
-     * 查询不动产列表
+     * 查询建筑矢量列表
      * 
-     * @param bdc 不动产
-     * @return 不动产
+     * @param bdc 建筑矢量
+     * @return 建筑矢量
      */
     @Override
     public List<Bdc> selectBdcList(Bdc bdc)
@@ -49,9 +51,9 @@ public class BdcServiceImpl implements IBdcService
     }
 
     /**
-     * 新增不动产
+     * 新增建筑矢量
      * 
-     * @param bdc 不动产
+     * @param bdc 建筑矢量
      * @return 结果
      */
     @Override
@@ -61,9 +63,9 @@ public class BdcServiceImpl implements IBdcService
     }
 
     /**
-     * 修改不动产
+     * 修改建筑矢量
      * 
-     * @param bdc 不动产
+     * @param bdc 建筑矢量
      * @return 结果
      */
     @Override
@@ -73,26 +75,26 @@ public class BdcServiceImpl implements IBdcService
     }
 
     /**
-     * 批量删除不动产
+     * 批量删除建筑矢量
      * 
-     * @param gids 需要删除的不动产主键
+     * @param smids 需要删除的建筑矢量主键
      * @return 结果
      */
     @Override
-    public int deleteBdcByGids(Integer[] gids)
+    public int deleteBdcBySmids(Integer[] smids)
     {
-        return bdcMapper.deleteBdcByGids(gids);
+        return bdcMapper.deleteBdcBySmids(smids);
     }
 
     /**
-     * 删除不动产信息
+     * 删除建筑矢量信息
      * 
-     * @param gid 不动产主键
+     * @param smid 建筑矢量主键
      * @return 结果
      */
     @Override
-    public int deleteBdcByGid(Integer gid)
+    public int deleteBdcBySmid(Integer smid)
     {
-        return bdcMapper.deleteBdcByGid(gid);
+        return bdcMapper.deleteBdcBySmid(smid);
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/DltbServiceImpl.java

@@ -9,31 +9,31 @@ import com.onemap.sanya.service.IDltbService;
 
 /**
  * 地类图斑Service业务层处理
- * 
+ *
  * @author ruoyi
- * @date 2024-08-27
+ * @date 2024-08-30
  */
 @Service
-public class DltbServiceImpl implements IDltbService 
+public class DltbServiceImpl implements IDltbService
 {
     @Autowired
     private DltbMapper dltbMapper;
 
     /**
      * 查询地类图斑
-     * 
-     * @param gid 地类图斑主键
+     *
+     * @param smid 地类图斑主键
      * @return 地类图斑
      */
     @Override
-    public Dltb selectDltbByGid(Integer gid)
+    public Dltb selectDltbBySmid(Integer smid)
     {
-        return dltbMapper.selectDltbByGid(gid);
+        return dltbMapper.selectDltbBySmid(smid);
     }
 
     /**
      * 查询地类图斑列表
-     * 
+     *
      * @param dltb 地类图斑
      * @return 地类图斑
      */
@@ -42,20 +42,13 @@ public class DltbServiceImpl implements IDltbService
     {
         return dltbMapper.selectDltbList(dltb);
     }
-
-    /**
-     * 查询多边形相交的图斑
-     * @param polygon wkt 多边形
-     * @return
-     */
-    public List<Dltb> selectDltbByPolygon(String polygon)
+    public  List<Dltb> selectDltbByPolygon(String polygon)
     {
         return dltbMapper.selectDltbByPolygon(polygon);
     }
-
     /**
      * 新增地类图斑
-     * 
+     *
      * @param dltb 地类图斑
      * @return 结果
      */
@@ -67,7 +60,7 @@ public class DltbServiceImpl implements IDltbService
 
     /**
      * 修改地类图斑
-     * 
+     *
      * @param dltb 地类图斑
      * @return 结果
      */
@@ -79,25 +72,25 @@ public class DltbServiceImpl implements IDltbService
 
     /**
      * 批量删除地类图斑
-     * 
-     * @param gids 需要删除的地类图斑主键
+     *
+     * @param smids 需要删除的地类图斑主键
      * @return 结果
      */
     @Override
-    public int deleteDltbByGids(Integer[] gids)
+    public int deleteDltbBySmids(Integer[] smids)
     {
-        return dltbMapper.deleteDltbByGids(gids);
+        return dltbMapper.deleteDltbBySmids(smids);
     }
 
     /**
      * 删除地类图斑信息
-     * 
-     * @param gid 地类图斑主键
+     *
+     * @param smid 地类图斑主键
      * @return 结果
      */
     @Override
-    public int deleteDltbByGid(Integer gid)
+    public int deleteDltbBySmid(Integer smid)
     {
-        return dltbMapper.deleteDltbByGid(gid);
+        return dltbMapper.deleteDltbBySmid(smid);
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/GysyqServiceImpl.java

@@ -1,6 +1,7 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.GysyqMapper;
@@ -8,10 +9,10 @@ import com.onemap.sanya.domain.spatial.Gysyq;
 import com.onemap.sanya.service.IGysyqService;
 
 /**
- * 国有使用权Service业务层处理
+ * 国有所有权Service业务层处理
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @Service
 public class GysyqServiceImpl implements IGysyqService 
@@ -20,27 +21,24 @@ public class GysyqServiceImpl implements IGysyqService
     private GysyqMapper gysyqMapper;
 
     /**
-     * 查询国有使用权
+     * 查询国有所有权
      * 
-     * @param gid 国有使用权主键
-     * @return 国有使用权
+     * @param smid 国有所有权主键
+     * @return 国有所有权
      */
     @Override
-    public Gysyq selectGysyqByGid(Integer gid)
+    public Gysyq selectGysyqBySmid(Integer smid)
     {
-        return gysyqMapper.selectGysyqByGid(gid);
+        return gysyqMapper.selectGysyqBySmid(smid);
     }
-
-    public List<Gysyq> selectGysyqByPolygon(String polygon)
-    {
+    public List<Gysyq> selectGysyqByPolygon(String polygon){
         return gysyqMapper.selectGysyqByPolygon(polygon);
     }
-
     /**
-     * 查询国有使用权列表
+     * 查询国有所有权列表
      * 
-     * @param gysyq 国有使用权
-     * @return 国有使用权
+     * @param gysyq 国有所有权
+     * @return 国有所有权
      */
     @Override
     public List<Gysyq> selectGysyqList(Gysyq gysyq)
@@ -49,9 +47,9 @@ public class GysyqServiceImpl implements IGysyqService
     }
 
     /**
-     * 新增国有使用权
+     * 新增国有所有权
      * 
-     * @param gysyq 国有使用权
+     * @param gysyq 国有所有权
      * @return 结果
      */
     @Override
@@ -61,9 +59,9 @@ public class GysyqServiceImpl implements IGysyqService
     }
 
     /**
-     * 修改国有使用权
+     * 修改国有所有权
      * 
-     * @param gysyq 国有使用权
+     * @param gysyq 国有所有权
      * @return 结果
      */
     @Override
@@ -73,26 +71,26 @@ public class GysyqServiceImpl implements IGysyqService
     }
 
     /**
-     * 批量删除国有使用权
+     * 批量删除国有所有权
      * 
-     * @param gids 需要删除的国有使用权主键
+     * @param smids 需要删除的国有所有权主键
      * @return 结果
      */
     @Override
-    public int deleteGysyqByGids(Integer[] gids)
+    public int deleteGysyqBySmids(Integer[] smids)
     {
-        return gysyqMapper.deleteGysyqByGids(gids);
+        return gysyqMapper.deleteGysyqBySmids(smids);
     }
 
     /**
-     * 删除国有使用权信息
+     * 删除国有所有权信息
      * 
-     * @param gid 国有使用权主键
+     * @param smid 国有所有权主键
      * @return 结果
      */
     @Override
-    public int deleteGysyqByGid(Integer gid)
+    public int deleteGysyqBySmid(Integer smid)
     {
-        return gysyqMapper.deleteGysyqByGid(gid);
+        return gysyqMapper.deleteGysyqBySmid(smid);
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/JtownerServiceImpl.java

@@ -1,6 +1,8 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Bdc;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.JtownerMapper;
@@ -11,7 +13,7 @@ import com.onemap.sanya.service.IJtownerService;
  * 集体所有权Service业务层处理
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @Service
 public class JtownerServiceImpl implements IJtownerService 
@@ -22,20 +24,18 @@ public class JtownerServiceImpl implements IJtownerService
     /**
      * 查询集体所有权
      * 
-     * @param gid 集体所有权主键
+     * @param smid 集体所有权主键
      * @return 集体所有权
      */
     @Override
-    public Jtowner selectJtownerByGid(Integer gid)
+    public Jtowner selectJtownerBySmid(Integer smid)
     {
-        return jtownerMapper.selectJtownerByGid(gid);
+        return jtownerMapper.selectJtownerBySmid(smid);
     }
-
-    public List<Jtowner> selectJtownerByPolygon(String polygon)
+    public  List<Jtowner> selectJtownerByPolygon(String polygon)
     {
-        return jtownerMapper.selectJtownerByPolygon(polygon);
+        return jtownerMapper.selectJtownerByPolygon (polygon);
     }
-
     /**
      * 查询集体所有权列表
      * 
@@ -75,24 +75,24 @@ public class JtownerServiceImpl implements IJtownerService
     /**
      * 批量删除集体所有权
      * 
-     * @param gids 需要删除的集体所有权主键
+     * @param smids 需要删除的集体所有权主键
      * @return 结果
      */
     @Override
-    public int deleteJtownerByGids(Integer[] gids)
+    public int deleteJtownerBySmids(Integer[] smids)
     {
-        return jtownerMapper.deleteJtownerByGids(gids);
+        return jtownerMapper.deleteJtownerBySmids(smids);
     }
 
     /**
      * 删除集体所有权信息
      * 
-     * @param gid 集体所有权主键
+     * @param smid 集体所有权主键
      * @return 结果
      */
     @Override
-    public int deleteJtownerByGid(Integer gid)
+    public int deleteJtownerBySmid(Integer smid)
     {
-        return jtownerMapper.deleteJtownerByGid(gid);
+        return jtownerMapper.deleteJtownerBySmid(smid);
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/JtuseServiceImpl.java

@@ -1,6 +1,8 @@
 package com.onemap.sanya.service.impl;
 
 import java.util.List;
+
+import com.onemap.sanya.domain.spatial.Jtowner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.onemap.sanya.mapper.spatial.JtuseMapper;
@@ -11,7 +13,7 @@ import com.onemap.sanya.service.IJtuseService;
  * 集体使用权Service业务层处理
  * 
  * @author ruoyi
- * @date 2024-08-28
+ * @date 2024-08-30
  */
 @Service
 public class JtuseServiceImpl implements IJtuseService 
@@ -22,20 +24,18 @@ public class JtuseServiceImpl implements IJtuseService
     /**
      * 查询集体使用权
      * 
-     * @param gid 集体使用权主键
+     * @param smid 集体使用权主键
      * @return 集体使用权
      */
     @Override
-    public Jtuse selectJtuseByGid(Integer gid)
+    public Jtuse selectJtuseBySmid(Integer smid)
     {
-        return jtuseMapper.selectJtuseByGid(gid);
+        return jtuseMapper.selectJtuseBySmid(smid);
     }
-
-
-    public List<Jtuse> selectJtuseByPolygon(String polygon) {
-            return (List<Jtuse>) jtuseMapper.selectJtuseByPolygon(polygon);
+    public  List<Jtuse> selectJtuseByPolygon(String polygon)
+    {
+        return jtuseMapper.selectJtuseByPolygon (polygon);
     }
-
     /**
      * 查询集体使用权列表
      * 
@@ -75,24 +75,24 @@ public class JtuseServiceImpl implements IJtuseService
     /**
      * 批量删除集体使用权
      * 
-     * @param gids 需要删除的集体使用权主键
+     * @param smids 需要删除的集体使用权主键
      * @return 结果
      */
     @Override
-    public int deleteJtuseByGids(Integer[] gids)
+    public int deleteJtuseBySmids(Integer[] smids)
     {
-        return jtuseMapper.deleteJtuseByGids(gids);
+        return jtuseMapper.deleteJtuseBySmids(smids);
     }
 
     /**
      * 删除集体使用权信息
      * 
-     * @param gid 集体使用权主键
+     * @param smid 集体使用权主键
      * @return 结果
      */
     @Override
-    public int deleteJtuseByGid(Integer gid)
+    public int deleteJtuseBySmid(Integer smid)
     {
-        return jtuseMapper.deleteJtuseByGid(gid);
+        return jtuseMapper.deleteJtuseBySmid(smid);
     }
 }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/service/impl/ZtZdBcbzListServiceImpl.java

@@ -74,7 +74,7 @@ public class ZtZdBcbzListServiceImpl implements IZtZdBcbzListService
      * @return 结果
      */
     @Override
-    public int deleteZtZdBcbzListByIds(Integer[] ids)
+    public int deleteZtZdBcbzListByIds(String[] ids)
     {
         return ztZdBcbzListMapper.deleteZtZdBcbzListByIds(ids);
     }
@@ -86,7 +86,7 @@ public class ZtZdBcbzListServiceImpl implements IZtZdBcbzListService
      * @return 结果
      */
     @Override
-    public int deleteZtZdBcbzListById(Integer id)
+    public int deleteZtZdBcbzListById(String id)
     {
         return ztZdBcbzListMapper.deleteZtZdBcbzListById(id);
     }

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/utils/SpatialOperate.java

@@ -1,5 +1,6 @@
 package com.onemap.sanya.utils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.onemap.common.core.annotation.Excel;
 import com.onemap.sanya.domain.spatial.CustomXY;
 
@@ -7,12 +8,15 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.onemap.sanya.domain.spatial.FldInfo;
+import com.onemap.sanya.domain.spatial.SuperMapFreature;
+import com.onemap.sanya.domain.spatial.SuperMapGeo;
 import org.geotools.geojson.GeoJSON;
 import org.geotools.geometry.jts.JTS;
-import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.util.factory.Hints;
 
 import org.locationtech.jts.geom.*;
@@ -22,12 +26,12 @@ import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.io.WKTReader;
 import org.locationtech.jts.io.WKTWriter;
 import org.geotools.referencing.CRS;
+import org.opengis.referencing.crs.CRSAuthorityFactory;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.operation.MathTransform;
 
 public class SpatialOperate {
-//    static Hints hints = new Hints();
+    static Hints hints = new Hints();
 //    static GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory(hints);
 
 
@@ -160,13 +164,15 @@ public class SpatialOperate {
     public static Geometry lonlat2WebMactor(Geometry geom) {
         try {
             //这里是以OGC WKT形式定义的是World Mercator投影，网页地图一般使用该投影
-
-            CoordinateReferenceSystem sourceTarget = CRS.parseWKT(srid4490);
+            CRSAuthorityFactory factory=CRS.getAuthorityFactory(true);
+            Integer wkid=geom.getSRID();
+            CoordinateReferenceSystem sourceTarget = factory.createCoordinateReferenceSystem("EPSG:"+4490);
 
 //            MathTransform transform1 = CRS.findMathTransform(DefaultGeographicCRS.WGS84, sourceTarget);
 //            Geometry geometry1= JTS.transform(geom, transform1);
             // 投影转换
-            CoordinateReferenceSystem crsTarget = CRS.parseWKT(srid4546);
+            CoordinateReferenceSystem crsTarget=factory.createCoordinateReferenceSystem("EPSG:"+4546);
+//            CoordinateReferenceSystem crsTarget = CRS.parseWKT(srid4546);
 
             MathTransform transform2 = CRS.findMathTransform(sourceTarget, crsTarget, false);
             return JTS.transform(geom, transform2);
@@ -228,15 +234,27 @@ public class SpatialOperate {
     }
 
     public static Double getIntersectsArea(Geometry polygon1, Geometry other) {
-        Geometry intersetGeom = (Geometry) polygon1.intersection(other);
+        Double result=0.0;
+        Geometry intersetGeom =null;
+        Boolean isInster= polygon1.intersects(other);
+        if(isInster)
+        {
+            try {
+                intersetGeom = polygon1.intersection(other);
+            }
+            catch (Exception er){
+                result=0.0;
+        }
+        }
         if (intersetGeom == null) {
-            return 0.00;
+             result=0.0;
         }
-        Polygon pPolgon = (Polygon) intersetGeom;
-        if (pPolgon == null)
-            return 0.00;
-        pPolgon = (Polygon) lonlat2WebMactor(pPolgon);
-        return pPolgon.getArea() / 666.66;
+        else {
+            Geometry pPolgon = lonlat2WebMactor(intersetGeom);
+            if (pPolgon != null)
+                result = pPolgon.getArea() / 666.66;
+        }
+        return result;
     }
 
     /**
@@ -271,6 +289,77 @@ public class SpatialOperate {
         }
     }
 
+    public  static SuperMapFreature Feature2Supermap(Object obj, Geometry geom ) throws org.locationtech.jts.io.ParseException, IllegalAccessException {
+        SuperMapFreature res = new SuperMapFreature();
+        Geometry geometry = geom;
+        WKTReader reader = new WKTReader();
+        Field[] fields = obj.getClass().getDeclaredFields();
+        String[] fieldNames = new String[fields.length];
+        String[] fieldValues = new String[fields.length];
+        Integer smId = 0;
+        for (int i = 0; i < fields.length; i++) {
+            String fldName = fields[i].getName().toUpperCase();
+//            if(fldName.equals("SMGEOMETRY"))
+//                continue;
+            fields[i].setAccessible(true);
+            fieldNames[i] = fldName;
+            String s = "null";
+            if(fldName=="SMGEOMETRY")
+                fieldValues[i]="";
+            fieldValues[i] = fields[i].get(obj) == null ? s : fields[i].get(obj).toString();
+            if (fields[i].getName().toUpperCase().equals("SMID"))
+                smId = Integer.parseInt(fields[i].get(obj).toString());
+        }
+
+        int innerCout = 0;
+        LinearRing outRing = null;
+        Integer[] parts = new Integer[1];
+        Integer[] partTop = new Integer[1];
+        Integer partIndex = 0;
+        List<Coordinate> allPoints = new ArrayList<>();
+        int outPointCount = 0;
+        LinearRing curInnerRing = null;
+        Polygon polygon = null;
+        if (geom.getGeometryType() == Geometry.TYPENAME_MULTIPOLYGON)
+            polygon = (Polygon) geom.getGeometryN(0);
+        else if (geom.getGeometryType() == Geometry.TYPENAME_POLYGON) {
+            polygon = (Polygon) geom;
+
+        }
+        innerCout = polygon.getNumInteriorRing();
+        outRing = polygon.getExteriorRing();
+        parts = new Integer[innerCout + 1];
+        partTop = new Integer[innerCout+1];
+        outPointCount = outRing.getNumPoints();
+        parts[0] = outPointCount - 1;
+        partTop[0] = 1;
+        partIndex = outPointCount - 1;
+        for (Integer i = 1; i < innerCout; i++) {
+            curInnerRing = polygon.getInteriorRingN(i - 1);
+            partIndex += curInnerRing.getNumPoints();
+            parts[i] = partIndex;
+            partTop[i] = -1;
+            Coordinate[] ddd= curInnerRing.getCoordinates();
+           List<Coordinate> dddfs= Arrays.stream(ddd).collect(Collectors.toList());
+            allPoints.addAll(dddfs);
+        }
+        allPoints.addAll(Arrays.stream(outRing.getCoordinates()).collect(Collectors.toList()));
+
+        SuperMapGeo superMapGeo = new SuperMapGeo();
+        superMapGeo.setCenter(new Coordinate(geom.getCentroid().getX(), geom.getCentroid().getY()));
+        superMapGeo.setId(smId);
+        superMapGeo.setParts(parts);
+        superMapGeo.setPoints(allPoints);
+        superMapGeo.setType("REGION");
+        superMapGeo.setPartTopo(partTop);
+
+        res.setFieldNames(fieldNames);
+        res.setFieldValues(fieldValues);
+        res.setGeometry(superMapGeo);
+        res.setID(smId);
+        return res;
+    }
+
     /**
      * 根据类生成字段列表
      *
@@ -295,7 +384,7 @@ public class SpatialOperate {
             }
             if (cnName == "" || cnName == null)
                 cnName = name;
-            fldInfos.add(new FldInfo(name, cnName, typeName));
+            fldInfos.add(new FldInfo(name.toUpperCase(), cnName.toUpperCase(), typeName.toUpperCase()));
         }
         return fldInfos;
     }

onemap-modules/onemap-model/src/main/resources/mapper/sanya/ZtBenchmarklandpricesMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
 
         </where>
+        order by "create_time" desc
     </select>
     
     <select id="selectZtBenchmarklandpricesById" parameterType="String" resultMap="ZtBenchmarklandpricesResult">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/ZtBillboardmodellistMapper.xml

@@ -28,10 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="templateTop"    column="templateTop"    />
         <result property="templateCentre"    column="templateCentre"    />
         <result property="templateBottom"    column="templateBottom"    />
+        <result property="results"    column="results"    />
+        <result property="viewing_angle"    column="viewing_angle"  />
     </resultMap>
 
     <sql id="selectZtBillboardmodellistVo">
-        select id, "billboardInfoId", "billboardName", "billboardType", x, y, z, "rotateX", "rotateY", "rotateZ", "ReviewStatus", "ReviewComments", create_by, create_time, update_by, update_time, remark, "isAddModel", remarks, "template","templateTop", "templateCentre", "templateBottom" from "zt_billboardModelList"
+        select id, "billboardInfoId", "billboardName", "billboardType", x, y, z, "rotateX", "rotateY", "rotateZ", "ReviewStatus", "ReviewComments", create_by, create_time, update_by, update_time, remark, "isAddModel", remarks, "template","templateTop", "templateCentre", "templateBottom","results","viewing_angle" from "zt_billboardModelList"
     </sql>
 
     <select id="selectZtBillboardmodellistList" parameterType="com.onemap.sanya.domain.business.ZtBillboardmodellist" resultMap="ZtBillboardmodellistResult">
@@ -89,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="templateTop != null">"templateTop",</if>
             <if test="templateCentre != null">"templateCentre",</if>
             <if test="templateBottom != null">"templateBottom",</if>
+            <if test="results != null">"results",</if>
+            <if test="viewing_angle != null">"viewing_angle",</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -114,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="templateTop != null">#{templateTop}::jsonb,</if>
             <if test="templateCentre != null">#{templateCentre}::jsonb,</if>
             <if test="templateBottom != null">#{templateBottom}::jsonb,</if>
+            <if test="results != null">#{results}::jsonb,</if>
+            <if test="viewing_angle != null ">#{viewing_angle}::jsonb</if>
          </trim>
     </insert>
 
@@ -143,6 +149,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="templateTop != null">"templateTop" = #{templateTop}::jsonb,</if>
             <if test="templateCentre != null">"templateCentre" = #{templateCentre}::jsonb,</if>
             <if test="templateBottom != null">"templateBottom" = #{templateBottom}::jsonb,</if>
+            <if test="results != null">"results" = #{results}::jsonb,</if>
+            <if test="viewing_angle != null">"viewing_angle" = #{viewing_angle}::jsonb,</if>
         </trim>
         where id = #{id}
     </update>

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/BdcMapper.xml

@@ -5,63 +5,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.BdcMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.Bdc" id="BdcResult">
-        <result property="gid"    column="gid"    />
+        <result property="smid"    column="smid"    />
         <result property="smuserid"    column="smuserid"    />
-        <result property="id"    column="id"    />
+        <result property="smarea"    column="smarea"    />
+        <result property="smperimeter"    column="smperimeter"    />
+        <result property="smgeometry"    column="smgeometry"    />
+        <result property="height"    column="height"    />
         <result property="floor"    column="floor"    />
         <result property="cqr"    column="cqr"    />
+        <result property="address"    column="address"    />
+        <result property="grade"    column="grade"    />
         <result property="zdmj"    column="zdmj"    />
         <result property="jzmj"    column="jzmj"    />
-        <result property="address"    column="address"    />
-        <result property="geom"    column="geom"    />
+        <result property="jg"    column="jg"    />
     </resultMap>
 
     <sql id="selectBdcVo">
-        select gid, smuserid, id, floor, cqr, zdmj, jzmj, address, geom from bdc
+        select smid, smuserid, smarea, smperimeter, st_asewkt(smgeometry) as smgeometry , height, floor, cqr, address, grade, zdmj, jzmj,jg from bdc
     </sql>
 
     <select id="selectBdcList" parameterType="com.onemap.sanya.domain.spatial.Bdc" resultMap="BdcResult">
         <include refid="selectBdcVo"/>
         <where>  
             <if test="smuserid != null "> and smuserid = #{smuserid}</if>
+            <if test="smarea != null "> and smarea = #{smarea}</if>
+            <if test="smperimeter != null "> and smperimeter = #{smperimeter}</if>
+            <if test="smgeometry != null  and smgeometry != ''"> and smgeometry = #{smgeometry}</if>
+            <if test="height != null "> and height = #{height}</if>
             <if test="floor != null "> and floor = #{floor}</if>
             <if test="cqr != null  and cqr != ''"> and cqr = #{cqr}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="grade != null "> and grade = #{grade}</if>
             <if test="zdmj != null "> and zdmj = #{zdmj}</if>
             <if test="jzmj != null "> and jzmj = #{jzmj}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="geom != null  and geom != ''"> and geom = #{geom}</if>
+            <if test="jg != null "> and jg = #{jg}</if>
         </where>
     </select>
     
-    <select id="selectBdcByGid" parameterType="Integer" resultMap="BdcResult">
+    <select id="selectBdcBySmid" parameterType="Integer" resultMap="BdcResult">
         <include refid="selectBdcVo"/>
-        where gid = #{gid}
+        where smid = #{smid}
     </select>
     <select id="selectBdcByPolygon" parameterType="String" resultMap="BdcResult">
         <include refid="selectBdcVo"/>
-        where st_intersects(st_geomfromewkt(polygon),bdc.geom)
+        where st_intersects( st_geomfromewkt(#{polygon}),bdc.smgeometry)
     </select>
-    <insert id="insertBdc" parameterType="com.onemap.sanya.domain.spatial.Bdc" useGeneratedKeys="true" keyProperty="gid">
+    <insert id="insertBdc" parameterType="com.onemap.sanya.domain.spatial.Bdc" useGeneratedKeys="true" keyProperty="smid">
         insert into bdc
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">smuserid,</if>
-            <if test="id != null">id,</if>
+            <if test="smarea != null">smarea,</if>
+            <if test="smperimeter != null">smperimeter,</if>
+            <if test="smgeometry != null">smgeometry,</if>
+            <if test="height != null">height,</if>
             <if test="floor != null">floor,</if>
             <if test="cqr != null">cqr,</if>
+            <if test="address != null">address,</if>
+            <if test="grade != null">grade,</if>
             <if test="zdmj != null">zdmj,</if>
             <if test="jzmj != null">jzmj,</if>
-            <if test="address != null">address,</if>
-            <if test="geom != null">geom,</if>
+            <if test="jg != null">jg,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">#{smuserid},</if>
-            <if test="id != null">#{id},</if>
+            <if test="smarea != null">#{smarea},</if>
+            <if test="smperimeter != null">#{smperimeter},</if>
+            <if test="smgeometry != null">#{smgeometry},</if>
+            <if test="height != null">#{height},</if>
             <if test="floor != null">#{floor},</if>
             <if test="cqr != null">#{cqr},</if>
+            <if test="address != null">#{address},</if>
+            <if test="grade != null">#{grade},</if>
             <if test="zdmj != null">#{zdmj},</if>
             <if test="jzmj != null">#{jzmj},</if>
-            <if test="address != null">#{address},</if>
-            <if test="geom != null">#{geom},</if>
+            <if test="jg != null">#{jg},</if>
          </trim>
     </insert>
 
@@ -69,25 +86,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update bdc
         <trim prefix="SET" suffixOverrides=",">
             <if test="smuserid != null">smuserid = #{smuserid},</if>
-            <if test="id != null">id = #{id},</if>
+            <if test="smarea != null">smarea = #{smarea},</if>
+            <if test="smperimeter != null">smperimeter = #{smperimeter},</if>
+            <if test="smgeometry != null">smgeometry = #{smgeometry},</if>
+            <if test="height != null">height = #{height},</if>
             <if test="floor != null">floor = #{floor},</if>
             <if test="cqr != null">cqr = #{cqr},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="grade != null">grade = #{grade},</if>
             <if test="zdmj != null">zdmj = #{zdmj},</if>
             <if test="jzmj != null">jzmj = #{jzmj},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="geom != null">geom = #{geom},</if>
+            <if test="jg != null">jg = #{jg},</if>
         </trim>
-        where gid = #{gid}
+        where smid = #{smid}
     </update>
 
-    <delete id="deleteBdcByGid" parameterType="Integer">
-        delete from bdc where gid = #{gid}
+    <delete id="deleteBdcBySmid" parameterType="Integer">
+        delete from bdc where smid = #{smid}
     </delete>
 
-    <delete id="deleteBdcByGids" parameterType="String">
-        delete from bdc where gid in 
-        <foreach item="gid" collection="array" open="(" separator="," close=")">
-            #{gid}
+    <delete id="deleteBdcBySmids" parameterType="String">
+        delete from bdc where smid in 
+        <foreach item="smid" collection="array" open="(" separator="," close=")">
+            #{smid}
         </foreach>
     </delete>
 </mapper>

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/DltbMapper.xml

@@ -3,10 +3,13 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.sanya.mapper.spatial.DltbMapper">
-    
+
     <resultMap type="com.onemap.sanya.domain.spatial.Dltb" id="DltbResult">
-        <result property="gid"    column="gid"    />
+        <result property="smid"    column="smid"    />
         <result property="smuserid"    column="smuserid"    />
+        <result property="smarea"    column="smarea"    />
+        <result property="smperimeter"    column="smperimeter"    />
+        <result property="smgeometry"    column="smgeometry"    />
         <result property="objectid"    column="objectid"    />
         <result property="fidDltb2"    column="fid_dltb_2"    />
         <result property="bsm"    column="bsm"    />
@@ -43,17 +46,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fidNewSh"    column="fid_new_sh"    />
         <result property="id"    column="id"    />
         <result property="ss"    column="ss"    />
-        <result property="shapeLe1"    column="shape_le_1"    />
+        <result property="shapeLength"    column="shape_length"    />
         <result property="shapeArea"    column="shape_area"    />
-        <result property="geom"    column="geom"    />
     </resultMap>
+
     <sql id="selectDltbVo">
-        select gid, smuserid, objectid, fid_dltb_2, bsm, ysdm, tbybh, tbbh, dlbm, dlmc, qsxz, qsdwdm, qsdwmc, zldwdm, zldwmc, tbmj, kcdlbm, kcxs, kcmj, tbdlmj, gdlx, gdpdjb, xzdwkd, tbxhdm, tbxhmc, zzsxdm, zzsxmc, gddb, frdbs, czcsxm, sjnf, mssm, hdmc, bz, shape_leng, fid_new_sh, id, ss, shape_le_1, shape_area, st_asewkt(geom) as geom from dltb
+        select smid, smuserid, smarea, smperimeter,  objectid, fid_dltb_2, bsm, ysdm, tbybh, tbbh, dlbm, dlmc, qsxz, qsdwdm, qsdwmc, zldwdm, zldwmc, tbmj, kcdlbm, kcxs, kcmj, tbdlmj, gdlx, gdpdjb, xzdwkd, tbxhdm, tbxhmc, zzsxdm, zzsxmc, gddb, frdbs, czcsxm, sjnf, mssm, hdmc, bz, st_asewkt(smgeometry) as smgeometry  from dltb
     </sql>
+
     <select id="selectDltbList" parameterType="com.onemap.sanya.domain.spatial.Dltb" resultMap="DltbResult">
         <include refid="selectDltbVo"/>
-        <where>  
+        <where>
             <if test="smuserid != null "> and smuserid = #{smuserid}</if>
+            <if test="smarea != null "> and smarea = #{smarea}</if>
+            <if test="smperimeter != null "> and smperimeter = #{smperimeter}</if>
+            <if test="smgeometry != null  and smgeometry != ''"> and smgeometry = #{smgeometry}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="fidDltb2 != null "> and fid_dltb_2 = #{fidDltb2}</if>
             <if test="bsm != null  and bsm != ''"> and bsm = #{bsm}</if>
@@ -89,24 +96,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shapeLeng != null "> and shape_leng = #{shapeLeng}</if>
             <if test="fidNewSh != null "> and fid_new_sh = #{fidNewSh}</if>
             <if test="ss != null "> and ss = #{ss}</if>
-            <if test="shapeLe1 != null "> and shape_le_1 = #{shapeLe1}</if>
+            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
             <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
-            <if test="geom != null  and geom != ''"> and geom = st_geomfromewkt(#{geom})</if>
         </where>
     </select>
-    
-    <select id="selectDltbByGid" parameterType="Integer" resultMap="DltbResult">
+
+    <select id="selectDltbBySmid" parameterType="Integer" resultMap="DltbResult">
         <include refid="selectDltbVo"/>
-        where gid = #{gid}
+        where smid = #{smid}
     </select>
     <select id="selectDltbByPolygon" parameterType="String" resultMap="DltbResult">
         <include refid="selectDltbVo"/>
-        where st_intersects( st_geomfromewkt(polygon),dltb.geom)
+        where st_intersects( st_geomfromewkt(#{polygon}),dltb.smgeometry)
     </select>
-    <insert id="insertDltb" parameterType="com.onemap.sanya.domain.spatial.Dltb" useGeneratedKeys="true" keyProperty="gid">
+    <insert id="insertDltb" parameterType="com.onemap.sanya.domain.spatial.Dltb" useGeneratedKeys="true" keyProperty="smid">
         insert into dltb
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">smuserid,</if>
+            <if test="smarea != null">smarea,</if>
+            <if test="smperimeter != null">smperimeter,</if>
+            <if test="smgeometry != null">smgeometry,</if>
             <if test="objectid != null">objectid,</if>
             <if test="fidDltb2 != null">fid_dltb_2,</if>
             <if test="bsm != null">bsm,</if>
@@ -143,12 +152,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fidNewSh != null">fid_new_sh,</if>
             <if test="id != null">id,</if>
             <if test="ss != null">ss,</if>
-            <if test="shapeLe1 != null">shape_le_1,</if>
+            <if test="shapeLength != null">shape_length,</if>
             <if test="shapeArea != null">shape_area,</if>
-            <if test="geom != null">geom,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">#{smuserid},</if>
+            <if test="smarea != null">#{smarea},</if>
+            <if test="smperimeter != null">#{smperimeter},</if>
+            <if test="smgeometry != null">st_geomfromewkt(#{smgeometry}),</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="fidDltb2 != null">#{fidDltb2},</if>
             <if test="bsm != null">#{bsm},</if>
@@ -185,16 +196,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fidNewSh != null">#{fidNewSh},</if>
             <if test="id != null">#{id},</if>
             <if test="ss != null">#{ss},</if>
-            <if test="shapeLe1 != null">#{shapeLe1},</if>
+            <if test="shapeLength != null">#{shapeLength},</if>
             <if test="shapeArea != null">#{shapeArea},</if>
-            <if test="geom != null"> ST_AsHEXEWKB(st_geomfromewkt((#{geom}),</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDltb" parameterType="com.onemap.sanya.domain.spatial.Dltb">
         update dltb
         <trim prefix="SET" suffixOverrides=",">
             <if test="smuserid != null">smuserid = #{smuserid},</if>
+            <if test="smarea != null">smarea = #{smarea},</if>
+            <if test="smperimeter != null">smperimeter = #{smperimeter},</if>
+            <if test="smgeometry != null">smgeometry  = st_geomfromewkt( #{smgeometry},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="fidDltb2 != null">fid_dltb_2 = #{fidDltb2},</if>
             <if test="bsm != null">bsm = #{bsm},</if>
@@ -231,21 +244,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fidNewSh != null">fid_new_sh = #{fidNewSh},</if>
             <if test="id != null">id = #{id},</if>
             <if test="ss != null">ss = #{ss},</if>
-            <if test="shapeLe1 != null">shape_le_1 = #{shapeLe1},</if>
+            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
             <if test="shapeArea != null">shape_area = #{shapeArea},</if>
-            <if test="geom != null">geom = st_geomfromewkt(#{geom}),</if>
         </trim>
-        where gid = #{gid}
+        where smid = #{smid}
     </update>
 
-    <delete id="deleteDltbByGid" parameterType="Integer">
-        delete from dltb where gid = #{gid}
+    <delete id="deleteDltbBySmid" parameterType="Integer">
+        delete from dltb where smid = #{smid}
     </delete>
 
-    <delete id="deleteDltbByGids" parameterType="String">
-        delete from dltb where gid in 
-        <foreach item="gid" collection="array" open="(" separator="," close=")">
-            #{gid}
+    <delete id="deleteDltbBySmids" parameterType="String">
+        delete from dltb where smid in
+        <foreach item="smid" collection="array" open="(" separator="," close=")">
+            #{smid}
         </foreach>
     </delete>
-</mapper>
+
+
+</mapper>

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/GysyqMapper.xml

@@ -5,8 +5,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.GysyqMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.Gysyq" id="GysyqResult">
-        <result property="gid"    column="gid"    />
+        <result property="smid"    column="smid"    />
         <result property="smuserid"    column="smuserid"    />
+        <result property="smarea"    column="smarea"    />
+        <result property="smperimeter"    column="smperimeter"    />
+        <result property="smgeometry"    column="smgeometry"    />
         <result property="objectid1"    column="objectid_1"    />
         <result property="objectid"    column="objectid"    />
         <result property="districtid"    column="districtid"    />
@@ -58,9 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fQlbz"    column="f_qlbz"    />
         <result property="yzbx"    column="yzbx"    />
         <result property="exportBz"    column="export_bz"    />
-        <result property="处理类"    column="处理类"    />
-        <result property="坐标变"    column="坐标变"    />
-        <result property="融合方"    column="融合方"    />
+        <result property="处理类型"    column="处理类型"    />
+        <result property="坐标变化"    column="坐标变化"    />
+        <result property="融合方式"    column="融合方式"    />
         <result property="objectidB"    column="objectid_b"    />
         <result property="createdTi"    column="created_ti"    />
         <result property="lastModif"    column="last_modif"    />
@@ -70,19 +73,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="oldCertN"    column="old_cert_n"    />
         <result property="clearupSt"    column="clearup_st"    />
         <result property="sjglbsm"    column="sjglbsm"    />
-        <result property="shapeLeng"    column="shape_leng"    />
+        <result property="shapeLength"    column="shape_length"    />
         <result property="shapeArea"    column="shape_area"    />
-        <result property="geom"    column="geom"    />
     </resultMap>
 
     <sql id="selectGysyqVo">
-        select gid, smuserid, objectid_1, objectid, districtid, lot_id, lot_number, is_right, cert_no, ref_x, ref_y, atqy, atfg, f_land_loc, mapguid, f_syqlx, f_zdtzm, f_zddm, f_memo, atbmqy, f_use, f_owntype, f_sjly, f_fzmj, f_sjqljs, ztid, iid, qlrbs, f_unit_no, f_xmmc, f_xmxz, f_hydb, f_yhlxa, f_yhlxb, f_yhwzsm, f_zhax, f_hdmc, f_hddm, f_hdwz, f_hdyt, f_ydfw, f_ydmj, f_djbh, f_yhnx, f_syfs, f_jtyt, sytdmj, txmj, yfttdmj, yfgtdmj, f_qlbz, yzbx, export_bz, 处理类, 坐标变, 融合方, objectid_b, created_ti, last_modif, right_owne, lot_numb_1, f_parcel_n, old_cert_n, clearup_st, sjglbsm, shape_leng, shape_area, geom from gysyq
+        select smid, smuserid, smarea, smperimeter, st_asewkt(smgeometry) as smgeometry , objectid_1, objectid, districtid, lot_id, lot_number, is_right, cert_no, ref_x, ref_y, atqy, atfg, f_land_loc, mapguid, f_syqlx, f_zdtzm, f_zddm, f_memo, atbmqy, f_use, f_owntype, f_sjly, f_fzmj, f_sjqljs, ztid, iid, qlrbs, f_unit_no, f_xmmc, f_xmxz, f_hydb, f_yhlxa, f_yhlxb, f_yhwzsm, f_zhax, f_hdmc, f_hddm, f_hdwz, f_hdyt, f_ydfw, f_ydmj, f_djbh, f_yhnx, f_syfs, f_jtyt, sytdmj, txmj, yfttdmj, yfgtdmj, f_qlbz, yzbx, export_bz, 处理类型, 坐标变化, 融合方式, objectid_b, created_ti, last_modif, right_owne, lot_numb_1, f_parcel_n, old_cert_n, clearup_st, sjglbsm, shape_length, shape_area from gysyq
     </sql>
 
     <select id="selectGysyqList" parameterType="com.onemap.sanya.domain.spatial.Gysyq" resultMap="GysyqResult">
         <include refid="selectGysyqVo"/>
         <where>  
             <if test="smuserid != null "> and smuserid = #{smuserid}</if>
+            <if test="smarea != null "> and smarea = #{smarea}</if>
+            <if test="smperimeter != null "> and smperimeter = #{smperimeter}</if>
+            <if test="smgeometry != null  and smgeometry != ''"> and smgeometry = #{smgeometry}</if>
             <if test="objectid1 != null "> and objectid_1 = #{objectid1}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="districtid != null  and districtid != ''"> and districtid = #{districtid}</if>
@@ -134,36 +139,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fQlbz != null  and fQlbz != ''"> and f_qlbz = #{fQlbz}</if>
             <if test="yzbx != null  and yzbx != ''"> and yzbx = #{yzbx}</if>
             <if test="exportBz != null  and exportBz != ''"> and export_bz = #{exportBz}</if>
-            <if test="处理类 != null  and 处理类 != ''"> and 处理类 = #{处理类}</if>
-            <if test="坐标变 != null  and 坐标变 != ''"> and 坐标变 = #{坐标变}</if>
-            <if test="融合方 != null  and 融合方 != ''"> and 融合方 = #{融合方}</if>
+            <if test="处理类型 != null  and 处理类型 != ''"> and 处理类型 = #{处理类型}</if>
+            <if test="坐标变化 != null  and 坐标变化 != ''"> and 坐标变化 = #{坐标变化}</if>
+            <if test="融合方式 != null  and 融合方式 != ''"> and 融合方式 = #{融合方式}</if>
             <if test="objectidB != null "> and objectid_b = #{objectidB}</if>
-            <if test="createdTi != null "> and created_ti = #{createdTi}</if>
-            <if test="lastModif != null "> and last_modif = #{lastModif}</if>
+            <if test="createdTi != null  and createdTi != ''"> and created_ti = #{createdTi}</if>
+            <if test="lastModif != null  and lastModif != ''"> and last_modif = #{lastModif}</if>
             <if test="rightOwne != null  and rightOwne != ''"> and right_owne = #{rightOwne}</if>
             <if test="lotNumb1 != null  and lotNumb1 != ''"> and lot_numb_1 = #{lotNumb1}</if>
             <if test="fParcelN != null  and fParcelN != ''"> and f_parcel_n = #{fParcelN}</if>
             <if test="oldCertN != null  and oldCertN != ''"> and old_cert_n = #{oldCertN}</if>
             <if test="clearupSt != null  and clearupSt != ''"> and clearup_st = #{clearupSt}</if>
             <if test="sjglbsm != null "> and sjglbsm = #{sjglbsm}</if>
-            <if test="shapeLeng != null "> and shape_leng = #{shapeLeng}</if>
+            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
             <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
-            <if test="geom != null  and geom != ''"> and geom = #{geom}</if>
         </where>
     </select>
     
-    <select id="selectGysyqByGid" parameterType="Integer" resultMap="GysyqResult">
+    <select id="selectGysyqBySmid" parameterType="Integer" resultMap="GysyqResult">
         <include refid="selectGysyqVo"/>
-        where gid = #{gid}
+        where smid = #{smid}
     </select>
     <select id="selectGysyqByPolygon" parameterType="String" resultMap="GysyqResult">
         <include refid="selectGysyqVo"/>
-        where st_intersects(st_geomfromewkt(polygon),gysyq.geom)
+        where st_intersects( st_geomfromewkt(#{polygon}),gysyq.smgeometry)
     </select>
-    <insert id="insertGysyq" parameterType="com.onemap.sanya.domain.spatial.Gysyq" useGeneratedKeys="true" keyProperty="gid">
+    <insert id="insertGysyq" parameterType="com.onemap.sanya.domain.spatial.Gysyq" useGeneratedKeys="true" keyProperty="smid">
         insert into gysyq
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">smuserid,</if>
+            <if test="smarea != null">smarea,</if>
+            <if test="smperimeter != null">smperimeter,</if>
+            <if test="smgeometry != null">smgeometry,</if>
             <if test="objectid1 != null">objectid_1,</if>
             <if test="objectid != null">objectid,</if>
             <if test="districtid != null">districtid,</if>
@@ -215,9 +222,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fQlbz != null">f_qlbz,</if>
             <if test="yzbx != null">yzbx,</if>
             <if test="exportBz != null">export_bz,</if>
-            <if test="处理类 != null">处理类,</if>
-            <if test="坐标变 != null">坐标变,</if>
-            <if test="融合方 != null">融合方,</if>
+            <if test="处理类型 != null">处理类型,</if>
+            <if test="坐标变化 != null">坐标变化,</if>
+            <if test="融合方式 != null">融合方式,</if>
             <if test="objectidB != null">objectid_b,</if>
             <if test="createdTi != null">created_ti,</if>
             <if test="lastModif != null">last_modif,</if>
@@ -227,12 +234,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oldCertN != null">old_cert_n,</if>
             <if test="clearupSt != null">clearup_st,</if>
             <if test="sjglbsm != null">sjglbsm,</if>
-            <if test="shapeLeng != null">shape_leng,</if>
+            <if test="shapeLength != null">shape_length,</if>
             <if test="shapeArea != null">shape_area,</if>
-            <if test="geom != null">geom,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">#{smuserid},</if>
+            <if test="smarea != null">#{smarea},</if>
+            <if test="smperimeter != null">#{smperimeter},</if>
+            <if test="smgeometry != null">st_geomfromewkt(#{smgeometry}),</if>
             <if test="objectid1 != null">#{objectid1},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="districtid != null">#{districtid},</if>
@@ -284,9 +293,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fQlbz != null">#{fQlbz},</if>
             <if test="yzbx != null">#{yzbx},</if>
             <if test="exportBz != null">#{exportBz},</if>
-            <if test="处理类 != null">#{处理类},</if>
-            <if test="坐标变 != null">#{坐标变},</if>
-            <if test="融合方 != null">#{融合方},</if>
+            <if test="处理类型 != null">#{处理类型},</if>
+            <if test="坐标变化 != null">#{坐标变化},</if>
+            <if test="融合方式 != null">#{融合方式},</if>
             <if test="objectidB != null">#{objectidB},</if>
             <if test="createdTi != null">#{createdTi},</if>
             <if test="lastModif != null">#{lastModif},</if>
@@ -296,9 +305,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oldCertN != null">#{oldCertN},</if>
             <if test="clearupSt != null">#{clearupSt},</if>
             <if test="sjglbsm != null">#{sjglbsm},</if>
-            <if test="shapeLeng != null">#{shapeLeng},</if>
+            <if test="shapeLength != null">#{shapeLength},</if>
             <if test="shapeArea != null">#{shapeArea},</if>
-            <if test="geom != null">#{geom},</if>
          </trim>
     </insert>
 
@@ -306,6 +314,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update gysyq
         <trim prefix="SET" suffixOverrides=",">
             <if test="smuserid != null">smuserid = #{smuserid},</if>
+            <if test="smarea != null">smarea = #{smarea},</if>
+            <if test="smperimeter != null">smperimeter = #{smperimeter},</if>
+            <if test="smgeometry != null">smgeometry =st_geomfromewkt(#{smgeometry}),</if>
             <if test="objectid1 != null">objectid_1 = #{objectid1},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="districtid != null">districtid = #{districtid},</if>
@@ -357,9 +368,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fQlbz != null">f_qlbz = #{fQlbz},</if>
             <if test="yzbx != null">yzbx = #{yzbx},</if>
             <if test="exportBz != null">export_bz = #{exportBz},</if>
-            <if test="处理类 != null">处理类 = #{处理类},</if>
-            <if test="坐标变 != null">坐标变 = #{坐标变},</if>
-            <if test="融合方 != null">融合方 = #{融合方},</if>
+            <if test="处理类型 != null">处理类型 = #{处理类型},</if>
+            <if test="坐标变化 != null">坐标变化 = #{坐标变化},</if>
+            <if test="融合方式 != null">融合方式 = #{融合方式},</if>
             <if test="objectidB != null">objectid_b = #{objectidB},</if>
             <if test="createdTi != null">created_ti = #{createdTi},</if>
             <if test="lastModif != null">last_modif = #{lastModif},</if>
@@ -369,21 +380,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oldCertN != null">old_cert_n = #{oldCertN},</if>
             <if test="clearupSt != null">clearup_st = #{clearupSt},</if>
             <if test="sjglbsm != null">sjglbsm = #{sjglbsm},</if>
-            <if test="shapeLeng != null">shape_leng = #{shapeLeng},</if>
+            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
             <if test="shapeArea != null">shape_area = #{shapeArea},</if>
-            <if test="geom != null">geom = #{geom},</if>
         </trim>
-        where gid = #{gid}
+        where smid = #{smid}
     </update>
 
-    <delete id="deleteGysyqByGid" parameterType="Integer">
-        delete from gysyq where gid = #{gid}
+    <delete id="deleteGysyqBySmid" parameterType="Integer">
+        delete from gysyq where smid = #{smid}
     </delete>
 
-    <delete id="deleteGysyqByGids" parameterType="String">
-        delete from gysyq where gid in 
-        <foreach item="gid" collection="array" open="(" separator="," close=")">
-            #{gid}
+    <delete id="deleteGysyqBySmids" parameterType="String">
+        delete from gysyq where smid in 
+        <foreach item="smid" collection="array" open="(" separator="," close=")">
+            #{smid}
         </foreach>
     </delete>
 </mapper>

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/JtownerMapper.xml

@@ -5,8 +5,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.JtownerMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.Jtowner" id="JtownerResult">
-        <result property="gid"    column="gid"    />
+        <result property="smid"    column="smid"    />
         <result property="smuserid"    column="smuserid"    />
+        <result property="smarea"    column="smarea"    />
+        <result property="smperimeter"    column="smperimeter"    />
+        <result property="smgeometry"    column="smgeometry"    />
         <result property="objectid1"    column="objectid_1"    />
         <result property="objectid"    column="objectid"    />
         <result property="bsm"    column="bsm"    />
@@ -68,19 +71,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fCreateT"    column="f_create_t"    />
         <result property="yzbx"    column="yzbx"    />
         <result property="sjglbsm"    column="sjglbsm"    />
-        <result property="shapeLeng"    column="shape_leng"    />
+        <result property="shapeLength"    column="shape_length"    />
         <result property="shapeArea"    column="shape_area"    />
-        <result property="geom"    column="geom"    />
     </resultMap>
 
     <sql id="selectJtownerVo">
-        select gid, smuserid, objectid_1, objectid, bsm, ysdm, zdh, zdsz, txdz, tdzl, qsxz, syqlx, scmj, fzmj, jzrjl, jzmd, tdjb, sbdj, qdjg, zdlsh, szxzcmc, ms, jcr, jcrq, jcsftg, jcbtgyy, blr, blrq, blsjjcr, blsjjcrq, blsjjcsftg, fzr, fzrq, sfhg, djh, sjly, tdyt, exportflag, atqy, iid, zdtybm, mapguid, bz, qlr, cert_no, qlrbs, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm, shape_leng, shape_area, geom from jtowner
+        select smid, smuserid, smarea, smperimeter, st_asewkt(smgeometry) as smgeometry , objectid_1, objectid, bsm, ysdm, zdh, zdsz, txdz, tdzl, qsxz, syqlx, scmj, fzmj, jzrjl, jzmd, tdjb, sbdj, qdjg, zdlsh, szxzcmc, ms, jcr, jcrq, jcsftg, jcbtgyy, blr, blrq, blsjjcr, blsjjcrq, blsjjcsftg, fzr, fzrq, sfhg, djh, sjly, tdyt, exportflag, atqy, iid, zdtybm, mapguid, bz, qlr, cert_no, qlrbs, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm, shape_length, shape_area from jtowner
     </sql>
 
     <select id="selectJtownerList" parameterType="com.onemap.sanya.domain.spatial.Jtowner" resultMap="JtownerResult">
         <include refid="selectJtownerVo"/>
         <where>  
             <if test="smuserid != null "> and smuserid = #{smuserid}</if>
+            <if test="smarea != null "> and smarea = #{smarea}</if>
+            <if test="smperimeter != null "> and smperimeter = #{smperimeter}</if>
+            <if test="smgeometry != null  and smgeometry != ''"> and smgeometry = #{smgeometry}</if>
             <if test="objectid1 != null "> and objectid_1 = #{objectid1}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="bsm != null "> and bsm = #{bsm}</if>
@@ -102,16 +107,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="szxzcmc != null  and szxzcmc != ''"> and szxzcmc = #{szxzcmc}</if>
             <if test="ms != null  and ms != ''"> and ms = #{ms}</if>
             <if test="jcr != null  and jcr != ''"> and jcr = #{jcr}</if>
-            <if test="jcrq != null "> and jcrq = #{jcrq}</if>
+            <if test="jcrq != null  and jcrq != ''"> and jcrq = #{jcrq}</if>
             <if test="jcsftg != null  and jcsftg != ''"> and jcsftg = #{jcsftg}</if>
             <if test="jcbtgyy != null  and jcbtgyy != ''"> and jcbtgyy = #{jcbtgyy}</if>
             <if test="blr != null  and blr != ''"> and blr = #{blr}</if>
-            <if test="blrq != null "> and blrq = #{blrq}</if>
+            <if test="blrq != null  and blrq != ''"> and blrq = #{blrq}</if>
             <if test="blsjjcr != null  and blsjjcr != ''"> and blsjjcr = #{blsjjcr}</if>
-            <if test="blsjjcrq != null "> and blsjjcrq = #{blsjjcrq}</if>
+            <if test="blsjjcrq != null  and blsjjcrq != ''"> and blsjjcrq = #{blsjjcrq}</if>
             <if test="blsjjcsftg != null  and blsjjcsftg != ''"> and blsjjcsftg = #{blsjjcsftg}</if>
             <if test="fzr != null  and fzr != ''"> and fzr = #{fzr}</if>
-            <if test="fzrq != null "> and fzrq = #{fzrq}</if>
+            <if test="fzrq != null  and fzrq != ''"> and fzrq = #{fzrq}</if>
             <if test="sfhg != null  and sfhg != ''"> and sfhg = #{sfhg}</if>
             <if test="djh != null  and djh != ''"> and djh = #{djh}</if>
             <if test="sjly != null "> and sjly = #{sjly}</if>
@@ -129,8 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fXb != null  and fXb != ''"> and f_xb = #{fXb}</if>
             <if test="fXdm != null  and fXdm != ''"> and f_xdm = #{fXdm}</if>
             <if test="fFbf != null  and fFbf != ''"> and f_fbf = #{fFbf}</if>
-            <if test="fCbqssj != null "> and f_cbqssj = #{fCbqssj}</if>
-            <if test="fCbjssj != null "> and f_cbjssj = #{fCbjssj}</if>
+            <if test="fCbqssj != null  and fCbqssj != ''"> and f_cbqssj = #{fCbqssj}</if>
+            <if test="fCbjssj != null  and fCbjssj != ''"> and f_cbjssj = #{fCbjssj}</if>
             <if test="fLqsqm != null  and fLqsqm != ''"> and f_lqsqm = #{fLqsqm}</if>
             <if test="fZysz != null  and fZysz != ''"> and f_zysz = #{fZysz}</if>
             <if test="fZs != null "> and f_zs = #{fZs}</if>
@@ -139,27 +144,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fSyqx != null  and fSyqx != ''"> and f_syqx = #{fSyqx}</if>
             <if test="fQlbz != null  and fQlbz != ''"> and f_qlbz = #{fQlbz}</if>
             <if test="fCreateB != null  and fCreateB != ''"> and f_create_b = #{fCreateB}</if>
-            <if test="fCreateT != null "> and f_create_t = #{fCreateT}</if>
+            <if test="fCreateT != null  and fCreateT != ''"> and f_create_t = #{fCreateT}</if>
             <if test="yzbx != null  and yzbx != ''"> and yzbx = #{yzbx}</if>
             <if test="sjglbsm != null "> and sjglbsm = #{sjglbsm}</if>
-            <if test="shapeLeng != null "> and shape_leng = #{shapeLeng}</if>
+            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
             <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
-            <if test="geom != null  and geom != ''"> and geom = #{geom}</if>
         </where>
     </select>
     
-    <select id="selectJtownerByGid" parameterType="Integer" resultMap="JtownerResult">
+    <select id="selectJtownerBySmid" parameterType="Integer" resultMap="JtownerResult">
         <include refid="selectJtownerVo"/>
-        where gid = #{gid}
+        where smid = #{smid}
     </select>
     <select id="selectJtownerByPolygon" parameterType="String" resultMap="JtownerResult">
         <include refid="selectJtownerVo"/>
-        where st_intersects( st_geomfromewkt(polygon),jtowner.geom)
+        where st_intersects( st_geomfromewkt(#{polygon}),jtowner.smgeometry)
     </select>
-    <insert id="insertJtowner" parameterType="com.onemap.sanya.domain.spatial.Jtowner" useGeneratedKeys="true" keyProperty="gid">
+    <insert id="insertJtowner" parameterType="com.onemap.sanya.domain.spatial.Jtowner" useGeneratedKeys="true" keyProperty="smid">
         insert into jtowner
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">smuserid,</if>
+            <if test="smarea != null">smarea,</if>
+            <if test="smperimeter != null">smperimeter,</if>
+            <if test="smgeometry != null">smgeometry,</if>
             <if test="objectid1 != null">objectid_1,</if>
             <if test="objectid != null">objectid,</if>
             <if test="bsm != null">bsm,</if>
@@ -221,12 +228,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateT != null">f_create_t,</if>
             <if test="yzbx != null">yzbx,</if>
             <if test="sjglbsm != null">sjglbsm,</if>
-            <if test="shapeLeng != null">shape_leng,</if>
+            <if test="shapeLength != null">shape_length,</if>
             <if test="shapeArea != null">shape_area,</if>
-            <if test="geom != null">geom,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">#{smuserid},</if>
+            <if test="smarea != null">#{smarea},</if>
+            <if test="smperimeter != null">#{smperimeter},</if>
+            <if test="smgeometry != null">#{smgeometry},</if>
             <if test="objectid1 != null">#{objectid1},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="bsm != null">#{bsm},</if>
@@ -288,9 +297,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateT != null">#{fCreateT},</if>
             <if test="yzbx != null">#{yzbx},</if>
             <if test="sjglbsm != null">#{sjglbsm},</if>
-            <if test="shapeLeng != null">#{shapeLeng},</if>
+            <if test="shapeLength != null">#{shapeLength},</if>
             <if test="shapeArea != null">#{shapeArea},</if>
-            <if test="geom != null">#{geom},</if>
          </trim>
     </insert>
 
@@ -298,6 +306,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update jtowner
         <trim prefix="SET" suffixOverrides=",">
             <if test="smuserid != null">smuserid = #{smuserid},</if>
+            <if test="smarea != null">smarea = #{smarea},</if>
+            <if test="smperimeter != null">smperimeter = #{smperimeter},</if>
+            <if test="smgeometry != null">smgeometry = #{smgeometry},</if>
             <if test="objectid1 != null">objectid_1 = #{objectid1},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="bsm != null">bsm = #{bsm},</if>
@@ -359,21 +370,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateT != null">f_create_t = #{fCreateT},</if>
             <if test="yzbx != null">yzbx = #{yzbx},</if>
             <if test="sjglbsm != null">sjglbsm = #{sjglbsm},</if>
-            <if test="shapeLeng != null">shape_leng = #{shapeLeng},</if>
+            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
             <if test="shapeArea != null">shape_area = #{shapeArea},</if>
-            <if test="geom != null">geom = #{geom},</if>
         </trim>
-        where gid = #{gid}
+        where smid = #{smid}
     </update>
 
-    <delete id="deleteJtownerByGid" parameterType="Integer">
-        delete from jtowner where gid = #{gid}
+    <delete id="deleteJtownerBySmid" parameterType="Integer">
+        delete from jtowner where smid = #{smid}
     </delete>
 
-    <delete id="deleteJtownerByGids" parameterType="String">
-        delete from jtowner where gid in 
-        <foreach item="gid" collection="array" open="(" separator="," close=")">
-            #{gid}
+    <delete id="deleteJtownerBySmids" parameterType="String">
+        delete from jtowner where smid in 
+        <foreach item="smid" collection="array" open="(" separator="," close=")">
+            #{smid}
         </foreach>
     </delete>
 </mapper>

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/JtuseMapper.xml

@@ -5,8 +5,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.JtuseMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.Jtuse" id="JtuseResult">
-        <result property="gid"    column="gid"    />
+        <result property="smid"    column="smid"    />
         <result property="smuserid"    column="smuserid"    />
+        <result property="smarea"    column="smarea"    />
+        <result property="smperimeter"    column="smperimeter"    />
+        <result property="smgeometry"    column="smgeometry"    />
         <result property="objectid1"    column="objectid_1"    />
         <result property="objectid"    column="objectid"    />
         <result property="syqr"    column="syqr"    />
@@ -37,19 +40,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fCreateT"    column="f_create_t"    />
         <result property="yzbx"    column="yzbx"    />
         <result property="sjglbsm"    column="sjglbsm"    />
-        <result property="shapeLeng"    column="shape_leng"    />
+        <result property="shapeLength"    column="shape_length"    />
         <result property="shapeArea"    column="shape_area"    />
-        <result property="geom"    column="geom"    />
     </resultMap>
 
     <sql id="selectJtuseVo">
-        select gid, smuserid, objectid_1, objectid, syqr, zdtybm, zdzl, zdmj, tdyt, ytdzh, mapguid, iid, cert_no, ztid, zdh, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm, shape_leng, shape_area, geom from jtuse
+        select smid, smuserid, smarea, smperimeter, st_asewkt(smgeometry) as smgeometry , objectid_1, objectid, syqr, zdtybm, zdzl, zdmj, tdyt, ytdzh, mapguid, iid, cert_no, ztid, zdh, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm, shape_length, shape_area from jtuse
     </sql>
 
     <select id="selectJtuseList" parameterType="com.onemap.sanya.domain.spatial.Jtuse" resultMap="JtuseResult">
         <include refid="selectJtuseVo"/>
         <where>  
             <if test="smuserid != null "> and smuserid = #{smuserid}</if>
+            <if test="smarea != null "> and smarea = #{smarea}</if>
+            <if test="smperimeter != null "> and smperimeter = #{smperimeter}</if>
+            <if test="smgeometry != null  and smgeometry != ''"> and smgeometry = #{smgeometry}</if>
             <if test="objectid1 != null "> and objectid_1 = #{objectid1}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="syqr != null  and syqr != ''"> and syqr = #{syqr}</if>
@@ -67,8 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fXb != null  and fXb != ''"> and f_xb = #{fXb}</if>
             <if test="fXdm != null  and fXdm != ''"> and f_xdm = #{fXdm}</if>
             <if test="fFbf != null  and fFbf != ''"> and f_fbf = #{fFbf}</if>
-            <if test="fCbqssj != null "> and f_cbqssj = #{fCbqssj}</if>
-            <if test="fCbjssj != null "> and f_cbjssj = #{fCbjssj}</if>
+            <if test="fCbqssj != null  and fCbqssj != ''"> and f_cbqssj = #{fCbqssj}</if>
+            <if test="fCbjssj != null  and fCbjssj != ''"> and f_cbjssj = #{fCbjssj}</if>
             <if test="fLqsqm != null  and fLqsqm != ''"> and f_lqsqm = #{fLqsqm}</if>
             <if test="fZysz != null  and fZysz != ''"> and f_zysz = #{fZysz}</if>
             <if test="fZs != null "> and f_zs = #{fZs}</if>
@@ -77,27 +82,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fSyqx != null  and fSyqx != ''"> and f_syqx = #{fSyqx}</if>
             <if test="fQlbz != null  and fQlbz != ''"> and f_qlbz = #{fQlbz}</if>
             <if test="fCreateB != null  and fCreateB != ''"> and f_create_b = #{fCreateB}</if>
-            <if test="fCreateT != null "> and f_create_t = #{fCreateT}</if>
+            <if test="fCreateT != null  and fCreateT != ''"> and f_create_t = #{fCreateT}</if>
             <if test="yzbx != null  and yzbx != ''"> and yzbx = #{yzbx}</if>
             <if test="sjglbsm != null "> and sjglbsm = #{sjglbsm}</if>
-            <if test="shapeLeng != null "> and shape_leng = #{shapeLeng}</if>
+            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
             <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
-            <if test="geom != null  and geom != ''"> and geom = #{geom}</if>
         </where>
     </select>
     
-    <select id="selectJtuseByGid" parameterType="Integer" resultMap="JtuseResult">
+    <select id="selectJtuseBySmid" parameterType="Integer" resultMap="JtuseResult">
         <include refid="selectJtuseVo"/>
-        where gid = #{gid}
+        where smid = #{smid}
     </select>
     <select id="selectJtuseByPolygon" parameterType="String" resultMap="JtuseResult">
         <include refid="selectJtuseVo"/>
-        where st_intersects(st_geomfromewkt(polygon),jtuse.geom)
+        where st_intersects( st_geomfromewkt(#{polygon}),jtuse.smgeometry)
     </select>
-    <insert id="insertJtuse" parameterType="com.onemap.sanya.domain.spatial.Jtuse" useGeneratedKeys="true" keyProperty="gid">
+    <insert id="insertJtuse" parameterType="com.onemap.sanya.domain.spatial.Jtuse" useGeneratedKeys="true" keyProperty="smid">
         insert into jtuse
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">smuserid,</if>
+            <if test="smarea != null">smarea,</if>
+            <if test="smperimeter != null">smperimeter,</if>
+            <if test="smgeometry != null">smgeometry,</if>
             <if test="objectid1 != null">objectid_1,</if>
             <if test="objectid != null">objectid,</if>
             <if test="syqr != null">syqr,</if>
@@ -128,12 +135,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateT != null">f_create_t,</if>
             <if test="yzbx != null">yzbx,</if>
             <if test="sjglbsm != null">sjglbsm,</if>
-            <if test="shapeLeng != null">shape_leng,</if>
+            <if test="shapeLength != null">shape_length,</if>
             <if test="shapeArea != null">shape_area,</if>
-            <if test="geom != null">geom,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="smuserid != null">#{smuserid},</if>
+            <if test="smarea != null">#{smarea},</if>
+            <if test="smperimeter != null">#{smperimeter},</if>
+            <if test="smgeometry != null">#{smgeometry},</if>
             <if test="objectid1 != null">#{objectid1},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="syqr != null">#{syqr},</if>
@@ -164,9 +173,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateT != null">#{fCreateT},</if>
             <if test="yzbx != null">#{yzbx},</if>
             <if test="sjglbsm != null">#{sjglbsm},</if>
-            <if test="shapeLeng != null">#{shapeLeng},</if>
+            <if test="shapeLength != null">#{shapeLength},</if>
             <if test="shapeArea != null">#{shapeArea},</if>
-            <if test="geom != null">#{geom},</if>
          </trim>
     </insert>
 
@@ -174,6 +182,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update jtuse
         <trim prefix="SET" suffixOverrides=",">
             <if test="smuserid != null">smuserid = #{smuserid},</if>
+            <if test="smarea != null">smarea = #{smarea},</if>
+            <if test="smperimeter != null">smperimeter = #{smperimeter},</if>
+            <if test="smgeometry != null">smgeometry = #{smgeometry},</if>
             <if test="objectid1 != null">objectid_1 = #{objectid1},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="syqr != null">syqr = #{syqr},</if>
@@ -204,21 +215,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateT != null">f_create_t = #{fCreateT},</if>
             <if test="yzbx != null">yzbx = #{yzbx},</if>
             <if test="sjglbsm != null">sjglbsm = #{sjglbsm},</if>
-            <if test="shapeLeng != null">shape_leng = #{shapeLeng},</if>
+            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
             <if test="shapeArea != null">shape_area = #{shapeArea},</if>
-            <if test="geom != null">geom = #{geom},</if>
         </trim>
-        where gid = #{gid}
+        where smid = #{smid}
     </update>
 
-    <delete id="deleteJtuseByGid" parameterType="Integer">
-        delete from jtuse where gid = #{gid}
+    <delete id="deleteJtuseBySmid" parameterType="Integer">
+        delete from jtuse where smid = #{smid}
     </delete>
 
-    <delete id="deleteJtuseByGids" parameterType="String">
-        delete from jtuse where gid in 
-        <foreach item="gid" collection="array" open="(" separator="," close=")">
-            #{gid}
+    <delete id="deleteJtuseBySmids" parameterType="String">
+        delete from jtuse where smid in 
+        <foreach item="smid" collection="array" open="(" separator="," close=")">
+            #{smid}
         </foreach>
     </delete>
 </mapper>

onemap-modules/onemap-model/src/main/resources/template/word/03-征收补偿预估报告-03.docx

@@ -92,7 +92,7 @@
   预计拆迁房屋共{{cqResult.jtCount}}个，总建筑面积{{cqResult.jtJZMJ}}平方米，房屋拆迁补偿费用共{{cqResult.totalPay}}万元，平均补偿费用{{cqResult.average}}元/平方米。
   各个房屋补偿情况如下表。
                        {{cqResult.jtFWData}}房屋结构
-                                 房屋级别
+                                    级别
                           拆迁补偿费用(万元)
                                     层数
                              占地面积（m²）
@@ -115,6 +115,6 @@
                                 {{qmBcbz.jjzw}}
                                  {{qmBcbz.sm}}
    青苗补偿费预估
-  预计青苗补偿费用合计{{qmResult.totalPay}}万元，其中：农作物补偿{{qmResult.nzwMJ}}亩，共{{qmResult.nzwPay}}万元；经济作物补偿{{qmResult.jjzwMJ}}亩，共{{qmResult.jjzwPay}}万元；林木{{qmResult.smMJ}}亩，补偿共{{qmResult.smPay}}万元。
+  预计青苗补偿费用合计{{qmResult.totalPay}} 万元，其中：农作物补偿{{qmResult.nzwMJ}}亩，共{{qmResult.nzwPay}}万元；经济作物补偿{{qmResult.jjzwMJ}}亩，共{{qmResult.jjzwPay}}万元；林木{{qmResult.smMJ}}亩，补偿共{{qmResult.smPay}}万元。