ssnyd上传

YHYZT/server/src/main/java/com/zjugis/yzt/beans/vo/PewgVO.java

@@ -1,9 +1,9 @@
 package com.zjugis.yzt.beans.vo;
 
-import com.vividsolutions.jts.geom.Geometry;
 import lombok.Data;
 import java.util.Date;
 import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 @Data
 public class PewgVO {
@@ -12,6 +12,7 @@ public class PewgVO {
     private String bz;
     private String dkZl;
     private String pfWh;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date pzSj;
     private BigDecimal dkMj;
     private String bpxmMc;
@@ -32,5 +33,5 @@ public class PewgVO {
     private String tsbh;
     private String pch;
     private String pcbh;
-    private Geometry shape;
+    private String shape;
 } 

YHYZT/server/src/main/java/com/zjugis/yzt/beans/vo/SsnydVO.java

@@ -0,0 +1,20 @@
+package com.zjugis.yzt.beans.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class SsnydVO {
+    private Integer objectid;
+    private String bah;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date basj;
+    private String yt;
+    private String xmbh;
+    private String xmmc;
+    private String szs;
+    private String xzq;
+    private Double bamj;
+    private String shape;
+} 

YHYZT/server/src/main/java/com/zjugis/yzt/beans/vo/TempLandVO.java

@@ -1,6 +1,8 @@
 package com.zjugis.yzt.beans.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
 import java.util.Date;
 
 @Data
@@ -11,12 +13,15 @@ public class TempLandVO {
     private String zlwz;        // 坐落位置
     private String pzdw;        // 批准单位
     private String pzwh;        // 批准文号
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date pzsj;         // 批准时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date dqsj;         // 到期时间
     private Double pzmj;       // 批准面积
     private String bz;         // 备注
     private String xmbh;       // 项目编号
     private String rknf;       // 入库年份
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date rksj;         // 入库时间
     private String rkry;       // 入库人员
     private String shape;      // 空间数据，WKT格式

YHYZT/server/src/main/java/com/zjugis/yzt/controller/PewgController.java

@@ -11,9 +11,7 @@ import com.zjugis.yzt.beans.entity.Pewg;
 import org.springframework.beans.BeanUtils;
 
 import java.util.List;
-import java.util.Date;
 
-import org.springframework.format.annotation.DateTimeFormat;
 
 @RestController
 @RequestMapping("/api/pewg")

YHYZT/server/src/main/java/com/zjugis/yzt/controller/SsnydController.java

@@ -16,6 +16,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
+import com.zjugis.yzt.beans.vo.SsnydVO;
 
 @RestController
 @RequestMapping("/api/ssnyd")
@@ -39,7 +40,7 @@ public class SsnydController extends BaseRestController {
      * @return 分页结果
      */
     @GetMapping("/page")
-    public IPage<SsnydNew> getSsnydList(
+    public IPage<SsnydVO> getSsnydList(
             @RequestParam(defaultValue = "1") Integer current,
             @RequestParam(defaultValue = "10") Integer size,
             @RequestParam(required = false) String xmbh,
@@ -76,15 +77,17 @@ public class SsnydController extends BaseRestController {
         }
 
         Page<SsnydNew> page = new Page<>(current, size);
-        return ssnydService.page(page, queryWrapper);
+        IPage<SsnydNew> ssnydPage = ssnydService.page(page, queryWrapper);
+        return ssnydPage.convert(this::convertToVO);
     }
 
     /**
      * 根据ID获取设施农用地信息
      */
     @GetMapping("/{id}")
-    public SsnydNew getSsnydById(@PathVariable Integer id) {
-        return ssnydService.getById(id);
+    public SsnydVO getSsnydById(@PathVariable Integer id) {
+        SsnydNew ssnyd = ssnydService.getById(id);
+        return convertToVO(ssnyd);
     }
 
     /**
@@ -136,4 +139,23 @@ public class SsnydController extends BaseRestController {
             return error("部分数据导入失败", ErrorCode.DEFAULT, errorList);
         }
     }
+
+    /**
+     * 实体转VO
+     */
+    private SsnydVO convertToVO(SsnydNew ssnyd) {
+        if (ssnyd == null) return null;
+        SsnydVO vo = new SsnydVO();
+        vo.setObjectid(ssnyd.getObjectid());
+        vo.setBah(ssnyd.getBah());
+        vo.setBasj(ssnyd.getBasj());
+        vo.setYt(ssnyd.getYt());
+        vo.setXmbh(ssnyd.getXmbh());
+        vo.setXmmc(ssnyd.getXmmc());
+        vo.setSzs(ssnyd.getSzs());
+        vo.setXzq(ssnyd.getXzq());
+        vo.setBamj(ssnyd.getBamj());
+        vo.setShape(ssnyd.getShape());
+        return vo;
+    }
 } 

YHYZT/server/src/main/java/com/zjugis/yzt/controller/StGddkController.java

@@ -25,7 +25,7 @@ public class StGddkController extends BaseRestController {
      *
      * @param current  当前页码
      * @param size     每页大小
-     * @param gdsy     做地主体
+     * @param dkbh     供地索引
      * @param dkMc     地块名称
      * @param xxz      用地性质
      * @param gpcrdk   挂牌出让地块
@@ -40,7 +40,7 @@ public class StGddkController extends BaseRestController {
     public IPage<StGddk> getStGddkList(
             @RequestParam(defaultValue = "1") Integer current,
             @RequestParam(defaultValue = "10") Integer size,
-            @RequestParam(required = false) String gdsy,
+            @RequestParam(required = false) String dkbh,
             @RequestParam(required = false) String dkMc,
             @RequestParam(required = false) String xxz,
             @RequestParam(required = false) String gpcrdk,
@@ -52,17 +52,17 @@ public class StGddkController extends BaseRestController {
 
         QueryWrapper<StGddk> queryWrapper = new QueryWrapper<>();
 
-        if (gdsy != null && !gdsy.isEmpty()) {
-            queryWrapper.like("gdsy", gdsy);
+        if (dkbh != null && !dkbh.isEmpty()) {
+            queryWrapper.like("dk_bh", dkbh);
         }
         if (dkMc != null && !dkMc.isEmpty()) {
-            queryWrapper.like("dk_mc", dkMc);
+            queryWrapper.like("dkMc", dkMc);
         }
         if (xxz != null && !xxz.isEmpty()) {
             queryWrapper.like("xxz", xxz);
         }
         if (gpcrdk != null && !gpcrdk.isEmpty()) {
-            queryWrapper.like("dk_bh", gpcrdk);
+            queryWrapper.like("gpcrdk", gpcrdk);
         }
         if (dwMc != null && !dwMc.isEmpty()) {
             queryWrapper.like("dw_mc", dwMc);