修改冲突

onemap-modules/onemap-apply/pom.xml

@@ -162,6 +162,11 @@
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
         </dependency>
+        <!-- JSON 解析器和生成器 -->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.fastjson2</groupId>-->
+<!--            <artifactId>fastjson2</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

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

@@ -0,0 +1,106 @@
+package com.onemap.apply.controller.qytdzz;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.onemap.apply.domain.qytdzz.TQytdzzZzxm;
+import com.onemap.apply.service.qytdzz.ITQytdzzZzxmService;
+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.AfterTdzz;
+import com.onemap.apply.service.qytdzz.IAfterTdzzService;
+
+/**
+ * 土地整治项目信息Controller
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+@RestController
+@RequestMapping("/qytdzz/tdzzxm")
+public class AfterTdzzController extends BaseController
+{
+    @Autowired
+    private IAfterTdzzService afterTdzzService;
+    @Autowired
+    private ITQytdzzZzxmService tQytdzzZzxmService;
+    /**
+     * 查询土地整治项目信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(AfterTdzz afterTdzz)
+    {
+        startPage();
+        List<AfterTdzz> list = afterTdzzService.selectAfterTdzzList(afterTdzz);
+        for (AfterTdzz t : list) {
+            TQytdzzZzxm tQytdzzZzxm = new TQytdzzZzxm();
+            tQytdzzZzxm.setPid(t.getId());
+            t.settQytdzzZzxm(tQytdzzZzxmService.selectTQytdzzZzxmList(tQytdzzZzxm));
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出土地整治项目信息列表
+     */
+    @Log(title = "土地整治项目信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AfterTdzz afterTdzz)
+    {
+        List<AfterTdzz> list = afterTdzzService.selectAfterTdzzList(afterTdzz);
+        ExcelUtil<AfterTdzz> util = new ExcelUtil<AfterTdzz>(AfterTdzz.class);
+        util.exportExcel(response, list, "土地整治项目信息数据");
+    }
+
+    /**
+     * 获取土地整治项目信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(afterTdzzService.selectAfterTdzzById(id));
+    }
+
+    /**
+     * 新增土地整治项目信息
+     */
+    @Log(title = "土地整治项目信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AfterTdzz afterTdzz)
+    {
+        return toAjax(afterTdzzService.insertAfterTdzz(afterTdzz));
+    }
+
+    /**
+     * 修改土地整治项目信息
+     */
+    @Log(title = "土地整治项目信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AfterTdzz afterTdzz)
+    {
+        return toAjax(afterTdzzService.updateAfterTdzz(afterTdzz));
+    }
+
+    /**
+     * 删除土地整治项目信息
+     */
+    @Log(title = "土地整治项目信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(afterTdzzService.deleteAfterTdzzByIds(ids));
+    }
+}

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

@@ -0,0 +1,101 @@
+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.TQytdzzZzxm;
+import com.onemap.apply.service.qytdzz.ITQytdzzZzxmService;
+
+import static com.onemap.common.core.utils.PageUtils.startPage;
+
+/**
+ * 土地整治项目空间信息Controller
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+@RestController
+@RequestMapping("/qytdzz/zzxmkj")
+public class TQytdzzZzxmController extends BaseController
+{
+    @Autowired
+    private ITQytdzzZzxmService tQytdzzZzxmService;
+
+    /**
+     * 查询土地整治项目空间信息列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:zzxm:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TQytdzzZzxm tQytdzzZzxm)
+    {
+        startPage();
+        List<TQytdzzZzxm> list = tQytdzzZzxmService.selectTQytdzzZzxmList(tQytdzzZzxm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出土地整治项目空间信息列表
+     */
+    @Log(title = "土地整治项目空间信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TQytdzzZzxm tQytdzzZzxm)
+    {
+        List<TQytdzzZzxm> list = tQytdzzZzxmService.selectTQytdzzZzxmList(tQytdzzZzxm);
+        ExcelUtil<TQytdzzZzxm> util = new ExcelUtil<TQytdzzZzxm>(TQytdzzZzxm.class);
+        util.exportExcel(response, list, "土地整治项目空间信息数据");
+    }
+
+    /**
+     * 获取土地整治项目空间信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tQytdzzZzxmService.selectTQytdzzZzxmById(id));
+    }
+
+    /**
+     * 新增土地整治项目空间信息
+     */
+    @Log(title = "土地整治项目空间信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TQytdzzZzxm tQytdzzZzxm)
+    {
+        return toAjax(tQytdzzZzxmService.insertTQytdzzZzxm(tQytdzzZzxm));
+    }
+
+    /**
+     * 修改土地整治项目空间信息
+     */
+    @Log(title = "土地整治项目空间信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TQytdzzZzxm tQytdzzZzxm)
+    {
+        return toAjax(tQytdzzZzxmService.updateTQytdzzZzxm(tQytdzzZzxm));
+    }
+
+    /**
+     * 删除土地整治项目空间信息
+     */
+    @Log(title = "土地整治项目空间信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tQytdzzZzxmService.deleteTQytdzzZzxmByIds(ids));
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/yzt/ZymlController.java

@@ -65,6 +65,16 @@ public class ZymlController extends BaseController {
         return list;
     }
 
+    /**
+     * 共享图层查询
+     *
+     * @return
+     */
+    @GetMapping("/GetTree/share")
+    public RequestResult GetTreeShare(String name) {
+        return zymlService.GetZymlShareList(name);
+    }
+
     /**
      * 获取资源目录树结构
      *

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/ShareConfigurationController.java

@@ -1,6 +1,8 @@
 package com.onemap.apply.controller.zymlapplication;
 
 import com.onemap.apply.domain.zymlapplication.TZymlApplicationRecord;
+import com.onemap.apply.domain.zymlapplication.TZymlFiled;
+import com.onemap.apply.domain.zymlapplication.TZymlFiledVo;
 import com.onemap.apply.service.zymlapplication.IShareConfigurationService;
 import com.onemap.apply.service.zymlapplication.ITZymlApplicationRecordService;
 import com.onemap.common.core.utils.StringUtils;
@@ -33,7 +35,7 @@ public class ShareConfigurationController extends BaseController {
      * 共享资源配置
      */
     @Log(title = "共享资源配置", businessType = BusinessType.INSERT)
-    @PutMapping
+    @PutMapping("/zyml")
     public AjaxResult edit(@RequestBody TZymlApplicationRecord tZymlApplicationRecord) {
         if (StringUtils.isNull(tZymlApplicationRecord)) {
             return AjaxResult.error("参数缺失");
@@ -49,14 +51,33 @@ public class ShareConfigurationController extends BaseController {
      */
 //    @RequiresPermissions("@ss.hasPermi('share:resources:application:list')")
     @GetMapping("/fileds/list")
-    public AjaxResult filedsList(TZymlApplicationRecord tZymlApplicationRecord) {
-        if (StringUtils.isNull(tZymlApplicationRecord)) {
+    public AjaxResult filedsList(TZymlFiledVo tZymlFiledVo) {
+        if (StringUtils.isNull(tZymlFiledVo)) {
             return AjaxResult.error("参数缺失");
         }
-        if (StringUtils.isEmpty(tZymlApplicationRecord.getId())) {
+        if (StringUtils.isEmpty(tZymlFiledVo.getZymlBsm())) {
+            return AjaxResult.error("参数缺失");
+        }
+        return AjaxResult.success(shareConfigurationService.selectTZymlFiledList(tZymlFiledVo));
+    }
+
+    @PutMapping("/filed")
+    public AjaxResult filedsEdit(@RequestBody List<TZymlFiled> zymlFiled) {
+        if (StringUtils.isNull(zymlFiled)) {
+            return AjaxResult.error("参数缺失");
+        }
+        if (zymlFiled.size() == 0) {
             return AjaxResult.error("参数缺失");
         }
-        return AjaxResult.success(shareConfigurationService.selectTZymlFiledList(tZymlApplicationRecord.getId()));
+        for (TZymlFiled filed : zymlFiled) {
+            if (StringUtils.isEmpty(filed.getId())) {
+                return AjaxResult.error("参数缺失");
+            }
+        }
+        for (TZymlFiled filed : zymlFiled) {
+            shareConfigurationService.updateTZymlFiledList(filed);
+        }
+        return AjaxResult.success("更新完成");
     }
 
     /**

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

@@ -0,0 +1,315 @@
+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;
+
+import java.util.List;
+
+/**
+ * 土地整治项目信息对象 after_tdzz
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+public class AfterTdzz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzqdm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lxfl;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String lxfl2;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xmmc;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String wz;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long gm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String gmdw;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long tygm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String tygmdw;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String jsnr;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long jhtz;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long czjhtz;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long shjhtz;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long jhkgnx;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long jhysnx;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String zgbm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String sqlxbm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pfbm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long xzgd;
+
+    private List<TQytdzzZzxm> tQytdzzZzxm;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXzqdm(String xzqdm) 
+    {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getXzqdm() 
+    {
+        return xzqdm;
+    }
+    public void setLxfl(String lxfl) 
+    {
+        this.lxfl = lxfl;
+    }
+
+    public String getLxfl() 
+    {
+        return lxfl;
+    }
+    public void setLxfl2(String lxfl2) 
+    {
+        this.lxfl2 = lxfl2;
+    }
+
+    public String getLxfl2() 
+    {
+        return lxfl2;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setWz(String wz) 
+    {
+        this.wz = wz;
+    }
+
+    public String getWz() 
+    {
+        return wz;
+    }
+    public void setGm(Long gm) 
+    {
+        this.gm = gm;
+    }
+
+    public Long getGm() 
+    {
+        return gm;
+    }
+    public void setGmdw(String gmdw) 
+    {
+        this.gmdw = gmdw;
+    }
+
+    public String getGmdw() 
+    {
+        return gmdw;
+    }
+    public void setTygm(Long tygm) 
+    {
+        this.tygm = tygm;
+    }
+
+    public Long getTygm() 
+    {
+        return tygm;
+    }
+    public void setTygmdw(String tygmdw) 
+    {
+        this.tygmdw = tygmdw;
+    }
+
+    public String getTygmdw() 
+    {
+        return tygmdw;
+    }
+    public void setJsnr(String jsnr) 
+    {
+        this.jsnr = jsnr;
+    }
+
+    public String getJsnr() 
+    {
+        return jsnr;
+    }
+    public void setJhtz(Long jhtz) 
+    {
+        this.jhtz = jhtz;
+    }
+
+    public Long getJhtz() 
+    {
+        return jhtz;
+    }
+    public void setCzjhtz(Long czjhtz) 
+    {
+        this.czjhtz = czjhtz;
+    }
+
+    public Long getCzjhtz() 
+    {
+        return czjhtz;
+    }
+    public void setShjhtz(Long shjhtz) 
+    {
+        this.shjhtz = shjhtz;
+    }
+
+    public Long getShjhtz() 
+    {
+        return shjhtz;
+    }
+    public void setJhkgnx(Long jhkgnx) 
+    {
+        this.jhkgnx = jhkgnx;
+    }
+
+    public Long getJhkgnx() 
+    {
+        return jhkgnx;
+    }
+    public void setJhysnx(Long jhysnx) 
+    {
+        this.jhysnx = jhysnx;
+    }
+
+    public Long getJhysnx() 
+    {
+        return jhysnx;
+    }
+    public void setZgbm(String zgbm) 
+    {
+        this.zgbm = zgbm;
+    }
+
+    public String getZgbm() 
+    {
+        return zgbm;
+    }
+    public void setSqlxbm(String sqlxbm) 
+    {
+        this.sqlxbm = sqlxbm;
+    }
+
+    public String getSqlxbm() 
+    {
+        return sqlxbm;
+    }
+    public void setPfbm(String pfbm) 
+    {
+        this.pfbm = pfbm;
+    }
+
+    public String getPfbm() 
+    {
+        return pfbm;
+    }
+    public void setXzgd(Long xzgd) 
+    {
+        this.xzgd = xzgd;
+    }
+
+    public Long getXzgd() 
+    {
+        return xzgd;
+    }
+
+    public List<TQytdzzZzxm> gettQytdzzZzxm() {
+        return tQytdzzZzxm;
+    }
+
+    public void settQytdzzZzxm(List<TQytdzzZzxm> tQytdzzZzxm) {
+        this.tQytdzzZzxm = tQytdzzZzxm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xzqdm", getXzqdm())
+            .append("lxfl", getLxfl())
+            .append("lxfl2", getLxfl2())
+            .append("xmmc", getXmmc())
+            .append("wz", getWz())
+            .append("gm", getGm())
+            .append("gmdw", getGmdw())
+            .append("tygm", getTygm())
+            .append("tygmdw", getTygmdw())
+            .append("jsnr", getJsnr())
+            .append("jhtz", getJhtz())
+            .append("czjhtz", getCzjhtz())
+            .append("shjhtz", getShjhtz())
+            .append("jhkgnx", getJhkgnx())
+            .append("jhysnx", getJhysnx())
+            .append("zgbm", getZgbm())
+            .append("sqlxbm", getSqlxbm())
+            .append("pfbm", getPfbm())
+            .append("xzgd", getXzgd())
+            .toString();
+    }
+}

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

@@ -0,0 +1,485 @@
+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_qytdzz_zzxm
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+public class TQytdzzZzxm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String geom;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String tbbh;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String dlbm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String dlmc;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String qsxz;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long tbmj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String kcdlbm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long kcxs;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long kcmj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long tbdlmj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String gdlx;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String gdpdjb;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String frdbs;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String czcsxm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long sjnf;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String bz;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String bsm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String ysdm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String 项目类型;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String 项目名称;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String zzhdlmc;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String qsdwdm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String qsdwmc;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String zldwdm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String zldwmc;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzgdlydlbm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String zzhdlbm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzgdlydlmc;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long xzgdmj;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzgddb;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String xzgdlyxm;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long pid;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setGeom(String geom) 
+    {
+        this.geom = geom;
+    }
+
+    public String getGeom() 
+    {
+        return geom;
+    }
+    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 setTbmj(Long tbmj) 
+    {
+        this.tbmj = tbmj;
+    }
+
+    public Long getTbmj() 
+    {
+        return tbmj;
+    }
+    public void setKcdlbm(String kcdlbm) 
+    {
+        this.kcdlbm = kcdlbm;
+    }
+
+    public String getKcdlbm() 
+    {
+        return kcdlbm;
+    }
+    public void setKcxs(Long kcxs) 
+    {
+        this.kcxs = kcxs;
+    }
+
+    public Long getKcxs() 
+    {
+        return kcxs;
+    }
+    public void setKcmj(Long kcmj) 
+    {
+        this.kcmj = kcmj;
+    }
+
+    public Long getKcmj() 
+    {
+        return kcmj;
+    }
+    public void setTbdlmj(Long tbdlmj) 
+    {
+        this.tbdlmj = tbdlmj;
+    }
+
+    public Long 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 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(Long sjnf) 
+    {
+        this.sjnf = sjnf;
+    }
+
+    public Long getSjnf() 
+    {
+        return sjnf;
+    }
+    public void setBz(String bz) 
+    {
+        this.bz = bz;
+    }
+
+    public String getBz() 
+    {
+        return bz;
+    }
+    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 set项目类型(String 项目类型) 
+    {
+        this.项目类型 = 项目类型;
+    }
+
+    public String get项目类型() 
+    {
+        return 项目类型;
+    }
+    public void set项目名称(String 项目名称) 
+    {
+        this.项目名称 = 项目名称;
+    }
+
+    public String get项目名称() 
+    {
+        return 项目名称;
+    }
+    public void setZzhdlmc(String zzhdlmc) 
+    {
+        this.zzhdlmc = zzhdlmc;
+    }
+
+    public String getZzhdlmc() 
+    {
+        return zzhdlmc;
+    }
+    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 setXzgdlydlbm(String xzgdlydlbm) 
+    {
+        this.xzgdlydlbm = xzgdlydlbm;
+    }
+
+    public String getXzgdlydlbm() 
+    {
+        return xzgdlydlbm;
+    }
+    public void setZzhdlbm(String zzhdlbm) 
+    {
+        this.zzhdlbm = zzhdlbm;
+    }
+
+    public String getZzhdlbm() 
+    {
+        return zzhdlbm;
+    }
+    public void setXzgdlydlmc(String xzgdlydlmc) 
+    {
+        this.xzgdlydlmc = xzgdlydlmc;
+    }
+
+    public String getXzgdlydlmc() 
+    {
+        return xzgdlydlmc;
+    }
+    public void setXzgdmj(Long xzgdmj) 
+    {
+        this.xzgdmj = xzgdmj;
+    }
+
+    public Long getXzgdmj() 
+    {
+        return xzgdmj;
+    }
+    public void setXzgddb(String xzgddb) 
+    {
+        this.xzgddb = xzgddb;
+    }
+
+    public String getXzgddb() 
+    {
+        return xzgddb;
+    }
+    public void setXzgdlyxm(String xzgdlyxm) 
+    {
+        this.xzgdlyxm = xzgdlyxm;
+    }
+
+    public String getXzgdlyxm() 
+    {
+        return xzgdlyxm;
+    }
+    public void setPid(Long pid) 
+    {
+        this.pid = pid;
+    }
+
+    public Long getPid() 
+    {
+        return pid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("geom", getGeom())
+            .append("tbbh", getTbbh())
+            .append("dlbm", getDlbm())
+            .append("dlmc", getDlmc())
+            .append("qsxz", getQsxz())
+            .append("tbmj", getTbmj())
+            .append("kcdlbm", getKcdlbm())
+            .append("kcxs", getKcxs())
+            .append("kcmj", getKcmj())
+            .append("tbdlmj", getTbdlmj())
+            .append("gdlx", getGdlx())
+            .append("gdpdjb", getGdpdjb())
+            .append("frdbs", getFrdbs())
+            .append("czcsxm", getCzcsxm())
+            .append("sjnf", getSjnf())
+            .append("bz", getBz())
+            .append("bsm", getBsm())
+            .append("ysdm", getYsdm())
+            .append("项目类型", get项目类型())
+            .append("项目名称", get项目名称())
+            .append("zzhdlmc", getZzhdlmc())
+            .append("qsdwdm", getQsdwdm())
+            .append("qsdwmc", getQsdwmc())
+            .append("zldwdm", getZldwdm())
+            .append("zldwmc", getZldwmc())
+            .append("xzgdlydlbm", getXzgdlydlbm())
+            .append("zzhdlbm", getZzhdlbm())
+            .append("xzgdlydlmc", getXzgdlydlmc())
+            .append("xzgdmj", getXzgdmj())
+            .append("xzgddb", getXzgddb())
+            .append("xzgdlyxm", getXzgdlyxm())
+            .append("pid", getPid())
+            .toString();
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/yzt/ZymlDTO.java

@@ -45,6 +45,8 @@ public class ZymlDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date create_time;
     private String create_by;
+    private String sharestate;
+    private String dataexplain;
 
     public String getYwlx() {
         return ywlx;
@@ -365,4 +367,20 @@ public class ZymlDTO {
     public void setCreate_by(String create_by) {
         this.create_by = create_by;
     }
+
+    public String getSharestate() {
+        return sharestate;
+    }
+
+    public void setSharestate(String sharestate) {
+        this.sharestate = sharestate;
+    }
+
+    public String getDataexplain() {
+        return dataexplain;
+    }
+
+    public void setDataexplain(String dataexplain) {
+        this.dataexplain = dataexplain;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/yzt/ZymlTreeDataDTO.java

@@ -1,9 +1,11 @@
 package com.onemap.apply.domain.yzt;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 //资源目录树状结构实体类
@@ -31,6 +33,12 @@ public class ZymlTreeDataDTO {
     private String format;
     private String maximumlevel;
     private String minimumlevel;
+    private String sharestate;
+    private String year;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    private String createBy;
+    private String dataexplain;
     private List<ZymlTreeDataDTO> children = new ArrayList<>();
 
     public String getLegend() {
@@ -218,4 +226,44 @@ public class ZymlTreeDataDTO {
     public void setMinimumlevel(String minimumlevel) {
         this.minimumlevel = minimumlevel;
     }
+
+    public String getSharestate() {
+        return sharestate;
+    }
+
+    public void setSharestate(String sharestate) {
+        this.sharestate = sharestate;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getDataexplain() {
+        return dataexplain;
+    }
+
+    public void setDataexplain(String dataexplain) {
+        this.dataexplain = dataexplain;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlApplicationRecord.java

@@ -175,6 +175,14 @@ public class TZymlApplicationRecord extends BaseEntity {
     @Excel(name = "服务KEY")
     private String fwKey;
 
+    @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;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -383,6 +391,22 @@ public class TZymlApplicationRecord extends BaseEntity {
         this.fwKey = fwKey;
     }
 
+    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;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("sqUserId", getSqUserId()).append("sqUserBy", getSqUserBy()).append("sqTime", getSqTime()).append("sqDepartmentId", getSqDepartmentId()).append("sqDepartmentBy", getSqDepartmentBy()).append("zymlId", getZymlId()).append("zymlBy", getZymlBy()).append("zymlTypeCode", getZymlTypeCode()).append("zymlTypeName", getZymlTypeName()).append("sqFw", getSqFw()).append("sqReason", getSqReason()).append("systemName", getSystemName()).append("callIp", getCallIp()).append("deadline", getDeadline()).append("attachment", getAttachment()).append("sqDeadline", getSqDeadline()).append("spUserId", getSpUserId()).append("spUserBy", getSpUserBy()).append("spTime", getSpTime()).append("spReason", getSpReason()).append("state", getState()).append("zymlUrl", getZymlUrl()).toString();

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlFiled.java

@@ -24,9 +24,11 @@ public class TZymlFiled extends BaseEntity {
     private String filedName;
     //    private String filed_name_zh;
     private String filedNameZh;
+    // 字段类型，超图和geoserver的格式不一致，暂时没有做强制映射配置
     private String filedType;
     //    private String share_display;
-    private String shareDisplay;
+    private Integer shareDisplay;
+    private Boolean status;
     private Integer sort;
 
     public String getId() {
@@ -69,11 +71,11 @@ public class TZymlFiled extends BaseEntity {
         this.filedType = filedType;
     }
 
-    public String getShareDisplay() {
+    public Integer getShareDisplay() {
         return shareDisplay;
     }
 
-    public void setShareDisplay(String shareDisplay) {
+    public void setShareDisplay(Integer shareDisplay) {
         this.shareDisplay = shareDisplay;
     }
 
@@ -81,6 +83,14 @@ public class TZymlFiled extends BaseEntity {
         return sort;
     }
 
+    public Boolean getStatus() {
+        return status;
+    }
+
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
+
     public void setSort(Integer sort) {
         this.sort = sort;
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlFiledVo.java

@@ -0,0 +1,24 @@
+package com.onemap.apply.domain.zymlapplication;
+
+public class TZymlFiledVo {
+    // 资源目录的ID
+    private String zymlBsm;
+    //是否重置
+    private Boolean resetType = false;
+
+    public String getZymlBsm() {
+        return zymlBsm;
+    }
+
+    public void setZymlBsm(String zymlBsm) {
+        this.zymlBsm = zymlBsm;
+    }
+
+    public Boolean getResetType() {
+        return resetType;
+    }
+
+    public void setResetType(Boolean resetType) {
+        this.resetType = resetType;
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.onemap.apply.mapper.qytdzz;
+
+import java.util.List;
+import com.onemap.apply.domain.qytdzz.AfterTdzz;
+import com.onemap.common.datasource.annotation.Slave;
+
+/**
+ * 土地整治项目信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+@Slave
+public interface AfterTdzzMapper 
+{
+    /**
+     * 查询土地整治项目信息
+     * 
+     * @param id 土地整治项目信息主键
+     * @return 土地整治项目信息
+     */
+    public AfterTdzz selectAfterTdzzById(Long id);
+
+    /**
+     * 查询土地整治项目信息列表
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 土地整治项目信息集合
+     */
+    public List<AfterTdzz> selectAfterTdzzList(AfterTdzz afterTdzz);
+
+    /**
+     * 新增土地整治项目信息
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 结果
+     */
+    public int insertAfterTdzz(AfterTdzz afterTdzz);
+
+    /**
+     * 修改土地整治项目信息
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 结果
+     */
+    public int updateAfterTdzz(AfterTdzz afterTdzz);
+
+    /**
+     * 删除土地整治项目信息
+     * 
+     * @param id 土地整治项目信息主键
+     * @return 结果
+     */
+    public int deleteAfterTdzzById(Long id);
+
+    /**
+     * 批量删除土地整治项目信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAfterTdzzByIds(Long[] ids);
+}

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

@@ -0,0 +1,63 @@
+package com.onemap.apply.mapper.qytdzz;
+
+import java.util.List;
+import com.onemap.apply.domain.qytdzz.TQytdzzZzxm;
+import com.onemap.common.datasource.annotation.Slave;
+
+/**
+ * 土地整治项目空间信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+@Slave
+public interface TQytdzzZzxmMapper 
+{
+    /**
+     * 查询土地整治项目空间信息
+     * 
+     * @param id 土地整治项目空间信息主键
+     * @return 土地整治项目空间信息
+     */
+    public TQytdzzZzxm selectTQytdzzZzxmById(Long id);
+
+    /**
+     * 查询土地整治项目空间信息列表
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 土地整治项目空间信息集合
+     */
+    public List<TQytdzzZzxm> selectTQytdzzZzxmList(TQytdzzZzxm tQytdzzZzxm);
+
+    /**
+     * 新增土地整治项目空间信息
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 结果
+     */
+    public int insertTQytdzzZzxm(TQytdzzZzxm tQytdzzZzxm);
+
+    /**
+     * 修改土地整治项目空间信息
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 结果
+     */
+    public int updateTQytdzzZzxm(TQytdzzZzxm tQytdzzZzxm);
+
+    /**
+     * 删除土地整治项目空间信息
+     * 
+     * @param id 土地整治项目空间信息主键
+     * @return 结果
+     */
+    public int deleteTQytdzzZzxmById(Long id);
+
+    /**
+     * 批量删除土地整治项目空间信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTQytdzzZzxmByIds(Long[] ids);
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/yzt/ZymlMapper.java

@@ -14,6 +14,9 @@ import java.util.Map;
  */
 @Mapper
 public interface ZymlMapper {
+
+    List<ZymlDTO> GetListCondition(@Param("username") String username, @Param("bsm") String bsm, @Param("pbsm") String pbsm, @Param("name") String name, @Param("sharestate") String sharestate);
+
     List<ZymlDTO> GetList(@Param("username") String username, @Param("param") String param, @Param("resources") String resources);
 
     List<ZymlDTO> GetList4XZQH(@Param("username") String username, @Param("xzqh") String xzqh, @Param("param") String param);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/zymlapplication/TZymlFiledMapper.java

@@ -54,6 +54,8 @@ public interface TZymlFiledMapper {
      */
     public int deleteTZymlFiledById(String id);
 
+    public int deleteTZymlFiledByZymlId(String zymlId);
+
     /**
      * 批量删除我的申请
      *

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

@@ -0,0 +1,95 @@
+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.AfterTdzzMapper;
+import com.onemap.apply.domain.qytdzz.AfterTdzz;
+import com.onemap.apply.service.qytdzz.IAfterTdzzService;
+
+import javax.annotation.Resource;
+
+/**
+ * 土地整治项目信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+@Service
+public class AfterTdzzServiceImpl implements IAfterTdzzService 
+{
+    @Resource
+    private AfterTdzzMapper afterTdzzMapper;
+
+    /**
+     * 查询土地整治项目信息
+     * 
+     * @param id 土地整治项目信息主键
+     * @return 土地整治项目信息
+     */
+    @Override
+    public AfterTdzz selectAfterTdzzById(Long id)
+    {
+        return afterTdzzMapper.selectAfterTdzzById(id);
+    }
+
+    /**
+     * 查询土地整治项目信息列表
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 土地整治项目信息
+     */
+    @Override
+    public List<AfterTdzz> selectAfterTdzzList(AfterTdzz afterTdzz)
+    {
+        return afterTdzzMapper.selectAfterTdzzList(afterTdzz);
+    }
+
+    /**
+     * 新增土地整治项目信息
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 结果
+     */
+    @Override
+    public int insertAfterTdzz(AfterTdzz afterTdzz)
+    {
+        return afterTdzzMapper.insertAfterTdzz(afterTdzz);
+    }
+
+    /**
+     * 修改土地整治项目信息
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 结果
+     */
+    @Override
+    public int updateAfterTdzz(AfterTdzz afterTdzz)
+    {
+        return afterTdzzMapper.updateAfterTdzz(afterTdzz);
+    }
+
+    /**
+     * 批量删除土地整治项目信息
+     * 
+     * @param ids 需要删除的土地整治项目信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAfterTdzzByIds(Long[] ids)
+    {
+        return afterTdzzMapper.deleteAfterTdzzByIds(ids);
+    }
+
+    /**
+     * 删除土地整治项目信息信息
+     * 
+     * @param id 土地整治项目信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAfterTdzzById(Long id)
+    {
+        return afterTdzzMapper.deleteAfterTdzzById(id);
+    }
+}

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

@@ -0,0 +1,93 @@
+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.TQytdzzZzxmMapper;
+import com.onemap.apply.domain.qytdzz.TQytdzzZzxm;
+import com.onemap.apply.service.qytdzz.ITQytdzzZzxmService;
+
+/**
+ * 土地整治项目空间信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+@Service
+public class TQytdzzZzxmServiceImpl implements ITQytdzzZzxmService 
+{
+    @Autowired
+    private TQytdzzZzxmMapper tQytdzzZzxmMapper;
+
+    /**
+     * 查询土地整治项目空间信息
+     * 
+     * @param id 土地整治项目空间信息主键
+     * @return 土地整治项目空间信息
+     */
+    @Override
+    public TQytdzzZzxm selectTQytdzzZzxmById(Long id)
+    {
+        return tQytdzzZzxmMapper.selectTQytdzzZzxmById(id);
+    }
+
+    /**
+     * 查询土地整治项目空间信息列表
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 土地整治项目空间信息
+     */
+    @Override
+    public List<TQytdzzZzxm> selectTQytdzzZzxmList(TQytdzzZzxm tQytdzzZzxm)
+    {
+        return tQytdzzZzxmMapper.selectTQytdzzZzxmList(tQytdzzZzxm);
+    }
+
+    /**
+     * 新增土地整治项目空间信息
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 结果
+     */
+    @Override
+    public int insertTQytdzzZzxm(TQytdzzZzxm tQytdzzZzxm)
+    {
+        return tQytdzzZzxmMapper.insertTQytdzzZzxm(tQytdzzZzxm);
+    }
+
+    /**
+     * 修改土地整治项目空间信息
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 结果
+     */
+    @Override
+    public int updateTQytdzzZzxm(TQytdzzZzxm tQytdzzZzxm)
+    {
+        return tQytdzzZzxmMapper.updateTQytdzzZzxm(tQytdzzZzxm);
+    }
+
+    /**
+     * 批量删除土地整治项目空间信息
+     * 
+     * @param ids 需要删除的土地整治项目空间信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTQytdzzZzxmByIds(Long[] ids)
+    {
+        return tQytdzzZzxmMapper.deleteTQytdzzZzxmByIds(ids);
+    }
+
+    /**
+     * 删除土地整治项目空间信息信息
+     * 
+     * @param id 土地整治项目空间信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTQytdzzZzxmById(Long id)
+    {
+        return tQytdzzZzxmMapper.deleteTQytdzzZzxmById(id);
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/yzt/ZymlServiceImpl.java

@@ -428,4 +428,169 @@ public class ZymlServiceImpl implements IZymlService {
     private boolean hasChild(List<ZymlTreeDTO> list, ZymlTreeDTO t) {
         return getChildList(list, t).size() > 0 ? true : false;
     }
+
+    //递归循环
+    public List<ZymlDTO> GetZymlSubsetList(String username, String pbsm, String name, Boolean share) {
+        String sharestate = null;
+        if (share != null && share == true) {
+            sharestate = "0";
+        }
+        List<ZymlDTO> ret = new ArrayList<>();
+        List<ZymlDTO> res = zymlMapper.GetListCondition(username, null, pbsm, name, sharestate);
+        for (ZymlDTO dto : res) {
+            List<ZymlDTO> subset = GetZymlSubsetList(username, dto.getBsm(), name, share);
+            ret.addAll(subset);
+        }
+        ret.addAll(res);
+        return ret;
+    }
+
+    @Override
+    public RequestResult GetZymlList(String bsm, String pbsm, String name, Boolean share, Boolean subset) {
+        try {
+            List<ZymlDTO> res = new ArrayList<>();
+            String sharestate = "1";
+            if (share != null && share == true) {
+                sharestate = "0";
+            }
+            //TODO 暂时为admin
+//            String username = SecurityUtils.getUsername();
+            String username = "admin";
+            if (StringUtils.isNotEmpty(username)) {
+                //暂定管理员权限可以查询所有数据，其他只能看到自己的
+                if (username.equals("admin")) {
+                    username = null;
+                }
+            } else {
+                return RequestResult.error("参数缺失");
+            }
+            List<ZymlDTO> ret = zymlMapper.GetListCondition(username, bsm, pbsm, name, sharestate);
+            if (subset != null && subset) {
+                for (ZymlDTO dto : ret) {
+                    List<ZymlDTO> subsetList = GetZymlSubsetList(username, dto.getBsm(), name, share);
+                    res.addAll(subsetList);
+                }
+            }
+            res.addAll(ret);
+            List<ZymlTreeDataDTO> treedata = new ArrayList<>();
+            for (int i = 0; i < res.size(); i++) {
+                ZymlDTO cur = res.get(i);
+                ZymlTreeDataDTO c = new ZymlTreeDataDTO();
+//                c.setDisabled((cur.getParent() == 1));
+                c.setId(cur.getBsm());
+                c.setPid(cur.getPbsm());
+                c.setLabel(cur.getName());
+                c.setTitle(cur.getName());
+                c.setType(cur.getType());
+                c.setLegend(cur.getLegend());
+                c.setUrl(cur.getUrl());
+                c.setSource(cur.getSde());
+                c.setFavorite(cur.getMy());
+                c.setMinimumlevel(cur.getMinimumlevel());
+                c.setMaximumlevel(cur.getMaximumlevel());
+                c.setFormat(cur.getFormat());
+                c.setLayergroup(cur.getLayergroup());
+                c.setQpfa(cur.getQpfa());
+                c.setFwys(cur.getFwys());
+                c.setFwgzkj(cur.getFwgzkj());
+                c.setFwmc(cur.getFwmc());
+                c.setServerType(cur.getServerType());
+                c.setSharestate(cur.getSharestate());
+                c.setYear(cur.getYear());
+                treedata.add(c);
+            }
+            List<ZymlTreeDataDTO> data = buildDeptTree2(treedata);
+            return RequestResult.success("成功", data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.error("失败", null);
+        }
+    }
+
+    public RequestResult GetZymlShareList(String name) {
+        List<ZymlDTO> res = new ArrayList<>();
+        List<ZymlDTO> ret = zymlMapper.GetListCondition(null, null, null, null, null);
+        for (ZymlDTO dto : ret) {
+            List<ZymlDTO> subsetList = GetZymlSubsetList(null, dto.getBsm(), null, null);
+            res.addAll(subsetList);
+        }
+        res.addAll(ret);
+        List<ZymlTreeDataDTO> treedata = new ArrayList<>();
+        for (int i = 0; i < res.size(); i++) {
+            ZymlDTO cur = res.get(i);
+            ZymlTreeDataDTO c = new ZymlTreeDataDTO();
+//                c.setDisabled((cur.getParent() == 1));
+            c.setId(cur.getBsm());
+            c.setPid(cur.getPbsm());
+            c.setLabel(cur.getName());
+            c.setTitle(cur.getName());
+            c.setType(cur.getType());
+            c.setLegend(cur.getLegend());
+            c.setUrl(cur.getUrl());
+            c.setSource(cur.getSde());
+            c.setFavorite(cur.getMy());
+            c.setMinimumlevel(cur.getMinimumlevel());
+            c.setMaximumlevel(cur.getMaximumlevel());
+            c.setFormat(cur.getFormat());
+            c.setLayergroup(cur.getLayergroup());
+            c.setQpfa(cur.getQpfa());
+            c.setFwys(cur.getFwys());
+            c.setFwgzkj(cur.getFwgzkj());
+            c.setFwmc(cur.getFwmc());
+            c.setServerType(cur.getServerType());
+            c.setSharestate(cur.getSharestate());
+            c.setYear(cur.getYear());
+            c.setCreateBy(cur.getCreate_by());
+            c.setCreateTime(cur.getCreate_time());
+            c.setDataexplain(cur.getDataexplain());
+            treedata.add(c);
+        }
+        //获取树
+        List<ZymlTreeDataDTO> newRET = new ArrayList<>();
+        List<ZymlTreeDataDTO> data = buildDeptTree2(treedata);
+        for (ZymlTreeDataDTO dto : data) {
+            Map<String, Object> statsMap = new HashMap<>();
+            statsMap.put("stats", false);
+            statsMap.put("id", dto.getId());
+            statsMap.put("data", dto);
+
+            Map<String, Object> retStatsMap = handleZymlTreeShare(statsMap);
+            Boolean retstats = (Boolean) retStatsMap.get("stats");
+            if (retstats) {
+                ZymlTreeDataDTO newData0 = (ZymlTreeDataDTO) retStatsMap.get("data");
+                newRET.add(newData0);
+            }
+        }
+        return RequestResult.success(newRET);
+    }
+
+
+    private Map<String, Object> handleZymlTreeShare(Map<String, Object> data) {
+        ZymlTreeDataDTO dtoObj = (ZymlTreeDataDTO) data.get("data");
+        Boolean stats = (Boolean) data.get("stats");
+        //判断是否是共享类型
+        String sharestate = dtoObj.getSharestate();
+        if (StringUtils.isNotEmpty(sharestate) && sharestate.equals("0")) {
+            stats = true;
+        }
+        List<ZymlTreeDataDTO> child = dtoObj.getChildren();
+        List<ZymlTreeDataDTO> newchild = new ArrayList<>();
+        for (ZymlTreeDataDTO dto : child) {
+            Map<String, Object> statsMap = new HashMap<>();
+            statsMap.put("stats", false);
+            statsMap.put("id", dto.getId());
+            statsMap.put("data", dto);
+            Map<String, Object> retStatsMap = handleZymlTreeShare(statsMap);
+            Boolean retstats = (Boolean) retStatsMap.get("stats");
+            if (retstats) {
+                ZymlTreeDataDTO newData0 = (ZymlTreeDataDTO) retStatsMap.get("data");
+                stats = true;
+                newchild.add(newData0);
+            }
+        }
+        dtoObj.setChildren(newchild);
+        data.put("data", dtoObj);
+        data.put("stats", stats);
+        return data;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/zymlapplication/ShareConfigurationServiceImp.java

@@ -1,6 +1,10 @@
 package com.onemap.apply.service.impl.zymlapplication;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.onemap.apply.domain.zymlapplication.TZymlFiled;
+import com.onemap.apply.domain.zymlapplication.TZymlFiledVo;
 import com.onemap.apply.mapper.zymlapplication.ShareConfigurationMapper;
 import com.onemap.apply.mapper.zymlapplication.TMyExamineMapper;
 import com.onemap.apply.mapper.zymlapplication.TZymlFiledMapper;
@@ -13,6 +17,7 @@ import javax.annotation.Resource;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -35,65 +40,124 @@ public class ShareConfigurationServiceImp implements IShareConfigurationService
     }
 
     @Override
-    public List<TZymlFiled> selectTZymlFiledList(String bsm) {
+    public List<TZymlFiled> selectTZymlFiledList(TZymlFiledVo tZymlFiledVo) {
+        String bsm = tZymlFiledVo.getZymlBsm();
         TZymlFiled tZymlFiled = new TZymlFiled();
         tZymlFiled.setZymlId(bsm);
-        List<TZymlFiled> list = tZymlFiledMapper.selectTZymlFiledList(tZymlFiled);
-        if (list == null || list.size() == 0) {
-            Map<String, Object> mapfwData = myExamineMapper.queryFwInfoByBsm(bsm);
-            String server_type = (String) mapfwData.get("server_type");
-            String type = (String) mapfwData.get("type");
-            String fwmc = (String) mapfwData.get("fwmc");
-            String fwgzkj = (String) mapfwData.get("fwgzkj");
-            String sde = (String) mapfwData.get("sde");
-            String url = (String) mapfwData.get("url");
-            //判断geoserver
-            if (StringUtils.isNotEmpty(server_type) && "geoserver".equals(server_type.toLowerCase())) {
-                int len_o = url.indexOf("geoserver");
+        List<TZymlFiled> dblist = tZymlFiledMapper.selectTZymlFiledList(tZymlFiled);
+        if (dblist == null || dblist.size() == 0) {
+            dblist = getZymlFiledList(bsm);
+            if (dblist == null || dblist.size() == 0) {
+                return null;
+            }
+            for (TZymlFiled kObj : dblist) {
+                tZymlFiledMapper.insertTZymlFiled(kObj);
+            }
+        }
+        if (tZymlFiledVo.getResetType()) {
+            List<TZymlFiled> zymlFiledList = getZymlFiledList(bsm);
+            List<TZymlFiled> newDbFiledList = new ArrayList<>();
+            int len = 0;
+            for (TZymlFiled dbFiled : dblist) {
+                for (TZymlFiled zymlFiled : zymlFiledList) {
+                    if (dbFiled.getFiledName().equals(zymlFiled.getFiledName())) {
+                        dbFiled.setSort(len);
+                        newDbFiledList.add(dbFiled);
+                        len++;
+                        continue;
+                    }
+                }
+            }
+            for (TZymlFiled zymlFiled : zymlFiledList) {
+                boolean check = false;
+                for (TZymlFiled dbFiled : newDbFiledList) {
+                    if (dbFiled.getFiledName().equals(zymlFiled.getFiledName())) {
+                        check = true;
+                        continue;
+                    }
+                }
+                if (!check) {
+                    zymlFiled.setSort(len);
+                    newDbFiledList.add(zymlFiled);
+                    len++;
+                }
+            }
+            dblist = newDbFiledList;
+            tZymlFiledMapper.deleteTZymlFiledByZymlId(bsm);
+            for (TZymlFiled kObj : dblist) {
+                tZymlFiledMapper.insertTZymlFiled(kObj);
+            }
+        }
+        return dblist;
+    }
+
+
+    private List<TZymlFiled> getZymlFiledList(String bsm) {
+        List<TZymlFiled> list = new ArrayList<>();
+        Map<String, Object> mapfwData = myExamineMapper.queryFwInfoByBsm(bsm);
+        String server_type = (String) mapfwData.get("server_type");
+        String type = (String) mapfwData.get("type");
+        String fwmc = (String) mapfwData.get("fwmc");
+        String fwgzkj = (String) mapfwData.get("fwgzkj");
+        if (StringUtils.isEmpty(fwgzkj) || StringUtils.isEmpty(fwmc)) {
+            return list;
+        }
+        String sde = (String) mapfwData.get("sde");
+        String url = (String) mapfwData.get("url");
+        //判断geoserver
+        if (StringUtils.isNotEmpty(server_type) && "geoserver".equals(server_type.toLowerCase()) && ("wms".equals(type.toLowerCase()) || "wmts".equals(type.toLowerCase()))) {
+            int len_o = url.indexOf("geoserver");
 //                http://192.168.60.2:8089/geoserver/ows?service=WFS&version=2.0.0&request=DescribeFeatureType&typeNames=demo:ghdk20241014
-                String getUrl = url.substring(0, len_o) + "geoserver/ows?service=WFS&version=2.0.0&request=DescribeFeatureType&typeNames=";
-                getUrl = getUrl + fwgzkj + ":" + fwmc;
-                String xml = formaServerJsonReplace(getUrl);
-                if (StringUtils.isEmpty(xml)) {
+            String getUrl = url.substring(0, len_o) + "geoserver/ows?service=WFS&version=2.0.0&request=DescribeFeatureType&typeNames=";
+            getUrl = getUrl + fwgzkj + ":" + fwmc;
+            String xml = formaServerReplace(getUrl);
+            if (StringUtils.isEmpty(xml)) {
+                return null;
+            }
+            list = analysisGeoServerFiledXml(xml, bsm);
+            if (list == null || list.size() == 0) {
+                return new ArrayList<>();
+            }
+        } else {
+            //超图矢量地图
+            if ("vector".equals(type.toLowerCase())) {
+                String url1 = url.replace("map-", "data-");
+                int len = url1.lastIndexOf("/rest/maps/");
+                String url2 = url1.substring(0, len);
+                try {
+                    url2 = url2 + "/rest/data/datasources/" + URLEncoder.encode(fwgzkj, "UTF-8");
+                    url2 = url2 + "/datasets/" + URLEncoder.encode(fwmc, "UTF-8") + "/fields";
+                } catch (UnsupportedEncodingException e) {
+                    System.out.println(e.getMessage());
                     return null;
                 }
-                list = analysisGeoServerFiledXml(xml, bsm);
+                String newUrl = url2 + ".json";
+                String json = formaServerReplace(newUrl);
+                list = analysisIServerFiledjson(json, bsm, url2);
                 if (list == null || list.size() == 0) {
-                    return null;
+                    return new ArrayList<>();
                 }
-                for (TZymlFiled kObj : list) {
-                    tZymlFiledMapper.insertTZymlFiled(kObj);
-                }
-            } else {
-//                //判断3DTiles
-//                if (StringUtils.isNotEmpty(type) && "3DTiles".toLowerCase().equals(type.toLowerCase())) {
-//                    String params = "";
-//                    params = params + paroxy_url.replace("{token}", fwKey) + "siwei3dtiles";
-//                    return params;
-//                } else {
-//                    //超图的
-//                    String sde = (String) mapfwData.get("sde");
-//                    String params = "";
-//                    params = params + paroxy_url.replace("{token}", fwKey) + "siweisupermap" + "?";
-//                    params = params + paramsTogether("server_type", type, true);
-//                    params = params + paramsTogether("sde", sde, false);
-//                    return params;
-//                }
             }
         }
         return list;
     }
 
+
+    @Override
+    public int updateTZymlFiledList(TZymlFiled filed) {
+        return tZymlFiledMapper.updateTZymlFiled(filed);
+    }
+
+
     /**
-     * 发送server请求，并将数据返回,处理JSON会将参数进行替换
+     * 发送geoserver请求，并将数据返回,处理xml结果
      *
      * @param uri
      * @throws IOException
      */
-    private String formaServerJsonReplace(String uri) {
+    private String formaServerReplace(String uri) {
         String retString = null;
         try {
-            System.out.println("uri:" + uri);
             URL url = new URL(uri);
             HttpURLConnection con = (HttpURLConnection) url.openConnection();
             if (con.getResponseCode() == 200) {
@@ -108,7 +172,6 @@ public class ShareConfigurationServiceImp implements IShareConfigurationService
                 is.close();
                 con.disconnect();
                 retString = strBuffer.toString();
-                System.out.println("retString:" + retString);
             }
         } catch (Exception e) {
             System.err.println("获取文件流出错," + e);
@@ -122,7 +185,6 @@ public class ShareConfigurationServiceImp implements IShareConfigurationService
         try {
             Document document = DocumentHelper.parseText(xmlString);
             Element rootElement = document.getRootElement();
-            System.out.println(rootElement.getName());
             Element sequence1 = rootElement.element("complexType");
             Element sequence2 = sequence1.element("complexContent");
             Element sequence3 = sequence2.element("extension");
@@ -139,6 +201,8 @@ public class ShareConfigurationServiceImp implements IShareConfigurationService
                 filedData.setZymlId(bsm);
                 filedData.setId(StringUtils.getUUID());
                 filedData.setSort(i);
+                filedData.setShareDisplay(1);
+                filedData.setStatus(true);
                 i++;
                 ret.add(filedData);
             }
@@ -149,4 +213,45 @@ public class ShareConfigurationServiceImp implements IShareConfigurationService
         return ret;
     }
 
+    /**
+     * 超图data处理
+     *
+     * @param jsonString
+     * @param bsm
+     * @return
+     */
+    private List<TZymlFiled> analysisIServerFiledjson(String jsonString, String bsm, String fieldUrl) {
+        List<TZymlFiled> ret = new ArrayList<>();
+        try {
+            JSONObject jsonObject1 = JSON.parseObject(jsonString);
+            JSONArray fieldNames = jsonObject1.getJSONArray("fieldNames");
+            for (int i = 0; i < fieldNames.size(); i++) {
+                String key = fieldNames.getString(i);
+                String fieldValueUrl = fieldUrl + "/" + URLEncoder.encode(key, "UTF-8") + ".json";
+                String fieldValueUrlJson = formaServerReplace(fieldValueUrl);
+                if (StringUtils.isNotEmpty(fieldValueUrlJson)) {
+                    JSONObject fieldValueObject_0 = JSON.parseObject(fieldValueUrlJson);
+                    JSONObject fieldInfoObj = fieldValueObject_0.getJSONObject("fieldInfo");
+                    String filedName = fieldInfoObj.getString("name");
+                    String filedType = fieldInfoObj.getString("type");
+                    TZymlFiled filedData = new TZymlFiled();
+                    filedData.setFiledName(filedName);
+                    filedData.setFiledNameZh(filedName);
+                    filedData.setFiledType(filedType);
+                    filedData.setZymlId(bsm);
+                    filedData.setId(StringUtils.getUUID());
+                    filedData.setSort(i);
+                    filedData.setShareDisplay(1);
+                    filedData.setStatus(true);
+                    i++;
+                    ret.add(filedData);
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("analysisGeoServerFiledXml error:" + e);
+            ret = new ArrayList<>();
+        }
+        return ret;
+    }
+
 }

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

@@ -0,0 +1,61 @@
+package com.onemap.apply.service.qytdzz;
+
+import java.util.List;
+import com.onemap.apply.domain.qytdzz.AfterTdzz;
+
+/**
+ * 土地整治项目信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+public interface IAfterTdzzService 
+{
+    /**
+     * 查询土地整治项目信息
+     * 
+     * @param id 土地整治项目信息主键
+     * @return 土地整治项目信息
+     */
+    public AfterTdzz selectAfterTdzzById(Long id);
+
+    /**
+     * 查询土地整治项目信息列表
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 土地整治项目信息集合
+     */
+    public List<AfterTdzz> selectAfterTdzzList(AfterTdzz afterTdzz);
+
+    /**
+     * 新增土地整治项目信息
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 结果
+     */
+    public int insertAfterTdzz(AfterTdzz afterTdzz);
+
+    /**
+     * 修改土地整治项目信息
+     * 
+     * @param afterTdzz 土地整治项目信息
+     * @return 结果
+     */
+    public int updateAfterTdzz(AfterTdzz afterTdzz);
+
+    /**
+     * 批量删除土地整治项目信息
+     * 
+     * @param ids 需要删除的土地整治项目信息主键集合
+     * @return 结果
+     */
+    public int deleteAfterTdzzByIds(Long[] ids);
+
+    /**
+     * 删除土地整治项目信息信息
+     * 
+     * @param id 土地整治项目信息主键
+     * @return 结果
+     */
+    public int deleteAfterTdzzById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.onemap.apply.service.qytdzz;
+
+import java.util.List;
+import com.onemap.apply.domain.qytdzz.TQytdzzZzxm;
+
+/**
+ * 土地整治项目空间信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-18
+ */
+public interface ITQytdzzZzxmService 
+{
+    /**
+     * 查询土地整治项目空间信息
+     * 
+     * @param id 土地整治项目空间信息主键
+     * @return 土地整治项目空间信息
+     */
+    public TQytdzzZzxm selectTQytdzzZzxmById(Long id);
+
+    /**
+     * 查询土地整治项目空间信息列表
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 土地整治项目空间信息集合
+     */
+    public List<TQytdzzZzxm> selectTQytdzzZzxmList(TQytdzzZzxm tQytdzzZzxm);
+
+    /**
+     * 新增土地整治项目空间信息
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 结果
+     */
+    public int insertTQytdzzZzxm(TQytdzzZzxm tQytdzzZzxm);
+
+    /**
+     * 修改土地整治项目空间信息
+     * 
+     * @param tQytdzzZzxm 土地整治项目空间信息
+     * @return 结果
+     */
+    public int updateTQytdzzZzxm(TQytdzzZzxm tQytdzzZzxm);
+
+    /**
+     * 批量删除土地整治项目空间信息
+     * 
+     * @param ids 需要删除的土地整治项目空间信息主键集合
+     * @return 结果
+     */
+    public int deleteTQytdzzZzxmByIds(Long[] ids);
+
+    /**
+     * 删除土地整治项目空间信息信息
+     * 
+     * @param id 土地整治项目空间信息主键
+     * @return 结果
+     */
+    public int deleteTQytdzzZzxmById(Long id);
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/yzt/IZymlService.java

@@ -28,4 +28,17 @@ public interface IZymlService {
     RequestResult GetLegendAttr(String ywlx);
 
     RequestResult GetTree(String param);
+
+    /**
+     * 暂时放弃
+     * @param bsm
+     * @param pbsm
+     * @param name
+     * @param share
+     * @param subset
+     * @return
+     */
+    RequestResult GetZymlList(String bsm, String pbsm, String name, Boolean share,Boolean subset);
+
+    RequestResult GetZymlShareList( String name);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/zymlapplication/IShareConfigurationService.java

@@ -1,6 +1,7 @@
 package com.onemap.apply.service.zymlapplication;
 
 import com.onemap.apply.domain.zymlapplication.TZymlFiled;
+import com.onemap.apply.domain.zymlapplication.TZymlFiledVo;
 
 import java.util.List;
 
@@ -8,5 +9,7 @@ public interface IShareConfigurationService {
 
     int updateZymlShareStateById(String bsm);
 
-    public List<TZymlFiled> selectTZymlFiledList(String bsm);
+    public List<TZymlFiled> selectTZymlFiledList(TZymlFiledVo tZymlFiledVo);
+
+    int updateTZymlFiledList(TZymlFiled filed);
 }

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

@@ -0,0 +1,148 @@
+<?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.AfterTdzzMapper">
+    
+    <resultMap type="AfterTdzz" id="AfterTdzzResult">
+        <result property="id"    column="id"    />
+        <result property="xzqdm"    column="xzqdm"    />
+        <result property="lxfl"    column="lxfl"    />
+        <result property="lxfl2"    column="lxfl2"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="wz"    column="wz"    />
+        <result property="gm"    column="gm"    />
+        <result property="gmdw"    column="gmdw"    />
+        <result property="tygm"    column="tygm"    />
+        <result property="tygmdw"    column="tygmdw"    />
+        <result property="jsnr"    column="jsnr"    />
+        <result property="jhtz"    column="jhtz"    />
+        <result property="czjhtz"    column="czjhtz"    />
+        <result property="shjhtz"    column="shjhtz"    />
+        <result property="jhkgnx"    column="jhkgnx"    />
+        <result property="jhysnx"    column="jhysnx"    />
+        <result property="zgbm"    column="zgbm"    />
+        <result property="sqlxbm"    column="sqlxbm"    />
+        <result property="pfbm"    column="pfbm"    />
+        <result property="xzgd"    column="xzgd"    />
+    </resultMap>
+
+    <sql id="selectAfterTdzzVo">
+        select id, xzqdm, lxfl, lxfl2, xmmc, wz, gm, gmdw, tygm, tygmdw, jsnr, jhtz, czjhtz, shjhtz, jhkgnx, jhysnx, zgbm, sqlxbm, pfbm, xzgd from "AFTER_TDZZ"
+    </sql>
+
+    <select id="selectAfterTdzzList" parameterType="AfterTdzz" resultMap="AfterTdzzResult">
+        <include refid="selectAfterTdzzVo"/>
+        <where>  
+            <if test="xzqdm != null  and xzqdm != ''"> and xzqdm like concat( #{xzqdm}, '%') </if>
+            <if test="lxfl != null  and lxfl != ''"> and lxfl = #{lxfl}</if>
+            <if test="lxfl2 != null  and lxfl2 != ''"> and lxfl2 = #{lxfl2}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc like concat('%' ,#{xmmc}, '%') </if>
+            <if test="wz != null  and wz != ''"> and wz = #{wz}</if>
+            <if test="gm != null "> and gm = #{gm}</if>
+            <if test="gmdw != null  and gmdw != ''"> and gmdw = #{gmdw}</if>
+            <if test="tygm != null "> and tygm = #{tygm}</if>
+            <if test="tygmdw != null  and tygmdw != ''"> and tygmdw = #{tygmdw}</if>
+            <if test="jsnr != null  and jsnr != ''"> and jsnr = #{jsnr}</if>
+            <if test="jhtz != null "> and jhtz = #{jhtz}</if>
+            <if test="czjhtz != null "> and czjhtz = #{czjhtz}</if>
+            <if test="shjhtz != null "> and shjhtz = #{shjhtz}</if>
+            <if test="jhkgnx != null "> and jhkgnx = #{jhkgnx}</if>
+            <if test="jhysnx != null "> and jhysnx = #{jhysnx}</if>
+            <if test="zgbm != null  and zgbm != ''"> and zgbm = #{zgbm}</if>
+            <if test="sqlxbm != null  and sqlxbm != ''"> and sqlxbm = #{sqlxbm}</if>
+            <if test="pfbm != null  and pfbm != ''"> and pfbm = #{pfbm}</if>
+            <if test="xzgd != null "> and xzgd = #{xzgd}</if>
+        </where>
+    </select>
+    
+    <select id="selectAfterTdzzById" parameterType="Long" resultMap="AfterTdzzResult">
+        <include refid="selectAfterTdzzVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAfterTdzz" parameterType="AfterTdzz">
+        insert into after_tdzz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="xzqdm != null">xzqdm,</if>
+            <if test="lxfl != null">lxfl,</if>
+            <if test="lxfl2 != null">lxfl2,</if>
+            <if test="xmmc != null">xmmc,</if>
+            <if test="wz != null">wz,</if>
+            <if test="gm != null">gm,</if>
+            <if test="gmdw != null">gmdw,</if>
+            <if test="tygm != null">tygm,</if>
+            <if test="tygmdw != null">tygmdw,</if>
+            <if test="jsnr != null">jsnr,</if>
+            <if test="jhtz != null">jhtz,</if>
+            <if test="czjhtz != null">czjhtz,</if>
+            <if test="shjhtz != null">shjhtz,</if>
+            <if test="jhkgnx != null">jhkgnx,</if>
+            <if test="jhysnx != null">jhysnx,</if>
+            <if test="zgbm != null">zgbm,</if>
+            <if test="sqlxbm != null">sqlxbm,</if>
+            <if test="pfbm != null">pfbm,</if>
+            <if test="xzgd != null">xzgd,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="xzqdm != null">#{xzqdm},</if>
+            <if test="lxfl != null">#{lxfl},</if>
+            <if test="lxfl2 != null">#{lxfl2},</if>
+            <if test="xmmc != null">#{xmmc},</if>
+            <if test="wz != null">#{wz},</if>
+            <if test="gm != null">#{gm},</if>
+            <if test="gmdw != null">#{gmdw},</if>
+            <if test="tygm != null">#{tygm},</if>
+            <if test="tygmdw != null">#{tygmdw},</if>
+            <if test="jsnr != null">#{jsnr},</if>
+            <if test="jhtz != null">#{jhtz},</if>
+            <if test="czjhtz != null">#{czjhtz},</if>
+            <if test="shjhtz != null">#{shjhtz},</if>
+            <if test="jhkgnx != null">#{jhkgnx},</if>
+            <if test="jhysnx != null">#{jhysnx},</if>
+            <if test="zgbm != null">#{zgbm},</if>
+            <if test="sqlxbm != null">#{sqlxbm},</if>
+            <if test="pfbm != null">#{pfbm},</if>
+            <if test="xzgd != null">#{xzgd},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAfterTdzz" parameterType="AfterTdzz">
+        update after_tdzz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xzqdm != null">xzqdm = #{xzqdm},</if>
+            <if test="lxfl != null">lxfl = #{lxfl},</if>
+            <if test="lxfl2 != null">lxfl2 = #{lxfl2},</if>
+            <if test="xmmc != null">xmmc = #{xmmc},</if>
+            <if test="wz != null">wz = #{wz},</if>
+            <if test="gm != null">gm = #{gm},</if>
+            <if test="gmdw != null">gmdw = #{gmdw},</if>
+            <if test="tygm != null">tygm = #{tygm},</if>
+            <if test="tygmdw != null">tygmdw = #{tygmdw},</if>
+            <if test="jsnr != null">jsnr = #{jsnr},</if>
+            <if test="jhtz != null">jhtz = #{jhtz},</if>
+            <if test="czjhtz != null">czjhtz = #{czjhtz},</if>
+            <if test="shjhtz != null">shjhtz = #{shjhtz},</if>
+            <if test="jhkgnx != null">jhkgnx = #{jhkgnx},</if>
+            <if test="jhysnx != null">jhysnx = #{jhysnx},</if>
+            <if test="zgbm != null">zgbm = #{zgbm},</if>
+            <if test="sqlxbm != null">sqlxbm = #{sqlxbm},</if>
+            <if test="pfbm != null">pfbm = #{pfbm},</if>
+            <if test="xzgd != null">xzgd = #{xzgd},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAfterTdzzById" parameterType="Long">
+        delete from after_tdzz where id = #{id}
+    </delete>
+
+    <delete id="deleteAfterTdzzByIds" parameterType="String">
+        delete from after_tdzz 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/TQytdzzZzxmMapper.xml

@@ -0,0 +1,213 @@
+<?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.TQytdzzZzxmMapper">
+    
+    <resultMap type="TQytdzzZzxm" id="TQytdzzZzxmResult">
+        <result property="id"    column="id"    />
+        <result property="geom"    column="geom"    />
+        <result property="tbbh"    column="tbbh"    />
+        <result property="dlbm"    column="dlbm"    />
+        <result property="dlmc"    column="dlmc"    />
+        <result property="qsxz"    column="qsxz"    />
+        <result property="tbmj"    column="tbmj"    />
+        <result property="kcdlbm"    column="kcdlbm"    />
+        <result property="kcxs"    column="kcxs"    />
+        <result property="kcmj"    column="kcmj"    />
+        <result property="tbdlmj"    column="tbdlmj"    />
+        <result property="gdlx"    column="gdlx"    />
+        <result property="gdpdjb"    column="gdpdjb"    />
+        <result property="frdbs"    column="frdbs"    />
+        <result property="czcsxm"    column="czcsxm"    />
+        <result property="sjnf"    column="sjnf"    />
+        <result property="bz"    column="bz"    />
+        <result property="bsm"    column="bsm"    />
+        <result property="ysdm"    column="ysdm"    />
+        <result property="项目类型"    column="项目类型"    />
+        <result property="项目名称"    column="项目名称"    />
+        <result property="zzhdlmc"    column="zzhdlmc"    />
+        <result property="qsdwdm"    column="qsdwdm"    />
+        <result property="qsdwmc"    column="qsdwmc"    />
+        <result property="zldwdm"    column="zldwdm"    />
+        <result property="zldwmc"    column="zldwmc"    />
+        <result property="xzgdlydlbm"    column="xzgdlydlbm"    />
+        <result property="zzhdlbm"    column="zzhdlbm"    />
+        <result property="xzgdlydlmc"    column="xzgdlydlmc"    />
+        <result property="xzgdmj"    column="xzgdmj"    />
+        <result property="xzgddb"    column="xzgddb"    />
+        <result property="xzgdlyxm"    column="xzgdlyxm"    />
+        <result property="pid"    column="pid"    />
+    </resultMap>
+
+    <sql id="selectTQytdzzZzxmVo">
+        select id, public.st_asewkt(public.st_force2d(geom)) geom, tbbh, dlbm, dlmc, qsxz, tbmj, kcdlbm, kcxs, kcmj, tbdlmj, gdlx, gdpdjb, frdbs, czcsxm, sjnf, bz, bsm, ysdm, 项目类型, 项目名称, zzhdlmc, qsdwdm, qsdwmc, zldwdm, zldwmc, xzgdlydlbm, zzhdlbm, xzgdlydlmc, xzgdmj, xzgddb, xzgdlyxm, pid from t_qytdzz_zzxm
+    </sql>
+
+    <select id="selectTQytdzzZzxmList" parameterType="TQytdzzZzxm" resultMap="TQytdzzZzxmResult">
+        <include refid="selectTQytdzzZzxmVo"/>
+        <where>  
+            <if test="geom != null  and geom != ''"> and geom = #{geom}</if>
+            <if test="tbbh != null  and tbbh != ''"> and tbbh = #{tbbh}</if>
+            <if test="dlbm != null  and dlbm != ''"> and dlbm = #{dlbm}</if>
+            <if test="dlmc != null  and dlmc != ''"> and dlmc = #{dlmc}</if>
+            <if test="qsxz != null  and qsxz != ''"> and qsxz = #{qsxz}</if>
+            <if test="tbmj != null "> and tbmj = #{tbmj}</if>
+            <if test="kcdlbm != null  and kcdlbm != ''"> and kcdlbm = #{kcdlbm}</if>
+            <if test="kcxs != null "> and kcxs = #{kcxs}</if>
+            <if test="kcmj != null "> and kcmj = #{kcmj}</if>
+            <if test="tbdlmj != null "> and tbdlmj = #{tbdlmj}</if>
+            <if test="gdlx != null  and gdlx != ''"> and gdlx = #{gdlx}</if>
+            <if test="gdpdjb != null  and gdpdjb != ''"> and gdpdjb = #{gdpdjb}</if>
+            <if test="frdbs != null  and frdbs != ''"> and frdbs = #{frdbs}</if>
+            <if test="czcsxm != null  and czcsxm != ''"> and czcsxm = #{czcsxm}</if>
+            <if test="sjnf != null "> and sjnf = #{sjnf}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
+            <if test="bsm != null  and bsm != ''"> and bsm = #{bsm}</if>
+            <if test="ysdm != null  and ysdm != ''"> and ysdm = #{ysdm}</if>
+            <if test="项目类型 != null  and 项目类型 != ''"> and 项目类型 = #{项目类型}</if>
+            <if test="项目名称 != null  and 项目名称 != ''"> and 项目名称 = #{项目名称}</if>
+            <if test="zzhdlmc != null  and zzhdlmc != ''"> and zzhdlmc = #{zzhdlmc}</if>
+            <if test="qsdwdm != null  and qsdwdm != ''"> and qsdwdm = #{qsdwdm}</if>
+            <if test="qsdwmc != null  and qsdwmc != ''"> and qsdwmc = #{qsdwmc}</if>
+            <if test="zldwdm != null  and zldwdm != ''"> and zldwdm = #{zldwdm}</if>
+            <if test="zldwmc != null  and zldwmc != ''"> and zldwmc = #{zldwmc}</if>
+            <if test="xzgdlydlbm != null  and xzgdlydlbm != ''"> and xzgdlydlbm = #{xzgdlydlbm}</if>
+            <if test="zzhdlbm != null  and zzhdlbm != ''"> and zzhdlbm = #{zzhdlbm}</if>
+            <if test="xzgdlydlmc != null  and xzgdlydlmc != ''"> and xzgdlydlmc = #{xzgdlydlmc}</if>
+            <if test="xzgdmj != null "> and xzgdmj = #{xzgdmj}</if>
+            <if test="xzgddb != null  and xzgddb != ''"> and xzgddb = #{xzgddb}</if>
+            <if test="xzgdlyxm != null  and xzgdlyxm != ''"> and xzgdlyxm = #{xzgdlyxm}</if>
+            <if test="pid != null "> and pid = #{pid}</if>
+        </where>
+    </select>
+    
+    <select id="selectTQytdzzZzxmById" parameterType="Long" resultMap="TQytdzzZzxmResult">
+        <include refid="selectTQytdzzZzxmVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTQytdzzZzxm" parameterType="TQytdzzZzxm">
+        insert into t_qytdzz_zzxm
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="geom != null">geom,</if>
+            <if test="tbbh != null">tbbh,</if>
+            <if test="dlbm != null">dlbm,</if>
+            <if test="dlmc != null">dlmc,</if>
+            <if test="qsxz != null">qsxz,</if>
+            <if test="tbmj != null">tbmj,</if>
+            <if test="kcdlbm != null">kcdlbm,</if>
+            <if test="kcxs != null">kcxs,</if>
+            <if test="kcmj != null">kcmj,</if>
+            <if test="tbdlmj != null">tbdlmj,</if>
+            <if test="gdlx != null">gdlx,</if>
+            <if test="gdpdjb != null">gdpdjb,</if>
+            <if test="frdbs != null">frdbs,</if>
+            <if test="czcsxm != null">czcsxm,</if>
+            <if test="sjnf != null">sjnf,</if>
+            <if test="bz != null">bz,</if>
+            <if test="bsm != null">bsm,</if>
+            <if test="ysdm != null">ysdm,</if>
+            <if test="项目类型 != null">项目类型,</if>
+            <if test="项目名称 != null">项目名称,</if>
+            <if test="zzhdlmc != null">zzhdlmc,</if>
+            <if test="qsdwdm != null">qsdwdm,</if>
+            <if test="qsdwmc != null">qsdwmc,</if>
+            <if test="zldwdm != null">zldwdm,</if>
+            <if test="zldwmc != null">zldwmc,</if>
+            <if test="xzgdlydlbm != null">xzgdlydlbm,</if>
+            <if test="zzhdlbm != null">zzhdlbm,</if>
+            <if test="xzgdlydlmc != null">xzgdlydlmc,</if>
+            <if test="xzgdmj != null">xzgdmj,</if>
+            <if test="xzgddb != null">xzgddb,</if>
+            <if test="xzgdlyxm != null">xzgdlyxm,</if>
+            <if test="pid != null">pid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="geom != null">#{geom},</if>
+            <if test="tbbh != null">#{tbbh},</if>
+            <if test="dlbm != null">#{dlbm},</if>
+            <if test="dlmc != null">#{dlmc},</if>
+            <if test="qsxz != null">#{qsxz},</if>
+            <if test="tbmj != null">#{tbmj},</if>
+            <if test="kcdlbm != null">#{kcdlbm},</if>
+            <if test="kcxs != null">#{kcxs},</if>
+            <if test="kcmj != null">#{kcmj},</if>
+            <if test="tbdlmj != null">#{tbdlmj},</if>
+            <if test="gdlx != null">#{gdlx},</if>
+            <if test="gdpdjb != null">#{gdpdjb},</if>
+            <if test="frdbs != null">#{frdbs},</if>
+            <if test="czcsxm != null">#{czcsxm},</if>
+            <if test="sjnf != null">#{sjnf},</if>
+            <if test="bz != null">#{bz},</if>
+            <if test="bsm != null">#{bsm},</if>
+            <if test="ysdm != null">#{ysdm},</if>
+            <if test="项目类型 != null">#{项目类型},</if>
+            <if test="项目名称 != null">#{项目名称},</if>
+            <if test="zzhdlmc != null">#{zzhdlmc},</if>
+            <if test="qsdwdm != null">#{qsdwdm},</if>
+            <if test="qsdwmc != null">#{qsdwmc},</if>
+            <if test="zldwdm != null">#{zldwdm},</if>
+            <if test="zldwmc != null">#{zldwmc},</if>
+            <if test="xzgdlydlbm != null">#{xzgdlydlbm},</if>
+            <if test="zzhdlbm != null">#{zzhdlbm},</if>
+            <if test="xzgdlydlmc != null">#{xzgdlydlmc},</if>
+            <if test="xzgdmj != null">#{xzgdmj},</if>
+            <if test="xzgddb != null">#{xzgddb},</if>
+            <if test="xzgdlyxm != null">#{xzgdlyxm},</if>
+            <if test="pid != null">#{pid},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTQytdzzZzxm" parameterType="TQytdzzZzxm">
+        update t_qytdzz_zzxm
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="geom != null">geom = #{geom},</if>
+            <if test="tbbh != null">tbbh = #{tbbh},</if>
+            <if test="dlbm != null">dlbm = #{dlbm},</if>
+            <if test="dlmc != null">dlmc = #{dlmc},</if>
+            <if test="qsxz != null">qsxz = #{qsxz},</if>
+            <if test="tbmj != null">tbmj = #{tbmj},</if>
+            <if test="kcdlbm != null">kcdlbm = #{kcdlbm},</if>
+            <if test="kcxs != null">kcxs = #{kcxs},</if>
+            <if test="kcmj != null">kcmj = #{kcmj},</if>
+            <if test="tbdlmj != null">tbdlmj = #{tbdlmj},</if>
+            <if test="gdlx != null">gdlx = #{gdlx},</if>
+            <if test="gdpdjb != null">gdpdjb = #{gdpdjb},</if>
+            <if test="frdbs != null">frdbs = #{frdbs},</if>
+            <if test="czcsxm != null">czcsxm = #{czcsxm},</if>
+            <if test="sjnf != null">sjnf = #{sjnf},</if>
+            <if test="bz != null">bz = #{bz},</if>
+            <if test="bsm != null">bsm = #{bsm},</if>
+            <if test="ysdm != null">ysdm = #{ysdm},</if>
+            <if test="项目类型 != null">项目类型 = #{项目类型},</if>
+            <if test="项目名称 != null">项目名称 = #{项目名称},</if>
+            <if test="zzhdlmc != null">zzhdlmc = #{zzhdlmc},</if>
+            <if test="qsdwdm != null">qsdwdm = #{qsdwdm},</if>
+            <if test="qsdwmc != null">qsdwmc = #{qsdwmc},</if>
+            <if test="zldwdm != null">zldwdm = #{zldwdm},</if>
+            <if test="zldwmc != null">zldwmc = #{zldwmc},</if>
+            <if test="xzgdlydlbm != null">xzgdlydlbm = #{xzgdlydlbm},</if>
+            <if test="zzhdlbm != null">zzhdlbm = #{zzhdlbm},</if>
+            <if test="xzgdlydlmc != null">xzgdlydlmc = #{xzgdlydlmc},</if>
+            <if test="xzgdmj != null">xzgdmj = #{xzgdmj},</if>
+            <if test="xzgddb != null">xzgddb = #{xzgddb},</if>
+            <if test="xzgdlyxm != null">xzgdlyxm = #{xzgdlyxm},</if>
+            <if test="pid != null">pid = #{pid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTQytdzzZzxmById" parameterType="Long">
+        delete from t_qytdzz_zzxm where id = #{id}
+    </delete>
+
+    <delete id="deleteTQytdzzZzxmByIds" parameterType="String">
+        delete from t_qytdzz_zzxm where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/yzt/ZymlMapper.xml

@@ -4,7 +4,80 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.apply.mapper.yzt.ZymlMapper">
 
+    <select id="GetListCondition" parameterType="java.lang.String" resultType="com.onemap.apply.domain.yzt.ZymlDTO">
+        select
+        (WITH RECURSIVE a AS (
+        SELECT g.bsm, g.pbsm, g.parent
+        FROM t_yzt_zyml g
+        WHERE bsm = t.bsm
+        UNION ALL
+        SELECT d.bsm, d.pbsm, d.parent
+        FROM t_yzt_zyml d
+        JOIN a ON a.bsm = d.pbsm )
+        SELECT count(1) FROM a where a.parent = '0') as "count",
+        t.bsm as "bsm",
+        t.name as "name",
+        t.type as "type",
+        t.pbsm as "pbsm",
+        t.icon as "icon",
+        t.url as "url",
+        t.lev as "lev",
+        t.sort as "sort",
+        t.state as "state",
+        t.parent as "parent",
+        case when t.sde is null then t.server_type else 'Arcgis' end as "server_type",
+        t.sflssj as "sflssj",
+        t.sfdbfx as "sfdbfx",
+        t.sfjl as "sfjl",
+        t.sfcx as "sfcx",
+        t.sftj as "sftj",
+        t.epsg as "epsg",
+        t.year as "year",
+        t.sjlx as "sjlx",
+        t.sde as "sde",
+        t.gltj as "gltj",
+        t.sjly as "sjly",
+        t.legend as "legend",
+        t.ywlx as "ywlx",
+        t.server_type as "serverType",
+        t.fwmc as "fwmc" ,
+        t.fwgzkj as "fwgzkj",
+        t.fwys as "fwys",
+        t.qpfa as "qpfa",
+        t.layergroup as "layergroup",
+        t.format as "format",
+        t.maximumlevel as "maximumlevel",
+        t.minimumlevel as "minimumlevel",
+        t.create_time as "create_time",
+        t.create_by as "create_by",
+        t.sharestate as "sharestate",
+        t.dataexplain as "dataexplain"
+        from t_yzt_zyml t
+        where 1 = 1
+        <choose>
+            <when test="bsm != null and bsm != ''">
+                and t.bsm = #{bsm}
+            </when>
+            <otherwise>
+                <choose>
+                    <when test="pbsm != null and pbsm != ''">
+                        and t.pbsm = #{pbsm}
+                    </when>
+                    <otherwise>
+                        and (T.pbsm is null or T.pbsm ='')
+                    </otherwise>
+                </choose>
+            </otherwise>
+        </choose>
+        <if test="name != null and name != ''">
+            and t.name like concat('%',#{name},'%')
+        </if>
+        <if test="sharestate != null and sharestate != ''">
+            and t.sharestate = #{sharestate}
+        </if>
 
+        order by t.lev,t.pbsm,t.sort
+    </select>
     <select id="GetList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.yzt.ZymlDTO">
         select
         (WITH RECURSIVE a AS (
@@ -222,6 +295,8 @@
         t.sjly as "sjly",
         t.legend as "legend",
         t.ywlx as "ywlx",
+        t.create_time as "create_time",
+        t.create_by as "create_by",
         null as "my",
         null as "fzbsm"
         from T_YZT_ZYML t where t.bsm in
@@ -267,6 +342,7 @@
         t.minimumlevel as "minimumlevel",
         t.create_time as "create_time",
         t.create_by as "create_by",
+        t.dataexplain as "dataexplain",
         null as "my",
         null as "fzbsm"
         from T_YZT_ZYML t

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/ShareConfigurationMapper.xml

@@ -5,6 +5,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.onemap.apply.mapper.zymlapplication.ShareConfigurationMapper">
 
     <update id="updateZymlShareState" parameterType="String">
-        update t_yzt_zyml set sharestate = (case when sharestate ='0' then '0' else '1' end)  where bsm = #{bsm}
+        update t_yzt_zyml set sharestate = (case when sharestate ='1' or sharestate is null or sharestate = '' then '0' else '1' end)  where bsm = #{bsm}
     </update>
 </mapper>

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlApplicationRecordMapper.xml

@@ -62,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spUserId != null  and spUserId != ''"> and sp_user_id = #{spUserId}</if>
             <if test="spUserBy != null  and spUserBy != ''"> and sp_user_by = #{spUserBy}</if>
             <if test="spTime != null "> and sp_time = #{spTime}</if>
+            <if test="startTime != null "> and sq_time &gt;= #{startTime}</if>
+            <if test="endTime != null "> and sq_time &lt;= #{endTime}</if>
             <if test="spReason != null  and spReason != ''"> and sp_reason = #{spReason}</if>
             <if test="state != null "> and state = #{state}</if>
             <if test="fwKey != null "> and fw_key = #{fwKey}</if>

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlFiledMapper.xml

@@ -12,10 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="filedType"    column="filed_type"    />
         <result property="shareDisplay"    column="share_display"    />
         <result property="sort"    column="sort"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectTZymlFiledVo">
-        select id, zyml_id, filed_name, filed_name_zh, share_display, sort from t_zyml_filed
+        select id, zyml_id, filed_name, filed_name_zh, share_display, sort,status from t_zyml_filed
     </sql>
 
     <select id="selectTZymlFiledList" parameterType="TZymlFiled" resultMap="TZymlFiledResult">
@@ -25,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="filedName != null  and filedName != ''"> and filed_name like concat('%', #{filedName}, '%')</if>
             <if test="filedNameZh != null  and filedNameZh != ''"> and filed_name_zh like concat('%', #{filedNameZh}, '%')</if>
         </where>
+        order by sort asc
     </select>
 
     <select id="selectTZymlFiledById" parameterType="String" resultMap="TZymlFiledResult">
@@ -42,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="filedType != null">filed_type,</if>
             <if test="shareDisplay != null">share_display,</if>
             <if test="sort != null">sort,</if>
+            <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -51,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="filedType != null">#{filedType},</if>
             <if test="shareDisplay != null">#{shareDisplay},</if>
             <if test="sort != null">#{sort},</if>
+            <if test="status != null">#{status},</if>
         </trim>
     </insert>
 
@@ -61,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="filedNameZh != null">filed_name_zh = #{filedNameZh},</if>
             <if test="shareDisplay != null">share_display = #{shareDisplay},</if>
             <if test="sort != null">sort = #{sort},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>
@@ -69,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from t_zyml_filed where id = #{id}
     </delete>
 
+    <delete id="deleteTZymlFiledByZymlId" parameterType="String">
+        delete from t_zyml_filed where zyml_id = #{zymlId}
+    </delete>
+
     <delete id="deleteTZymlFiledByIds" parameterType="String">
         delete from t_zyml_filed where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">

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

@@ -77,14 +77,14 @@ public class ZtCqBcbzListController extends BaseController
     @Log(title = "拆迁补偿标准列", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ZtCqBcbzList ztCqBcbzList) {
-        String pUuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
-        ztCqBcbzList.setId(pUuid);
+//        String pUuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+//        ztCqBcbzList.setId(pUuid);
         String uuid = "";
         List<ZtCqBcbzItem> items = ztCqBcbzList.getBcbz();
         if (items != null) {
             for (ZtCqBcbzItem item : items) {
                 uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
-                item.setPid(pUuid);
+                item.setPid(ztCqBcbzList.getId());
                 item.setId(uuid);
                 ztCqBcbzItemService.insertZtCqBcbzItem(item);
             }

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

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="des != null  and des != ''"> and des = #{des}</if>
             <if test="pid != null  and pid != ''"> and pid = #{pid}</if>
         </where>
+        order by "jg","grade" asc
     </select>
     
     <select id="selectZtCqBcbzItemById" parameterType="String" resultMap="ZtCqBcbzItemResult">

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

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertZtCqBcbzList" parameterType="com.onemap.sanya.domain.business.ZtCqBcbzList">
+    <insert id="insertZtCqBcbzList" parameterType="com.onemap.sanya.domain.business.ZtCqBcbzList" useGeneratedKeys="true" keyProperty="id">
         insert into "zt_cq_bcbz_list"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

onemap-modules/onemap-system/src/main/java/com/onemap/system/domain/TYztZyml.java

@@ -1,116 +1,191 @@
 package com.onemap.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
 import com.onemap.common.core.web.domain.TreeEntity;
 
+import java.util.Date;
+
 /**
  * 数据资源目录对象 t_yzt_zyml
- * 
+ *
  * @author onemap
- * @date 2022-12-01
  */
-public class TYztZyml extends TreeEntity
-{
+public class TYztZyml extends TreeEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 标识码 */
+    /**
+     * 标识码
+     */
     @Excel(name = "标识码")
     private String bsm;
 
-    /** 名称 */
+    /**
+     * 名称
+     */
     @Excel(name = "名称")
     private String name;
 
-    /** 类型(Point、Line、Polygon、WMTS) */
+    /**
+     * 类型(Point、Line、Polygon、WMTS)
+     */
     @Excel(name = "类型(Point、Line、Polygon、WMTS)")
     private String type;
 
-    /** 父标识码 */
+    /**
+     * 父标识码
+     */
     @Excel(name = "父标识码")
     private String pbsm;
 
-    /** 图标 */
+    /**
+     * 图标
+     */
     @Excel(name = "图标")
     private String icon;
 
-    /** URL */
+    /**
+     * URL
+     */
     @Excel(name = "URL")
     private String url;
 
-    /** 级别 */
+    /**
+     * 级别
+     */
     @Excel(name = "级别")
     private Long lev;
 
-    /** 排序 */
+    /**
+     * 排序
+     */
     @Excel(name = "排序")
     private Long sort;
 
-    /** 状态 */
+    /**
+     * 状态
+     */
     @Excel(name = "状态")
-    private Long state;
+    private String state;
 
-    /** 是否父节点(0否 1是) */
+    /**
+     * 是否父节点(0否 1是)
+     */
     @Excel(name = "是否父节点(0否 1是)")
-    private Long parent;
+    private String parent;
 
-    /** 服务器类型(arcgis geoserver) */
+    /**
+     * 服务器类型(arcgis geoserver)
+     */
     @Excel(name = "服务器类型(arcgis geoserver)")
     private String serverType;
 
-    /** 是否历史数据(0否 1是) */
+    /**
+     * 是否历史数据(0否 1是)
+     */
     @Excel(name = "是否历史数据(0否 1是)")
     private Long sflssj;
 
-    /** 是否对比分析(0否 1是) */
+    /**
+     * 是否对比分析(0否 1是)
+     */
     @Excel(name = "是否对比分析(0否 1是)")
     private Long sfdbfx;
 
-    /** 是否卷帘(0否 1是) */
+    /**
+     * 是否卷帘(0否 1是)
+     */
     @Excel(name = "是否卷帘(0否 1是)")
     private Long sfjl;
 
-    /** 是否查询(0否 1是) */
+    /**
+     * 是否查询(0否 1是)
+     */
     @Excel(name = "是否查询(0否 1是)")
     private Long sfcx;
 
-    /** 是否统计(0否 1是) */
+    /**
+     * 是否统计(0否 1是)
+     */
     @Excel(name = "是否统计(0否 1是)")
     private Long sftj;
 
-    /** 数据坐标系 */
+    /**
+     * 数据坐标系
+     */
     @Excel(name = "数据坐标系")
     private String epsg;
 
-    /** 数据年份 */
+    /**
+     * 数据年份
+     */
     @Excel(name = "数据年份")
     private String year;
 
-    /** 数据类型(point、line、polyon、img、pdf) */
+    /**
+     * 数据类型(point、line、polyon、img、pdf)
+     */
     @Excel(name = "数据类型(point、line、polyon、img、pdf)")
     private String sjlx;
 
-    /** SDE表 */
+    /**
+     * SDE表
+     */
     @Excel(name = "SDE表")
     private String sde;
 
-    /** 过滤条件 */
+    /**
+     * 过滤条件
+     */
     @Excel(name = "过滤条件")
     private String gltj;
 
-    /** 数据来源 */
+    /**
+     * 数据来源
+     */
     @Excel(name = "数据来源")
     private String sjly;
 
-    /** 图例 */
+    /**
+     * 图例
+     */
     @Excel(name = "图例")
     private String legend;
 
-    /** 业务类型 */
+    /**
+     * 业务类型
+     */
     @Excel(name = "业务类型")
     private String ywlx;
 
+    @Excel(name = "服务名称")
+    private String fwmc;
+    @Excel(name = "服务工作空间")
+    private String fwgzkj;
+    @Excel(name = "服务样式")
+    private String fwys;
+    @Excel(name = "切片方案")
+    private String qpfa;
+    @Excel(name = "图层组名称")
+    private String layergroup;
+    @Excel(name = "格式")
+    private String format;
+    @Excel(name = "最大层级")
+    private Integer maximumlevel;
+    @Excel(name = "最小层级")
+    private Integer minimumlevel;
+    @Excel(name = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    @Excel(name = "创建人")
+    private String createBy;
+    @Excel(name = "共享状态")
+    private String sharestate;
+    @Excel(name = "数据说明")
+    private String dataexplain;
+
     public String getYwlx() {
         return ywlx;
     }
@@ -119,240 +194,316 @@ public class TYztZyml extends TreeEntity
         this.ywlx = ywlx;
     }
 
-    public void setBsm(String bsm)
-    {
+    public void setBsm(String bsm) {
         this.bsm = bsm;
     }
 
-    public String getBsm() 
-    {
+    public String getBsm() {
         return bsm;
     }
-    public void setName(String name) 
-    {
+
+    public void setName(String name) {
         this.name = name;
     }
 
-    public String getName() 
-    {
+    public String getName() {
         return name;
     }
-    public void setType(String type) 
-    {
+
+    public void setType(String type) {
         this.type = type;
     }
 
-    public String getType() 
-    {
+    public String getType() {
         return type;
     }
-    public void setPbsm(String pbsm) 
-    {
+
+    public void setPbsm(String pbsm) {
         this.pbsm = pbsm;
     }
 
-    public String getPbsm() 
-    {
+    public String getPbsm() {
         return pbsm;
     }
-    public void setIcon(String icon) 
-    {
+
+    public void setIcon(String icon) {
         this.icon = icon;
     }
 
-    public String getIcon() 
-    {
+    public String getIcon() {
         return icon;
     }
-    public void setUrl(String url) 
-    {
+
+    public void setUrl(String url) {
         this.url = url;
     }
 
-    public String getUrl() 
-    {
+    public String getUrl() {
         return url;
     }
-    public void setLev(Long lev) 
-    {
+
+    public void setLev(Long lev) {
         this.lev = lev;
     }
 
-    public Long getLev() 
-    {
+    public Long getLev() {
         return lev;
     }
-    public void setSort(Long sort) 
-    {
+
+    public void setSort(Long sort) {
         this.sort = sort;
     }
 
-    public Long getSort() 
-    {
+    public Long getSort() {
         return sort;
     }
-    public void setState(Long state) 
-    {
+
+    public void setState(String state) {
         this.state = state;
     }
 
-    public Long getState() 
-    {
+    public String getState() {
         return state;
     }
-    public void setParent(Long parent) 
-    {
+
+    public void setParent(String parent) {
         this.parent = parent;
     }
 
-    public Long getParent() 
-    {
+    public String getParent() {
         return parent;
     }
-    public void setServerType(String serverType) 
-    {
+
+    public void setServerType(String serverType) {
         this.serverType = serverType;
     }
 
-    public String getServerType() 
-    {
+    public String getServerType() {
         return serverType;
     }
-    public void setSflssj(Long sflssj) 
-    {
+
+    public void setSflssj(Long sflssj) {
         this.sflssj = sflssj;
     }
 
-    public Long getSflssj() 
-    {
+    public Long getSflssj() {
         return sflssj;
     }
-    public void setSfdbfx(Long sfdbfx) 
-    {
+
+    public void setSfdbfx(Long sfdbfx) {
         this.sfdbfx = sfdbfx;
     }
 
-    public Long getSfdbfx() 
-    {
+    public Long getSfdbfx() {
         return sfdbfx;
     }
-    public void setSfjl(Long sfjl) 
-    {
+
+    public void setSfjl(Long sfjl) {
         this.sfjl = sfjl;
     }
 
-    public Long getSfjl() 
-    {
+    public Long getSfjl() {
         return sfjl;
     }
-    public void setSfcx(Long sfcx) 
-    {
+
+    public void setSfcx(Long sfcx) {
         this.sfcx = sfcx;
     }
 
-    public Long getSfcx() 
-    {
+    public Long getSfcx() {
         return sfcx;
     }
-    public void setSftj(Long sftj) 
-    {
+
+    public void setSftj(Long sftj) {
         this.sftj = sftj;
     }
 
-    public Long getSftj() 
-    {
+    public Long getSftj() {
         return sftj;
     }
-    public void setEpsg(String epsg) 
-    {
+
+    public void setEpsg(String epsg) {
         this.epsg = epsg;
     }
 
-    public String getEpsg() 
-    {
+    public String getEpsg() {
         return epsg;
     }
-    public void setYear(String year) 
-    {
+
+    public void setYear(String year) {
         this.year = year;
     }
 
-    public String getYear() 
-    {
+    public String getYear() {
         return year;
     }
-    public void setSjlx(String sjlx) 
-    {
+
+    public void setSjlx(String sjlx) {
         this.sjlx = sjlx;
     }
 
-    public String getSjlx() 
-    {
+    public String getSjlx() {
         return sjlx;
     }
-    public void setSde(String sde) 
-    {
+
+    public void setSde(String sde) {
         this.sde = sde;
     }
 
-    public String getSde() 
-    {
+    public String getSde() {
         return sde;
     }
-    public void setGltj(String gltj) 
-    {
+
+    public void setGltj(String gltj) {
         this.gltj = gltj;
     }
 
-    public String getGltj() 
-    {
+    public String getGltj() {
         return gltj;
     }
-    public void setSjly(String sjly) 
-    {
+
+    public void setSjly(String sjly) {
         this.sjly = sjly;
     }
 
-    public String getSjly() 
-    {
+    public String getSjly() {
         return sjly;
     }
-    public void setLegend(String legend) 
-    {
+
+    public void setLegend(String legend) {
         this.legend = legend;
     }
 
-    public String getLegend() 
-    {
+    public String getLegend() {
         return legend;
     }
 
+    public String getFwmc() {
+        return fwmc;
+    }
+
+    public void setFwmc(String fwmc) {
+        this.fwmc = fwmc;
+    }
+
+    public String getFwgzkj() {
+        return fwgzkj;
+    }
+
+    public void setFwgzkj(String fwgzkj) {
+        this.fwgzkj = fwgzkj;
+    }
+
+    public String getFwys() {
+        return fwys;
+    }
+
+    public void setFwys(String fwys) {
+        this.fwys = fwys;
+    }
+
+    public String getQpfa() {
+        return qpfa;
+    }
+
+    public void setQpfa(String qpfa) {
+        this.qpfa = qpfa;
+    }
+
+    public String getLayergroup() {
+        return layergroup;
+    }
+
+    public void setLayergroup(String layergroup) {
+        this.layergroup = layergroup;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    public Integer getMaximumlevel() {
+        return maximumlevel;
+    }
+
+    public void setMaximumlevel(Integer maximumlevel) {
+        this.maximumlevel = maximumlevel;
+    }
+
+    public Integer getMinimumlevel() {
+        return minimumlevel;
+    }
+
+    public void setMinimumlevel(Integer minimumlevel) {
+        this.minimumlevel = minimumlevel;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    @Override
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getSharestate() {
+        return sharestate;
+    }
+
+    public void setSharestate(String sharestate) {
+        this.sharestate = sharestate;
+    }
+
+    public String getDataexplain() {
+        return dataexplain;
+    }
+
+    public void setDataexplain(String dataexplain) {
+        this.dataexplain = dataexplain;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("bsm", getBsm())
-            .append("name", getName())
-            .append("type", getType())
-            .append("pbsm", getPbsm())
-            .append("icon", getIcon())
-            .append("url", getUrl())
-            .append("lev", getLev())
-            .append("sort", getSort())
-            .append("state", getState())
-            .append("parent", getParent())
-            .append("serverType", getServerType())
-            .append("sflssj", getSflssj())
-            .append("sfdbfx", getSfdbfx())
-            .append("sfjl", getSfjl())
-            .append("sfcx", getSfcx())
-            .append("sftj", getSftj())
-            .append("epsg", getEpsg())
-            .append("year", getYear())
-            .append("sjlx", getSjlx())
-            .append("sde", getSde())
-            .append("gltj", getGltj())
-            .append("sjly", getSjly())
-            .append("legend", getLegend())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("bsm", getBsm())
+                .append("name", getName())
+                .append("type", getType())
+                .append("pbsm", getPbsm())
+                .append("icon", getIcon())
+                .append("url", getUrl())
+                .append("lev", getLev())
+                .append("sort", getSort())
+                .append("state", getState())
+                .append("parent", getParent())
+                .append("serverType", getServerType())
+                .append("sflssj", getSflssj())
+                .append("sfdbfx", getSfdbfx())
+                .append("sfjl", getSfjl())
+                .append("sfcx", getSfcx())
+                .append("sftj", getSftj())
+                .append("epsg", getEpsg())
+                .append("year", getYear())
+                .append("sjlx", getSjlx())
+                .append("sde", getSde())
+                .append("gltj", getGltj())
+                .append("sjly", getSjly())
+                .append("legend", getLegend())
+                .toString();
     }
 }

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TYztZymlServiceImpl.java

@@ -1,8 +1,10 @@
 package com.onemap.system.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.security.utils.SecurityUtils;
 import com.onemap.system.api.domain.SysDictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,6 +12,8 @@ import com.onemap.system.mapper.TYztZymlMapper;
 import com.onemap.system.domain.TYztZyml;
 import com.onemap.system.service.ITYztZymlService;
 
+import javax.annotation.Resource;
+
 /**
  * 数据资源目录Service业务层处理
  *
@@ -18,7 +22,8 @@ import com.onemap.system.service.ITYztZymlService;
  */
 @Service
 public class TYztZymlServiceImpl implements ITYztZymlService {
-    @Autowired
+
+    @Resource
     private TYztZymlMapper tYztZymlMapper;
 
     /**
@@ -52,6 +57,9 @@ public class TYztZymlServiceImpl implements ITYztZymlService {
     @Override
     public int insertTYztZyml(TYztZyml tYztZyml) {
         tYztZyml = filterZymlPbsm(tYztZyml);
+        tYztZyml.setCreateTime(new Date());
+        tYztZyml.setCreateBy(SecurityUtils.getUsername());
+        //判断不为空
         if (!StringUtils.isEmpty(tYztZyml.getSde())) {
             String[] dblayers = tYztZyml.getSde().split(",");
             if (dblayers.length == 1) {

onemap-modules/onemap-system/src/main/resources/mapper/postgresql/system/TYztZymlMapper.xml

@@ -29,29 +29,43 @@
         <result property="sjly" column="sjly"/>
         <result property="legend" column="legend"/>
         <result property="ywlx" column="ywlx"/>
+        <result property="fwmc" column="fwmc"/>
+        <result property="fwgzkj" column="fwgzkj"/>
+        <result property="fwys" column="fwys"/>
+        <result property="qpfa" column="qpfa"/>
+        <result property="layergroup" column="layergroup"/>
+        <result property="format" column="format"/>
+        <result property="maximumlevel" column="maximumlevel"/>
+        <result property="minimumlevel" column="minimumlevel"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="sharestate" column="sharestate"/>
+        <result property="dataexplain" column="dataexplain"/>
     </resultMap>
 
     <sql id="selectTYztZymlVo">
-        select bsm, name, type, pbsm, icon, url, lev, sort, state, parent, server_type, sflssj, sfdbfx, sfjl, sfcx, sftj, epsg, year, sjlx, sde, gltj, sjly, legend, ywlx from t_yzt_zyml
+        select bsm, name, type, pbsm, icon, url, lev, sort, state, parent, server_type, sflssj, sfdbfx, sfjl, sfcx, sftj, epsg,
+            year, sjlx, sde, gltj, sjly, legend, ywlx,dataexplain,
+            fwmc,fwgzkj,fwys,qpfa,layergroup,format,maximumlevel,minimumlevel,create_time,create_by,sharestate from t_yzt_zyml
     </sql>
 
     <select id="getDbLayersMSN" parameterType="java.lang.String" resultType="com.onemap.system.api.domain.SysDictData">
-SELECT t.id as "dict_value", t.layeralias as "dict_label",'dblayers' as "dict_type"
-  from T_YZT_DB_LAYER t
-  left join t_yzt_zyml ml
-    on ml.sde = t.id
- where ml.sde is null
+        SELECT t.id as "dict_value", t.layeralias as "dict_label",'dblayers' as "dict_type"
+        from T_YZT_DB_LAYER t
+                 left join t_yzt_zyml ml
+                           on ml.sde = t.id
+        where ml.sde is null
     </select>
 
     <select id="getDbLayers" parameterType="java.lang.String" resultType="com.onemap.system.api.domain.SysDictData">
-SELECT t.id as "dict_value", t.layeralias as "dict_label",'dblayers' as "dict_type", t.source as "remark"
-  from T_YZT_DB_LAYER t
+        SELECT t.id as "dict_value", t.layeralias as "dict_label",'dblayers' as "dict_type", t.source as "remark"
+        from T_YZT_DB_LAYER t
     </select>
 
 
     <select id="getDbLayerName" parameterType="java.lang.String" resultType="java.lang.String">
-SELECT t.layeralias
-  from T_YZT_DB_LAYER t where id = #{dblayer}
+        SELECT t.layeralias
+        from T_YZT_DB_LAYER t where id = #{dblayer}
     </select>
 
     <select id="selectTYztZymlList" parameterType="TYztZyml" resultMap="TYztZymlResult">
@@ -81,6 +95,7 @@ SELECT t.layeralias
             <if test="sjly != null  and sjly != ''">and sjly = #{sjly}</if>
             <if test="legend != null  and legend != ''">and legend = #{legend}</if>
             <if test="ywlx != null  and ywlx != ''">and ywlx = #{ywlx}</if>
+            <if test="sharestate != null  and sharestate != ''">and sharestate = #{sharestate}</if>
         </where>
         order by sort
     </select>
@@ -117,6 +132,18 @@ SELECT t.layeralias
             <if test="sjly != null">sjly,</if>
             <if test="legend != null">legend,</if>
             <if test="ywlx != null">ywlx,</if>
+            <if test="fwmc != null">fwmc,</if>
+            <if test="fwgzkj != null">fwgzkj,</if>
+            <if test="fwys != null">fwys,</if>
+            <if test="qpfa != null">qpfa,</if>
+            <if test="layergroup != null">layergroup,</if>
+            <if test="format != null">format,</if>
+            <if test="maximumlevel != null">maximumlevel,</if>
+            <if test="minimumlevel != null">minimumlevel,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="sharestate != null">sharestate,</if>
+            <if test="dataexplain != null">dataexplain,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="bsm != null and bsm != ''">#{bsm},</if>
@@ -143,6 +170,18 @@ SELECT t.layeralias
             <if test="sjly != null">#{sjly},</if>
             <if test="legend != null">#{legend},</if>
             <if test="ywlx != null">#{ywlx},</if>
+            <if test="fwmc != null">#{fwmc},</if>
+            <if test="fwgzkj != null">#{fwgzkj},</if>
+            <if test="fwys != null">#{fwys},</if>
+            <if test="qpfa != null">#{qpfa},</if>
+            <if test="layergroup != null">#{layergroup},</if>
+            <if test="format != null">#{format},</if>
+            <if test="maximumlevel != null">#{maximumlevel},</if>
+            <if test="minimumlevel != null">#{minimumlevel},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="sharestate != null">#{sharestate},</if>
+            <if test="dataexplain != null">#{dataexplain},</if>
         </trim>
     </insert>
 
@@ -172,6 +211,16 @@ SELECT t.layeralias
             <if test="sjly != null">sjly = #{sjly},</if>
             <if test="legend != null">legend = #{legend},</if>
             <if test="ywlx != null">ywlx = #{ywlx},</if>
+            <if test="fwmc != null">fwmc = #{fwmc},</if>
+            <if test="fwgzkj != null">fwgzkj = #{fwgzkj},</if>
+            <if test="fwys != null">fwys = #{fwys},</if>
+            <if test="qpfa != null">qpfa = #{qpfa},</if>
+            <if test="layergroup != null">layergroup = #{layergroup},</if>
+            <if test="format != null">format = #{format},</if>
+            <if test="maximumlevel != null">maximumlevel = #{maximumlevel},</if>
+            <if test="minimumlevel != null">minimumlevel = #{minimumlevel},</if>
+            <if test="sharestate != null">sharestate = #{sharestate},</if>
+            <if test="dataexplain != null">dataexplain=#{dataexplain},</if>
         </trim>
         where bsm = #{bsm}
     </update>