Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back

onemap-modules/onemap-analyse/pom.xml

@@ -142,6 +142,12 @@
             <artifactId>jakarta.activation-api</artifactId>
             <version>2.1.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.drewnoakes</groupId>
+            <artifactId>metadata-extractor</artifactId>
+            <version>2.18.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/ImageRotationCorrector.java

@@ -0,0 +1,175 @@
+package com.onemap.analyse;
+
+import com.drew.imaging.ImageMetadataReader;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.exif.ExifDirectoryBase;
+
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import javax.imageio.ImageIO;
+
+public class ImageRotationCorrector {
+
+    public static BufferedImage correctImageOrientation(BufferedImage image, int orientation) {
+        switch (orientation) {
+            case 1:
+                return image; // 无需旋转
+            case 3:
+                return rotate180(image);
+            case 6:
+                return rotate90(image);
+            case 8:
+                return rotate270(image);
+            default:
+                return image; // 未知方向，保持原样
+        }
+    }
+
+    private static BufferedImage rotate90(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        BufferedImage rotated = new BufferedImage(height, width, image.getType());
+
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                rotated.setRGB(height - 1 - y, x, image.getRGB(x, y));
+            }
+        }
+
+        return rotated;
+    }
+
+    private static BufferedImage rotate180(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        BufferedImage rotated = new BufferedImage(width, height, image.getType());
+
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                rotated.setRGB(width - 1 - x, height - 1 - y, image.getRGB(x, y));
+            }
+        }
+
+        return rotated;
+    }
+
+    private static BufferedImage rotate270(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        BufferedImage rotated = new BufferedImage(height, width, image.getType());
+
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                rotated.setRGB(y, width - 1 - x, image.getRGB(x, y));
+            }
+        }
+
+        return rotated;
+    }
+
+    /**
+     * 旋转图像
+     *
+     * @param image   原始图像
+     * @param degrees 旋转角度（0-360）
+     * @return 旋转后的图像
+     */
+    public static BufferedImage rotateImage(BufferedImage image, double degrees) {
+        // 将角度转换为弧度
+        double radians = Math.toRadians(degrees);
+
+        // 计算旋转后的图像尺寸
+        double sin = Math.abs(Math.sin(radians));
+        double cos = Math.abs(Math.cos(radians));
+        int newWidth = (int) Math.round(image.getWidth() * cos + image.getHeight() * sin);
+        int newHeight = (int) Math.round(image.getWidth() * sin + image.getHeight() * cos);
+
+        // 创建新的BufferedImage
+        BufferedImage rotatedImage = new BufferedImage(newWidth, newHeight, image.getType());
+        Graphics2D g2d = rotatedImage.createGraphics();
+
+        // 设置旋转中心并旋转
+        AffineTransform transform = new AffineTransform();
+        transform.translate(newWidth / 2, newHeight / 2);
+        transform.rotate(radians);
+        transform.translate(-image.getWidth() / 2, -image.getHeight() / 2);
+
+        // 应用变换
+        g2d.setTransform(transform);
+        g2d.drawImage(image, 0, 0, null);
+        g2d.dispose();
+
+        return rotatedImage;
+    }
+
+    public static int getImageOrientation(File imageFile) throws Exception {
+        Metadata metadata = ImageMetadataReader.readMetadata(imageFile);
+        for (ExifDirectoryBase directory : metadata.getDirectoriesOfType(ExifDirectoryBase.class)) {
+            if (directory.containsTag(ExifDirectoryBase.TAG_ORIENTATION)) {
+                return directory.getInt(ExifDirectoryBase.TAG_ORIENTATION);
+            }
+        }
+        return 1; // 默认方向
+    }
+
+    public static void main(String[] args) {
+        try {
+            File fileDir = new File("D:\\onemapfile\\gdbh\\flight\\batch\\24001120460\\下");
+            File[] files = fileDir.listFiles();
+            for (File imageFile : files) {
+                String name = imageFile.getName();
+//                File imageFile = file;
+                BufferedImage image = ImageIO.read(imageFile);
+                // 获取EXIF方向信息
+                int orientation = getImageOrientation(imageFile);
+                if (1 != orientation) {
+                    // 校正图像方向
+                    BufferedImage correctedImage = correctImageOrientation(image, orientation);
+
+                    // 旋转270度（逆时针90度）
+                    BufferedImage rotatedImage = rotateImage(correctedImage, 270);
+                    ImageIO.write(rotatedImage, "jpg", new File("D:\\onemapfile\\gdbh\\flight\\batch\\24001120460\\上\\" + name));
+                } else {
+                    ImageIO.write(image, "jpg", new File("D:\\onemapfile\\gdbh\\flight\\batch\\24001120460\\上\\" + name));
+                }
+            }
+            System.out.println("图像方向已校正并保存");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void main1(String[] args) {
+        try {
+            File fileDir = new File("D:\\02DATA\\三亚\\甲方数据\\飞行\\三亚无人机数据\\24001120450\\下");
+            File[] files = fileDir.listFiles();
+            for (File file : files) {
+                File imageFile = new File("D:\\02DATA\\三亚\\甲方数据\\飞行\\三亚无人机数据\\24001120450\\下\\240011204500004.JPG");
+                BufferedImage image = ImageIO.read(imageFile);
+            }
+
+
+            File imageFile = new File("D:\\02DATA\\三亚\\甲方数据\\飞行\\三亚无人机数据\\24001120450\\下\\240011204500004.JPG");
+            BufferedImage image = ImageIO.read(imageFile);
+
+            // 获取EXIF方向信息
+            int orientation = getImageOrientation(imageFile);
+
+            if (1 != orientation) {
+                // 校正图像方向
+                BufferedImage correctedImage = correctImageOrientation(image, orientation);
+                // 保存校正后的图像
+                ImageIO.write(correctedImage, "jpg", new File("D:\\02DATA\\三亚\\甲方数据\\飞行\\三亚无人机数据\\24001120450\\下\\corrected_photo.jpg"));
+
+            }
+
+
+            System.out.println("图像方向已校正并保存");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/AnalyseUtilsDBController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 只分析不创建数据
  * 基于pgsql里的POSTGIS做的分析数据组件
  */
 @RestController

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/CreateUtilsDBController.java

@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
+ * 创建数据
  * 基于pgsql里的POST做的生成数据组件
  */
 @RestController

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/gdbh/TGdbhGdController.java

@@ -1,14 +1,13 @@
 package com.onemap.apply.controller.gdbh;
 
+import com.onemap.apply.domain.gdbh.TGdbhFlightBatchDto;
 import com.onemap.apply.domain.gdbh.TGdbhGdServerDTO;
 import com.onemap.apply.service.gdbh.ITGdbhGdService;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
@@ -57,7 +56,7 @@ public class TGdbhGdController extends BaseController {
      * 变化规律
      *
      * @param xzqhdm 12
-     * @param dlbm 12
+     * @param dlbm   12
      */
     @GetMapping("/ntzlbhqk")
     public AjaxResult ntzlbhqk(String sourceyear, String targeyear, String xzqhdm, String dlbm) {
@@ -78,7 +77,7 @@ public class TGdbhGdController extends BaseController {
      * 变化规律
      *
      * @param xzqhdm 1
-     * @param dlbm 1
+     * @param dlbm   1
      * @return
      */
     @GetMapping("/ntzllnbhqk")
@@ -100,4 +99,10 @@ public class TGdbhGdController extends BaseController {
         return success(itGdbhGdService.ntzlqxfl(year, xzqhdm, dlbm));
     }
 
+    @PostMapping("/uav/query")
+    public AjaxResult uavQuery(@RequestBody TGdbhFlightBatchDto tGdbhFlightBatchDto) {
+        return success(itGdbhGdService.uavQuery(tGdbhFlightBatchDto));
+    }
+
+
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/TGdbhFlightBatchDto.java

@@ -0,0 +1,118 @@
+package com.onemap.apply.domain.gdbh;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+public class TGdbhFlightBatchDto {
+
+    private String id;
+    private String batch;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date batch_time;
+    private List<TGdbhFlightVideoDto> videoDtoList;
+    private List<TGdbhFlightDto> flightDtoList;
+    private String fpf;
+
+    //速度
+    private String speed;
+    //方位角控制左右旋转的
+    private String heading;
+    //切斜角控制上下
+    private String tilt;
+    //高度
+    private String height;
+    //刷新飞行 0 刷新
+    private String refresh;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getBatch() {
+        return batch;
+    }
+
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    public Date getBatch_time() {
+        return batch_time;
+    }
+
+    public void setBatch_time(Date batch_time) {
+        this.batch_time = batch_time;
+    }
+
+    public List<TGdbhFlightVideoDto> getVideoDtoList() {
+        return videoDtoList;
+    }
+
+    public void setVideoDtoList(List<TGdbhFlightVideoDto> videoDtoList) {
+        this.videoDtoList = videoDtoList;
+    }
+
+    public List<TGdbhFlightDto> getFlightDtoList() {
+        return flightDtoList;
+    }
+
+    public void setFlightDtoList(List<TGdbhFlightDto> flightDtoList) {
+        this.flightDtoList = flightDtoList;
+    }
+
+    public String getFpf() {
+        return fpf;
+    }
+
+    public void setFpf(String fpf) {
+        this.fpf = fpf;
+    }
+
+    public String getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(String speed) {
+        this.speed = speed;
+    }
+
+    public String getHeading() {
+        return heading;
+    }
+
+    public void setHeading(String heading) {
+        this.heading = heading;
+    }
+
+    public String getTilt() {
+        return tilt;
+    }
+
+    public void setTilt(String tilt) {
+        this.tilt = tilt;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getRefresh() {
+        return refresh;
+    }
+
+    public void setRefresh(String refresh) {
+        this.refresh = refresh;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/TGdbhFlightDto.java

@@ -0,0 +1,154 @@
+package com.onemap.apply.domain.gdbh;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+public class TGdbhFlightDto {
+
+    //    @TableField(exist = false)
+    private String id;
+    private String photo_path;
+    private String longitude;
+    private String latitude;
+    private String height;
+    private String omega;
+    private String phi;
+    private String kappa;
+    private String quality;
+    private String solve_type;
+    private String gps_time;
+    private String batch;
+    private String batch_time;
+    private String geom;
+    private String photo_name;
+    private Double[] pngenvelope;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPhoto_path() {
+        return photo_path;
+    }
+
+    public void setPhoto_path(String photo_path) {
+        this.photo_path = photo_path;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getOmega() {
+        return omega;
+    }
+
+    public void setOmega(String omega) {
+        this.omega = omega;
+    }
+
+    public String getPhi() {
+        return phi;
+    }
+
+    public void setPhi(String phi) {
+        this.phi = phi;
+    }
+
+    public String getKappa() {
+        return kappa;
+    }
+
+    public void setKappa(String kappa) {
+        this.kappa = kappa;
+    }
+
+    public String getQuality() {
+        return quality;
+    }
+
+    public void setQuality(String quality) {
+        this.quality = quality;
+    }
+
+    public String getSolve_type() {
+        return solve_type;
+    }
+
+    public void setSolve_type(String solve_type) {
+        this.solve_type = solve_type;
+    }
+
+    public String getGps_time() {
+        return gps_time;
+    }
+
+    public void setGps_time(String gps_time) {
+        this.gps_time = gps_time;
+    }
+
+    public String getBatch() {
+        return batch;
+    }
+
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    public String getBatch_time() {
+        return batch_time;
+    }
+
+    public void setBatch_time(String batch_time) {
+        this.batch_time = batch_time;
+    }
+
+    public String getGeom() {
+        return geom;
+    }
+
+    public void setGeom(String geom) {
+        this.geom = geom;
+    }
+
+
+    public String getPhoto_name() {
+        return photo_name;
+    }
+
+    public void setPhoto_name(String photo_name) {
+        this.photo_name = photo_name;
+    }
+
+    public Double[] getPngenvelope() {
+        return pngenvelope;
+    }
+
+    public void setPngenvelope(Double[] pngenvelope) {
+        this.pngenvelope = pngenvelope;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/TGdbhFlightVideoDto.java

@@ -0,0 +1,67 @@
+package com.onemap.apply.domain.gdbh;
+
+public class TGdbhFlightVideoDto {
+
+    private String id;
+    private String batch;
+    private String video_time;
+    private String video_path;
+    private String video_name;
+    private String video_type;
+    private String photo_path;
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getBatch() {
+        return batch;
+    }
+
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    public String getVideo_time() {
+        return video_time;
+    }
+
+    public void setVideo_time(String video_time) {
+        this.video_time = video_time;
+    }
+
+    public String getVideo_path() {
+        return video_path;
+    }
+
+    public void setVideo_path(String video_path) {
+        this.video_path = video_path;
+    }
+
+    public String getVideo_name() {
+        return video_name;
+    }
+
+    public void setVideo_name(String video_name) {
+        this.video_name = video_name;
+    }
+
+    public String getVideo_type() {
+        return video_type;
+    }
+
+    public void setVideo_type(String video_type) {
+        this.video_type = video_type;
+    }
+
+    public String getPhoto_path() {
+        return photo_path;
+    }
+
+    public void setPhoto_path(String photo_path) {
+        this.photo_path = photo_path;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/TGdbhFlightBatchMapper.java

@@ -0,0 +1,11 @@
+package com.onemap.apply.mapper.gdbh;
+
+import com.onemap.apply.domain.gdbh.TGdbhFlightBatchDto;
+
+import java.util.List;
+
+public interface TGdbhFlightBatchMapper {
+
+    public List<TGdbhFlightBatchDto> selectList(TGdbhFlightBatchDto tGdbhFlightBatchDto);
+
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/TGdbhFlightMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.apply.mapper.gdbh;
+
+import com.onemap.apply.domain.gdbh.TGdbhFlightDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TGdbhFlightMapper {
+
+    public List<TGdbhFlightDto> selectList(TGdbhFlightDto dto);
+
+    public Float stAzimuth(@Param("longitude") String longitude, @Param("latitude") String latitude,
+                           @Param("t_longitude") String t_longitude, @Param("t_latitude") String t_latitude);
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/TGdbhFlightVideoMapper.java

@@ -0,0 +1,11 @@
+package com.onemap.apply.mapper.gdbh;
+
+import com.onemap.apply.domain.gdbh.TGdbhFlightVideoDto;
+
+import java.util.List;
+
+public interface TGdbhFlightVideoMapper {
+
+    public List<TGdbhFlightVideoDto> selectList(TGdbhFlightVideoDto tGdbhFlightVideoDto);
+
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/ITGdbhGdService.java

@@ -1,5 +1,8 @@
 package com.onemap.apply.service.gdbh;
 
+import com.onemap.apply.domain.gdbh.TGdbhFlightBatchDto;
+import com.onemap.apply.domain.gdbh.TGdbhFlightBatchDto;
+import com.onemap.apply.domain.gdbh.TGdbhFlightDto;
 import com.onemap.apply.domain.gdbh.TGdbhGdServerDTO;
 import com.onemap.apply.domain.gdbh.TGdbhYjjbntServerDTO;
 
@@ -25,5 +28,5 @@ public interface ITGdbhGdService {
     List<Map<String, Object>> ntzllnbhqk(String xzqhdm, String dlbm);
 
     List<Map<String, Object>> ntzlqxfl(String year, String xzqhdm, String dlbm);
-
+    List<TGdbhFlightBatchDto> uavQuery(TGdbhFlightBatchDto tGdbhFlightBatchDto);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhGdServiceImpl.java

@@ -1,16 +1,17 @@
 package com.onemap.apply.service.gdbh.impl;
 
-import com.onemap.apply.domain.gdbh.TGdbhGdServerDTO;
-import com.onemap.apply.domain.gdbh.TGdbhYjjbntServerDTO;
-import com.onemap.apply.mapper.gdbh.TGdbhGdMapper;
-import com.onemap.apply.mapper.gdbh.TGdbhGdServerMapper;
-import com.onemap.apply.mapper.gdbh.TGdbhYjjbntMapper;
-import com.onemap.apply.mapper.gdbh.TGdbhYjjbntServerMapper;
+import com.onemap.apply.domain.gdbh.*;
+import com.onemap.apply.mapper.gdbh.*;
 import com.onemap.apply.service.gdbh.ITGdbhGdService;
 import com.onemap.common.core.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
@@ -30,6 +31,14 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
     private TGdbhGdServerMapper tGdbhGdServerMapper;
     @Resource
     private TGdbhGdMapper tGdbhGdMapper;
+    @Resource
+    private TGdbhFlightMapper tGdbhFlightMapper;
+    @Resource
+    private TGdbhFlightBatchMapper tGdbhFlightBatchMapper;
+    @Resource
+    private TGdbhFlightVideoMapper tGdbhFlightVideoMapper;
+    @Value("${file.path}")
+    private String uploadFilePath;
 
     @Override
     public List<TGdbhGdServerDTO> selectTGdbhGdServerList(TGdbhGdServerDTO tGdbhGdServer) {
@@ -152,4 +161,137 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
         return retMap;
     }
 
+    @Override
+    public List<TGdbhFlightBatchDto> uavQuery(TGdbhFlightBatchDto tGdbhFlightBatchDto) {
+        List<TGdbhFlightBatchDto> bathDtos = tGdbhFlightBatchMapper.selectList(tGdbhFlightBatchDto);
+        for (TGdbhFlightBatchDto bathDto : bathDtos) {
+            if (StringUtils.isNotEmpty(bathDto.getBatch())) {
+                String fpfPath = "/gdbh/flight/batch_video/" + bathDto.getBatch().trim() + ".fpf";
+                TGdbhFlightVideoDto queryvideo = new TGdbhFlightVideoDto();
+                queryvideo.setBatch(bathDto.getBatch());
+                List<TGdbhFlightVideoDto> videoDtoList = tGdbhFlightVideoMapper.selectList(queryvideo);
+                bathDto.setVideoDtoList(videoDtoList);
+                TGdbhFlightDto queryFlightDto = new TGdbhFlightDto();
+                queryFlightDto.setBatch(bathDto.getBatch());
+                List<TGdbhFlightDto> flightDtoList = tGdbhFlightMapper.selectList(queryFlightDto);
+                writeFpf(tGdbhFlightBatchDto, flightDtoList, uploadFilePath + fpfPath);
+                bathDto.setFpf(fpfPath);
+                bathDto.setFlightDtoList(flightDtoList);
+            }
+        }
+        return bathDtos;
+    }
+
+
+    private void writeFpf(TGdbhFlightBatchDto tGdbhFlightBatchDto, List<TGdbhFlightDto> flightDtoList, String filePathString) {
+        File filePath = new File(filePathString);
+        if ("0".equals(tGdbhFlightBatchDto.getRefresh()) || (!filePath.exists())) {
+            String speed = "10";
+            String heading = "0.000001";
+            String tilt = "0.100000000000000006";
+            if (null != tGdbhFlightBatchDto) {
+                if (StringUtils.isNotEmpty(tGdbhFlightBatchDto.getTilt())) {
+                    tilt = tGdbhFlightBatchDto.getTilt();
+                }
+                if (StringUtils.isNotEmpty(tGdbhFlightBatchDto.getHeading())) {
+                    heading = tGdbhFlightBatchDto.getHeading();
+                }
+                if (StringUtils.isNotEmpty(tGdbhFlightBatchDto.getSpeed())) {
+                    speed = tGdbhFlightBatchDto.getSpeed();
+                }
+            }
+
+            try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
+                writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+                writer.newLine(); // 写入换行
+                writer.write("<SceneRoute xmlns=\"http://www.supermap.com.cn/ugc60\">");
+                writer.newLine(); // 写入换行
+                writer.write("<route name=\"飞行路线_1\" speed=\"" + speed + "\" lineType=\"0\" showroutestop=\"True\" showrouteline=\"True\" altitudefree=\"False\" headingfree=\"False\" tiltfree=\"False\" flycircle=\"False\" alongline=\"False\">");
+                writer.newLine(); // 写入换行
+                writer.write("<style>");
+                writer.newLine(); // 写入换行
+                writer.write("<geostyle3d>");
+                writer.newLine(); // 写入换行
+                writer.write("<linecolor>RGBA(147,112,219,100)</linecolor>");
+                writer.newLine(); // 写入换行
+                writer.write("<linewidth>2</linewidth>");
+                writer.newLine(); // 写入换行
+                writer.write("<altitudeMode>Absolute</altitudeMode>");
+                writer.newLine(); // 写入换行
+                writer.write("<bottomAltitude>0.00</bottomAltitude>");
+                writer.newLine(); // 写入换行
+                writer.write("</geostyle3d>");
+                writer.newLine(); // 写入换行
+                writer.write("</style>");
+                writer.newLine(); // 写入换行
+                int len = flightDtoList.size();
+                boolean qiehuan = false;
+                String writetilt = tilt;
+                String writeheading = heading;
+
+                TGdbhFlightDto dto_0 = flightDtoList.get(0);
+                TGdbhFlightDto dto_1 = flightDtoList.get(1);
+                Double dr_mr = Double.valueOf(tGdbhFlightMapper.stAzimuth(dto_0.getLongitude(), dto_0.getLatitude(), dto_1.getLongitude(), dto_1.getLatitude()));
+
+                for (int i = 0; i < flightDtoList.size(); i++) {
+                    TGdbhFlightDto dto = flightDtoList.get(i);
+                    if (i > 0 && i + 1 < len) {
+                        TGdbhFlightDto dto_hou = flightDtoList.get(i + 1);
+                        Double dr_hou = Double.valueOf(tGdbhFlightMapper.stAzimuth(dto.getLongitude(), dto.getLatitude(), dto_hou.getLongitude(), dto_hou.getLatitude()));
+                        Double dr_hou4 = dr_hou;
+                        if (i + 5 <= len) {
+                            TGdbhFlightDto dto_hou2 = flightDtoList.get(i + 2);
+                            dr_hou4 = Double.valueOf(tGdbhFlightMapper.stAzimuth(dto_hou.getLongitude(), dto_hou.getLatitude(), dto_hou2.getLongitude(), dto_hou2.getLatitude()));
+                            if (dr_hou4 <= 10) {
+                                TGdbhFlightDto dto_hou3 = flightDtoList.get(i + 3);
+                                dr_hou4 = Double.valueOf(tGdbhFlightMapper.stAzimuth(dto_hou2.getLongitude(), dto_hou2.getLatitude(), dto_hou3.getLongitude(), dto_hou3.getLatitude()));
+                                if (dr_hou4 <= 10) {
+                                    TGdbhFlightDto dto_hou4 = flightDtoList.get(i + 4);
+                                    dr_hou4 = Double.valueOf(tGdbhFlightMapper.stAzimuth(dto_hou3.getLongitude(), dto_hou3.getLatitude(), dto_hou4.getLongitude(), dto_hou4.getLatitude()));
+                                }
+                            }
+                        } else if (i + 5 > len) {
+                            dr_hou4 = dr_hou + 15;
+                        }
+
+                        Double dr4 = Math.abs(dr_hou - dr_hou4);
+                        if (dr4 > 10) {
+                            writetilt = "0.100000000000000006";
+                            writeheading = heading;
+                        } else {
+                            Double dr = Math.abs(dr_mr - dr_hou);
+                            if (dr > 10 && dr < 160) {
+                                writetilt = "0.100000000000000006";
+                                writeheading = heading;
+                            } else if (dr > 160) {
+//                        writetilt = (360 - Double.parseDouble(tilt)) + "";
+                                writeheading = "180.0";
+                                writetilt = tilt;
+                            } else {
+                                writetilt = tilt;
+                                writeheading = heading;
+                            }
+                        }
+                    }
+                    String height = dto.getHeight();
+                    if (null != tGdbhFlightBatchDto) {
+                        if (StringUtils.isNotEmpty(tGdbhFlightBatchDto.getHeight())) {
+                            height = tGdbhFlightBatchDto.getHeight();
+                        }
+                    }
+                    String fpf = "<routestop name=\"" + dto.getPhoto_name() + "\" speed=\"0\" excluded=\"False\" viewType=\"camera\">" + "<camera>" + "<longitude>" + dto.getLongitude() + "</longitude>" + "<latitude>" + dto.getLatitude() + "</latitude>" + "<altitude>" + height + "</altitude>" + "<heading>" + writeheading + "</heading>" + "<tilt>" + writetilt + "</tilt>" + "<altitudeMode>Absolute</altitudeMode>" + "</camera>" + "<style>" + "<geostyle3d>" + "<icon/>" + "<markersize>4.8</markersize>" + "<markericonscale>1</markericonscale>" + "<markercolor>RGBA(255,255,255,255)</markercolor>" + "</geostyle3d>" + "</style>" + "<setting>" + "<turnTime>1.5</turnTime>" + "<turnSlowly>False</turnSlowly>" + "<stopPlayMode>StopPause</stopPlayMode>" + "<autoPlay>False</autoPlay>" + "<pauseTime>0</pauseTime>" + "<angularSpeed>1</angularSpeed>" + "</setting>" + "</routestop>";
+                    writer.write(fpf);
+                    writer.newLine(); // 写入换行
+                }
+                writer.write("</route>");
+                writer.newLine(); // 写入换
+                writer.write("</SceneRoute>");
+                System.out.println("File written successfully!");
+            } catch (IOException e) {
+                System.err.println("Error writing file: " + e.getMessage());
+            }
+        }
+    }
+
+
 }

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhFlightBathMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.onemap.apply.mapper.gdbh.TGdbhFlightBatchMapper">
+
+    <resultMap type="TGdbhFlightBatchDto" id="TGdbhFlightBatchDtoResult">
+        <result property="id" column="id"/>
+        <result property="batch" column="batch"/>
+        <result property="batch_time" column="batch_time"/>
+    </resultMap>
+
+
+    <select id="selectList" parameterType="TGdbhFlightBatchDto" resultMap="TGdbhFlightBatchDtoResult">
+        SELECT *
+        FROM t_gdbh_flight_bath inTbale
+        <where>
+            <if test="batch!=null and batch!='' ">
+                and batch = #{batch}
+            </if>
+        </where>
+        order by batch_time asc
+    </select>
+
+</mapper>

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhFlightMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.onemap.apply.mapper.gdbh.TGdbhFlightMapper">
+
+    <resultMap type="TGdbhFlightDto" id="TGdbhFlightDtoResult">
+        <result property="id" column="id"/>
+        <result property="photo_path" column="photo_path"/>
+        <result property="longitude" column="longitude"/>
+        <result property="latitude" column="latitude"/>
+        <result property="height" column="height"/>
+        <result property="omega" column="omega"/>
+        <result property="phi" column="phi"/>
+        <result property="kappa" column="kappa"/>
+        <result property="quality" column="quality"/>
+        <result property="solve_type" column="solve_type"/>
+        <result property="gps_time" column="gps_time"/>
+        <result property="batch" column="batch"/>
+        <result property="batch_time" column="batch_time"/>
+        <result property="geom" column="geom"/>
+        <result property="photo_name" column="photo_name"/>
+        <result property="pngenvelope" column="pngenvelope" jdbcType="ARRAY" typeHandler="org.apache.ibatis.type.ArrayTypeHandler"/>
+    </resultMap>
+
+
+    <select id="selectList" parameterType="TGdbhFlightDto" resultMap="TGdbhFlightDtoResult">
+        SELECT id,photo_path,longitude,latitude,height,omega,phi,kappa,quality,solve_type,gps_time,batch,
+        batch_time,photo_name,ARRAY[ public.ST_XMin(geom),public.ST_YMin(geom),public.ST_XMax(geom),public.ST_YMax(geom)] as pngenvelope
+        FROM t_gdbh_flight inTbale
+        <where>
+            <if test="batch!=null and batch!='' ">
+                and batch = #{batch}
+            </if>
+        </where>
+        order by photo_name asc
+    </select>
+
+
+    <select id="stAzimuth" resultType="float" >
+        SELECT degrees(public.ST_Azimuth(
+                public.ST_SetSRID(public.ST_MakePoint(#{longitude}::FLOAT, #{latitude}::FLOAT), 4326),
+                public.ST_SetSRID(public.ST_MakePoint(#{t_longitude}::FLOAT, #{t_latitude}::FLOAT), 4326)
+            )
+        ) AS azimuth_degrees
+    </select>
+
+</mapper>

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhFlightVideoMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.onemap.apply.mapper.gdbh.TGdbhFlightVideoMapper">
+
+    <resultMap type="TGdbhFlightVideoDto" id="TGdbhFlightVideoDtoResult">
+        <result property="id" column="id"/>
+        <result property="batch" column="batch"/>
+        <result property="video_time" column="video_time"/>
+        <result property="video_path" column="video_path"/>
+        <result property="video_type" column="video_type"/>
+        <result property="video_name" column="video_name"/>
+        <result property="photo_path" column="photo_path"/>
+    </resultMap>
+
+
+    <select id="selectList" parameterType="TGdbhFlightVideoDto" resultMap="TGdbhFlightVideoDtoResult">
+        SELECT *
+        FROM t_gdbh_flight_video
+        <where>
+            <if test="batch!=null and batch!='' ">
+                and batch = #{batch}
+            </if>
+        </where>
+        order by video_time desc
+    </select>
+
+</mapper>

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

@@ -96,28 +96,33 @@ public class JZDJAnalyseController extends BaseController {
 
         List<Ghdk> GhdkList = ghdkService.selectByPolygon(str);
         for (Ghdk ghdk : GhdkList) {
-            if(!ghdk.getSmgeometry().isEmpty()){
-                ghdk.setSmgeometry("SRID=4490;"+ghdk.getSmgeometry());
+            if(!ghdk.getGeom().isEmpty()){
+                ghdk.setGeom("SRID=4490;"+ghdk.getGeom());
             }
             GHDKInfo ghdkInfo = new GHDKInfo();
             ghdkInfo.setId(UUID.randomUUID().toString());
-            List<FldInfo> fldInfos = getFieldAnnotation(ghdk);
+            List<FldInfo> fldInfos = getFieldAnnotationJZDJ(ghdk);
             List<Data> dataList = new ArrayList<>();
             for (FldInfo fldInfo : fldInfos) {
                 Data data = new Data();
                 data.setLabel(fldInfo.getName());
                 data.setLabelCN(fldInfo.getCaption());
+                System.out.print(fldInfo.getName());
+
                 Object sdd = getFieldValue(ghdk, fldInfo.getName());
-                data.setValue(sdd.toString());
+                if(sdd!=null){
+                    data.setValue(sdd.toString());
+                }
+
                 dataList.add(data);
             }
             ghdkInfo.setData(dataList);
 
             // 从WKT字符串读取Geometry对象
-            Geometry geometry =createGeometryByWkt(ghdk.getSmgeometry());
+            Geometry geometry =createGeometryByWkt(ghdk.getGeom());
             //组织超图格式图形
             com.onemap.sanya.domain.JZDJ.Geometry geom = new com.onemap.sanya.domain.JZDJ.Geometry();
-            geom.setWKTstr(ghdk.getSmgeometry());
+            geom.setWKTstr(ghdk.getGeom());
             Center center = new Center();
             center.setX(geometry.getCentroid().getX());
             center.setY(geometry.getCentroid().getY());
@@ -197,13 +202,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C12Sfjb":
                                 List<C12Sfjb> DataList = c12SfjbService.selectByPolygon(WKTString);
                                 for (C12Sfjb data : DataList) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -214,13 +219,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C22Zzjb":
                                 List<C22Zzjb> DataList1 = c22ZzjbService.selectByPolygon(WKTString);
                                 for (C22Zzjb data : DataList1) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -230,13 +235,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C32Gyjb":
                                 List<C32Gyjb> DataList2 = c32GyjbService.selectByPolygon(WKTString);
                                 for (C32Gyjb data : DataList2) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -246,13 +251,13 @@ public class JZDJAnalyseController extends BaseController {
                             case "C41Gfjb":
                                 List<C41Gfjb> DataList3 = c41GfjbService.selectByPolygon(WKTString);
                                 for (C41Gfjb data : DataList3) {
-                                    if(!data.getSmgeometry().isEmpty()){
-                                        data.setSmgeometry("SRID=4490;"+data.getSmgeometry());
+                                    if(!data.getGeom().isEmpty()){
+                                        data.setGeom("SRID=4490;"+data.getGeom());
                                     }
                                     layerData layerData = new layerData();
                                     layerData.setId(UUID.randomUUID().toString());
                                     layerData.setData(combinationData(data));
-                                    layerData.setGeometry(combinationgeometry(data.getSmgeometry()));
+                                    layerData.setGeometry(combinationgeometry(data.getGeom()));
                                     layerData.setlayerInfo(layerinfo);
                                     layerDataList.add(layerData);
                                 }
@@ -304,7 +309,7 @@ public class JZDJAnalyseController extends BaseController {
                     // 从WKT字符串读取Geometry对象
                     Geometry geometryJZDJ =createGeometryByWkt(JZDJ.getGeometry().getWKTstr());
                     polygons.add(geometryJZDJ);
-                    Double area = getIntersectByGeometrys(polygons);
+                    Double area = setPrecision2(getIntersectByGeometrys(polygons));
                     if (area >= 0.01) {
                         ZytdList zytdList = new ZytdList();
                         zytdList.setData(JZDJ.getData());
@@ -345,9 +350,9 @@ public class JZDJAnalyseController extends BaseController {
         ztBenchmarkLandPriceResults.setProjectName(BenchmarkLandPrice.getProjectName());
         ztBenchmarkLandPriceResults.setAnalysisDate(BenchmarkLandPrice.getAnalysisDate());
         ztBenchmarkLandPriceResults.setBuildUnit(BenchmarkLandPrice.getConstructionUnit());
-        ztBenchmarkLandPriceResults.setAnalysisArea(Double.toString(getGeometryArea(polygon)/666.66));
-        ztBenchmarkLandPriceResults.setParticipationArea(Double.toString(jszmj));
-        ztBenchmarkLandPriceResults.setTotalLandPrice(Double.toString(zdj));
+        ztBenchmarkLandPriceResults.setAnalysisArea(Double.toString(setPrecision2(getGeometryArea(polygon)/666.66)));
+        ztBenchmarkLandPriceResults.setParticipationArea(Double.toString(setPrecision2(jszmj)));
+        ztBenchmarkLandPriceResults.setTotalLandPrice(Double.toString(setPrecision2(zdj)));
         ztBenchmarkLandPriceResults.setGhdkDetailedDjList(objectMapper.writeValueAsString(ghdkDetailedDjList));
         return ztBenchmarkLandPriceResults;
     }
@@ -377,7 +382,7 @@ public class JZDJAnalyseController extends BaseController {
      * @throws Exception
      */
     public List<Data> combinationData(Object dataInfo) throws Exception {
-        List<FldInfo> fldInfos = getFieldAnnotation(dataInfo);
+        List<FldInfo> fldInfos = getFieldAnnotationJZDJ(dataInfo);
         List<Data> dataList = new ArrayList<>();
         for (FldInfo fldInfo : fldInfos) {
             Data data = new Data();
@@ -449,6 +454,12 @@ public class JZDJAnalyseController extends BaseController {
                 children.stream().flatMap(this::flattenNode) // 递归扁平化子节点
         );
     }
-
+    //保留2位小数
+    private   Double  setPrecision2(Double data)
+    {
+        java.text.DecimalFormat   df   =new   java.text.DecimalFormat("#.00");
+        String result =   df.format(data);
+        return Double.parseDouble(result);
+    }
 
 }

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

@@ -3,7 +3,6 @@ package com.onemap.sanya.controller.spatial;
 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.business.*;
 import com.onemap.sanya.domain.spatial.*;
@@ -14,13 +13,14 @@ import com.onemap.sanya.utils.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
 import static com.onemap.sanya.utils.SpatialOperate.getFieldAnnotation;
 
 /**
@@ -76,7 +76,7 @@ public class ZDAnalyseController extends BaseController {
     Polygon polygon = null;
 
     @PostMapping("/getAnalyseResult")
-    public ZtZdProjectList getAnalyseResult(ZDPost zdPost) throws JsonProcessingException {
+    public ZtZdProjectList getAnalyseResult(@RequestBody ZDPost zdPost) throws JsonProcessingException {
         try {
 
             List<Coordinate> pointArray = objectMapper.readValue(zdPost.getRegions(), new TypeReference<List<Coordinate>>() {
@@ -197,7 +197,7 @@ public class ZDAnalyseController extends BaseController {
         for (int i = 0; i < gysyqs.size(); i++) {
             Gysyq feature1 = gysyqs.get(i);
             String qsdwmc = feature1.getRightOwne();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea =  setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
          SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
             Integer index = -1;
@@ -223,7 +223,7 @@ public class ZDAnalyseController extends BaseController {
         for (int i = 0; i < jtowners.size(); i++) {
             Jtowner feature1 = jtowners.get(i);
             String qsdwmc = feature1.getQlr();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
             Integer index = -1;
             SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
@@ -250,7 +250,7 @@ public class ZDAnalyseController extends BaseController {
             Jtuse feature1 = jtuses.get(i);
 
             String qsdwmc = feature1.getSyqr();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature1.getGeom());
             instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom));
             Integer index = -1;
             SuperMapFreature superMapFreature=   SpatialOperate.Feature2Supermap(feature1,geom);
@@ -289,12 +289,11 @@ public class ZDAnalyseController extends BaseController {
         qsResultList.setCollectiveUsedFeatures(objectMapper.writeValueAsString(gyFeatures));
         qsResultList.setCollectiveOwnerFeatures(objectMapper.writeValueAsString(jtOFeatures));
         qsResultList.setCollectiveUsedFeatures(objectMapper.writeValueAsString(jtUFeatures));
-
-
+        qsResultList.setStateUsedFeatures(objectMapper.writeValueAsString(gyFeatures));
 
         Gysyq gysyq = new Gysyq();
-        Jtuse jtuse = new Jtuse();
-        Jtowner jtowner = new Jtowner();
+        Jtowner jtuse = new Jtowner();
+        Jtuse jtowner = new Jtuse();
 
         List<FldInfo> gyFldInfos = getFieldAnnotation(gysyq);
         List<FldInfo> jtOFldInfos = getFieldAnnotation(jtuse);
@@ -353,18 +352,20 @@ public class ZDAnalyseController extends BaseController {
         Double jjzwMj = 0.00;
         Double nzwMj = 0.00;
         List<SuperMapFreature> qmFreatures = new ArrayList<>();
-
+        String dlmc="";
+        String qsdw="";
         for (int i = 0; i < dltbs.size(); i++) {
             Dltb feature = dltbs.get(i);
-            String dlmc = feature.getDlmc();
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getSmgeometry());
-            instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom)) ;
+             dlmc = feature.getDlmc();//地类名称
+             qsdw=feature.getQsdwmc(); //权属单位
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getGeom());
+            instertArea = setPrecision2(SpatialOperate.getIntersectsArea(polygon, geom)) ;//亩
             if (instertArea == 0)
                 continue;
             Integer index = -1;
             SuperMapFreature superMapFreature=  SpatialOperate.  Feature2Supermap(feature,geom);
             //集体或者国有地类判断 权属字段包含 村/村民 为集体 否则为国有
-            if (isValueInList(jtLikes, dlmc)) {
+            if (isValueInList(jtLikes, qsdw)) {
                 jtmj = getaDouble(instertArea, jtdlData, jtmj, dlmc, index);
                 jtFeatures.add(superMapFreature);
                 //青苗判断
@@ -386,24 +387,26 @@ public class ZDAnalyseController extends BaseController {
 
         }
         //青苗补偿
-        ZtQmBcbzList qmBcbz= zdProjectList.getQmBcbz();
-        if(qmBcbz!=null)
-        {
-            smPay=setPrecision2((smMj*qmBcbz.getSm()));
-            jjzwPay=setPrecision2(jjzwMj*qmBcbz.getJjzw());
-            nzwPay=setPrecision2(nzwMj*qmBcbz.getNzw());
-        }
+//        ZtQmBcbzList qmBcbz= zdProjectList.getQmBcbz();
+//        if(qmBcbz!=null)
+//        {
+//            smPay=setPrecision2((smMj*qmBcbz.getSm())/10000); //树木
+//            jjzwPay=setPrecision2(jjzwMj*qmBcbz.getJjzw()/10000);//经济作物
+//            nzwPay=setPrecision2(nzwMj*qmBcbz.getNzw()/10000);//农作物
+//        }
         ZtZdBcbzList zdbcbz= zdProjectList.getZdBcbz();
         if(zdbcbz!=null) {
-            zdPay =setPrecision2(zdbcbz.getTdcz() * (jtmj));
-            azPay = setPrecision2(zdbcbz.getAzbcf() * (jtmj));
-            bchjPay=setPrecision2(zdbcbz.getBchj()* (jtmj));
+//           土地补偿费 Tdbcf 安置补偿费Azbcf 补偿合计 Bchj
+            zdPay =setPrecision2(zdbcbz.getTdbcf() * (jtmj)/10000);//转为万元
+            azPay = setPrecision2(zdbcbz.getAzbcf() * (jtmj)/10000);
+            bchjPay=setPrecision2(zdbcbz.getBchj()* (jtmj)/10000);
 
         }
         //征地补偿
-        ztZdDlResultList.setTotalAZPay(azPay);
-        ztZdDlResultList.setTotalZDPay(zdPay);
-        ztZdDlResultList.setTotalPay(bchjPay);
+        ztZdDlResultList.setTotalZDMJ(zdProjectList.getTotalZDMJ());
+        ztZdDlResultList.setTotalAZPay(azPay);//安置补偿费
+        ztZdDlResultList.setTotalZDPay(zdPay);// 土地补偿费
+        ztZdDlResultList.setTotalPay(bchjPay);//补偿合计
         //地类统计
         //国有用地统计
         ztZdDlResultList.setGyMJ(setPrecision2(gymj));
@@ -423,9 +426,9 @@ public class ZDAnalyseController extends BaseController {
         //青苗补偿计算
         ZtQmBcbzList qmbcbz = zdProjectList.getQmBcbz();
         if (qmbcbz != null) {
-            Float jjzwbz = qmbcbz.getJjzw();
-            Float nzwbz = qmbcbz.getNzw();
-            Float smbz = qmbcbz.getSm();
+            Float jjzwbz = qmbcbz.getJjzw()/10000;//转为万元
+            Float nzwbz = qmbcbz.getNzw()/10000; //转为万元
+            Float smbz = qmbcbz.getSm()/10000;//转为万元
 
             jjzwPay = setPrecision2(jjzwbz * jjzwMj);
             ztZdQmResultList.setJjzwMJ(setPrecision2(jjzwMj));
@@ -448,6 +451,8 @@ public class ZDAnalyseController extends BaseController {
         ztZdQmResultList.setJjzwPay(jjzwPay);
 
         ztZdQmResultList.setFeatures(objectMapper.writeValueAsString(qmFreatures));
+        ztZdQmResultList.setTotalPay(nzwPay + jjzwPay + smPay);
+        ztZdQmResultList.setTotalMJ(nzwMj + jjzwMj + smMj);
 
         Dltb dltb = new Dltb();
         List<FldInfo> dltbFldInfos = getFieldAnnotation(dltb);
@@ -475,10 +480,10 @@ public class ZDAnalyseController extends BaseController {
         }
         if (index > -1) {
             Double area = jtdlData.get(index).getMj() + instertArea;
-            jtdlData.get(index).setMj(area + instertArea);
+            jtdlData.get(index).setMj(setPrecision2(area + instertArea));
         } else {
             DLItem dlItem = new DLItem();
-            dlItem.setMj(instertArea);
+            dlItem.setMj(setPrecision2(instertArea));
             dlItem.setDlmc(dlmc);
             jtdlData.add(dlItem);
         }
@@ -501,7 +506,7 @@ public class ZDAnalyseController extends BaseController {
         List<FWItem> jtList = new ArrayList<>();
         for (int i = 0; i < bdcs.size(); i++) {
             Bdc feature = bdcs.get(i);
-            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getSmgeometry());
+            Geometry geom = SpatialOperate.createPolygonByWkt(feature.getGeom());
             //占地面积
             Double zdmj =  setPrecision2(SpatialOperate.getGeometryArea(geom));
             //高度
@@ -514,7 +519,7 @@ public class ZDAnalyseController extends BaseController {
             String jtUqsdwmc = "";
             for (int i1 = 0; i1 < gysyqs.size(); i1++) {
                 Gysyq temfeature = gysyqs.get(i1);
-                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getGeom());
                 if (polygon1.intersects(geom)) {
                     gyqsdwmc = temfeature.getRightOwne();
                     isgy = true;
@@ -523,7 +528,7 @@ public class ZDAnalyseController extends BaseController {
             }
             for (int j = 0; j < jtowners.size(); j++) {
                 Jtowner temfeature = jtowners.get(j);
-                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getGeom());
                 if (polygon1.intersects(geom)) {
                     isgy=false;
                     jtOqsdwmc = temfeature.getQlr();
@@ -532,7 +537,7 @@ public class ZDAnalyseController extends BaseController {
             }
             for (int i1 = 0; i1 < jtuses.size(); i1++) {
                 Jtuse temfeature = jtuses.get(i1);
-                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getSmgeometry());
+                Geometry polygon1 = SpatialOperate.createPolygonByWkt(temfeature.getGeom());
                 if (polygon1.intersects(geom)) {
                     jtUqsdwmc = temfeature.getSyqr();
                     isgy=false;
@@ -552,6 +557,7 @@ public class ZDAnalyseController extends BaseController {
                 jzmj = floor * zdmj;
             } else
                 jzmj = feature.getJzmj();
+            jzmj=setPrecision2(jzmj);
             Integer grade = feature.getGrade() == null ? 1 : feature.getGrade();
             if (grade == 0)
                 grade = 1;
@@ -564,6 +570,9 @@ public class ZDAnalyseController extends BaseController {
                         item.getJg().equals(jg) &&item.getGrade().equals(finalGrade)).collect(Collectors.toList());
                 if(itemList.size()>0)
                     bcbzItem = cqBcbzItems.get(0);
+                else{
+                    bcbzItem.setBz(0.00);
+                }
                 signalPay = bcbzItem.getBz() * jzmj/10000;
                 signalPay=Double.parseDouble(  String.format("%.2f",signalPay));
             }
@@ -574,7 +583,7 @@ public class ZDAnalyseController extends BaseController {
             item.setAddress(address);
             item.setFloor(floor);
             item.setGrade(grade);
-            item.setId(feature.getSmid().toString());
+            item.setId(feature.getGid().toString());
             item.setJg(jg);
             item.setJzmj(jzmj);
             item.setPay(signalPay);
@@ -589,7 +598,7 @@ public class ZDAnalyseController extends BaseController {
                 gymj+=jzmj;
                 gyPay += signalPay;
                 gyFeatures.add(superMapFreature);
-                jtList.add(item);
+                gyList.add(item);
             }
         }
         cqReultList.setJtFWData(jtList);
@@ -605,7 +614,8 @@ public class ZDAnalyseController extends BaseController {
         cqReultList.setJtfeatures(objectMapper.writeValueAsString(jtFeatyres));
         cqReultList.setGyCount(gyList.size());
         cqReultList.setJtCount(jtList.size());
-
+        cqReultList.setGyPay(gyPay);
+        cqReultList.setJtPay(jtPay);
         cqReultList.setTotalPay(setPrecision2(jtPay + gyPay));
         cqReultList.setTotalJZMJ(setPrecision2(jtmj + gymj));
         average = setPrecision2 ((jtPay + gyPay)*10000 / (jtmj + gymj));

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/domain/business/ZtZdCqReultList.java

@@ -59,7 +59,11 @@ public class ZtZdCqReultList extends BaseEntity
     /** 集体建筑面积 */
     @Excel(name = "集体建筑面积")
     private Double jtJZMJ;
+    /**国有补偿8 */
+    private Double gyPay;
+    /** 集体补偿 */
 
+    private Double jtPay;
     /** 国有建筑数量 */
     @Excel(name = "国有建筑数量")
     private Integer gyCount;
@@ -72,9 +76,7 @@ public class ZtZdCqReultList extends BaseEntity
     @Excel(name = "集体列表")
     private String jtList;
       private List<FWItem> jtFWData;
-
-
-    /** 相关图元信息 */
+          /** 相关图元信息 */
     @Excel(name = "相关图元信息")
     private String jtfeatures;
 
@@ -177,6 +179,25 @@ public class ZtZdCqReultList extends BaseEntity
         this.gyCount = gyCount;
     }
 
+
+    public Double getGyPay()
+    {
+        return gyPay;
+    }
+    public void setGyPay(Double gyPay)
+    {
+        this.gyPay = gyPay;
+    }
+
+    public Double getJtPay()
+    {
+        return jtPay;
+    }
+    public void setJtPay(Double jtPay)
+    {
+        this.jtPay = jtPay;
+    }
+
     public Integer getGyCount()
     {
         return gyCount;

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

@@ -1,36 +1,27 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
 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
  * 
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-14
  */
 public class Bdc extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
-    /** $column.columnComment */
-    private Integer smuserid;
-
-    /** $column.columnComment */
-
-    private Double smarea;
+    private Integer gid;
 
-    /** $column.columnComment */
 
-    private Double smperimeter;
 
     /** $column.columnComment */
-
-    private String smgeometry;
+    private Integer id;
 
     /** 建筑高度(米) */
     @Excel(name = "建筑高度(米)")
@@ -40,9 +31,8 @@ public class Bdc extends BaseEntity
     @Excel(name = "层数")
     private Integer floor;
 
-    /** 产权人 */
-    @Excel(name = "房屋结构")
-    private String jg;
+
+
     /** 产权人 */
     @Excel(name = "产权人")
     private String cqr;
@@ -51,6 +41,10 @@ public class Bdc extends BaseEntity
     @Excel(name = "地址")
     private String address;
 
+    /** 房屋结构 */
+    @Excel(name = "房屋结构")
+    private String jg;
+
     /** 等级 */
     @Excel(name = "等级")
     private Integer grade;
@@ -63,50 +57,28 @@ public class Bdc extends BaseEntity
     @Excel(name = "建筑面积(平方米)")
     private Double jzmj;
 
-    public void setSmid(Integer smid) 
-    {
-        this.smid = smid;
-    }
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 
-    public Integer getSmid() 
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid) 
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid() 
-    {
-        return smuserid;
-    }
-    public void setSmarea(Double smarea) 
+    public void setGid(Integer gid) 
     {
-        this.smarea = smarea;
+        this.gid = gid;
     }
 
-    public Double getSmarea() 
-    {
-        return smarea;
-    }
-    public void setSmperimeter(Double smperimeter) 
+    public Integer getGid() 
     {
-        this.smperimeter = smperimeter;
+        return gid;
     }
 
-    public Double getSmperimeter() 
+    public void setId(Integer id) 
     {
-        return smperimeter;
-    }
-    public void setSmgeometry(String smgeometry) 
-    {
-        this.smgeometry = smgeometry;
+        this.id = id;
     }
 
-    public String getSmgeometry() 
+    public Integer getId() 
     {
-        return smgeometry;
+        return id;
     }
     public void setHeight(Double height) 
     {
@@ -126,6 +98,15 @@ public class Bdc extends BaseEntity
     {
         return floor;
     }
+    public void setGeom(String geom) 
+    {
+        this.geom = geom;
+    }
+
+    public String getGeom() 
+    {
+        return geom;
+    }
     public void setCqr(String cqr) 
     {
         this.cqr = cqr;
@@ -144,6 +125,15 @@ public class Bdc extends BaseEntity
     {
         return address;
     }
+    public void setJg(String jg) 
+    {
+        this.jg = jg;
+    }
+
+    public String getJg() 
+    {
+        return jg;
+    }
     public void setGrade(Integer grade) 
     {
         this.grade = grade;
@@ -172,26 +162,17 @@ public class Bdc extends BaseEntity
         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("smid", getSmid())
-            .append("smuserid", getSmuserid())
-            .append("smarea", getSmarea())
-            .append("smperimeter", getSmperimeter())
-            .append("smgeometry", getSmgeometry())
+            .append("gid", getGid())
+            .append("id", getId())
             .append("height", getHeight())
             .append("floor", getFloor())
+            .append("geom", getGeom())
             .append("cqr", getCqr())
             .append("address", getAddress())
+            .append("jg", getJg())
             .append("grade", getGrade())
             .append("zdmj", getZdmj())
             .append("jzmj", getJzmj())

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c1_2_商服级别对象 c1_2_sfjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,24 +22,12 @@ public class C12Sfjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
+    /** $column.columnComment */
+    private Integer id;
 
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
 
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
 
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
 
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -56,15 +44,10 @@ public class C12Sfjb extends BaseEntity
     private Double 楼面单价;
 
     /** $column.columnComment */
-
+    @Excel(name = "qpbh", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c2_2_住宅级别对象 c2_2_zzjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,27 +22,11 @@ public class C22Zzjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
-
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
-
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
-
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
-
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
+    /** $column.columnComment */
+    private Integer id;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** 土地级别 */
@@ -56,15 +40,11 @@ public class C22Zzjb extends BaseEntity
     private Double 楼面单价;
 
     /** $column.columnComment */
-
+    @Excel(name = "qpbh", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 
 }

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c3_2_工业级别对象 c3_2_gyjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,32 +22,16 @@ public class C32Gyjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
-
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
-
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
-
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
-
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
+    /** $column.columnComment */
+    private Integer id;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** 土地级别 */
     @Excel(name = "土地级别")
-    @JsonProperty("土地级别")
+    @JsonProperty("楼面单价")
     private String 土地级别;
 
     /** 楼面单价 */
@@ -56,15 +40,10 @@ public class C32Gyjb extends BaseEntity
     private Double 楼面单价;
 
     /** $column.columnComment */
-
+    @Excel(name = "qpbh", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -13,7 +13,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * c4_1_公服级别对象 c4_1_gfjb
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -22,27 +22,14 @@ public class C41Gfjb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
-
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
+    /** $column.columnComment */
+    private Integer id;
 
-    /** 面积 */
-    @Excel(name = "面积")
-    private Double smarea;
 
-    /** 周长 */
-    @Excel(name = "周长")
-    private Double smperimeter;
 
-    /** 范围坐标 */
-    @Excel(name = "范围坐标")
-    private String smgeometry;
 
-    /** objectid */
-    @Excel(name = "objectid")
+    /** $column.columnComment */
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** 土地级别 */
@@ -50,8 +37,8 @@ public class C41Gfjb extends BaseEntity
     @JsonProperty("土地级别")
     private String 土地级别;
 
-    /** qpbh */
-    @Excel(name = "qpbh")
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String qpbh;
 
     /** 新闻出版用地 */
@@ -114,12 +101,7 @@ public class C41Gfjb extends BaseEntity
     @JsonProperty("公园_地价")
     private Double 公园地价;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -1,6 +1,8 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -10,37 +12,27 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 地类图斑对象 dltb
  * 
  * @author ruoyi
- * @date 2024-08-27
+ * @date 2024-11-14
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Dltb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
+    private Integer id0;
 
-    /** $column.columnComment */
-
-    private Integer smuserid;
-
-    /** $column.columnComment */
-
-    private Double smarea;
 
-    /** $column.columnComment */
 
-    private Double smperimeter;
 
     /** $column.columnComment */
-
-    private String smgeometry;
-
-    /** $column.columnComment */
-
+    @Excel(name = "objectid", readConverterExp = "$column.readConverterExp()")
     private Integer objectid;
 
     /** $column.columnComment */
-
+    @Excel(name = "fidDltb2", readConverterExp = "$column.readConverterExp()")
     private Integer fidDltb2;
 
     /** 标识码 */
@@ -152,474 +144,33 @@ public class Dltb extends BaseEntity
     private Integer sjnf;
 
     /** $column.columnComment */
-
+    @Excel(name = "mssm", readConverterExp = "$column.readConverterExp()")
     private String mssm;
 
     /** $column.columnComment */
-
+    @Excel(name = "hdmc", readConverterExp = "$column.readConverterExp()")
     private String hdmc;
 
     /** $column.columnComment */
-
+    @Excel(name = "bz", readConverterExp = "$column.readConverterExp()")
     private String bz;
 
     /** $column.columnComment */
-
+    @Excel(name = "shapeLeng", readConverterExp = "$column.readConverterExp()")
     private Double shapeLeng;
 
     /** $column.columnComment */
-
+    @Excel(name = "fidNewSh", readConverterExp = "$column.readConverterExp()")
     private Integer fidNewSh;
 
     /** $column.columnComment */
     private Integer id;
 
     /** $column.columnComment */
-
+    @Excel(name = "ss", readConverterExp = "$column.readConverterExp()")
     private Double ss;
 
-    /** $column.columnComment */
-
-    private Double shapeLength;
-
-    /** $column.columnComment */
-
-    private Double shapeArea;
-
-    public void setSmid(Integer smid)
-    {
-        this.smid = smid;
-    }
-
-    public Integer getSmid()
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid)
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid()
-    {
-        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;
-    }
-
-    public Integer getObjectid()
-    {
-        return objectid;
-    }
-    public void setFidDltb2(Integer fidDltb2)
-    {
-        this.fidDltb2 = fidDltb2;
-    }
-
-    public Integer getFidDltb2()
-    {
-        return fidDltb2;
-    }
-    public void setBsm(String bsm)
-    {
-        this.bsm = bsm;
-    }
-
-    public String getBsm()
-    {
-        return bsm;
-    }
-    public void setYsdm(String ysdm)
-    {
-        this.ysdm = ysdm;
-    }
-
-    public String getYsdm()
-    {
-        return ysdm;
-    }
-    public void setTbybh(String tbybh)
-    {
-        this.tbybh = tbybh;
-    }
-
-    public String getTbybh()
-    {
-        return tbybh;
-    }
-    public void setTbbh(String tbbh)
-    {
-        this.tbbh = tbbh;
-    }
-
-    public String getTbbh()
-    {
-        return tbbh;
-    }
-    public void setDlbm(String dlbm)
-    {
-        this.dlbm = dlbm;
-    }
-
-    public String getDlbm()
-    {
-        return dlbm;
-    }
-    public void setDlmc(String dlmc)
-    {
-        this.dlmc = dlmc;
-    }
-
-    public String getDlmc()
-    {
-        return dlmc;
-    }
-    public void setQsxz(String qsxz)
-    {
-        this.qsxz = qsxz;
-    }
-
-    public String getQsxz()
-    {
-        return qsxz;
-    }
-    public void setQsdwdm(String qsdwdm)
-    {
-        this.qsdwdm = qsdwdm;
-    }
-
-    public String getQsdwdm()
-    {
-        return qsdwdm;
-    }
-    public void setQsdwmc(String qsdwmc)
-    {
-        this.qsdwmc = qsdwmc;
-    }
-
-    public String getQsdwmc()
-    {
-        return qsdwmc;
-    }
-    public void setZldwdm(String zldwdm)
-    {
-        this.zldwdm = zldwdm;
-    }
-
-    public String getZldwdm()
-    {
-        return zldwdm;
-    }
-    public void setZldwmc(String zldwmc)
-    {
-        this.zldwmc = zldwmc;
-    }
-
-    public String getZldwmc()
-    {
-        return zldwmc;
-    }
-    public void setTbmj(Double tbmj)
-    {
-        this.tbmj = tbmj;
-    }
-
-    public Double getTbmj()
-    {
-        return tbmj;
-    }
-    public void setKcdlbm(String kcdlbm)
-    {
-        this.kcdlbm = kcdlbm;
-    }
-
-    public String getKcdlbm()
-    {
-        return kcdlbm;
-    }
-    public void setKcxs(Double kcxs)
-    {
-        this.kcxs = kcxs;
-    }
-
-    public Double getKcxs()
-    {
-        return kcxs;
-    }
-    public void setKcmj(Double kcmj)
-    {
-        this.kcmj = kcmj;
-    }
-
-    public Double getKcmj()
-    {
-        return kcmj;
-    }
-    public void setTbdlmj(Double tbdlmj)
-    {
-        this.tbdlmj = tbdlmj;
-    }
-
-    public Double getTbdlmj()
-    {
-        return tbdlmj;
-    }
-    public void setGdlx(String gdlx)
-    {
-        this.gdlx = gdlx;
-    }
-
-    public String getGdlx()
-    {
-        return gdlx;
-    }
-    public void setGdpdjb(String gdpdjb)
-    {
-        this.gdpdjb = gdpdjb;
-    }
-
-    public String getGdpdjb()
-    {
-        return gdpdjb;
-    }
-    public void setXzdwkd(Double xzdwkd)
-    {
-        this.xzdwkd = xzdwkd;
-    }
-
-    public Double getXzdwkd()
-    {
-        return xzdwkd;
-    }
-    public void setTbxhdm(String tbxhdm)
-    {
-        this.tbxhdm = tbxhdm;
-    }
-
-    public String getTbxhdm()
-    {
-        return tbxhdm;
-    }
-    public void setTbxhmc(String tbxhmc)
-    {
-        this.tbxhmc = tbxhmc;
-    }
-
-    public String getTbxhmc()
-    {
-        return tbxhmc;
-    }
-    public void setZzsxdm(String zzsxdm)
-    {
-        this.zzsxdm = zzsxdm;
-    }
-
-    public String getZzsxdm()
-    {
-        return zzsxdm;
-    }
-    public void setZzsxmc(String zzsxmc)
-    {
-        this.zzsxmc = zzsxmc;
-    }
-
-    public String getZzsxmc()
-    {
-        return zzsxmc;
-    }
-    public void setGddb(Integer gddb)
-    {
-        this.gddb = gddb;
-    }
-
-    public Integer getGddb()
-    {
-        return gddb;
-    }
-    public void setFrdbs(String frdbs)
-    {
-        this.frdbs = frdbs;
-    }
-
-    public String getFrdbs()
-    {
-        return frdbs;
-    }
-    public void setCzcsxm(String czcsxm)
-    {
-        this.czcsxm = czcsxm;
-    }
-
-    public String getCzcsxm()
-    {
-        return czcsxm;
-    }
-    public void setSjnf(Integer sjnf)
-    {
-        this.sjnf = sjnf;
-    }
-
-    public Integer getSjnf()
-    {
-        return sjnf;
-    }
-    public void setMssm(String mssm)
-    {
-        this.mssm = mssm;
-    }
-
-    public String getMssm()
-    {
-        return mssm;
-    }
-    public void setHdmc(String hdmc)
-    {
-        this.hdmc = hdmc;
-    }
-
-    public String getHdmc()
-    {
-        return hdmc;
-    }
-    public void setBz(String bz)
-    {
-        this.bz = bz;
-    }
-
-    public String getBz()
-    {
-        return bz;
-    }
-    public void setShapeLeng(Double shapeLeng)
-    {
-        this.shapeLeng = shapeLeng;
-    }
-
-    public Double getShapeLeng()
-    {
-        return shapeLeng;
-    }
-    public void setFidNewSh(Integer fidNewSh)
-    {
-        this.fidNewSh = fidNewSh;
-    }
-
-    public Integer getFidNewSh()
-    {
-        return fidNewSh;
-    }
-    public void setId(Integer id)
-    {
-        this.id = id;
-    }
-
-    public Integer getId()
-    {
-        return id;
-    }
-    public void setSs(Double ss)
-    {
-        this.ss = ss;
-    }
-
-    public Double getSs()
-    {
-        return ss;
-    }
-    public void setShapeLength(Double shapeLength)
-    {
-        this.shapeLength = shapeLength;
-    }
-
-    public Double getShapeLength()
-    {
-        return shapeLength;
-    }
-    public void setShapeArea(Double shapeArea)
-    {
-        this.shapeArea = shapeArea;
-    }
-
-    public Double getShapeArea()
-    {
-        return shapeArea;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("smid", getSmid())
-                .append("smuserid", getSmuserid())
-                .append("smarea", getSmarea())
-                .append("smperimeter", getSmperimeter())
-                .append("smgeometry", getSmgeometry())
-                .append("objectid", getObjectid())
-                .append("fidDltb2", getFidDltb2())
-                .append("bsm", getBsm())
-                .append("ysdm", getYsdm())
-                .append("tbybh", getTbybh())
-                .append("tbbh", getTbbh())
-                .append("dlbm", getDlbm())
-                .append("dlmc", getDlmc())
-                .append("qsxz", getQsxz())
-                .append("qsdwdm", getQsdwdm())
-                .append("qsdwmc", getQsdwmc())
-                .append("zldwdm", getZldwdm())
-                .append("zldwmc", getZldwmc())
-                .append("tbmj", getTbmj())
-                .append("kcdlbm", getKcdlbm())
-                .append("kcxs", getKcxs())
-                .append("kcmj", getKcmj())
-                .append("tbdlmj", getTbdlmj())
-                .append("gdlx", getGdlx())
-                .append("gdpdjb", getGdpdjb())
-                .append("xzdwkd", getXzdwkd())
-                .append("tbxhdm", getTbxhdm())
-                .append("tbxhmc", getTbxhmc())
-                .append("zzsxdm", getZzsxdm())
-                .append("zzsxmc", getZzsxmc())
-                .append("gddb", getGddb())
-                .append("frdbs", getFrdbs())
-                .append("czcsxm", getCzcsxm())
-                .append("sjnf", getSjnf())
-                .append("mssm", getMssm())
-                .append("hdmc", getHdmc())
-                .append("bz", getBz())
-                .append("shapeLeng", getShapeLeng())
-                .append("fidNewSh", getFidNewSh())
-                .append("id", getId())
-                .append("ss", getSs())
-                .append("shapeLength", getShapeLength())
-                .append("shapeArea", getShapeArea())
-                .toString();
-    }
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -12,7 +12,7 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 规划地块对象 ghdk
  * 
  * @author ruoyi
- * @date 2024-08-29
+ * @date 2024-11-14
  */
 @Data
 @NoArgsConstructor
@@ -21,24 +21,11 @@ public class Ghdk extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** smid */
-    private Integer smid;
+    /** $column.columnComment */
+    private Integer id;
 
-    /** smuserid */
-    @Excel(name = "smuserid")
-    private Integer smuserid;
 
-    /** smarea */
-    @Excel(name = "smarea")
-    private Double smarea;
 
-    /** smperimeter */
-    @Excel(name = "smperimeter")
-    private Double smperimeter;
-
-    /** smgeometry */
-    @Excel(name = "smgeometry")
-    private String smgeometry;
 
     /** objectid */
     @Excel(name = "objectid")
@@ -220,12 +207,7 @@ public class Ghdk extends BaseEntity
     @Excel(name = "建筑系数说明")
     private String jzxssm;
 
-    /** Shape_Length */
-    @Excel(name = "Shape_Length")
-    private Double shapeLength;
-
-    /** Shape_Area */
-    @Excel(name = "Shape_Area")
-    private Double shapeArea;
-
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -1,5 +1,9 @@
 package com.onemap.sanya.domain.spatial;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -9,30 +13,25 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 国有所有权对象 gysyq
  * 
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-14
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Gysyq extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
+    private Integer id;
 
     /** $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;
+    private String geom;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String smgeometry;
+    private Integer smuserid;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -240,14 +239,17 @@ public class Gysyq extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonProperty("处理类型")
     private String 处理类型;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonProperty("坐标变化")
     private String 坐标变化;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonProperty("融合方式")
     private String 融合方式;
 
     /** $column.columnComment */
@@ -286,718 +288,4 @@ public class Gysyq extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer sjglbsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeLength;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeArea;
-
-    public void setSmid(Integer smid) 
-    {
-        this.smid = smid;
-    }
-
-    public Integer getSmid() 
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid) 
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid() 
-    {
-        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;
-    }
-
-    public Integer getObjectid1() 
-    {
-        return objectid1;
-    }
-    public void setObjectid(Integer objectid) 
-    {
-        this.objectid = objectid;
-    }
-
-    public Integer getObjectid() 
-    {
-        return objectid;
-    }
-    public void setDistrictid(String districtid) 
-    {
-        this.districtid = districtid;
-    }
-
-    public String getDistrictid() 
-    {
-        return districtid;
-    }
-    public void setLotId(Double lotId) 
-    {
-        this.lotId = lotId;
-    }
-
-    public Double getLotId() 
-    {
-        return lotId;
-    }
-    public void setLotNumber(String lotNumber) 
-    {
-        this.lotNumber = lotNumber;
-    }
-
-    public String getLotNumber() 
-    {
-        return lotNumber;
-    }
-    public void setIsRight(Double isRight) 
-    {
-        this.isRight = isRight;
-    }
-
-    public Double getIsRight() 
-    {
-        return isRight;
-    }
-    public void setCertNo(String certNo) 
-    {
-        this.certNo = certNo;
-    }
-
-    public String getCertNo() 
-    {
-        return certNo;
-    }
-    public void setRefX(Double refX) 
-    {
-        this.refX = refX;
-    }
-
-    public Double getRefX() 
-    {
-        return refX;
-    }
-    public void setRefY(Double refY) 
-    {
-        this.refY = refY;
-    }
-
-    public Double getRefY() 
-    {
-        return refY;
-    }
-    public void setAtqy(Double atqy) 
-    {
-        this.atqy = atqy;
-    }
-
-    public Double getAtqy() 
-    {
-        return atqy;
-    }
-    public void setAtfg(Integer atfg) 
-    {
-        this.atfg = atfg;
-    }
-
-    public Integer getAtfg() 
-    {
-        return atfg;
-    }
-    public void setfLandLoc(String fLandLoc) 
-    {
-        this.fLandLoc = fLandLoc;
-    }
-
-    public String getfLandLoc() 
-    {
-        return fLandLoc;
-    }
-    public void setMapguid(String mapguid) 
-    {
-        this.mapguid = mapguid;
-    }
-
-    public String getMapguid() 
-    {
-        return mapguid;
-    }
-    public void setfSyqlx(String fSyqlx) 
-    {
-        this.fSyqlx = fSyqlx;
-    }
-
-    public String getfSyqlx() 
-    {
-        return fSyqlx;
-    }
-    public void setfZdtzm(String fZdtzm) 
-    {
-        this.fZdtzm = fZdtzm;
-    }
-
-    public String getfZdtzm() 
-    {
-        return fZdtzm;
-    }
-    public void setfZddm(String fZddm) 
-    {
-        this.fZddm = fZddm;
-    }
-
-    public String getfZddm() 
-    {
-        return fZddm;
-    }
-    public void setfMemo(String fMemo) 
-    {
-        this.fMemo = fMemo;
-    }
-
-    public String getfMemo() 
-    {
-        return fMemo;
-    }
-    public void setAtbmqy(String atbmqy) 
-    {
-        this.atbmqy = atbmqy;
-    }
-
-    public String getAtbmqy() 
-    {
-        return atbmqy;
-    }
-    public void setfUse(String fUse) 
-    {
-        this.fUse = fUse;
-    }
-
-    public String getfUse() 
-    {
-        return fUse;
-    }
-    public void setfOwntype(String fOwntype) 
-    {
-        this.fOwntype = fOwntype;
-    }
-
-    public String getfOwntype() 
-    {
-        return fOwntype;
-    }
-    public void setfSjly(String fSjly) 
-    {
-        this.fSjly = fSjly;
-    }
-
-    public String getfSjly() 
-    {
-        return fSjly;
-    }
-    public void setfFzmj(String fFzmj) 
-    {
-        this.fFzmj = fFzmj;
-    }
-
-    public String getfFzmj() 
-    {
-        return fFzmj;
-    }
-    public void setfSjqljs(String fSjqljs) 
-    {
-        this.fSjqljs = fSjqljs;
-    }
-
-    public String getfSjqljs() 
-    {
-        return fSjqljs;
-    }
-    public void setZtid(Integer ztid) 
-    {
-        this.ztid = ztid;
-    }
-
-    public Integer getZtid() 
-    {
-        return ztid;
-    }
-    public void setIid(String iid) 
-    {
-        this.iid = iid;
-    }
-
-    public String getIid() 
-    {
-        return iid;
-    }
-    public void setQlrbs(Integer qlrbs) 
-    {
-        this.qlrbs = qlrbs;
-    }
-
-    public Integer getQlrbs() 
-    {
-        return qlrbs;
-    }
-    public void setfUnitNo(String fUnitNo) 
-    {
-        this.fUnitNo = fUnitNo;
-    }
-
-    public String getfUnitNo() 
-    {
-        return fUnitNo;
-    }
-    public void setfXmmc(String fXmmc) 
-    {
-        this.fXmmc = fXmmc;
-    }
-
-    public String getfXmmc() 
-    {
-        return fXmmc;
-    }
-    public void setfXmxz(String fXmxz) 
-    {
-        this.fXmxz = fXmxz;
-    }
-
-    public String getfXmxz() 
-    {
-        return fXmxz;
-    }
-    public void setfHydb(String fHydb) 
-    {
-        this.fHydb = fHydb;
-    }
-
-    public String getfHydb() 
-    {
-        return fHydb;
-    }
-    public void setfYhlxa(String fYhlxa) 
-    {
-        this.fYhlxa = fYhlxa;
-    }
-
-    public String getfYhlxa() 
-    {
-        return fYhlxa;
-    }
-    public void setfYhlxb(String fYhlxb) 
-    {
-        this.fYhlxb = fYhlxb;
-    }
-
-    public String getfYhlxb() 
-    {
-        return fYhlxb;
-    }
-    public void setfYhwzsm(String fYhwzsm) 
-    {
-        this.fYhwzsm = fYhwzsm;
-    }
-
-    public String getfYhwzsm() 
-    {
-        return fYhwzsm;
-    }
-    public void setfZhax(String fZhax) 
-    {
-        this.fZhax = fZhax;
-    }
-
-    public String getfZhax() 
-    {
-        return fZhax;
-    }
-    public void setfHdmc(String fHdmc) 
-    {
-        this.fHdmc = fHdmc;
-    }
-
-    public String getfHdmc() 
-    {
-        return fHdmc;
-    }
-    public void setfHddm(String fHddm) 
-    {
-        this.fHddm = fHddm;
-    }
-
-    public String getfHddm() 
-    {
-        return fHddm;
-    }
-    public void setfHdwz(String fHdwz) 
-    {
-        this.fHdwz = fHdwz;
-    }
-
-    public String getfHdwz() 
-    {
-        return fHdwz;
-    }
-    public void setfHdyt(String fHdyt) 
-    {
-        this.fHdyt = fHdyt;
-    }
-
-    public String getfHdyt() 
-    {
-        return fHdyt;
-    }
-    public void setfYdfw(String fYdfw) 
-    {
-        this.fYdfw = fYdfw;
-    }
-
-    public String getfYdfw() 
-    {
-        return fYdfw;
-    }
-    public void setfYdmj(Double fYdmj) 
-    {
-        this.fYdmj = fYdmj;
-    }
-
-    public Double getfYdmj() 
-    {
-        return fYdmj;
-    }
-    public void setfDjbh(String fDjbh) 
-    {
-        this.fDjbh = fDjbh;
-    }
-
-    public String getfDjbh() 
-    {
-        return fDjbh;
-    }
-    public void setfYhnx(String fYhnx) 
-    {
-        this.fYhnx = fYhnx;
-    }
-
-    public String getfYhnx() 
-    {
-        return fYhnx;
-    }
-    public void setfSyfs(String fSyfs) 
-    {
-        this.fSyfs = fSyfs;
-    }
-
-    public String getfSyfs() 
-    {
-        return fSyfs;
-    }
-    public void setfJtyt(String fJtyt) 
-    {
-        this.fJtyt = fJtyt;
-    }
-
-    public String getfJtyt() 
-    {
-        return fJtyt;
-    }
-    public void setSytdmj(String sytdmj) 
-    {
-        this.sytdmj = sytdmj;
-    }
-
-    public String getSytdmj() 
-    {
-        return sytdmj;
-    }
-    public void setTxmj(String txmj) 
-    {
-        this.txmj = txmj;
-    }
-
-    public String getTxmj() 
-    {
-        return txmj;
-    }
-    public void setYfttdmj(String yfttdmj) 
-    {
-        this.yfttdmj = yfttdmj;
-    }
-
-    public String getYfttdmj() 
-    {
-        return yfttdmj;
-    }
-    public void setYfgtdmj(String yfgtdmj) 
-    {
-        this.yfgtdmj = yfgtdmj;
-    }
-
-    public String getYfgtdmj() 
-    {
-        return yfgtdmj;
-    }
-    public void setfQlbz(String fQlbz) 
-    {
-        this.fQlbz = fQlbz;
-    }
-
-    public String getfQlbz() 
-    {
-        return fQlbz;
-    }
-    public void setYzbx(String yzbx) 
-    {
-        this.yzbx = yzbx;
-    }
-
-    public String getYzbx() 
-    {
-        return yzbx;
-    }
-    public void setExportBz(String exportBz) 
-    {
-        this.exportBz = exportBz;
-    }
-
-    public String getExportBz() 
-    {
-        return exportBz;
-    }
-    public void set处理类型(String 处理类型) 
-    {
-        this.处理类型 = 处理类型;
-    }
-
-    public String get处理类型() 
-    {
-        return 处理类型;
-    }
-    public void set坐标变化(String 坐标变化) 
-    {
-        this.坐标变化 = 坐标变化;
-    }
-
-    public String get坐标变化() 
-    {
-        return 坐标变化;
-    }
-    public void set融合方式(String 融合方式) 
-    {
-        this.融合方式 = 融合方式;
-    }
-
-    public String get融合方式() 
-    {
-        return 融合方式;
-    }
-    public void setObjectidB(Integer objectidB) 
-    {
-        this.objectidB = objectidB;
-    }
-
-    public Integer getObjectidB() 
-    {
-        return objectidB;
-    }
-    public void setCreatedTi(String createdTi) 
-    {
-        this.createdTi = createdTi;
-    }
-
-    public String getCreatedTi() 
-    {
-        return createdTi;
-    }
-    public void setLastModif(String lastModif) 
-    {
-        this.lastModif = lastModif;
-    }
-
-    public String getLastModif() 
-    {
-        return lastModif;
-    }
-    public void setRightOwne(String rightOwne) 
-    {
-        this.rightOwne = rightOwne;
-    }
-
-    public String getRightOwne() 
-    {
-        return rightOwne;
-    }
-    public void setLotNumb1(String lotNumb1) 
-    {
-        this.lotNumb1 = lotNumb1;
-    }
-
-    public String getLotNumb1() 
-    {
-        return lotNumb1;
-    }
-    public void setfParcelN(String fParcelN) 
-    {
-        this.fParcelN = fParcelN;
-    }
-
-    public String getfParcelN() 
-    {
-        return fParcelN;
-    }
-    public void setOldCertN(String oldCertN) 
-    {
-        this.oldCertN = oldCertN;
-    }
-
-    public String getOldCertN() 
-    {
-        return oldCertN;
-    }
-    public void setClearupSt(String clearupSt) 
-    {
-        this.clearupSt = clearupSt;
-    }
-
-    public String getClearupSt() 
-    {
-        return clearupSt;
-    }
-    public void setSjglbsm(Integer sjglbsm) 
-    {
-        this.sjglbsm = sjglbsm;
-    }
-
-    public Integer getSjglbsm() 
-    {
-        return sjglbsm;
-    }
-    public void setShapeLength(Double shapeLength) 
-    {
-        this.shapeLength = shapeLength;
-    }
-
-    public Double getShapeLength() 
-    {
-        return shapeLength;
-    }
-    public void setShapeArea(Double shapeArea) 
-    {
-        this.shapeArea = shapeArea;
-    }
-
-    public Double getShapeArea() 
-    {
-        return shapeArea;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("smid", getSmid())
-            .append("smuserid", getSmuserid())
-            .append("smarea", getSmarea())
-            .append("smperimeter", getSmperimeter())
-            .append("smgeometry", getSmgeometry())
-            .append("objectid1", getObjectid1())
-            .append("objectid", getObjectid())
-            .append("districtid", getDistrictid())
-            .append("lotId", getLotId())
-            .append("lotNumber", getLotNumber())
-            .append("isRight", getIsRight())
-            .append("certNo", getCertNo())
-            .append("refX", getRefX())
-            .append("refY", getRefY())
-            .append("atqy", getAtqy())
-            .append("atfg", getAtfg())
-            .append("fLandLoc", getfLandLoc())
-            .append("mapguid", getMapguid())
-            .append("fSyqlx", getfSyqlx())
-            .append("fZdtzm", getfZdtzm())
-            .append("fZddm", getfZddm())
-            .append("fMemo", getfMemo())
-            .append("atbmqy", getAtbmqy())
-            .append("fUse", getfUse())
-            .append("fOwntype", getfOwntype())
-            .append("fSjly", getfSjly())
-            .append("fFzmj", getfFzmj())
-            .append("fSjqljs", getfSjqljs())
-            .append("ztid", getZtid())
-            .append("iid", getIid())
-            .append("qlrbs", getQlrbs())
-            .append("fUnitNo", getfUnitNo())
-            .append("fXmmc", getfXmmc())
-            .append("fXmxz", getfXmxz())
-            .append("fHydb", getfHydb())
-            .append("fYhlxa", getfYhlxa())
-            .append("fYhlxb", getfYhlxb())
-            .append("fYhwzsm", getfYhwzsm())
-            .append("fZhax", getfZhax())
-            .append("fHdmc", getfHdmc())
-            .append("fHddm", getfHddm())
-            .append("fHdwz", getfHdwz())
-            .append("fHdyt", getfHdyt())
-            .append("fYdfw", getfYdfw())
-            .append("fYdmj", getfYdmj())
-            .append("fDjbh", getfDjbh())
-            .append("fYhnx", getfYhnx())
-            .append("fSyfs", getfSyfs())
-            .append("fJtyt", getfJtyt())
-            .append("sytdmj", getSytdmj())
-            .append("txmj", getTxmj())
-            .append("yfttdmj", getYfttdmj())
-            .append("yfgtdmj", getYfgtdmj())
-            .append("fQlbz", getfQlbz())
-            .append("yzbx", getYzbx())
-            .append("exportBz", getExportBz())
-            .append("处理类型", get处理类型())
-            .append("坐标变化", get坐标变化())
-            .append("融合方式", get融合方式())
-            .append("objectidB", getObjectidB())
-            .append("createdTi", getCreatedTi())
-            .append("lastModif", getLastModif())
-            .append("rightOwne", getRightOwne())
-            .append("lotNumb1", getLotNumb1())
-            .append("fParcelN", getfParcelN())
-            .append("oldCertN", getOldCertN())
-            .append("clearupSt", getClearupSt())
-            .append("sjglbsm", getSjglbsm())
-            .append("shapeLength", getShapeLength())
-            .append("shapeArea", getShapeArea())
-            .toString();
-    }
 }

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

@@ -1,6 +1,8 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -10,967 +12,202 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 集体所有权对象 jtowner
  * 
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-14
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Jtowner extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
+    private Integer id;
 
-    /** $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;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer objectid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer bsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String ysdm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdh;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdsz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String txdz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdzl;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String qsxz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String syqlx;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double scmj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double fzmj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double jzrjl;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double jzmd;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdjb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double sbdj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double qdjg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer zdlsh;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String szxzcmc;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String ms;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcsftg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String jcbtgyy;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blsjjcr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blsjjcrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String blsjjcsftg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fzr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fzrq;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String sfhg;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String djh;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer sjly;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdyt;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer exportflag;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer atqy;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String iid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdtybm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String mapguid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String bz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String qlr;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String certNo;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer qlrbs;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXdm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fFbf;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbqssj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbjssj;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLqsqm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fZysz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZs;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSllb;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZlnd;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSyqx;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fQlbz;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateB;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateT;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String yzbx;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Integer sjglbsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeLength;
+    private Integer sjglbsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeArea;
-
-    public void setSmid(Integer smid) 
-    {
-        this.smid = smid;
-    }
-
-    public Integer getSmid() 
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid) 
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid() 
-    {
-        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;
-    }
-
-    public Integer getObjectid1() 
-    {
-        return objectid1;
-    }
-    public void setObjectid(Integer objectid) 
-    {
-        this.objectid = objectid;
-    }
-
-    public Integer getObjectid() 
-    {
-        return objectid;
-    }
-    public void setBsm(Integer bsm) 
-    {
-        this.bsm = bsm;
-    }
-
-    public Integer getBsm() 
-    {
-        return bsm;
-    }
-    public void setYsdm(String ysdm) 
-    {
-        this.ysdm = ysdm;
-    }
-
-    public String getYsdm() 
-    {
-        return ysdm;
-    }
-    public void setZdh(String zdh) 
-    {
-        this.zdh = zdh;
-    }
-
-    public String getZdh() 
-    {
-        return zdh;
-    }
-    public void setZdsz(String zdsz) 
-    {
-        this.zdsz = zdsz;
-    }
-
-    public String getZdsz() 
-    {
-        return zdsz;
-    }
-    public void setTxdz(String txdz) 
-    {
-        this.txdz = txdz;
-    }
-
-    public String getTxdz() 
-    {
-        return txdz;
-    }
-    public void setTdzl(String tdzl) 
-    {
-        this.tdzl = tdzl;
-    }
-
-    public String getTdzl() 
-    {
-        return tdzl;
-    }
-    public void setQsxz(String qsxz) 
-    {
-        this.qsxz = qsxz;
-    }
-
-    public String getQsxz() 
-    {
-        return qsxz;
-    }
-    public void setSyqlx(String syqlx) 
-    {
-        this.syqlx = syqlx;
-    }
-
-    public String getSyqlx() 
-    {
-        return syqlx;
-    }
-    public void setScmj(Double scmj) 
-    {
-        this.scmj = scmj;
-    }
-
-    public Double getScmj() 
-    {
-        return scmj;
-    }
-    public void setFzmj(Double fzmj) 
-    {
-        this.fzmj = fzmj;
-    }
-
-    public Double getFzmj() 
-    {
-        return fzmj;
-    }
-    public void setJzrjl(Double jzrjl) 
-    {
-        this.jzrjl = jzrjl;
-    }
-
-    public Double getJzrjl() 
-    {
-        return jzrjl;
-    }
-    public void setJzmd(Double jzmd) 
-    {
-        this.jzmd = jzmd;
-    }
-
-    public Double getJzmd() 
-    {
-        return jzmd;
-    }
-    public void setTdjb(String tdjb) 
-    {
-        this.tdjb = tdjb;
-    }
-
-    public String getTdjb() 
-    {
-        return tdjb;
-    }
-    public void setSbdj(Double sbdj) 
-    {
-        this.sbdj = sbdj;
-    }
-
-    public Double getSbdj() 
-    {
-        return sbdj;
-    }
-    public void setQdjg(Double qdjg) 
-    {
-        this.qdjg = qdjg;
-    }
-
-    public Double getQdjg() 
-    {
-        return qdjg;
-    }
-    public void setZdlsh(Integer zdlsh) 
-    {
-        this.zdlsh = zdlsh;
-    }
-
-    public Integer getZdlsh() 
-    {
-        return zdlsh;
-    }
-    public void setSzxzcmc(String szxzcmc) 
-    {
-        this.szxzcmc = szxzcmc;
-    }
-
-    public String getSzxzcmc() 
-    {
-        return szxzcmc;
-    }
-    public void setMs(String ms) 
-    {
-        this.ms = ms;
-    }
-
-    public String getMs() 
-    {
-        return ms;
-    }
-    public void setJcr(String jcr) 
-    {
-        this.jcr = jcr;
-    }
-
-    public String getJcr() 
-    {
-        return jcr;
-    }
-    public void setJcrq(String jcrq) 
-    {
-        this.jcrq = jcrq;
-    }
-
-    public String getJcrq() 
-    {
-        return jcrq;
-    }
-    public void setJcsftg(String jcsftg) 
-    {
-        this.jcsftg = jcsftg;
-    }
-
-    public String getJcsftg() 
-    {
-        return jcsftg;
-    }
-    public void setJcbtgyy(String jcbtgyy) 
-    {
-        this.jcbtgyy = jcbtgyy;
-    }
-
-    public String getJcbtgyy() 
-    {
-        return jcbtgyy;
-    }
-    public void setBlr(String blr) 
-    {
-        this.blr = blr;
-    }
-
-    public String getBlr() 
-    {
-        return blr;
-    }
-    public void setBlrq(String blrq) 
-    {
-        this.blrq = blrq;
-    }
-
-    public String getBlrq() 
-    {
-        return blrq;
-    }
-    public void setBlsjjcr(String blsjjcr) 
-    {
-        this.blsjjcr = blsjjcr;
-    }
-
-    public String getBlsjjcr() 
-    {
-        return blsjjcr;
-    }
-    public void setBlsjjcrq(String blsjjcrq) 
-    {
-        this.blsjjcrq = blsjjcrq;
-    }
-
-    public String getBlsjjcrq() 
-    {
-        return blsjjcrq;
-    }
-    public void setBlsjjcsftg(String blsjjcsftg) 
-    {
-        this.blsjjcsftg = blsjjcsftg;
-    }
-
-    public String getBlsjjcsftg() 
-    {
-        return blsjjcsftg;
-    }
-    public void setFzr(String fzr) 
-    {
-        this.fzr = fzr;
-    }
-
-    public String getFzr() 
-    {
-        return fzr;
-    }
-    public void setFzrq(String fzrq) 
-    {
-        this.fzrq = fzrq;
-    }
-
-    public String getFzrq() 
-    {
-        return fzrq;
-    }
-    public void setSfhg(String sfhg) 
-    {
-        this.sfhg = sfhg;
-    }
-
-    public String getSfhg() 
-    {
-        return sfhg;
-    }
-    public void setDjh(String djh) 
-    {
-        this.djh = djh;
-    }
-
-    public String getDjh() 
-    {
-        return djh;
-    }
-    public void setSjly(Integer sjly) 
-    {
-        this.sjly = sjly;
-    }
-
-    public Integer getSjly() 
-    {
-        return sjly;
-    }
-    public void setTdyt(String tdyt) 
-    {
-        this.tdyt = tdyt;
-    }
-
-    public String getTdyt() 
-    {
-        return tdyt;
-    }
-    public void setExportflag(Integer exportflag) 
-    {
-        this.exportflag = exportflag;
-    }
-
-    public Integer getExportflag() 
-    {
-        return exportflag;
-    }
-    public void setAtqy(Integer atqy) 
-    {
-        this.atqy = atqy;
-    }
-
-    public Integer getAtqy() 
-    {
-        return atqy;
-    }
-    public void setIid(String iid) 
-    {
-        this.iid = iid;
-    }
-
-    public String getIid() 
-    {
-        return iid;
-    }
-    public void setZdtybm(String zdtybm) 
-    {
-        this.zdtybm = zdtybm;
-    }
-
-    public String getZdtybm() 
-    {
-        return zdtybm;
-    }
-    public void setMapguid(String mapguid) 
-    {
-        this.mapguid = mapguid;
-    }
-
-    public String getMapguid() 
-    {
-        return mapguid;
-    }
-    public void setBz(String bz) 
-    {
-        this.bz = bz;
-    }
-
-    public String getBz() 
-    {
-        return bz;
-    }
-    public void setQlr(String qlr) 
-    {
-        this.qlr = qlr;
-    }
-
-    public String getQlr() 
-    {
-        return qlr;
-    }
-    public void setCertNo(String certNo) 
-    {
-        this.certNo = certNo;
-    }
-
-    public String getCertNo() 
-    {
-        return certNo;
-    }
-    public void setQlrbs(Integer qlrbs) 
-    {
-        this.qlrbs = qlrbs;
-    }
-
-    public Integer getQlrbs() 
-    {
-        return qlrbs;
-    }
-    public void setfLb(String fLb) 
-    {
-        this.fLb = fLb;
-    }
-
-    public String getfLb() 
-    {
-        return fLb;
-    }
-    public void setfXb(String fXb) 
-    {
-        this.fXb = fXb;
-    }
-
-    public String getfXb() 
-    {
-        return fXb;
-    }
-    public void setfXdm(String fXdm) 
-    {
-        this.fXdm = fXdm;
-    }
-
-    public String getfXdm() 
-    {
-        return fXdm;
-    }
-    public void setfFbf(String fFbf) 
-    {
-        this.fFbf = fFbf;
-    }
-
-    public String getfFbf() 
-    {
-        return fFbf;
-    }
-    public void setfCbqssj(String fCbqssj) 
-    {
-        this.fCbqssj = fCbqssj;
-    }
-
-    public String getfCbqssj() 
-    {
-        return fCbqssj;
-    }
-    public void setfCbjssj(String fCbjssj) 
-    {
-        this.fCbjssj = fCbjssj;
-    }
-
-    public String getfCbjssj() 
-    {
-        return fCbjssj;
-    }
-    public void setfLqsqm(String fLqsqm) 
-    {
-        this.fLqsqm = fLqsqm;
-    }
-
-    public String getfLqsqm() 
-    {
-        return fLqsqm;
-    }
-    public void setfZysz(String fZysz) 
-    {
-        this.fZysz = fZysz;
-    }
-
-    public String getfZysz() 
-    {
-        return fZysz;
-    }
-    public void setfZs(Integer fZs) 
-    {
-        this.fZs = fZs;
-    }
-
-    public Integer getfZs() 
-    {
-        return fZs;
-    }
-    public void setfSllb(String fSllb) 
-    {
-        this.fSllb = fSllb;
-    }
-
-    public String getfSllb() 
-    {
-        return fSllb;
-    }
-    public void setfZlnd(Integer fZlnd) 
-    {
-        this.fZlnd = fZlnd;
-    }
-
-    public Integer getfZlnd() 
-    {
-        return fZlnd;
-    }
-    public void setfSyqx(String fSyqx) 
-    {
-        this.fSyqx = fSyqx;
-    }
-
-    public String getfSyqx() 
-    {
-        return fSyqx;
-    }
-    public void setfQlbz(String fQlbz) 
-    {
-        this.fQlbz = fQlbz;
-    }
-
-    public String getfQlbz() 
-    {
-        return fQlbz;
-    }
-    public void setfCreateB(String fCreateB) 
-    {
-        this.fCreateB = fCreateB;
-    }
-
-    public String getfCreateB() 
-    {
-        return fCreateB;
-    }
-    public void setfCreateT(String fCreateT) 
-    {
-        this.fCreateT = fCreateT;
-    }
-
-    public String getfCreateT() 
-    {
-        return fCreateT;
-    }
-    public void setYzbx(String yzbx) 
-    {
-        this.yzbx = yzbx;
-    }
-
-    public String getYzbx() 
-    {
-        return yzbx;
-    }
-    public void setSjglbsm(Integer sjglbsm) 
-    {
-        this.sjglbsm = sjglbsm;
-    }
-
-    public Integer getSjglbsm() 
-    {
-        return sjglbsm;
-    }
-    public void setShapeLength(Double shapeLength) 
-    {
-        this.shapeLength = shapeLength;
-    }
-
-    public Double getShapeLength() 
-    {
-        return shapeLength;
-    }
-    public void setShapeArea(Double shapeArea) 
-    {
-        this.shapeArea = shapeArea;
-    }
-
-    public Double getShapeArea() 
-    {
-        return shapeArea;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("smid", getSmid())
-            .append("smuserid", getSmuserid())
-            .append("smarea", getSmarea())
-            .append("smperimeter", getSmperimeter())
-            .append("smgeometry", getSmgeometry())
-            .append("objectid1", getObjectid1())
-            .append("objectid", getObjectid())
-            .append("bsm", getBsm())
-            .append("ysdm", getYsdm())
-            .append("zdh", getZdh())
-            .append("zdsz", getZdsz())
-            .append("txdz", getTxdz())
-            .append("tdzl", getTdzl())
-            .append("qsxz", getQsxz())
-            .append("syqlx", getSyqlx())
-            .append("scmj", getScmj())
-            .append("fzmj", getFzmj())
-            .append("jzrjl", getJzrjl())
-            .append("jzmd", getJzmd())
-            .append("tdjb", getTdjb())
-            .append("sbdj", getSbdj())
-            .append("qdjg", getQdjg())
-            .append("zdlsh", getZdlsh())
-            .append("szxzcmc", getSzxzcmc())
-            .append("ms", getMs())
-            .append("jcr", getJcr())
-            .append("jcrq", getJcrq())
-            .append("jcsftg", getJcsftg())
-            .append("jcbtgyy", getJcbtgyy())
-            .append("blr", getBlr())
-            .append("blrq", getBlrq())
-            .append("blsjjcr", getBlsjjcr())
-            .append("blsjjcrq", getBlsjjcrq())
-            .append("blsjjcsftg", getBlsjjcsftg())
-            .append("fzr", getFzr())
-            .append("fzrq", getFzrq())
-            .append("sfhg", getSfhg())
-            .append("djh", getDjh())
-            .append("sjly", getSjly())
-            .append("tdyt", getTdyt())
-            .append("exportflag", getExportflag())
-            .append("atqy", getAtqy())
-            .append("iid", getIid())
-            .append("zdtybm", getZdtybm())
-            .append("mapguid", getMapguid())
-            .append("bz", getBz())
-            .append("qlr", getQlr())
-            .append("certNo", getCertNo())
-            .append("qlrbs", getQlrbs())
-            .append("fLb", getfLb())
-            .append("fXb", getfXb())
-            .append("fXdm", getfXdm())
-            .append("fFbf", getfFbf())
-            .append("fCbqssj", getfCbqssj())
-            .append("fCbjssj", getfCbjssj())
-            .append("fLqsqm", getfLqsqm())
-            .append("fZysz", getfZysz())
-            .append("fZs", getfZs())
-            .append("fSllb", getfSllb())
-            .append("fZlnd", getfZlnd())
-            .append("fSyqx", getfSyqx())
-            .append("fQlbz", getfQlbz())
-            .append("fCreateB", getfCreateB())
-            .append("fCreateT", getfCreateT())
-            .append("yzbx", getYzbx())
-            .append("sjglbsm", getSjglbsm())
-            .append("shapeLength", getShapeLength())
-            .append("shapeArea", getShapeArea())
-            .toString();
-    }
+    /** 范围坐标 */
+    @Excel(name = "范围坐标", readConverterExp = "$column.readConverterExp()")
+    private String geom;
 }

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

@@ -1,6 +1,8 @@
 package com.onemap.sanya.domain.spatial;
 
-import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
@@ -10,533 +12,142 @@ import com.onemap.common.core.web.domain.BaseEntity;
  * 集体使用权对象 jtuse
  * 
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-14
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Jtuse extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private Integer smid;
+    private Integer id;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Integer smuserid;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double smarea;
+    private String geom;
 
-    /** $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;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer objectid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String syqr;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdtybm;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdzl;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Double zdmj;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String tdyt;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String ytdzh;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String mapguid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String iid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String certNo;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer ztid;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String zdh;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLb;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXb;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fXdm;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fFbf;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbqssj;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCbjssj;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fLqsqm;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fZysz;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZs;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSllb;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer fZlnd;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fSyqx;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fQlbz;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateB;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String fCreateT;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private String yzbx;
 
     /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+
     private Integer sjglbsm;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeLength;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Double shapeArea;
-
-    public void setSmid(Integer smid) 
-    {
-        this.smid = smid;
-    }
-
-    public Integer getSmid() 
-    {
-        return smid;
-    }
-    public void setSmuserid(Integer smuserid) 
-    {
-        this.smuserid = smuserid;
-    }
-
-    public Integer getSmuserid() 
-    {
-        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;
-    }
-
-    public Integer getObjectid1() 
-    {
-        return objectid1;
-    }
-    public void setObjectid(Integer objectid) 
-    {
-        this.objectid = objectid;
-    }
-
-    public Integer getObjectid() 
-    {
-        return objectid;
-    }
-    public void setSyqr(String syqr) 
-    {
-        this.syqr = syqr;
-    }
-
-    public String getSyqr() 
-    {
-        return syqr;
-    }
-    public void setZdtybm(String zdtybm) 
-    {
-        this.zdtybm = zdtybm;
-    }
-
-    public String getZdtybm() 
-    {
-        return zdtybm;
-    }
-    public void setZdzl(String zdzl) 
-    {
-        this.zdzl = zdzl;
-    }
-
-    public String getZdzl() 
-    {
-        return zdzl;
-    }
-    public void setZdmj(Double zdmj) 
-    {
-        this.zdmj = zdmj;
-    }
-
-    public Double getZdmj() 
-    {
-        return zdmj;
-    }
-    public void setTdyt(String tdyt) 
-    {
-        this.tdyt = tdyt;
-    }
-
-    public String getTdyt() 
-    {
-        return tdyt;
-    }
-    public void setYtdzh(String ytdzh) 
-    {
-        this.ytdzh = ytdzh;
-    }
-
-    public String getYtdzh() 
-    {
-        return ytdzh;
-    }
-    public void setMapguid(String mapguid) 
-    {
-        this.mapguid = mapguid;
-    }
-
-    public String getMapguid() 
-    {
-        return mapguid;
-    }
-    public void setIid(String iid) 
-    {
-        this.iid = iid;
-    }
-
-    public String getIid() 
-    {
-        return iid;
-    }
-    public void setCertNo(String certNo) 
-    {
-        this.certNo = certNo;
-    }
-
-    public String getCertNo() 
-    {
-        return certNo;
-    }
-    public void setZtid(Integer ztid) 
-    {
-        this.ztid = ztid;
-    }
-
-    public Integer getZtid() 
-    {
-        return ztid;
-    }
-    public void setZdh(String zdh) 
-    {
-        this.zdh = zdh;
-    }
-
-    public String getZdh() 
-    {
-        return zdh;
-    }
-    public void setfLb(String fLb) 
-    {
-        this.fLb = fLb;
-    }
-
-    public String getfLb() 
-    {
-        return fLb;
-    }
-    public void setfXb(String fXb) 
-    {
-        this.fXb = fXb;
-    }
-
-    public String getfXb() 
-    {
-        return fXb;
-    }
-    public void setfXdm(String fXdm) 
-    {
-        this.fXdm = fXdm;
-    }
-
-    public String getfXdm() 
-    {
-        return fXdm;
-    }
-    public void setfFbf(String fFbf) 
-    {
-        this.fFbf = fFbf;
-    }
-
-    public String getfFbf() 
-    {
-        return fFbf;
-    }
-    public void setfCbqssj(String fCbqssj) 
-    {
-        this.fCbqssj = fCbqssj;
-    }
-
-    public String getfCbqssj() 
-    {
-        return fCbqssj;
-    }
-    public void setfCbjssj(String fCbjssj) 
-    {
-        this.fCbjssj = fCbjssj;
-    }
-
-    public String getfCbjssj() 
-    {
-        return fCbjssj;
-    }
-    public void setfLqsqm(String fLqsqm) 
-    {
-        this.fLqsqm = fLqsqm;
-    }
-
-    public String getfLqsqm() 
-    {
-        return fLqsqm;
-    }
-    public void setfZysz(String fZysz) 
-    {
-        this.fZysz = fZysz;
-    }
-
-    public String getfZysz() 
-    {
-        return fZysz;
-    }
-    public void setfZs(Integer fZs) 
-    {
-        this.fZs = fZs;
-    }
-
-    public Integer getfZs() 
-    {
-        return fZs;
-    }
-    public void setfSllb(String fSllb) 
-    {
-        this.fSllb = fSllb;
-    }
-
-    public String getfSllb() 
-    {
-        return fSllb;
-    }
-    public void setfZlnd(Integer fZlnd) 
-    {
-        this.fZlnd = fZlnd;
-    }
-
-    public Integer getfZlnd() 
-    {
-        return fZlnd;
-    }
-    public void setfSyqx(String fSyqx) 
-    {
-        this.fSyqx = fSyqx;
-    }
-
-    public String getfSyqx() 
-    {
-        return fSyqx;
-    }
-    public void setfQlbz(String fQlbz) 
-    {
-        this.fQlbz = fQlbz;
-    }
-
-    public String getfQlbz() 
-    {
-        return fQlbz;
-    }
-    public void setfCreateB(String fCreateB) 
-    {
-        this.fCreateB = fCreateB;
-    }
-
-    public String getfCreateB() 
-    {
-        return fCreateB;
-    }
-    public void setfCreateT(String fCreateT) 
-    {
-        this.fCreateT = fCreateT;
-    }
-
-    public String getfCreateT() 
-    {
-        return fCreateT;
-    }
-    public void setYzbx(String yzbx) 
-    {
-        this.yzbx = yzbx;
-    }
-
-    public String getYzbx() 
-    {
-        return yzbx;
-    }
-    public void setSjglbsm(Integer sjglbsm) 
-    {
-        this.sjglbsm = sjglbsm;
-    }
-
-    public Integer getSjglbsm() 
-    {
-        return sjglbsm;
-    }
-    public void setShapeLength(Double shapeLength) 
-    {
-        this.shapeLength = shapeLength;
-    }
-
-    public Double getShapeLength() 
-    {
-        return shapeLength;
-    }
-    public void setShapeArea(Double shapeArea) 
-    {
-        this.shapeArea = shapeArea;
-    }
-
-    public Double getShapeArea() 
-    {
-        return shapeArea;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("smid", getSmid())
-            .append("smuserid", getSmuserid())
-            .append("smarea", getSmarea())
-            .append("smperimeter", getSmperimeter())
-            .append("smgeometry", getSmgeometry())
-            .append("objectid1", getObjectid1())
-            .append("objectid", getObjectid())
-            .append("syqr", getSyqr())
-            .append("zdtybm", getZdtybm())
-            .append("zdzl", getZdzl())
-            .append("zdmj", getZdmj())
-            .append("tdyt", getTdyt())
-            .append("ytdzh", getYtdzh())
-            .append("mapguid", getMapguid())
-            .append("iid", getIid())
-            .append("certNo", getCertNo())
-            .append("ztid", getZtid())
-            .append("zdh", getZdh())
-            .append("fLb", getfLb())
-            .append("fXb", getfXb())
-            .append("fXdm", getfXdm())
-            .append("fFbf", getfFbf())
-            .append("fCbqssj", getfCbqssj())
-            .append("fCbjssj", getfCbjssj())
-            .append("fLqsqm", getfLqsqm())
-            .append("fZysz", getfZysz())
-            .append("fZs", getfZs())
-            .append("fSllb", getfSllb())
-            .append("fZlnd", getfZlnd())
-            .append("fSyqx", getfSyqx())
-            .append("fQlbz", getfQlbz())
-            .append("fCreateB", getfCreateB())
-            .append("fCreateT", getfCreateT())
-            .append("yzbx", getYzbx())
-            .append("sjglbsm", getSjglbsm())
-            .append("shapeLength", getShapeLength())
-            .append("shapeArea", getShapeArea())
-            .toString();
-    }
 }

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

@@ -155,6 +155,33 @@ public class SpatialOperate {
         return polygon;
     }
 
+    /**
+     * 经纬度转墨卡托   便于面积转换
+     *
+     * @param geom
+     * @return
+     */
+//    public static Geometry lonlat2WebMactor(Geometry geom) {
+//        try {
+//            //这里是以OGC WKT形式定义的是World Mercator投影，网页地图一般使用该投影
+//            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=factory.createCoordinateReferenceSystem("EPSG:"+4546);
+////            CoordinateReferenceSystem crsTarget = CRS.parseWKT(srid4546);
+//
+//            MathTransform transform2 = CRS.findMathTransform(sourceTarget, crsTarget, false);
+//            return JTS.transform(geom, transform2);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return null;
+//        }
+//    }
+
     /**
      * 经纬度转墨卡托   便于面积转换
      *
@@ -164,25 +191,23 @@ public class SpatialOperate {
     public static Geometry lonlat2WebMactor(Geometry geom) {
         try {
             //这里是以OGC WKT形式定义的是World Mercator投影，网页地图一般使用该投影
-            CRSAuthorityFactory factory=CRS.getAuthorityFactory(true);
-            Integer wkid=geom.getSRID();
-            CoordinateReferenceSystem sourceTarget = factory.createCoordinateReferenceSystem("EPSG:"+4490);
+
+            CoordinateReferenceSystem sourceTarget = CRS.parseWKT(srid4490);
 
 //            MathTransform transform1 = CRS.findMathTransform(DefaultGeographicCRS.WGS84, sourceTarget);
 //            Geometry geometry1= JTS.transform(geom, transform1);
             // 投影转换
-            CoordinateReferenceSystem crsTarget=factory.createCoordinateReferenceSystem("EPSG:"+4546);
-//            CoordinateReferenceSystem crsTarget = CRS.parseWKT(srid4546);
+            CoordinateReferenceSystem crsTarget = CRS.parseWKT(srid4546);
 
             MathTransform transform2 = CRS.findMathTransform(sourceTarget, crsTarget, false);
             return JTS.transform(geom, transform2);
         } catch (Exception e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
             return null;
         }
     }
 
+
     /**
      * 获取面积（平方米）
      *
@@ -388,6 +413,35 @@ public class SpatialOperate {
         }
         return fldInfos;
     }
+
+    /**
+     * 根据类生成字段列表
+     *
+     * @param object
+     * @return
+     */
+    public static List<FldInfo> getFieldAnnotationJZDJ(Object object) {
+        Field[] fields = object.getClass().getDeclaredFields();
+        List<FldInfo> fldInfos = new ArrayList<>();
+        for (Field field : fields) {
+            // 是否引用ApiModelProperty注解
+            String name = field.getName();
+            String typeName = field.getType().getName();
+
+            boolean bool = field.isAnnotationPresent(Excel.class);
+            String cnName = "";
+            if (bool) {
+                cnName = field.getAnnotation(Excel.class).name();
+//                fldInfos.add(new FldInfo(value);
+                System.out.print(cnName);
+
+            }
+            if (cnName == "" || cnName == null)
+                cnName = name;
+            fldInfos.add(new FldInfo(name, cnName, typeName));
+        }
+        return fldInfos;
+    }
 //
 //    private GeometryFactory geometryFactory = new GeometryFactory();
 //    /**

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

@@ -14,6 +14,8 @@
         <result property="projectId"    column="projectId"    />
         <result property="gyJZMJ"    column="gyJZMJ"    />
         <result property="jtJZMJ"    column="jtJZMJ"    />
+        <result property="jtPay"    column="jtPay"    />
+        <result property="gyPay"    column="gyPay"    />
         <result property="gyCount"    column="gyCount"    />
         <result property="jtCount"    column="jtCount"    />
         <result property="jtList"    column="jtList"    />
@@ -36,6 +38,8 @@
             <if test="projectId != null  and projectId != ''"> and "projectId" = #{projectId}</if>
             <if test="gyJZMJ != null "> and "gyJZMJ" = #{gyJZMJ}</if>
             <if test="jtJZMJ != null "> and "jtJZMJ" = #{jtJZMJ}</if>
+            <if test="jtPay != null "> and "jtPay" = #{jtPay}</if>
+            <if test="gyPay != null "> and "gyPay" = #{gyPay}</if>
             <if test="gyCount != null "> and "gyCount" = #{gyCount}</if>
             <if test="jtCount != null "> and "jtCount" = #{jtCount}</if>
             <if test="jtList != null  and jtList != ''"> and "jtList" = #{jtList}</if>
@@ -62,6 +66,8 @@
             <if test="projectId != null">"projectId",</if>
             <if test="gyJZMJ != null">"gyJZMJ",</if>
             <if test="jtJZMJ != null">"jtJZMJ",</if>
+            <if test="jtPay != null">"jtPay",</if>
+            <if test="gyPay != null">"gyPay",</if>
             <if test="gyCount != null">"gyCount",</if>
             <if test="jtCount != null">"jtCount",</if>
             <if test="jtList != null">"jtList",</if>
@@ -79,6 +85,8 @@
             <if test="projectId != null">#{projectId},</if>
             <if test="gyJZMJ != null">#{gyJZMJ},</if>
             <if test="jtJZMJ != null">#{jtJZMJ},</if>
+            <if test="jtPay != null">#{jtPay},</if>
+            <if test="gyPay != null">#{gyPay},</if>
             <if test="gyCount != null">#{gyCount},</if>
             <if test="jtCount != null">#{jtCount},</if>
             <if test="jtList != null">#{jtList},</if>
@@ -99,6 +107,8 @@
             <if test="projectId != null">"projectId" = #{projectId},</if>
             <if test="gyJZMJ != null">"gyJZMJ" = #{gyJZMJ},</if>
             <if test="jtJZMJ != null">"jtJZMJ" = #{jtJZMJ},</if>
+            <if test="jtPay != null">"jtPay" = #{jtPay},</if>
+            <if test="gyPay != null">"gyPay" = #{gyPay},</if>
             <if test="gyCount != null">"gyCount" = #{gyCount},</if>
             <if test="jtCount != null">"jtCount" = #{jtCount},</if>
             <if test="jtList != null">"jtList" = #{jtList},</if>

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

@@ -5,110 +5,101 @@ 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="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="gid"    column="gid"    />
+        <result property="id"    column="id"    />
         <result property="height"    column="height"    />
         <result property="floor"    column="floor"    />
+        <result property="geom"    column="geom"    />
         <result property="cqr"    column="cqr"    />
         <result property="address"    column="address"    />
+        <result property="jg"    column="jg"    />
         <result property="grade"    column="grade"    />
         <result property="zdmj"    column="zdmj"    />
         <result property="jzmj"    column="jzmj"    />
-        <result property="jg"    column="jg"    />
     </resultMap>
 
     <sql id="selectBdcVo">
-        select smid, smuserid, smarea, smperimeter, st_asewkt(smgeometry) as smgeometry , height, floor, cqr, address, grade, zdmj, jzmj,jg from bdc
+        select gid, id, height, floor, public.st_astext(geom) as geom, cqr, address, jg, grade, zdmj, jzmj 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>
+        <where>
             <if test="height != null "> and height = #{height}</if>
             <if test="floor != null "> and floor = #{floor}</if>
+            <if test="geom != null  and geom != ''"> and geom = #{geom}</if>
             <if test="cqr != null  and cqr != ''"> and cqr = #{cqr}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="jg != null  and jg != ''"> and jg = #{jg}</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="jg != null "> and jg = #{jg}</if>
         </where>
     </select>
     
-    <select id="selectBdcBySmid" parameterType="Integer" resultMap="BdcResult">
+    <select id="selectBdcByGid" parameterType="Integer" resultMap="BdcResult">
         <include refid="selectBdcVo"/>
-        where smid = #{smid}
+        where gid = #{gid}
     </select>
+
     <select id="selectBdcByPolygon" parameterType="String" resultMap="BdcResult">
         <include refid="selectBdcVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),bdc.smgeometry)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),bdc.geom)
     </select>
-    <insert id="insertBdc" parameterType="com.onemap.sanya.domain.spatial.Bdc" useGeneratedKeys="true" keyProperty="smid">
+        
+    <insert id="insertBdc" parameterType="com.onemap.sanya.domain.spatial.Bdc" useGeneratedKeys="true" keyProperty="gid">
         insert into bdc
         <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="id != null">id,</if>
             <if test="height != null">height,</if>
             <if test="floor != null">floor,</if>
+            <if test="geom != null">geom,</if>
             <if test="cqr != null">cqr,</if>
             <if test="address != null">address,</if>
+            <if test="jg != null">jg,</if>
             <if test="grade != null">grade,</if>
             <if test="zdmj != null">zdmj,</if>
             <if test="jzmj != null">jzmj,</if>
-            <if test="jg != null">jg,</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="id != null">#{id},</if>
             <if test="height != null">#{height},</if>
             <if test="floor != null">#{floor},</if>
+            <if test="geom != null">#{geom},</if>
             <if test="cqr != null">#{cqr},</if>
             <if test="address != null">#{address},</if>
+            <if test="jg != null">#{jg},</if>
             <if test="grade != null">#{grade},</if>
             <if test="zdmj != null">#{zdmj},</if>
             <if test="jzmj != null">#{jzmj},</if>
-            <if test="jg != null">#{jg},</if>
          </trim>
     </insert>
 
     <update id="updateBdc" parameterType="com.onemap.sanya.domain.spatial.Bdc">
         update bdc
         <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="id != null">id = #{id},</if>
             <if test="height != null">height = #{height},</if>
             <if test="floor != null">floor = #{floor},</if>
+            <if test="geom != null">geom = #{geom},</if>
             <if test="cqr != null">cqr = #{cqr},</if>
             <if test="address != null">address = #{address},</if>
+            <if test="jg != null">jg = #{jg},</if>
             <if test="grade != null">grade = #{grade},</if>
             <if test="zdmj != null">zdmj = #{zdmj},</if>
             <if test="jzmj != null">jzmj = #{jzmj},</if>
-            <if test="jg != null">jg = #{jg},</if>
         </trim>
-        where smid = #{smid}
+        where gid = #{gid}
     </update>
 
-    <delete id="deleteBdcBySmid" parameterType="Integer">
-        delete from bdc where smid = #{smid}
+    <delete id="deleteBdcByGid" parameterType="Integer">
+        delete from bdc where gid = #{gid}
     </delete>
 
-    <delete id="deleteBdcBySmids" parameterType="String">
-        delete from bdc where smid in 
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteBdcByGids" parameterType="String">
+        delete from bdc where gid in 
+        <foreach item="gid" collection="array" open="(" separator="," close=")">
+            #{gid}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,102 +5,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.C12SfjbMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.C12Sfjb" id="C12SfjbResult">
-        <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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid"    column="objectid"    />
         <result property="土地级别"    column="土地级别"    />
         <result property="楼面单价"    column="楼面单价"    />
         <result property="qpbh"    column="qpbh"    />
-        <result property="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectC12SfjbVo">
-        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c1_2_sfjb"
+        select id, public.st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c1_2_sfjb"
     </sql>
 
     <select id="selectC12SfjbList" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb" resultMap="C12SfjbResult">
         <include refid="selectC12SfjbVo"/>
         <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="geom != null  and geom != ''"> and geom = #{geom}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="土地级别 != null  and 土地级别 != ''"> and 土地级别 = #{土地级别}</if>
             <if test="楼面单价 != null "> and 楼面单价 = #{楼面单价}</if>
             <if test="qpbh != null  and qpbh != ''"> and qpbh = #{qpbh}</if>
-            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectC12SfjbBySmid" parameterType="Integer" resultMap="C12SfjbResult">
+    <select id="selectC12SfjbById" parameterType="Integer" resultMap="C12SfjbResult">
         <include refid="selectC12SfjbVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
 
     <select id="selectByPolygon" parameterType="String" resultMap="C12SfjbResult">
         <include refid="selectC12SfjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+        where public.st_intersects( public.ST_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
-
-    <insert id="insertC12Sfjb" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb" useGeneratedKeys="true" keyProperty="smid">
-        insert into "c1_2_sfjb"
+        
+    <insert id="insertC12Sfjb" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb" useGeneratedKeys="true" keyProperty="id">
+        insert into c1_2_sfjb
         <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="geom != null">geom,</if>
             <if test="objectid != null">objectid,</if>
             <if test="土地级别 != null">土地级别,</if>
             <if test="楼面单价 != null">楼面单价,</if>
             <if test="qpbh != null">qpbh,</if>
-            <if test="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="土地级别 != null">#{土地级别},</if>
             <if test="楼面单价 != null">#{楼面单价},</if>
             <if test="qpbh != null">#{qpbh},</if>
-            <if test="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateC12Sfjb" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb">
-        update "c1_2_sfjb"
+        update c1_2_sfjb
         <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="geom != null">geom = #{geom},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="土地级别 != null">土地级别 = #{土地级别},</if>
             <if test="楼面单价 != null">楼面单价 = #{楼面单价},</if>
             <if test="qpbh != null">qpbh = #{qpbh},</if>
-            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteC12SfjbBySmid" parameterType="Integer">
-        delete from "c1_2_sfjb" where smid = #{smid}
+    <delete id="deleteC12SfjbById" parameterType="Integer">
+        delete from c1_2_sfjb where id = #{id}
     </delete>
 
-    <delete id="deleteC12SfjbBySmids" parameterType="String">
-        delete from "c1_2_sfjb" where smid in
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteC12SfjbByIds" parameterType="String">
+        delete from c1_2_sfjb where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,102 +5,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.C22ZzjbMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.C22Zzjb" id="C22ZzjbResult">
-        <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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid"    column="objectid"    />
         <result property="土地级别"    column="土地级别"    />
         <result property="楼面单价"    column="楼面单价"    />
         <result property="qpbh"    column="qpbh"    />
-        <result property="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectC22ZzjbVo">
-        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c2_2_zzjb"
+        select id, public.st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c2_2_zzjb"
     </sql>
 
     <select id="selectC22ZzjbList" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb" resultMap="C22ZzjbResult">
         <include refid="selectC22ZzjbVo"/>
         <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="geom != null  and geom != ''"> and geom = #{geom}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="土地级别 != null  and 土地级别 != ''"> and 土地级别 = #{土地级别}</if>
             <if test="楼面单价 != null "> and 楼面单价 = #{楼面单价}</if>
             <if test="qpbh != null  and qpbh != ''"> and qpbh = #{qpbh}</if>
-            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectC22ZzjbBySmid" parameterType="Integer" resultMap="C22ZzjbResult">
+    <select id="selectC22ZzjbById" parameterType="Integer" resultMap="C22ZzjbResult">
         <include refid="selectC22ZzjbVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
 
     <select id="selectByPolygon" parameterType="String" resultMap="C22ZzjbResult">
         <include refid="selectC22ZzjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+        where public.st_intersects( public.ST_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
-
-    <insert id="insertC22Zzjb" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb" useGeneratedKeys="true" keyProperty="smid">
-        insert into "c2_2_zzjb"
+        
+    <insert id="insertC22Zzjb" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb" useGeneratedKeys="true" keyProperty="id">
+        insert into c2_2_zzjb
         <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="geom != null">geom,</if>
             <if test="objectid != null">objectid,</if>
             <if test="土地级别 != null">土地级别,</if>
             <if test="楼面单价 != null">楼面单价,</if>
             <if test="qpbh != null">qpbh,</if>
-            <if test="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="土地级别 != null">#{土地级别},</if>
             <if test="楼面单价 != null">#{楼面单价},</if>
             <if test="qpbh != null">#{qpbh},</if>
-            <if test="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateC22Zzjb" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb">
-        update "c2_2_zzjb"
+        update c2_2_zzjb
         <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="geom != null">geom = #{geom},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="土地级别 != null">土地级别 = #{土地级别},</if>
             <if test="楼面单价 != null">楼面单价 = #{楼面单价},</if>
             <if test="qpbh != null">qpbh = #{qpbh},</if>
-            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteC22ZzjbBySmid" parameterType="Integer">
-        delete from "c2_2_zzjb" where smid = #{smid}
+    <delete id="deleteC22ZzjbById" parameterType="Integer">
+        delete from c2_2_zzjb where id = #{id}
     </delete>
 
-    <delete id="deleteC22ZzjbBySmids" parameterType="String">
-        delete from "c2_2_zzjb" where smid in
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteC22ZzjbByIds" parameterType="String">
+        delete from c2_2_zzjb where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,102 +5,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.C32GyjbMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.C32Gyjb" id="C32GyjbResult">
-        <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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid"    column="objectid"    />
         <result property="土地级别"    column="土地级别"    />
         <result property="楼面单价"    column="楼面单价"    />
         <result property="qpbh"    column="qpbh"    />
-        <result property="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectC32GyjbVo">
-        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, 楼面单价, qpbh, shape_length, shape_area from "c3_2_gyjb"
+        select id, public.st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c3_2_gyjb"
     </sql>
 
     <select id="selectC32GyjbList" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb" resultMap="C32GyjbResult">
         <include refid="selectC32GyjbVo"/>
         <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="geom != null  and geom != ''"> and geom = #{geom}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="土地级别 != null  and 土地级别 != ''"> and 土地级别 = #{土地级别}</if>
             <if test="楼面单价 != null "> and 楼面单价 = #{楼面单价}</if>
             <if test="qpbh != null  and qpbh != ''"> and qpbh = #{qpbh}</if>
-            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectC32GyjbBySmid" parameterType="Integer" resultMap="C32GyjbResult">
+    <select id="selectC32GyjbById" parameterType="Integer" resultMap="C32GyjbResult">
         <include refid="selectC32GyjbVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
 
     <select id="selectByPolygon" parameterType="String" resultMap="C32GyjbResult">
         <include refid="selectC32GyjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+        where public.st_intersects( public.st_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
-
-    <insert id="insertC32Gyjb" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb" useGeneratedKeys="true" keyProperty="smid">
-        insert into "c3_2_gyjb"
+        
+    <insert id="insertC32Gyjb" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb" useGeneratedKeys="true" keyProperty="id">
+        insert into c3_2_gyjb
         <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="geom != null">geom,</if>
             <if test="objectid != null">objectid,</if>
             <if test="土地级别 != null">土地级别,</if>
             <if test="楼面单价 != null">楼面单价,</if>
             <if test="qpbh != null">qpbh,</if>
-            <if test="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="土地级别 != null">#{土地级别},</if>
             <if test="楼面单价 != null">#{楼面单价},</if>
             <if test="qpbh != null">#{qpbh},</if>
-            <if test="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateC32Gyjb" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb">
-        update "c3_2_gyjb"
+        update c3_2_gyjb
         <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="geom != null">geom = #{geom},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="土地级别 != null">土地级别 = #{土地级别},</if>
             <if test="楼面单价 != null">楼面单价 = #{楼面单价},</if>
             <if test="qpbh != null">qpbh = #{qpbh},</if>
-            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteC32GyjbBySmid" parameterType="Integer">
-        delete from "c3_2_gyjb" where smid = #{smid}
+    <delete id="deleteC32GyjbById" parameterType="Integer">
+        delete from c3_2_gyjb where id = #{id}
     </delete>
 
-    <delete id="deleteC32GyjbBySmids" parameterType="String">
-        delete from "c3_2_gyjb" where smid in
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteC32GyjbByIds" parameterType="String">
+        delete from c3_2_gyjb where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,11 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.C41GfjbMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.C41Gfjb" id="C41GfjbResult">
-        <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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid"    column="objectid"    />
         <result property="土地级别"    column="土地级别"    />
         <result property="qpbh"    column="qpbh"    />
@@ -25,21 +22,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="文化地价"    column="文化_地价"    />
         <result property="公园与绿地公用设施用地"    column="公园与绿地、公用设施用地"    />
         <result property="公园地价"    column="公园_地价"    />
-        <result property="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectC41GfjbVo">
-        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, 土地级别, qpbh, 新闻出版用地, 新闻_地价, 医疗卫生、社会福利用地, 医疗_地价, 教育、科研用地, 教育_地价, 机关团体用地, 机关_地价, 文化设施、体育用地, 文化_地价, 公园与绿地、公用设施用地, 公园_地价, shape_length, shape_area from "c4_1_gfjb"
+        select id, public.st_astext(geom) as geom,  objectid, 土地级别, qpbh, 新闻出版用地, 新闻_地价, 医疗卫生、社会福利用地, 医疗_地价, 教育、科研用地, 教育_地价, 机关团体用地, 机关_地价, 文化设施、体育用地, 文化_地价, 公园与绿地、公用设施用地, 公园_地价 from "c4_1_gfjb"
     </sql>
 
     <select id="selectC41GfjbList" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb" resultMap="C41GfjbResult">
         <include refid="selectC41GfjbVo"/>
         <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="geom != null  and geom != ''"> and geom = #{geom}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="土地级别 != null  and 土地级别 != ''"> and 土地级别 = #{土地级别}</if>
             <if test="qpbh != null  and qpbh != ''"> and qpbh = #{qpbh}</if>
@@ -55,28 +47,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="文化地价 != null "> and 文化_地价 = #{文化地价}</if>
             <if test="公园与绿地、公用设施用地 != null  and 公园与绿地、公用设施用地 != ''"> and 公园与绿地、公用设施用地 = #{公园与绿地、公用设施用地}</if>
             <if test="公园地价 != null "> and 公园_地价 = #{公园地价}</if>
-            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectC41GfjbBySmid" parameterType="Integer" resultMap="C41GfjbResult">
+    <select id="selectC41GfjbById" parameterType="Integer" resultMap="C41GfjbResult">
         <include refid="selectC41GfjbVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
 
     <select id="selectByPolygon" parameterType="String" resultMap="C41GfjbResult">
         <include refid="selectC41GfjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+        where public.st_intersects( public.st_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
-
-    <insert id="insertC41Gfjb" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb" useGeneratedKeys="true" keyProperty="smid">
-        insert into "c4_1_gfjb"
+        
+    <insert id="insertC41Gfjb" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb" useGeneratedKeys="true" keyProperty="id">
+        insert into c4_1_gfjb
         <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="geom != null">geom,</if>
             <if test="objectid != null">objectid,</if>
             <if test="土地级别 != null">土地级别,</if>
             <if test="qpbh != null">qpbh,</if>
@@ -92,14 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="文化地价 != null">文化_地价,</if>
             <if test="公园与绿地、公用设施用地 != null">公园与绿地、公用设施用地,</if>
             <if test="公园地价 != null">公园_地价,</if>
-            <if test="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="土地级别 != null">#{土地级别},</if>
             <if test="qpbh != null">#{qpbh},</if>
@@ -115,18 +97,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="文化地价 != null">#{文化地价},</if>
             <if test="公园与绿地、公用设施用地 != null">#{公园与绿地、公用设施用地},</if>
             <if test="公园地价 != null">#{公园地价},</if>
-            <if test="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateC41Gfjb" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb">
-        update "c4_1_gfjb"
+        update c4_1_gfjb
         <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="geom != null">geom = #{geom},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="土地级别 != null">土地级别 = #{土地级别},</if>
             <if test="qpbh != null">qpbh = #{qpbh},</if>
@@ -142,20 +119,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="文化地价 != null">文化_地价 = #{文化地价},</if>
             <if test="公园与绿地、公用设施用地 != null">公园与绿地、公用设施用地 = #{公园与绿地、公用设施用地},</if>
             <if test="公园地价 != null">公园_地价 = #{公园地价},</if>
-            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteC41GfjbBySmid" parameterType="Integer">
-        delete from "c4_1_gfjb" where smid = #{smid}
+    <delete id="deleteC41GfjbById" parameterType="Integer">
+        delete from c4_1_gfjb where id = #{id}
     </delete>
 
-    <delete id="deleteC41GfjbBySmids" parameterType="String">
-        delete from "c4_1_gfjb" where smid in
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteC41GfjbByIds" parameterType="String">
+        delete from c4_1_gfjb where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -3,13 +3,10 @@
 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="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="id0"    column="id_0"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid"    column="objectid"    />
         <result property="fidDltb2"    column="fid_dltb_2"    />
         <result property="bsm"    column="bsm"    />
@@ -46,21 +43,16 @@ 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="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectDltbVo">
-        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
+        select id_0,  public.st_asewkt(geom) as geom, 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 from dltb
     </sql>
 
     <select id="selectDltbList" parameterType="com.onemap.sanya.domain.spatial.Dltb" resultMap="DltbResult">
         <include refid="selectDltbVo"/>
         <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="geom != null  and geom != ''"> and geom = #{geom}</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>
@@ -96,26 +88,23 @@ 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="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
-
-    <select id="selectDltbBySmid" parameterType="Integer" resultMap="DltbResult">
+    
+    <select id="selectDltbById0" parameterType="Integer" resultMap="DltbResult">
         <include refid="selectDltbVo"/>
-        where smid = #{smid}
+        where id_0 = #{id0}
     </select>
+
     <select id="selectDltbByPolygon" parameterType="String" resultMap="DltbResult">
         <include refid="selectDltbVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),dltb.smgeometry)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),dltb.geom)
     </select>
-    <insert id="insertDltb" parameterType="com.onemap.sanya.domain.spatial.Dltb" useGeneratedKeys="true" keyProperty="smid">
+        
+    <insert id="insertDltb" parameterType="com.onemap.sanya.domain.spatial.Dltb" useGeneratedKeys="true" keyProperty="id0">
         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="geom != null">geom,</if>
             <if test="objectid != null">objectid,</if>
             <if test="fidDltb2 != null">fid_dltb_2,</if>
             <if test="bsm != null">bsm,</if>
@@ -152,14 +141,9 @@ 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="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="fidDltb2 != null">#{fidDltb2},</if>
             <if test="bsm != null">#{bsm},</if>
@@ -196,18 +180,13 @@ 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="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</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="geom != null">geom = #{geom},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="fidDltb2 != null">fid_dltb_2 = #{fidDltb2},</if>
             <if test="bsm != null">bsm = #{bsm},</if>
@@ -244,22 +223,18 @@ 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="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id_0 = #{id0}
     </update>
 
-    <delete id="deleteDltbBySmid" parameterType="Integer">
-        delete from dltb where smid = #{smid}
+    <delete id="deleteDltbById0" parameterType="Integer">
+        delete from dltb where id_0 = #{id0}
     </delete>
 
-    <delete id="deleteDltbBySmids" parameterType="String">
-        delete from dltb where smid in
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteDltbById0s" parameterType="String">
+        delete from dltb where id_0 in 
+        <foreach item="id0" collection="array" open="(" separator="," close=")">
+            #{id0}
         </foreach>
     </delete>
-
-
-</mapper>
+</mapper>

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

@@ -5,11 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.sanya.mapper.spatial.GhdkMapper">
     
     <resultMap type="com.onemap.sanya.domain.spatial.Ghdk" id="GhdkResult">
-        <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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid"    column="objectid"    />
         <result property="sjxzqmc"    column="sjxzqmc"    />
         <result property="xjxzqmc"    column="xjxzqmc"    />
@@ -55,21 +52,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ydflbz"    column="ydflbz"    />
         <result property="jzxs"    column="jzxs"    />
         <result property="jzxssm"    column="jzxssm"    />
-        <result property="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectGhdkVo">
-        select smid, smuserid, smarea, smperimeter, st_astext(smgeometry) as smgeometry, objectid, sjxzqmc, xjxzqmc, xzmc, ghcgmc, bzsj, bzdw, pzwh, pfsj, sjwt, kzxxgyddm, kzxxgydmc, hhydzbsm, dkbm, dkfbm, ydmj, jzmj, rjld, rjlx, rjlsm, jzmdd, jzmdx, jzmdsm, ldld, ldlx, ldlsm, jzxgd, jzxgx, jzxgsm, pjjdcw, pjjdcwsm, pjfjdcw, kzxzbsm, dkbz, jrx, ghsjyq, cssjyd, pjss, jzmjsm, pjfjdcwsm, xzqdm, bz, ydflbz, jzxs, jzxssm, shape_length, shape_area from "ghdk"
+        select id, public.st_astext(geom) as geom,  objectid, sjxzqmc, xjxzqmc, xzmc, ghcgmc, bzsj, bzdw, pzwh, pfsj, sjwt, kzxxgyddm, kzxxgydmc, hhydzbsm, dkbm, dkfbm, ydmj, jzmj, rjld, rjlx, rjlsm, jzmdd, jzmdx, jzmdsm, ldld, ldlx, ldlsm, jzxgd, jzxgx, jzxgsm, pjjdcw, pjjdcwsm, pjfjdcw, kzxzbsm, dkbz, jrx, ghsjyq, cssjyd, pjss, jzmjsm, pjfjdcwsm, xzqdm, bz, ydflbz, jzxs, jzxssm from "ghdk"
     </sql>
 
     <select id="selectGhdkList" parameterType="com.onemap.sanya.domain.spatial.Ghdk" resultMap="GhdkResult">
         <include refid="selectGhdkVo"/>
         <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="geom != null  and geom != ''"> and geom = #{geom}</if>
             <if test="objectid != null "> and objectid = #{objectid}</if>
             <if test="sjxzqmc != null  and sjxzqmc != ''"> and sjxzqmc = #{sjxzqmc}</if>
             <if test="xjxzqmc != null  and xjxzqmc != ''"> and xjxzqmc = #{xjxzqmc}</if>
@@ -115,28 +107,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ydflbz != null  and ydflbz != ''"> and ydflbz = #{ydflbz}</if>
             <if test="jzxs != null "> and jzxs = #{jzxs}</if>
             <if test="jzxssm != null  and jzxssm != ''"> and jzxssm = #{jzxssm}</if>
-            <if test="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectGhdkBySmid" parameterType="Integer" resultMap="GhdkResult">
+    <select id="selectGhdkById" parameterType="Integer" resultMap="GhdkResult">
         <include refid="selectGhdkVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
 
     <select id="selectByPolygon" parameterType="String" resultMap="GhdkResult">
         <include refid="selectGhdkVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),smgeometry)
+        where public.st_intersects( public.ST_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
         
-    <insert id="insertGhdk" parameterType="com.onemap.sanya.domain.spatial.Ghdk" useGeneratedKeys="true" keyProperty="smid">
-        insert into "ghdk"
+    <insert id="insertGhdk" parameterType="com.onemap.sanya.domain.spatial.Ghdk" useGeneratedKeys="true" keyProperty="id">
+        insert into ghdk
         <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="geom != null">geom,</if>
             <if test="objectid != null">objectid,</if>
             <if test="sjxzqmc != null">sjxzqmc,</if>
             <if test="xjxzqmc != null">xjxzqmc,</if>
@@ -182,14 +169,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ydflbz != null">ydflbz,</if>
             <if test="jzxs != null">jzxs,</if>
             <if test="jzxssm != null">jzxssm,</if>
-            <if test="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="sjxzqmc != null">#{sjxzqmc},</if>
             <if test="xjxzqmc != null">#{xjxzqmc},</if>
@@ -235,18 +217,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ydflbz != null">#{ydflbz},</if>
             <if test="jzxs != null">#{jzxs},</if>
             <if test="jzxssm != null">#{jzxssm},</if>
-            <if test="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateGhdk" parameterType="com.onemap.sanya.domain.spatial.Ghdk">
-        update "ghdk"
+        update ghdk
         <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="geom != null">geom = #{geom},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="sjxzqmc != null">sjxzqmc = #{sjxzqmc},</if>
             <if test="xjxzqmc != null">xjxzqmc = #{xjxzqmc},</if>
@@ -292,20 +269,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ydflbz != null">ydflbz = #{ydflbz},</if>
             <if test="jzxs != null">jzxs = #{jzxs},</if>
             <if test="jzxssm != null">jzxssm = #{jzxssm},</if>
-            <if test="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteGhdkBySmid" parameterType="Integer">
-        delete from "ghdk" where smid = #{smid}
+    <delete id="deleteGhdkById" parameterType="Integer">
+        delete from ghdk where id = #{id}
     </delete>
 
-    <delete id="deleteGhdkBySmids" parameterType="String">
-        delete from "ghdk" where smid in
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteGhdkByIds" parameterType="String">
+        delete from ghdk where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,11 +5,8 @@ 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="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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid1"    column="objectid_1"    />
         <result property="objectid"    column="objectid"    />
         <result property="districtid"    column="districtid"    />
@@ -73,21 +70,16 @@ 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="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectGysyqVo">
-        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
+        select id, public.st_asewkt(geom) as geom,  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 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="geom != null  and geom != ''"> and geom = #{geom}</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>
@@ -151,26 +143,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectGysyqBySmid" parameterType="Integer" resultMap="GysyqResult">
+    <select id="selectGysyqById" parameterType="Integer" resultMap="GysyqResult">
         <include refid="selectGysyqVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
+
     <select id="selectGysyqByPolygon" parameterType="String" resultMap="GysyqResult">
         <include refid="selectGysyqVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),gysyq.smgeometry)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),gysyq.geom)
     </select>
-    <insert id="insertGysyq" parameterType="com.onemap.sanya.domain.spatial.Gysyq" useGeneratedKeys="true" keyProperty="smid">
+        
+    <insert id="insertGysyq" parameterType="com.onemap.sanya.domain.spatial.Gysyq" useGeneratedKeys="true" keyProperty="id">
         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="geom != null">geom,</if>
             <if test="objectid1 != null">objectid_1,</if>
             <if test="objectid != null">objectid,</if>
             <if test="districtid != null">districtid,</if>
@@ -234,14 +223,9 @@ 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="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid1 != null">#{objectid1},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="districtid != null">#{districtid},</if>
@@ -305,18 +289,13 @@ 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="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateGysyq" parameterType="com.onemap.sanya.domain.spatial.Gysyq">
         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="geom != null">geom = #{geom},</if>
             <if test="objectid1 != null">objectid_1 = #{objectid1},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="districtid != null">districtid = #{districtid},</if>
@@ -380,20 +359,18 @@ 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="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteGysyqBySmid" parameterType="Integer">
-        delete from gysyq where smid = #{smid}
+    <delete id="deleteGysyqById" parameterType="Integer">
+        delete from gysyq where id = #{id}
     </delete>
 
-    <delete id="deleteGysyqBySmids" parameterType="String">
-        delete from gysyq where smid in 
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteGysyqByIds" parameterType="String">
+        delete from gysyq where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,11 +5,8 @@ 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="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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid1"    column="objectid_1"    />
         <result property="objectid"    column="objectid"    />
         <result property="bsm"    column="bsm"    />
@@ -71,21 +68,16 @@ 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="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectJtownerVo">
-        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
+        select id,  public.st_asewkt(geom) as geom, 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 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>
+        <where>
+            <if test="geom != null  and geom != ''"> and geom = #{geom}</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>
@@ -147,26 +139,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectJtownerBySmid" parameterType="Integer" resultMap="JtownerResult">
+    <select id="selectJtownerById" parameterType="Integer" resultMap="JtownerResult">
         <include refid="selectJtownerVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
+
     <select id="selectJtownerByPolygon" parameterType="String" resultMap="JtownerResult">
         <include refid="selectJtownerVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),jtowner.smgeometry)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),jtowner.geom)
     </select>
-    <insert id="insertJtowner" parameterType="com.onemap.sanya.domain.spatial.Jtowner" useGeneratedKeys="true" keyProperty="smid">
+        
+    <insert id="insertJtowner" parameterType="com.onemap.sanya.domain.spatial.Jtowner" useGeneratedKeys="true" keyProperty="id">
         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="geom != null">geom,</if>
             <if test="objectid1 != null">objectid_1,</if>
             <if test="objectid != null">objectid,</if>
             <if test="bsm != null">bsm,</if>
@@ -228,14 +217,9 @@ 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="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid1 != null">#{objectid1},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="bsm != null">#{bsm},</if>
@@ -297,18 +281,13 @@ 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="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateJtowner" parameterType="com.onemap.sanya.domain.spatial.Jtowner">
         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="geom != null">geom = #{geom},</if>
             <if test="objectid1 != null">objectid_1 = #{objectid1},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="bsm != null">bsm = #{bsm},</if>
@@ -370,20 +349,18 @@ 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="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteJtownerBySmid" parameterType="Integer">
-        delete from jtowner where smid = #{smid}
+    <delete id="deleteJtownerById" parameterType="Integer">
+        delete from jtowner where id = #{id}
     </delete>
 
-    <delete id="deleteJtownerBySmids" parameterType="String">
-        delete from jtowner where smid in 
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteJtownerByIds" parameterType="String">
+        delete from jtowner where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,11 +5,8 @@ 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="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="id"    column="id"    />
+        <result property="geom"    column="geom"    />
         <result property="objectid1"    column="objectid_1"    />
         <result property="objectid"    column="objectid"    />
         <result property="syqr"    column="syqr"    />
@@ -40,21 +37,16 @@ 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="shapeLength"    column="shape_length"    />
-        <result property="shapeArea"    column="shape_area"    />
     </resultMap>
 
     <sql id="selectJtuseVo">
-        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
+        select id, public.st_asewkt(geom) as geom,  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 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="geom != null  and geom != ''"> and geom = #{geom}</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>
@@ -85,26 +77,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="shapeLength != null "> and shape_length = #{shapeLength}</if>
-            <if test="shapeArea != null "> and shape_area = #{shapeArea}</if>
         </where>
     </select>
     
-    <select id="selectJtuseBySmid" parameterType="Integer" resultMap="JtuseResult">
+    <select id="selectJtuseById" parameterType="Integer" resultMap="JtuseResult">
         <include refid="selectJtuseVo"/>
-        where smid = #{smid}
+        where id = #{id}
     </select>
+
     <select id="selectJtuseByPolygon" parameterType="String" resultMap="JtuseResult">
         <include refid="selectJtuseVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),jtuse.smgeometry)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),jtuse.geom)
     </select>
-    <insert id="insertJtuse" parameterType="com.onemap.sanya.domain.spatial.Jtuse" useGeneratedKeys="true" keyProperty="smid">
+        
+    <insert id="insertJtuse" parameterType="com.onemap.sanya.domain.spatial.Jtuse" useGeneratedKeys="true" keyProperty="id">
         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="geom != null">geom,</if>
             <if test="objectid1 != null">objectid_1,</if>
             <if test="objectid != null">objectid,</if>
             <if test="syqr != null">syqr,</if>
@@ -135,14 +124,9 @@ 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="shapeLength != null">shape_length,</if>
-            <if test="shapeArea != null">shape_area,</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="geom != null">#{geom},</if>
             <if test="objectid1 != null">#{objectid1},</if>
             <if test="objectid != null">#{objectid},</if>
             <if test="syqr != null">#{syqr},</if>
@@ -173,18 +157,13 @@ 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="shapeLength != null">#{shapeLength},</if>
-            <if test="shapeArea != null">#{shapeArea},</if>
          </trim>
     </insert>
 
     <update id="updateJtuse" parameterType="com.onemap.sanya.domain.spatial.Jtuse">
         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="geom != null">geom = #{geom},</if>
             <if test="objectid1 != null">objectid_1 = #{objectid1},</if>
             <if test="objectid != null">objectid = #{objectid},</if>
             <if test="syqr != null">syqr = #{syqr},</if>
@@ -215,20 +194,18 @@ 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="shapeLength != null">shape_length = #{shapeLength},</if>
-            <if test="shapeArea != null">shape_area = #{shapeArea},</if>
         </trim>
-        where smid = #{smid}
+        where id = #{id}
     </update>
 
-    <delete id="deleteJtuseBySmid" parameterType="Integer">
-        delete from jtuse where smid = #{smid}
+    <delete id="deleteJtuseById" parameterType="Integer">
+        delete from jtuse where id = #{id}
     </delete>
 
-    <delete id="deleteJtuseBySmids" parameterType="String">
-        delete from jtuse where smid in 
-        <foreach item="smid" collection="array" open="(" separator="," close=")">
-            #{smid}
+    <delete id="deleteJtuseByIds" parameterType="String">
+        delete from jtuse where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>