liutao 2 тижнів тому
батько
коміт
8be04b014f

+ 1 - 2
YHYZT/server/src/main/java/com/zjugis/yzt/beans/entity/Pewg.java

@@ -3,7 +3,6 @@ package com.zjugis.yzt.beans.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.vividsolutions.jts.geom.Geometry;
 import java.util.Date;
 import java.math.BigDecimal;
 
@@ -36,6 +35,6 @@ public class Pewg {
     private String tsbh;
     private String pch;
     private String pcbh;
-    private Geometry shape;
+    private String shape;
 
 } 

+ 12 - 1
YHYZT/server/src/main/java/com/zjugis/yzt/controller/StNzydkController.java

@@ -34,6 +34,17 @@ public class StNzydkController {
 
     /**
      * 获取农转用批次列表(分页)
+     * @param pch 批次名称(可选)
+     * @param lx 类型(可选)
+     * @param pwh 批文号(可选)
+     * @param pzrqStart 批准日期开始(可选)
+     * @param pzrqEnd 批准日期结束(可选)
+     * @param pzmj 批准面积(可选)
+     * @param nmjf 拟亩均费(可选)
+     * @param pcbh 批次编号(可选)
+     * @param current 当前页码,默认为1
+     * @param size 每页显示条数,默认为10
+     * @return 分页查询结果
      */
     @GetMapping("/page")
     public Page<StNzydk> getStNzydkByPage(
@@ -206,4 +217,4 @@ public class StNzydkController {
 
     
     
-} 
+}

+ 1 - 1
YHYZT/server/src/main/java/com/zjugis/yzt/mapper/PewgMapper.java → YHYZT/server/src/main/java/com/zjugis/yzt/dao/PewgMapper.java

@@ -1,4 +1,4 @@
-package com.zjugis.yzt.mapper;
+package com.zjugis.yzt.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zjugis.yzt.beans.entity.Pewg;

+ 11 - 1
YHYZT/server/src/main/java/com/zjugis/yzt/dao/SsnydNewMapper.java

@@ -3,6 +3,7 @@ package com.zjugis.yzt.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zjugis.yzt.beans.entity.SsnydNew;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @program: yh_yzt
@@ -12,4 +13,13 @@ import org.apache.ibatis.annotations.Mapper;
  **/
 @Mapper
 public interface SsnydNewMapper extends BaseMapper<SsnydNew> {
-} 
+    /**
+     * @param id
+     * @param shape
+     * @param wkid
+     * @return
+     */
+    @Update("UPDATE st_nzydk SET shape = st_geometry(#{shape}, #{wkid}) WHERE objectid = #{id}")
+    int updateShapeById(Integer id, String shape, int wkid);
+    
+}

+ 6 - 6
YHYZT/server/src/main/java/com/zjugis/yzt/dao/StGddkMapper.java

@@ -15,11 +15,11 @@ import org.apache.ibatis.annotations.Update;
 public interface StGddkMapper extends BaseMapper<StGddk> {
     
     /**
-     * 根据主键更新shape字段
-     * @param id 主键ID
-     * @param shape 空间数据
-     * @return 更新成功的记录数
+     * @param id
+     * @param shape
+     * @param wkid
+     * @return
      */
-    @Update("UPDATE st_gddk SET shape = #{shape} WHERE objectid = #{id}")
-    int updateShapeById(String id, String shape);
+    @Update("UPDATE st_nzydk SET shape = st_geometry(#{shape}, #{wkid}) WHERE objectid = #{id}")
+    int updateShapeById(Integer id, String shape, int wkid);
 } 

+ 12 - 2
YHYZT/server/src/main/java/com/zjugis/yzt/dao/TempLandMapper.java

@@ -5,10 +5,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.yzt.beans.entity.TempLand;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
 import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface TempLandMapper extends BaseMapper<TempLand> {
-    List<Map> getList(@Param("map") Map params, Page pageCon);
-} 
+    
+/**
+     * @param id
+     * @param shape
+     * @param wkid
+     * @return
+     */
+    @Update("UPDATE st_nzydk SET shape = st_geometry(#{shape}, #{wkid}) WHERE objectid = #{id}")
+    int updateShapeById(Integer id, String shape, int wkid);
+}

+ 1 - 1
YHYZT/server/src/main/java/com/zjugis/yzt/service/impl/PewgServiceImpl.java

@@ -2,7 +2,7 @@ package com.zjugis.yzt.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zjugis.yzt.beans.entity.Pewg;
-import com.zjugis.yzt.mapper.PewgMapper;
+import com.zjugis.yzt.dao.PewgMapper;
 import com.zjugis.yzt.service.PewgService;
 import org.springframework.stereotype.Service;