新增整治预检接口

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/qytdzz/TTdzzyjController.java

@@ -0,0 +1,100 @@
+package com.onemap.apply.controller.qytdzz;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.onemap.common.core.utils.poi.ExcelUtil;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.AjaxResult;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.core.web.page.TableDataInfo;
+import com.onemap.common.log.annotation.Log;
+import com.onemap.common.log.enums.BusinessType;
+import com.onemap.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.onemap.apply.domain.qytdzz.TTdzzyj;
+import com.onemap.apply.service.qytdzz.ITTdzzyjService;
+
+/**
+ * 土地整治预检表Controller
+ *
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+@RestController
+@RequestMapping("/qytdzz/tdzzyj")
+public class TTdzzyjController extends BaseController {
+    @Autowired
+    private ITTdzzyjService tTdzzyjService;
+
+    /**
+     * 查询土地整治预检表列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TTdzzyj tTdzzyj) {
+        startPage();
+        List<TTdzzyj> list = tTdzzyjService.selectTTdzzyjList(tTdzzyj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出土地整治预检表列表
+     */
+    @Log(title = "土地整治预检表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TTdzzyj tTdzzyj) {
+        List<TTdzzyj> list = tTdzzyjService.selectTTdzzyjList(tTdzzyj);
+        ExcelUtil<TTdzzyj> util = new ExcelUtil<TTdzzyj>(TTdzzyj.class);
+        util.exportExcel(response, list, "土地整治预检表数据");
+    }
+
+    /**
+     * 获取土地整治预检表详细信息
+     */
+    @GetMapping(value = "/{bsm}")
+    public AjaxResult getInfo(@PathVariable("bsm") String bsm) {
+        return success(tTdzzyjService.selectTTdzzyjByBsm(bsm));
+    }
+
+    /**
+     * 新增土地整治预检表
+     */
+    @Log(title = "土地整治预检表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public RequestResult add(@RequestBody TTdzzyj tTdzzyj) {
+        tTdzzyj.setCjUserId(SecurityUtils.getUserId());
+        return tTdzzyjService.insertTTdzzyj(tTdzzyj);
+    }
+
+    /**
+     * 修改土地整治预检表
+     */
+    @Log(title = "土地整治预检表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTdzzyj tTdzzyj) {
+        return toAjax(tTdzzyjService.updateTTdzzyj(tTdzzyj));
+    }
+
+    /**
+     * 删除土地整治预检表
+     */
+//    @Log(title = "土地整治预检表", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{bsms}")
+//    public AjaxResult remove(@PathVariable String[] bsms)
+//    {
+//        return toAjax(tTdzzyjService.deleteTTdzzyjByBsms(bsms));
+//    }
+    @Log(title = "土地整治预检表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{bsms}")
+    public AjaxResult remove(@PathVariable String bsms) {
+        return toAjax(tTdzzyjService.deleteTTdzzyjByBsm(bsms, SecurityUtils.getUserId()));
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/qytdzz/TTdzzyjJgController.java

@@ -0,0 +1,98 @@
+package com.onemap.apply.controller.qytdzz;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.onemap.common.core.utils.poi.ExcelUtil;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.AjaxResult;
+import com.onemap.common.core.web.page.TableDataInfo;
+import com.onemap.common.log.annotation.Log;
+import com.onemap.common.log.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.onemap.apply.domain.qytdzz.TTdzzyjJg;
+import com.onemap.apply.service.qytdzz.ITTdzzyjJgService;
+
+/**
+ * 土地整治预检结果表Controller
+ * 
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+@RestController
+@RequestMapping("/system/jg")
+public class TTdzzyjJgController extends BaseController
+{
+    @Autowired
+    private ITTdzzyjJgService tTdzzyjJgService;
+
+    /**
+     * 查询土地整治预检结果表列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TTdzzyjJg tTdzzyjJg)
+    {
+        startPage();
+        List<TTdzzyjJg> list = tTdzzyjJgService.selectTTdzzyjJgList(tTdzzyjJg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出土地整治预检结果表列表
+     */
+    @Log(title = "土地整治预检结果表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TTdzzyjJg tTdzzyjJg)
+    {
+        List<TTdzzyjJg> list = tTdzzyjJgService.selectTTdzzyjJgList(tTdzzyjJg);
+        ExcelUtil<TTdzzyjJg> util = new ExcelUtil<TTdzzyjJg>(TTdzzyjJg.class);
+        util.exportExcel(response, list, "土地整治预检结果表数据");
+    }
+
+    /**
+     * 获取土地整治预检结果表详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tTdzzyjJgService.selectTTdzzyjJgById(id));
+    }
+
+    /**
+     * 新增土地整治预检结果表
+     */
+    @Log(title = "土地整治预检结果表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTdzzyjJg tTdzzyjJg)
+    {
+        return toAjax(tTdzzyjJgService.insertTTdzzyjJg(tTdzzyjJg));
+    }
+
+    /**
+     * 修改土地整治预检结果表
+     */
+    @Log(title = "土地整治预检结果表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTdzzyjJg tTdzzyjJg)
+    {
+        return toAjax(tTdzzyjJgService.updateTTdzzyjJg(tTdzzyjJg));
+    }
+
+    /**
+     * 删除土地整治预检结果表
+     */
+    @Log(title = "土地整治预检结果表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tTdzzyjJgService.deleteTTdzzyjJgByIds(ids));
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/qytdzz/TTdzzyj.java

@@ -0,0 +1,285 @@
+package com.onemap.apply.domain.qytdzz;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.onemap.common.core.annotation.Excel;
+import com.onemap.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 土地整治预检表对象 t_tdzzyj
+ * 
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public class TTdzzyj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String bsm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzfw;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Double xzmj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date rwkssj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date rwjssj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date rwcjsj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date rwscsj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Integer status;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Integer rwzt;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long cjUserId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long scUserId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xmmc;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzfwTbaleName;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzfwTbaleId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long sumNumber;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String fxbg;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    private String geom;
+
+    public void setBsm(String bsm) 
+    {
+        this.bsm = bsm;
+    }
+
+    public String getBsm() 
+    {
+        return bsm;
+    }
+    public void setXzfw(String xzfw) 
+    {
+        this.xzfw = xzfw;
+    }
+
+    public String getXzfw() 
+    {
+        return xzfw;
+    }
+    public void setXzmj(Double xzmj)
+    {
+        this.xzmj = xzmj;
+    }
+
+    public Double getXzmj()
+    {
+        return xzmj;
+    }
+    public void setRwkssj(Date rwkssj) 
+    {
+        this.rwkssj = rwkssj;
+    }
+
+    public Date getRwkssj() 
+    {
+        return rwkssj;
+    }
+    public void setRwjssj(Date rwjssj) 
+    {
+        this.rwjssj = rwjssj;
+    }
+
+    public Date getRwjssj() 
+    {
+        return rwjssj;
+    }
+    public void setRwcjsj(Date rwcjsj) 
+    {
+        this.rwcjsj = rwcjsj;
+    }
+
+    public Date getRwcjsj() 
+    {
+        return rwcjsj;
+    }
+    public void setRwscsj(Date rwscsj) 
+    {
+        this.rwscsj = rwscsj;
+    }
+
+    public Date getRwscsj() 
+    {
+        return rwscsj;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+    public void setRwzt(Integer rwzt)
+    {
+        this.rwzt = rwzt;
+    }
+
+    public Integer getRwzt()
+    {
+        return rwzt;
+    }
+    public void setCjUserId(Long cjUserId) 
+    {
+        this.cjUserId = cjUserId;
+    }
+
+    public Long getCjUserId() 
+    {
+        return cjUserId;
+    }
+    public void setScUserId(Long scUserId) 
+    {
+        this.scUserId = scUserId;
+    }
+
+    public Long getScUserId() 
+    {
+        return scUserId;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setXzfwTbaleName(String xzfwTbaleName) 
+    {
+        this.xzfwTbaleName = xzfwTbaleName;
+    }
+
+    public String getXzfwTbaleName() 
+    {
+        return xzfwTbaleName;
+    }
+    public void setXzfwTbaleId(String xzfwTbaleId) 
+    {
+        this.xzfwTbaleId = xzfwTbaleId;
+    }
+
+    public String getXzfwTbaleId() 
+    {
+        return xzfwTbaleId;
+    }
+    public void setSumNumber(Long sumNumber) 
+    {
+        this.sumNumber = sumNumber;
+    }
+
+    public Long getSumNumber() 
+    {
+        return sumNumber;
+    }
+    public void setFxbg(String fxbg) 
+    {
+        this.fxbg = fxbg;
+    }
+
+    public String getFxbg() 
+    {
+        return fxbg;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getGeom() {
+        return geom;
+    }
+
+    public void setGeom(String geom) {
+        this.geom = geom;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("bsm", getBsm())
+            .append("xzfw", getXzfw())
+            .append("xzmj", getXzmj())
+            .append("rwkssj", getRwkssj())
+            .append("rwjssj", getRwjssj())
+            .append("rwcjsj", getRwcjsj())
+            .append("rwscsj", getRwscsj())
+            .append("status", getStatus())
+            .append("rwzt", getRwzt())
+            .append("cjUserId", getCjUserId())
+            .append("scUserId", getScUserId())
+            .append("xmmc", getXmmc())
+            .append("xzfwTbaleName", getXzfwTbaleName())
+            .append("xzfwTbaleId", getXzfwTbaleId())
+            .append("sumNumber", getSumNumber())
+            .append("fxbg", getFxbg())
+            .toString();
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/qytdzz/TTdzzyjJg.java

@@ -0,0 +1,131 @@
+package com.onemap.apply.domain.qytdzz;
+
+import com.onemap.common.core.annotation.Excel;
+import com.onemap.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 土地整治预检结果表对象 t_tdzzyj_jg
+ * 
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public class TTdzzyjJg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String rwbsm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String mxBsm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String yzBsm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String groupvalue;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String sumvalue;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String geomvalue;
+
+    private Integer countvalue;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setRwbsm(String rwbsm) 
+    {
+        this.rwbsm = rwbsm;
+    }
+
+    public String getRwbsm() 
+    {
+        return rwbsm;
+    }
+    public void setMxBsm(String mxBsm) 
+    {
+        this.mxBsm = mxBsm;
+    }
+
+    public String getMxBsm() 
+    {
+        return mxBsm;
+    }
+    public void setYzBsm(String yzBsm) 
+    {
+        this.yzBsm = yzBsm;
+    }
+
+    public String getYzBsm() 
+    {
+        return yzBsm;
+    }
+    public void setGroupvalue(String groupvalue) 
+    {
+        this.groupvalue = groupvalue;
+    }
+
+    public String getGroupvalue() 
+    {
+        return groupvalue;
+    }
+    public void setSumvalue(String sumvalue) 
+    {
+        this.sumvalue = sumvalue;
+    }
+
+    public String getSumvalue() 
+    {
+        return sumvalue;
+    }
+    public void setGeomvalue(String geomvalue) 
+    {
+        this.geomvalue = geomvalue;
+    }
+
+    public String getGeomvalue() 
+    {
+        return geomvalue;
+    }
+
+    public Integer getCountvalue() {
+        return countvalue;
+    }
+
+    public void setCountvalue(Integer countvalue) {
+        this.countvalue = countvalue;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("rwbsm", getRwbsm())
+            .append("mxBsm", getMxBsm())
+            .append("yzBsm", getYzBsm())
+            .append("groupvalue", getGroupvalue())
+            .append("sumvalue", getSumvalue())
+            .append("geomvalue", getGeomvalue())
+            .toString();
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/qytdzz/TTdzzyjJgMapper.java

@@ -0,0 +1,63 @@
+package com.onemap.apply.mapper.qytdzz;
+
+import java.util.List;
+import com.onemap.apply.domain.qytdzz.TTdzzyjJg;
+
+/**
+ * 土地整治预检结果表Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public interface TTdzzyjJgMapper 
+{
+    /**
+     * 查询土地整治预检结果表
+     * 
+     * @param id 土地整治预检结果表主键
+     * @return 土地整治预检结果表
+     */
+    public TTdzzyjJg selectTTdzzyjJgById(String id);
+
+    /**
+     * 查询土地整治预检结果表列表
+     * 
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 土地整治预检结果表集合
+     */
+    public List<TTdzzyjJg> selectTTdzzyjJgList(TTdzzyjJg tTdzzyjJg);
+
+    public List<TTdzzyjJg> selectTTdzzyjJgSumByRwBsm(TTdzzyjJg tTdzzyjJg);
+
+    /**
+     * 新增土地整治预检结果表
+     * 
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 结果
+     */
+    public int insertTTdzzyjJg(TTdzzyjJg tTdzzyjJg);
+
+    /**
+     * 修改土地整治预检结果表
+     * 
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 结果
+     */
+    public int updateTTdzzyjJg(TTdzzyjJg tTdzzyjJg);
+
+    /**
+     * 删除土地整治预检结果表
+     * 
+     * @param id 土地整治预检结果表主键
+     * @return 结果
+     */
+    public int deleteTTdzzyjJgById(String id);
+
+    /**
+     * 批量删除土地整治预检结果表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTTdzzyjJgByIds(String[] ids);
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/qytdzz/TTdzzyjMapper.java

@@ -0,0 +1,62 @@
+package com.onemap.apply.mapper.qytdzz;
+
+import java.util.Date;
+import java.util.List;
+import com.onemap.apply.domain.qytdzz.TTdzzyj;
+
+/**
+ * 土地整治预检表Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public interface TTdzzyjMapper 
+{
+    /**
+     * 查询土地整治预检表
+     * 
+     * @param bsm 土地整治预检表主键
+     * @return 土地整治预检表
+     */
+    public TTdzzyj selectTTdzzyjByBsm(String bsm);
+
+    /**
+     * 查询土地整治预检表列表
+     * 
+     * @param tTdzzyj 土地整治预检表
+     * @return 土地整治预检表集合
+     */
+    public List<TTdzzyj> selectTTdzzyjList(TTdzzyj tTdzzyj);
+
+    /**
+     * 新增土地整治预检表
+     * 
+     * @param tTdzzyj 土地整治预检表
+     * @return 结果
+     */
+    public int insertTTdzzyj(TTdzzyj tTdzzyj);
+
+    /**
+     * 修改土地整治预检表
+     * 
+     * @param tTdzzyj 土地整治预检表
+     * @return 结果
+     */
+    public int updateTTdzzyj(TTdzzyj tTdzzyj);
+
+    /**
+     * 删除土地整治预检表
+     * 
+     * @param bsm 土地整治预检表主键
+     * @return 结果
+     */
+    public int deleteTTdzzyjByBsm(String bsm);
+
+    /**
+     * 批量删除土地整治预检表
+     * 
+     * @param bsms 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTTdzzyjByBsms(String[] bsms);
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/qytdzz/TTdzzyjJgServiceImpl.java

@@ -0,0 +1,102 @@
+package com.onemap.apply.service.impl.qytdzz;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.onemap.apply.mapper.qytdzz.TTdzzyjJgMapper;
+import com.onemap.apply.domain.qytdzz.TTdzzyjJg;
+import com.onemap.apply.service.qytdzz.ITTdzzyjJgService;
+
+import javax.annotation.Resource;
+
+/**
+ * 土地整治预检结果表Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+@Service
+public class TTdzzyjJgServiceImpl implements ITTdzzyjJgService {
+    @Resource
+    private TTdzzyjJgMapper tTdzzyjJgMapper;
+
+
+    /**
+     * 查询土地整治预检结果表
+     *
+     * @param id 土地整治预检结果表主键
+     * @return 土地整治预检结果表
+     */
+    @Override
+    public TTdzzyjJg selectTTdzzyjJgById(String id) {
+        return tTdzzyjJgMapper.selectTTdzzyjJgById(id);
+    }
+
+    /**
+     * 查询土地整治预检汇总结果表，
+     * 根据bsm ，mx,yz 参数
+     *
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 土地整治预检结果表
+     */
+    @Override
+    public List<TTdzzyjJg> selectTTdzzyjJgSumByRwBsm(TTdzzyjJg tTdzzyjJg) {
+        return tTdzzyjJgMapper.selectTTdzzyjJgSumByRwBsm(tTdzzyjJg);
+    }
+
+    /**
+     * 查询土地整治预检结果表列表
+     *
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 土地整治预检结果表
+     */
+    @Override
+    public List<TTdzzyjJg> selectTTdzzyjJgList(TTdzzyjJg tTdzzyjJg) {
+        return tTdzzyjJgMapper.selectTTdzzyjJgList(tTdzzyjJg);
+    }
+
+    /**
+     * 新增土地整治预检结果表
+     *
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 结果
+     */
+    @Override
+    public int insertTTdzzyjJg(TTdzzyjJg tTdzzyjJg) {
+        return tTdzzyjJgMapper.insertTTdzzyjJg(tTdzzyjJg);
+    }
+
+    /**
+     * 修改土地整治预检结果表
+     *
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 结果
+     */
+    @Override
+    public int updateTTdzzyjJg(TTdzzyjJg tTdzzyjJg) {
+        return tTdzzyjJgMapper.updateTTdzzyjJg(tTdzzyjJg);
+    }
+
+    /**
+     * 批量删除土地整治预检结果表
+     *
+     * @param ids 需要删除的土地整治预检结果表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTTdzzyjJgByIds(String[] ids) {
+        return tTdzzyjJgMapper.deleteTTdzzyjJgByIds(ids);
+    }
+
+    /**
+     * 删除土地整治预检结果表信息
+     *
+     * @param id 土地整治预检结果表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTTdzzyjJgById(String id) {
+        return tTdzzyjJgMapper.deleteTTdzzyjJgById(id);
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/qytdzz/TTdzzyjServiceImpl.java

@@ -0,0 +1,139 @@
+package com.onemap.apply.service.impl.qytdzz;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.system.api.RemoteFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.onemap.apply.mapper.qytdzz.TTdzzyjMapper;
+import com.onemap.apply.domain.qytdzz.TTdzzyj;
+import com.onemap.apply.service.qytdzz.ITTdzzyjService;
+
+import javax.annotation.Resource;
+
+/**
+ * 土地整治预检表Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+@Service
+public class TTdzzyjServiceImpl implements ITTdzzyjService {
+    @Resource
+    private TTdzzyjMapper tTdzzyjMapper;
+    @Resource
+    private RemoteFileService remoteFileService;
+    @Resource
+    private TdzzyjHandleService tdzzyjHandleService;
+
+    /**
+     * 查询土地整治预检表
+     *
+     * @param bsm 土地整治预检表主键
+     * @return 土地整治预检表
+     */
+    @Override
+    public Map<String, Object> selectTTdzzyjByBsm(String bsm) {
+        TTdzzyj tdzzyjxm = tTdzzyjMapper.selectTTdzzyjByBsm(bsm);
+        if (null == tdzzyjxm) {
+            return null;
+        }
+        Map<String, Object> map = tdzzyjHandleService.tdzzyjAnalysisJg(tdzzyjxm);
+        map.put("YJJG", tdzzyjxm);
+        return map;
+    }
+
+    /**
+     * 查询土地整治预检表列表
+     *
+     * @param tTdzzyj 土地整治预检表
+     * @return 土地整治预检表
+     */
+    @Override
+    public List<TTdzzyj> selectTTdzzyjList(TTdzzyj tTdzzyj) {
+        tTdzzyj.setStatus(1);
+        return tTdzzyjMapper.selectTTdzzyjList(tTdzzyj);
+    }
+
+    /**
+     * 新增土地整治预检表
+     *
+     * @param tTdzzyj 土地整治预检表
+     * @return 结果
+     */
+    @Override
+    public RequestResult insertTTdzzyj(TTdzzyj tTdzzyj) {
+        RequestResult resultData = remoteFileService.uploadGeomQuery(tTdzzyj.getXzfw(), 0);
+        if (resultData.isError()) {
+            return resultData;
+        }
+        Map<String, Object> xzfw = (Map) resultData.get(RequestResult.DATA_TAG);
+        if (xzfw == null) {
+            return RequestResult.error("选址范围参数为空");
+        }
+        Double area = Double.valueOf(xzfw.get("area").toString());
+        String ewkt = (String) xzfw.get("geom");
+        String tableName = (String) xzfw.get("tableName");
+        String tableId = (String) xzfw.get("filepath");
+        Integer number = (Integer) xzfw.get("number");
+        if (StringUtils.isEmpty(ewkt)) {
+            return RequestResult.error("选址范围参数为空");
+        }
+        String rebsm = StringUtils.getUUID();
+        tTdzzyj.setGeom(ewkt);
+        tTdzzyj.setXzfwTbaleName(tableName);
+        tTdzzyj.setXzfwTbaleId(tableId);
+        tTdzzyj.setSumNumber(Long.parseLong(number.toString()));
+        tTdzzyj.setXzfwTbaleId(tableId);
+        tTdzzyj.setXzmj(area);
+        tTdzzyj.setBsm(rebsm);
+        tTdzzyj.setStatus(1);
+        tTdzzyj.setRwzt(0);
+        tTdzzyj.setRwcjsj(new Date());
+        tTdzzyjMapper.insertTTdzzyj(tTdzzyj);
+        tdzzyjHandleService.tdzzyjAnalysisHandle(tTdzzyj);
+        return RequestResult.success("添加成功", rebsm);
+    }
+
+    /**
+     * 修改土地整治预检表
+     *
+     * @param tTdzzyj 土地整治预检表
+     * @return 结果
+     */
+    @Override
+    public int updateTTdzzyj(TTdzzyj tTdzzyj) {
+        return tTdzzyjMapper.updateTTdzzyj(tTdzzyj);
+    }
+
+    /**
+     * 批量删除土地整治预检表
+     *
+     * @param bsms 需要删除的土地整治预检表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTTdzzyjByBsms(String[] bsms) {
+        return tTdzzyjMapper.deleteTTdzzyjByBsms(bsms);
+    }
+
+    /**
+     * 删除土地整治预检表信息
+     *
+     * @param bsm 土地整治预检表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTTdzzyjByBsm(String bsm, Long scUserId) {
+        TTdzzyj tTdzzyj = new TTdzzyj();
+        tTdzzyj.setBsm(bsm);
+        tTdzzyj.setScUserId(scUserId);
+        tTdzzyj.setRwscsj(new Date());
+        tTdzzyj.setStatus(0);
+        return tTdzzyjMapper.updateTTdzzyj(tTdzzyj);
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/qytdzz/TdzzyjHandleService.java

@@ -0,0 +1,226 @@
+package com.onemap.apply.service.impl.qytdzz;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.onemap.apply.domain.config.fzss.FxrwrzDTO;
+import com.onemap.apply.domain.gdbh.*;
+import com.onemap.apply.domain.qytdzz.TTdzzyj;
+import com.onemap.apply.domain.qytdzz.TTdzzyjJg;
+import com.onemap.apply.mapper.fzss.FxrwrzMapper;
+import com.onemap.apply.mapper.gdbh.GdbhMapper;
+import com.onemap.apply.mapper.gdbh.GdbhRwJgMapper;
+import com.onemap.apply.mapper.gdbh.GdbhYzMapper;
+import com.onemap.apply.mapper.qytdzz.TTdzzyjJgMapper;
+import com.onemap.apply.mapper.qytdzz.TTdzzyjMapper;
+import com.onemap.apply.service.analyse.HttpAnalyseService;
+import com.onemap.apply.service.gdbh.impl.GdbhJgService;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.system.api.AnalyseService;
+import com.onemap.system.api.domain.IntersectionTableWktVo;
+import com.onemap.system.api.domain.TablesAIdsVo;
+import com.onemap.system.api.domain.TargetTableVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class TdzzyjHandleService {
+    @Resource
+    private TTdzzyjMapper tTdzzyjMapper;
+    @Resource
+    private TTdzzyjJgMapper tTdzzyjJgMapper;
+    @Autowired
+    private HttpAnalyseService httpAnalyseService;
+    @Resource
+    private AnalyseService analyseService;
+    @Resource
+    private FxrwrzMapper fxrwrzMapper;
+
+    public void tdzzyjAnalysisHandle(TTdzzyj tTdzzyj) {
+        //获取范围
+        String d_RawTableName = tTdzzyj.getXzfwTbaleName();
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析开始。。。", "info");
+        updateTdzzyj(tTdzzyj.getBsm(), 1, new Date(), null, null);
+
+        //计算三调结果
+//        List<String> columns3d = new ArrayList<String>();
+//        columns3d.add("dlbm dlbmc,substr(a.dlbm,1,2) dlbm");
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析三调数据分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "TEMP_DLTU_BPQ", tTdzzyj.getBsm(), "3D", null, columns3d, "dlbm");
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析三调数据分析结束。。。", "info");
+
+
+        //计算三线数据中的永久基本农田
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析永久基本农田分析开始。。。", "info");
+        intersectionDataStore(tTdzzyj.getGeom(), "TB_YJJBNTBH", tTdzzyj.getBsm(), "SQSX", "YJJBNT", null, null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析永久基本农田分析结束。。。", "info");
+
+
+        //计算三线数据中的生态保护红线
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析生态保护红线分析开始。。。", "info");
+        intersectionDataStore(tTdzzyj.getGeom(), "TB_STBHHX", tTdzzyj.getBsm(), "SQSX", "STBHHX", null, null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析生态保护红线分析结束。。。", "info");
+
+        //计算三线数据中的城市开发边界
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析城镇开发边界分析开始。。。", "info");
+        intersectionDataStore(tTdzzyj.getGeom(), "TB_CZKFBJ", tTdzzyj.getBsm(), "SQSX", "CZKFBJ", null, null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析城镇开发边界分析结束。。。", "info");
+
+        //计算新增耕地
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析新增耕地分析开始。。。", "info");
+        intersectionDataStore(tTdzzyj.getGeom(), "t_qytdzz_xzgd", tTdzzyj.getBsm(), "XZGD", null, null, null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析新增耕地分析结束。。。", "info");
+
+        //计算整治整治前土地利用结构
+        List<String> columnszzq = new ArrayList<String>();
+        columnszzq.add("dlbm");
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治前土地利用结构分析开始。。。", "info");
+        intersectionDataStore(tTdzzyj.getGeom(), "tb_qytdzz_sd_zzq", tTdzzyj.getBsm(), "ZZQ", null, columnszzq, null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治前土地利用结构分析结束。。。", "info");
+
+        //计算整治整治后土地利用结构
+        List<String> columnszzh = new ArrayList<String>();
+        columnszzh.add("zzhdlbm");
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治后土地利用结构分析开始。。。", "info");
+        intersectionDataStore(tTdzzyj.getGeom(), "tb_qytdzz_sd_zzh", tTdzzyj.getBsm(), "ZZH", null, columnszzh, null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治后土地利用结构分析结束。。。", "info");
+
+        //计算整治整治后土地利用结构
+        List<String> columnsghdk = new ArrayList<String>();
+        columnsghdk.add("lbmc");
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析规划地块分析开始。。。", "info");
+        intersectionDataStore(tTdzzyj.getGeom(), "TB_GHDK", tTdzzyj.getBsm(), "GHDK", null, columnsghdk, null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析规划地块分析结束。。。", "info");
+
+
+        updateTdzzyj(tTdzzyj.getBsm(), 2, null, new Date(), null);
+        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析结束。。。", "info");
+
+    }
+
+    public Map<String, Object> tdzzyjAnalysisJg(TTdzzyj tTdzzyj) {
+        Map<String, Object> retMap = new HashMap<>();
+        retMap.put("SQSX", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "SQSX", null));
+        retMap.put("GHDK", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "GHDK", null));
+        retMap.put("XZGD", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "XZGD", null));
+        List<TTdzzyjJg> zzqList = tdzzyjAnalysisJg(tTdzzyj.getBsm(), "ZZQ", null);
+        List<TTdzzyjJg> zzhList = tdzzyjAnalysisJg(tTdzzyj.getBsm(), "ZZH", null);
+        Map<String, TTdzzyjJg> zzqMap = new HashMap<>();
+        Map<String, TTdzzyjJg> zzhMap = new HashMap<>();
+        Set<String> sdset = new HashSet<>();
+        for (TTdzzyjJg obj : zzqList) {
+            sdset.add(obj.getGroupvalue());
+            zzqMap.put(obj.getGroupvalue(), obj);
+        }
+        for (TTdzzyjJg obj : zzhList) {
+            sdset.add(obj.getGroupvalue());
+            zzhMap.put(obj.getGroupvalue(), obj);
+        }
+
+        List<Map<String, Object>> sdList = new ArrayList<>();
+        for (String obj : sdset) {
+            TTdzzyjJg zzq = zzqMap.get(obj);
+            TTdzzyjJg zzh = zzqMap.get(obj);
+            Map<String, Object> objMap = new HashMap<>();
+            objMap.put("key", obj);
+            Double zzqarea = 0d;
+            Double zzharea = 0d;
+            if (null != zzq) {
+                zzqarea = Double.parseDouble(zzq.getSumvalue());
+                objMap.put("zzq_area", zzq.getSumvalue());
+                objMap.put("zzq_geom", zzq.getGeomvalue());
+            } else {
+                objMap.put("zzq_area", null);
+                objMap.put("zzq_geom", null);
+            }
+            if (null != zzh) {
+                zzharea = Double.parseDouble(zzh.getSumvalue());
+                objMap.put("zzh_area", zzh.getSumvalue());
+                objMap.put("zzh_geom", zzh.getGeomvalue());
+            } else {
+                objMap.put("zzh_area", null);
+                objMap.put("zzh_geom", null);
+            }
+            objMap.put("ce_area", zzqarea - zzharea);
+            sdList.add(objMap);
+        }
+        retMap.put("3D", sdList);
+        return retMap;
+    }
+
+    public List<TTdzzyjJg> tdzzyjAnalysisJg(String bsm, String mxBsm, String yzBsm) {
+        Map<String, Object> retMap = new HashMap<>();
+        TTdzzyjJg tTdzzyjJg = new TTdzzyjJg();
+        tTdzzyjJg.setRwbsm(bsm);
+        tTdzzyjJg.setMxBsm(mxBsm);
+        tTdzzyjJg.setYzBsm(yzBsm);
+        return tTdzzyjJgMapper.selectTTdzzyjJgSumByRwBsm(tTdzzyjJg);
+    }
+
+
+    //查询交集数据入库
+    public void intersectionDataStore(String suorceEWKT, String tablename, String rwbsm, String mxBsm, String yzBsm, List<String> columns, String getFields) {
+        //交集
+        IntersectionTableWktVo intersectionTableWktVo = new IntersectionTableWktVo();
+        intersectionTableWktVo.setTableName(tablename);
+        intersectionTableWktVo.setEwkt(suorceEWKT);
+        String tableName = httpAnalyseService.intersectionTableWkt(intersectionTableWktVo);
+
+        TargetTableVo targetTableVo = new TargetTableVo();
+        targetTableVo.setSrid(4525);
+        targetTableVo.setIsGeography(false);
+        targetTableVo.setSiweiArea(true);
+        targetTableVo.setTargetTableName(tableName);
+        targetTableVo.setRawTableName(tablename);
+        targetTableVo.setColumns(columns);
+        List<Map> map = httpAnalyseService.targetTable(targetTableVo);
+
+        for (Map map1 : map) {
+            TTdzzyjJg d_dto_0 = new TTdzzyjJg();
+            d_dto_0.setId(StringUtils.getUUID());
+            d_dto_0.setRwbsm(rwbsm);
+            d_dto_0.setMxBsm(mxBsm);
+            d_dto_0.setYzBsm(yzBsm);
+            if (null != columns && columns.size() >= 1) {
+                if (StringUtils.isNotEmpty(getFields)) {
+                    d_dto_0.setGroupvalue((map1.get(getFields)).toString());
+                } else {
+                    d_dto_0.setGroupvalue((map1.get(columns.get(0))).toString());
+                }
+            }
+            d_dto_0.setSumvalue(String.valueOf(map1.get("siweiarea")));
+            d_dto_0.setGeomvalue((String) map1.get("geom"));
+            tTdzzyjJgMapper.insertTTdzzyjJg(d_dto_0);
+        }
+    }
+
+    private void insertFxrwrz(String bsm, String rwbsm, String scxName, String rznr, String rzlx) {
+        //添加记录
+        FxrwrzDTO fxrwrzDTO = new FxrwrzDTO();
+        fxrwrzDTO.setBsm(bsm);
+        fxrwrzDTO.setRwbsm(rwbsm);
+        fxrwrzDTO.setRwlx(scxName);
+        if (StringUtils.isNotEmpty(rznr)) {
+            fxrwrzDTO.setRzlr(rznr);
+        } else {
+            fxrwrzDTO.setRzlr(scxName + "完成");
+        }
+        fxrwrzDTO.setRzlx(rzlx);
+        fxrwrzDTO.setRzsj(new Date());
+        fxrwrzMapper.insert(fxrwrzDTO);
+    }
+
+    private void updateTdzzyj(String bsm, Integer rwzt, Date rwkssj, Date rwjzsj, String fxbg) {
+        //添加记录
+        TTdzzyj tdzzyjDto = new TTdzzyj();
+        tdzzyjDto.setRwzt(rwzt);
+        tdzzyjDto.setRwkssj(rwkssj);
+        tdzzyjDto.setRwjssj(rwjzsj);
+        tdzzyjDto.setFxbg(fxbg);
+        tdzzyjDto.setBsm(bsm);
+        tTdzzyjMapper.updateTTdzzyj(tdzzyjDto);
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/qytdzz/ITTdzzyjJgService.java

@@ -0,0 +1,63 @@
+package com.onemap.apply.service.qytdzz;
+
+import java.util.List;
+import com.onemap.apply.domain.qytdzz.TTdzzyjJg;
+
+/**
+ * 土地整治预检结果表Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public interface ITTdzzyjJgService 
+{
+    /**
+     * 查询土地整治预检结果表
+     * 
+     * @param id 土地整治预检结果表主键
+     * @return 土地整治预检结果表
+     */
+    public TTdzzyjJg selectTTdzzyjJgById(String id);
+
+    public List<TTdzzyjJg> selectTTdzzyjJgSumByRwBsm(TTdzzyjJg tTdzzyjJg);
+
+    /**
+     * 查询土地整治预检结果表列表
+     * 
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 土地整治预检结果表集合
+     */
+    public List<TTdzzyjJg> selectTTdzzyjJgList(TTdzzyjJg tTdzzyjJg);
+
+    /**
+     * 新增土地整治预检结果表
+     * 
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 结果
+     */
+    public int insertTTdzzyjJg(TTdzzyjJg tTdzzyjJg);
+
+    /**
+     * 修改土地整治预检结果表
+     * 
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 结果
+     */
+    public int updateTTdzzyjJg(TTdzzyjJg tTdzzyjJg);
+
+    /**
+     * 批量删除土地整治预检结果表
+     * 
+     * @param ids 需要删除的土地整治预检结果表主键集合
+     * @return 结果
+     */
+    public int deleteTTdzzyjJgByIds(String[] ids);
+
+    /**
+     * 删除土地整治预检结果表信息
+     * 
+     * @param id 土地整治预检结果表主键
+     * @return 结果
+     */
+    public int deleteTTdzzyjJgById(String id);
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/qytdzz/ITTdzzyjService.java

@@ -0,0 +1,64 @@
+package com.onemap.apply.service.qytdzz;
+
+import java.util.List;
+import java.util.Map;
+
+import com.onemap.apply.domain.qytdzz.TTdzzyj;
+import com.onemap.common.core.web.domain.RequestResult;
+
+/**
+ * 土地整治预检表Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public interface ITTdzzyjService 
+{
+    /**
+     * 查询土地整治预检表
+     * 
+     * @param bsm 土地整治预检表主键
+     * @return 土地整治预检表
+     */
+    public Map<String, Object> selectTTdzzyjByBsm(String bsm);
+
+    /**
+     * 查询土地整治预检表列表
+     * 
+     * @param tTdzzyj 土地整治预检表
+     * @return 土地整治预检表集合
+     */
+    public List<TTdzzyj> selectTTdzzyjList(TTdzzyj tTdzzyj);
+
+    /**
+     * 新增土地整治预检表
+     * 
+     * @param tTdzzyj 土地整治预检表
+     * @return 结果
+     */
+    public RequestResult insertTTdzzyj(TTdzzyj tTdzzyj);
+
+    /**
+     * 修改土地整治预检表
+     * 
+     * @param tTdzzyj 土地整治预检表
+     * @return 结果
+     */
+    public int updateTTdzzyj(TTdzzyj tTdzzyj);
+
+    /**
+     * 批量删除土地整治预检表
+     * 
+     * @param bsms 需要删除的土地整治预检表主键集合
+     * @return 结果
+     */
+    public int deleteTTdzzyjByBsms(String[] bsms);
+
+    /**
+     * 删除土地整治预检表信息
+     * 
+     * @param bsm 土地整治预检表主键
+     * @return 结果
+     */
+    public int deleteTTdzzyjByBsm(String bsm,Long scUserId);
+}

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/qytdzz/TTdzzyjJgMapper.xml

@@ -0,0 +1,97 @@
+<?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.qytdzz.TTdzzyjJgMapper">
+    
+    <resultMap type="TTdzzyjJg" id="TTdzzyjJgResult">
+        <result property="id"    column="id"    />
+        <result property="rwbsm"    column="rwbsm"    />
+        <result property="mxBsm"    column="mx_bsm"    />
+        <result property="yzBsm"    column="yz_bsm"    />
+        <result property="groupvalue"    column="groupvalue"    />
+        <result property="sumvalue"    column="sumvalue"    />
+        <result property="geomvalue"    column="geomvalue"    />
+        <result property="countvalue"    column="countvalue"    />
+    </resultMap>
+
+    <sql id="selectTTdzzyjJgVo">
+        select id, rwbsm, mx_bsm, yz_bsm, groupvalue, sumvalue, geomvalue from t_tdzzyj_jg
+    </sql>
+
+    <select id="selectTTdzzyjJgList" parameterType="TTdzzyjJg" resultMap="TTdzzyjJgResult">
+        <include refid="selectTTdzzyjJgVo"/>
+        <where>  
+            <if test="rwbsm != null  and rwbsm != ''"> and rwbsm = #{rwbsm}</if>
+            <if test="mxBsm != null  and mxBsm != ''"> and mx_bsm = #{mxBsm}</if>
+            <if test="yzBsm != null  and yzBsm != ''"> and yz_bsm = #{yzBsm}</if>
+            <if test="groupvalue != null  and groupvalue != ''"> and groupvalue = #{groupvalue}</if>
+            <if test="sumvalue != null  and sumvalue != ''"> and sumvalue = #{sumvalue}</if>
+            <if test="geomvalue != null  and geomvalue != ''"> and geomvalue = #{geomvalue}</if>
+        </where>
+    </select>
+
+    <select id="selectTTdzzyjJgSumByRwBsm" parameterType="TTdzzyjJg" resultMap="TTdzzyjJgResult">
+        select mx_bsm,yz_bsm,groupvalue, ROUND(coalesce(sum(sumvalue::numeric),0),2) sumvalue, public.st_asewkt(public.st_union(geomvalue)) geomvalue,count(*) countvalue from t_tdzzyj_jg
+        <where>
+            <if test="rwbsm != null  and rwbsm != ''"> and rwbsm = #{rwbsm}</if>
+            <if test="mxBsm != null  and mxBsm != ''"> and mx_bsm = #{mxBsm}</if>
+            <if test="yzBsm != null  and yzBsm != ''"> and yz_bsm = #{yzBsm}</if>
+            <if test="groupvalue != null  and groupvalue != ''"> and groupvalue = #{groupvalue}</if>
+            <if test="sumvalue != null  and sumvalue != ''"> and sumvalue = #{sumvalue}</if>
+            <if test="geomvalue != null  and geomvalue != ''"> and geomvalue = #{geomvalue}</if>
+        </where>
+        group by mx_bsm,yz_bsm,groupvalue
+    </select>
+    
+    <select id="selectTTdzzyjJgById" parameterType="String" resultMap="TTdzzyjJgResult">
+        <include refid="selectTTdzzyjJgVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTTdzzyjJg" parameterType="TTdzzyjJg">
+        insert into t_tdzzyj_jg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="rwbsm != null and rwbsm != ''">rwbsm,</if>
+            <if test="mxBsm != null and mxBsm != ''">mx_bsm,</if>
+            <if test="yzBsm != null and yzBsm != ''">yz_bsm,</if>
+            <if test="groupvalue != null">groupvalue,</if>
+            <if test="sumvalue != null">sumvalue,</if>
+            <if test="geomvalue != null">geomvalue,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="rwbsm != null and rwbsm != ''">#{rwbsm},</if>
+            <if test="mxBsm != null and mxBsm != ''">#{mxBsm},</if>
+            <if test="yzBsm != null and yzBsm != ''">#{yzBsm},</if>
+            <if test="groupvalue != null">#{groupvalue},</if>
+            <if test="sumvalue != null">#{sumvalue},</if>
+            <if test="geomvalue != null">public.st_transform(public.st_force2d(public.st_geomfromewkt(#{geomvalue})), 4326),</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTdzzyjJg" parameterType="TTdzzyjJg">
+        update t_tdzzyj_jg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rwbsm != null and rwbsm != ''">rwbsm = #{rwbsm},</if>
+            <if test="mxBsm != null and mxBsm != ''">mx_bsm = #{mxBsm},</if>
+            <if test="yzBsm != null and yzBsm != ''">yz_bsm = #{yzBsm},</if>
+            <if test="groupvalue != null">groupvalue = #{groupvalue},</if>
+            <if test="sumvalue != null">sumvalue = #{sumvalue},</if>
+            <if test="geomvalue != null">geomvalue = #{geomvalue},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTTdzzyjJgById" parameterType="String">
+        delete from t_tdzzyj_jg where id = #{id}
+    </delete>
+
+    <delete id="deleteTTdzzyjJgByIds" parameterType="String">
+        delete from t_tdzzyj_jg where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/qytdzz/TTdzzyjMapper.xml

@@ -0,0 +1,133 @@
+<?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.qytdzz.TTdzzyjMapper">
+    
+    <resultMap type="TTdzzyj" id="TTdzzyjResult">
+        <result property="bsm"    column="bsm"    />
+        <result property="geom"    column="geom"    />
+        <result property="xzfw"    column="xzfw"    />
+        <result property="xzmj"    column="xzmj"    />
+        <result property="rwkssj"    column="rwkssj"    />
+        <result property="rwjssj"    column="rwjssj"    />
+        <result property="rwcjsj"    column="rwcjsj"    />
+        <result property="rwscsj"    column="rwscsj"    />
+        <result property="status"    column="status"    />
+        <result property="rwzt"    column="rwzt"    />
+        <result property="cjUserId"    column="cj_user_id"    />
+        <result property="scUserId"    column="sc_user_id"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="xzfwTbaleName"    column="xzfw_tbale_name"    />
+        <result property="xzfwTbaleId"    column="xzfw_tbale_id"    />
+        <result property="sumNumber"    column="sum_number"    />
+        <result property="fxbg"    column="fxbg"    />
+    </resultMap>
+
+    <sql id="selectTTdzzyjVo">
+        select geom,bsm, xzfw, xzmj, rwkssj, rwjssj, rwcjsj, rwscsj, status, rwzt, cj_user_id, sc_user_id, xmmc, xzfw_tbale_name, xzfw_tbale_id, sum_number, fxbg from t_tdzzyj
+    </sql>
+
+    <select id="selectTTdzzyjList" parameterType="TTdzzyj" resultMap="TTdzzyjResult">
+        <include refid="selectTTdzzyjVo"/>
+        <where>  
+            <if test="xzfw != null  and xzfw != ''"> and xzfw = #{xzfw}</if>
+            <if test="xzmj != null "> and xzmj = #{xzmj}</if>
+            <if test="rwkssj != null "> and rwkssj = #{rwkssj}</if>
+            <if test="rwjssj != null "> and rwjssj = #{rwjssj}</if>
+            <if test="rwcjsj != null "> and rwcjsj = #{rwcjsj}</if>
+            <if test="rwscsj != null "> and rwscsj = #{rwscsj}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="rwzt != null "> and rwzt = #{rwzt}</if>
+            <if test="startTime != null "> and rwcjsj &gt;= #{startTime}</if>
+            <if test="endTime != null "> and rwcjsj &lt;= #{endTime}</if>
+            <if test="cjUserId != null "> and cj_user_id = #{cjUserId}</if>
+            <if test="scUserId != null "> and sc_user_id = #{scUserId}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="xzfwTbaleName != null  and xzfwTbaleName != ''"> and xzfw_tbale_name like concat('%', #{xzfwTbaleName}, '%')</if>
+            <if test="xzfwTbaleId != null  and xzfwTbaleId != ''"> and xzfw_tbale_id = #{xzfwTbaleId}</if>
+            <if test="sumNumber != null "> and sum_number = #{sumNumber}</if>
+            <if test="fxbg != null  and fxbg != ''"> and fxbg = #{fxbg}</if>
+        </where>
+    </select>
+    
+    <select id="selectTTdzzyjByBsm" parameterType="String" resultMap="TTdzzyjResult">
+        <include refid="selectTTdzzyjVo"/>
+        where bsm = #{bsm}
+    </select>
+
+    <insert id="insertTTdzzyj" parameterType="TTdzzyj">
+        insert into t_tdzzyj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="bsm != null">bsm,</if>
+            <if test="geom != null">geom,</if>
+            <if test="xzfw != null and xzfw != ''">xzfw,</if>
+            <if test="xzmj != null">xzmj,</if>
+            <if test="rwkssj != null">rwkssj,</if>
+            <if test="rwjssj != null">rwjssj,</if>
+            <if test="rwcjsj != null">rwcjsj,</if>
+            <if test="rwscsj != null">rwscsj,</if>
+            <if test="status != null">status,</if>
+            <if test="rwzt != null">rwzt,</if>
+            <if test="cjUserId != null">cj_user_id,</if>
+            <if test="scUserId != null">sc_user_id,</if>
+            <if test="xmmc != null and xmmc != ''">xmmc,</if>
+            <if test="xzfwTbaleName != null">xzfw_tbale_name,</if>
+            <if test="xzfwTbaleId != null">xzfw_tbale_id,</if>
+            <if test="sumNumber != null">sum_number,</if>
+            <if test="fxbg != null">fxbg,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="bsm != null">#{bsm},</if>
+            <if test="geom != null">#{geom},</if>
+            <if test="xzfw != null and xzfw != ''">#{xzfw},</if>
+            <if test="xzmj != null">#{xzmj},</if>
+            <if test="rwkssj != null">#{rwkssj},</if>
+            <if test="rwjssj != null">#{rwjssj},</if>
+            <if test="rwcjsj != null">#{rwcjsj},</if>
+            <if test="rwscsj != null">#{rwscsj},</if>
+            <if test="status != null">#{status},</if>
+            <if test="rwzt != null">#{rwzt},</if>
+            <if test="cjUserId != null">#{cjUserId},</if>
+            <if test="scUserId != null">#{scUserId},</if>
+            <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
+            <if test="xzfwTbaleName != null">#{xzfwTbaleName},</if>
+            <if test="xzfwTbaleId != null">#{xzfwTbaleId},</if>
+            <if test="sumNumber != null">#{sumNumber},</if>
+            <if test="fxbg != null">#{fxbg},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTdzzyj" parameterType="TTdzzyj">
+        update t_tdzzyj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xzfw != null and xzfw != ''">xzfw = #{xzfw},</if>
+            <if test="xzmj != null">xzmj = #{xzmj},</if>
+            <if test="rwkssj != null">rwkssj = #{rwkssj},</if>
+            <if test="rwjssj != null">rwjssj = #{rwjssj},</if>
+            <if test="rwcjsj != null">rwcjsj = #{rwcjsj},</if>
+            <if test="rwscsj != null">rwscsj = #{rwscsj},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="rwzt != null">rwzt = #{rwzt},</if>
+            <if test="cjUserId != null">cj_user_id = #{cjUserId},</if>
+            <if test="scUserId != null">sc_user_id = #{scUserId},</if>
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
+            <if test="xzfwTbaleName != null">xzfw_tbale_name = #{xzfwTbaleName},</if>
+            <if test="xzfwTbaleId != null">xzfw_tbale_id = #{xzfwTbaleId},</if>
+            <if test="sumNumber != null">sum_number = #{sumNumber},</if>
+            <if test="fxbg != null">fxbg = #{fxbg},</if>
+        </trim>
+        where bsm = #{bsm}
+    </update>
+
+    <delete id="deleteTTdzzyjByBsm" parameterType="String">
+        delete from t_tdzzyj where bsm = #{bsm}
+    </delete>
+
+    <delete id="deleteTTdzzyjByBsms" parameterType="String">
+        delete from t_tdzzyj where bsm in 
+        <foreach item="bsm" collection="array" open="(" separator="," close=")">
+            #{bsm}
+        </foreach>
+    </delete>
+</mapper>