From e1f82f9209a2af1b462f758bfa659583ca40bcd4 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Wed, 28 Feb 2024 14:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BsSgcDfFxyhdcController.java   | 115 +++++++
 .../df/controller/BsSgcDfGcxyController.java  |  11 +-
 .../controller/BsSgcDfHdmtzzController.java   | 115 +++++++
 .../df/controller/BsSgcDfSjcsController.java  |  11 +-
 .../com/kms/yg/df/domain/BsSgcDfFxyhdc.java   |  85 +++++
 .../com/kms/yg/df/domain/BsSgcDfGcxy.java     | 171 +++++-----
 .../com/kms/yg/df/domain/BsSgcDfHdmtzz.java   | 215 +++++++++++++
 .../domain/BsSgcDfHydrographicFeatures.java   | 191 ++++++------
 .../com/kms/yg/df/domain/BsSgcDfSafeJbxx.java | 291 +++++++++++++-----
 .../com/kms/yg/df/domain/BsSgcDfSjcs.java     |  20 +-
 .../com/kms/yg/df/domain/BsSgcDfSwtz.java     |  76 +++--
 .../kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java |  16 +
 .../kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java |  16 +
 .../yg/df/service/BsSgcDfFxyhdcService.java   |  16 +
 .../yg/df/service/BsSgcDfHdmtzzService.java   |  16 +
 .../com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java |   1 +
 16 files changed, 1081 insertions(+), 285 deletions(-)
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java
 create mode 100644 shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java

diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java
new file mode 100644
index 00000000..5115fbc9
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java
@@ -0,0 +1,115 @@
+package com.kms.yg.df.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.poi.ExcelUtil;
+import com.kms.common.utils.BaseEntityUtils;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.baomidou.mybatisplus.core.metadata.IPage;
+import com.shuili.common.mybaitsplus.BeanToWrapper;
+
+import com.shuili.common.annotation.Log;
+import com.shuili.common.core.domain.AjaxResult;
+import com.shuili.common.enums.BusinessType;
+import com.kms.yg.df.domain.BsSgcDfFxyhdc;
+import com.kms.yg.df.service.BsSgcDfFxyhdcService;
+
+
+/**
+ * 风险隐患调查Controller
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@RestController
+@RequestMapping("/df/fxyhdc")
+@Api(tags = "风险隐患调查")
+public class BsSgcDfFxyhdcController extends BaseController
+{
+    @Autowired
+    private BsSgcDfFxyhdcService bsSgcDfFxyhdcService;
+
+
+    /**
+     * 查询风险隐患调查列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("风险隐患调查列表")
+    public IPage list(@RequestBody SearchParam<BsSgcDfFxyhdc> sp)
+    {
+        return bsSgcDfFxyhdcService.selectPage(sp);
+    }
+
+    /**
+     * 导出风险隐患调查列表
+     */
+    @Log(title = "风险隐患调查导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("风险隐患调查导出")
+    public AjaxResult export(@RequestBody BsSgcDfFxyhdc bsSgcDfFxyhdc)
+    {
+        List<BsSgcDfFxyhdc> list = bsSgcDfFxyhdcService.listByIds(bsSgcDfFxyhdc.getIds());
+        ExcelUtil<BsSgcDfFxyhdc> util = new ExcelUtil<>(BsSgcDfFxyhdc.class);
+        return util.exportExcel(list, "fxyhdc");
+    }
+
+    /**
+     * 获取风险隐患调查详细信息
+     */
+    @ApiOperation(" 风险隐患调查详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcDfFxyhdcService.getById(id));
+    }
+
+    /**
+     * 新增风险隐患调查
+     */
+    @Log(title = "风险隐患调查新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("风险隐患调查新增")
+    public AjaxResult add(@RequestBody BsSgcDfFxyhdc bsSgcDfFxyhdc)
+    {
+        BaseEntityUtils.preInsert(bsSgcDfFxyhdc);
+        return toAjax(bsSgcDfFxyhdcService.save(bsSgcDfFxyhdc));
+    }
+
+    /**
+     * 修改风险隐患调查
+     */
+    @ApiOperation("风险隐患调查修改")
+    @Log(title = "风险隐患调查修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcDfFxyhdc bsSgcDfFxyhdc)
+    {
+        return toAjax(bsSgcDfFxyhdcService.updateById(bsSgcDfFxyhdc));
+    }
+
+    /**
+     * 删除风险隐患调查
+     */
+    @ApiOperation("风险隐患调查删除")
+    @Log(title = "风险隐患调查删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcDfFxyhdcService.removeByIds(Arrays.asList(ids)));
+    }
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java
index 90e26ace..1d9980e6 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java
@@ -3,6 +3,7 @@ package com.kms.yg.df.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yg.df.domain.BsSgcDfGcxy;
@@ -105,8 +106,9 @@ public class BsSgcDfGcxyController extends BaseController
     public AjaxResult add(@RequestBody BsSgcDfGcxy bsSgcSzGcxy)
     {
         BaseEntityUtils.preInsert(bsSgcSzGcxy);
-        String wagaId = bsSgcSzGcxy.getDikeId();
-        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
+        String dikeCode = bsSgcSzGcxy.getDikeCode();
+        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
+                .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode));
         byId.setStatus("4");
         bsSgcSzSafeJbxxService.updateById(byId);
         return toAjax(bsSgcSzGcxyService.save(bsSgcSzGcxy));
@@ -121,8 +123,9 @@ public class BsSgcDfGcxyController extends BaseController
     public AjaxResult edit(@RequestBody BsSgcDfGcxy bsSgcSzGcxy)
     {
 
-        String wagaId = bsSgcSzGcxy.getDikeId();
-        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
+        String dikeCode = bsSgcSzGcxy.getDikeCode();
+        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
+                .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode));
         byId.setStatus("4");
         bsSgcSzSafeJbxxService.updateById(byId);
         return toAjax(bsSgcSzGcxyService.updateById(bsSgcSzGcxy));
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java
new file mode 100644
index 00000000..fa5d2a0d
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java
@@ -0,0 +1,115 @@
+package com.kms.yg.df.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.poi.ExcelUtil;
+import com.kms.common.utils.BaseEntityUtils;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.baomidou.mybatisplus.core.metadata.IPage;
+import com.shuili.common.mybaitsplus.BeanToWrapper;
+
+import com.shuili.common.annotation.Log;
+import com.shuili.common.core.domain.AjaxResult;
+import com.shuili.common.enums.BusinessType;
+import com.kms.yg.df.domain.BsSgcDfHdmtzz;
+import com.kms.yg.df.service.BsSgcDfHdmtzzService;
+
+
+/**
+ * 横断面特征值Controller
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@RestController
+@RequestMapping("/df/hdmtzz")
+@Api(tags = "横断面特征值")
+public class BsSgcDfHdmtzzController extends BaseController
+{
+    @Autowired
+    private BsSgcDfHdmtzzService bsSgcDfHdmtzzService;
+
+
+    /**
+     * 查询横断面特征值列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("横断面特征值列表")
+    public IPage list(@RequestBody SearchParam<BsSgcDfHdmtzz> sp)
+    {
+        return bsSgcDfHdmtzzService.selectPage(sp);
+    }
+
+    /**
+     * 导出横断面特征值列表
+     */
+    @Log(title = "横断面特征值导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("横断面特征值导出")
+    public AjaxResult export(@RequestBody BsSgcDfHdmtzz bsSgcDfHdmtzz)
+    {
+        List<BsSgcDfHdmtzz> list = bsSgcDfHdmtzzService.listByIds(bsSgcDfHdmtzz.getIds());
+        ExcelUtil<BsSgcDfHdmtzz> util = new ExcelUtil<>(BsSgcDfHdmtzz.class);
+        return util.exportExcel(list, "hdmtzz");
+    }
+
+    /**
+     * 获取横断面特征值详细信息
+     */
+    @ApiOperation(" 横断面特征值详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcDfHdmtzzService.getById(id));
+    }
+
+    /**
+     * 新增横断面特征值
+     */
+    @Log(title = "横断面特征值新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("横断面特征值新增")
+    public AjaxResult add(@RequestBody BsSgcDfHdmtzz bsSgcDfHdmtzz)
+    {
+        BaseEntityUtils.preInsert(bsSgcDfHdmtzz);
+        return toAjax(bsSgcDfHdmtzzService.save(bsSgcDfHdmtzz));
+    }
+
+    /**
+     * 修改横断面特征值
+     */
+    @ApiOperation("横断面特征值修改")
+    @Log(title = "横断面特征值修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcDfHdmtzz bsSgcDfHdmtzz)
+    {
+        return toAjax(bsSgcDfHdmtzzService.updateById(bsSgcDfHdmtzz));
+    }
+
+    /**
+     * 删除横断面特征值
+     */
+    @ApiOperation("横断面特征值删除")
+    @Log(title = "横断面特征值删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcDfHdmtzzService.removeByIds(Arrays.asList(ids)));
+    }
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java
index 95f45f77..c27dede2 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java
@@ -3,6 +3,7 @@ package com.kms.yg.df.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
@@ -105,8 +106,9 @@ public class BsSgcDfSjcsController extends BaseController
     public AjaxResult add(@RequestBody BsSgcDfSjcs bsSgcSzSjcs)
     {
         BaseEntityUtils.preInsert(bsSgcSzSjcs);
-        String wagaId = bsSgcSzSjcs.getDikeId();
-        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
+        String dikeCode = bsSgcSzSjcs.getDikeCode();
+        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
+                .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode));
         byId.setStatus("4");
         bsSgcSzSafeJbxxService.updateById(byId);
         return toAjax(bsSgcSzSjcsService.save(bsSgcSzSjcs));
@@ -120,8 +122,9 @@ public class BsSgcDfSjcsController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcDfSjcs bsSgcSzSjcs)
     {
-        String wagaId = bsSgcSzSjcs.getDikeId();
-        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(wagaId);
+        String dikeCode = bsSgcSzSjcs.getDikeCode();
+        BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
+                .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode));
         byId.setStatus("4");
         bsSgcSzSafeJbxxService.updateById(byId);
         return toAjax(bsSgcSzSjcsService.updateById(bsSgcSzSjcs));
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java
new file mode 100644
index 00000000..1eb612ff
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java
@@ -0,0 +1,85 @@
+package com.kms.yg.df.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.shuili.common.annotation.Excel;
+import com.shuili.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 风险隐患调查对象 bs_sgc_df_fxyhdc
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@TableName("bs_sgc_df_fxyhdc")
+@Data
+@ApiModel("风险隐患调查")
+public class BsSgcDfFxyhdc extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 堤防代码 */
+    @Excel(name = "堤防代码")
+    @ApiModelProperty("堤防代码")
+    private String dikeCode;
+
+    /** 工程隐患描述 */
+    @Excel(name = "工程隐患描述")
+    @ApiModelProperty("工程隐患描述")
+    private String dikeSafety;
+
+    /** 工程隐患位置 */
+    @Excel(name = "工程隐患位置")
+    @ApiModelProperty("工程隐患位置")
+    private String dikeSafetyLoc;
+
+    /** 生效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("生效时间")
+    private Date fromTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String note;
+
+    /** 记录生效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录生效时间")
+    private Date effDate;
+
+    /** 记录失效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录失效时间")
+    private Date exprDate;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String relation;
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java
index e20058ea..c09e74ac 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java
@@ -1,11 +1,12 @@
 package com.kms.yg.df.domain;
 
-import com.shuili.common.core.domain.BaseEntity;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.shuili.common.annotation.Excel;
-
+import com.shuili.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 
@@ -14,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * 工程效益对象 bs_sgc_df_gcxy
  *
  * @author kms
- * @date 2024-01-17
+ * @date 2024-02-28
  */
 @TableName("bs_sgc_df_gcxy")
 @Data
@@ -23,103 +24,111 @@ public class BsSgcDfGcxy extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 设计灌溉面积 */
-    @Excel(name = "设计灌溉面积")
-    @ApiModelProperty("设计灌溉面积")
-    private String dsirArea;
-
-    /** 实际灌溉面积 */
-    @Excel(name = "实际灌溉面积")
-    @ApiModelProperty("实际灌溉面积")
-    private String acirArea;
-
-    /** 设计排涝标准 */
-    @Excel(name = "设计排涝标准")
-    @ApiModelProperty("设计排涝标准")
-    private String dsrmwtStd;
-
-    /** 设计排涝面积 */
-    @Excel(name = "设计排涝面积")
-    @ApiModelProperty("设计排涝面积")
-    private String dsrmwtArea;
-
-    /** 实际排涝面积 */
-    @Excel(name = "实际排涝面积")
-    @ApiModelProperty("实际排涝面积")
-    private String acrmwtArea;
-
-    /** 防洪保护对象 */
-    @Excel(name = "防洪保护对象")
-    @ApiModelProperty("防洪保护对象")
-    private String cnflObj;
-
     /** $column.columnComment */
-    @Excel(name = "防洪保护对象")
-    @ApiModelProperty("防洪保护对象")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String createUid;
 
     /** $column.columnComment */
-    @Excel(name = "防洪保护对象")
-    @ApiModelProperty("防洪保护对象")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String updateUid;
 
     /** $column.columnComment */
-    @Excel(name = "防洪保护对象")
-    @ApiModelProperty("防洪保护对象")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String proCode;
 
     /** $column.columnComment */
-    @Excel(name = "防洪保护对象")
-    @ApiModelProperty("防洪保护对象")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String proNo;
 
     /** $column.columnComment */
-    @Excel(name = "防洪保护对象")
-    @ApiModelProperty("防洪保护对象")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String owerDept;
 
     /** $column.columnComment */
-    @Excel(name = "防洪保护对象")
-    @ApiModelProperty("防洪保护对象")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String relation;
 
-    /** 水闸id */
-    @Excel(name = "水闸id")
-    @ApiModelProperty("水闸id")
-    private String dikeId;
-
-    /** $column.columnComment */
-    @Excel(name = "水闸id")
-    @ApiModelProperty("水闸id")
+    /** 堤防代码 */
+    @Excel(name = "堤防代码")
+    @ApiModelProperty("堤防代码")
     private String dikeCode;
 
-    //保护面积
-    private String protected_area;
-
-    //保护耕地面积
-    private String protectedArableArea;
-
-    //保护村数
-    private String protectedVillages;
-
-    //保护资产
-    private String protectedAssets;
-    //保护人口
-    private String protectedPopulation;
-
-    //保护房屋
-    private String protectedHouse;
-
-    //保护工矿
-    private String protectedIndustrial;
-    //保护城镇
-    private String protectedCity;
-
-    //保护铁路
-    private String protectedRailway;
-    //保护公路
-    private String protectedRoad;
+    /** 保护面积 */
+    @Excel(name = "保护面积")
+    @ApiModelProperty("保护面积")
+    private String prArea;
+
+    /** 保护耕地面积 */
+    @Excel(name = "保护耕地面积")
+    @ApiModelProperty("保护耕地面积")
+    private String prinArea;
+
+    /** 保护村数 */
+    @Excel(name = "保护村数")
+    @ApiModelProperty("保护村数")
+    private String prvlNum;
+
+    /** 保护固定资产 */
+    @Excel(name = "保护固定资产")
+    @ApiModelProperty("保护固定资产")
+    private String prfxasNum;
+
+    /** 保护人口 */
+    @Excel(name = "保护人口")
+    @ApiModelProperty("保护人口")
+    private String ptPp;
+
+    /** 保护房屋 */
+    @Excel(name = "保护房屋")
+    @ApiModelProperty("保护房屋")
+    private String prhuNum;
+
+    /** 保护工矿 */
+    @Excel(name = "保护工矿")
+    @ApiModelProperty("保护工矿")
+    private String prfcMn;
+
+    /** 保护城镇 */
+    @Excel(name = "保护城镇")
+    @ApiModelProperty("保护城镇")
+    private String prCt;
+
+    /** 保护铁路 */
+    @Excel(name = "保护铁路")
+    @ApiModelProperty("保护铁路")
+    private String prRl;
+
+    /** 保护公路 */
+    @Excel(name = "保护公路")
+    @ApiModelProperty("保护公路")
+    private String prHg;
+
+    /** 保护重点设施 */
+    @Excel(name = "保护重点设施")
+    @ApiModelProperty("保护重点设施")
+    private String prsTes;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String note;
+
+    /** 记录生效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录生效时间")
+    private Date effDate;
+
+    /** 记录失效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录失效时间")
+    private Date exprDate;
 
-    //保护重点设施
-    private String protectedFacilities;
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java
new file mode 100644
index 00000000..4df57d07
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java
@@ -0,0 +1,215 @@
+package com.kms.yg.df.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.shuili.common.annotation.Excel;
+import com.shuili.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 横断面特征值对象 bs_sgc_df_hdmtzz
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@TableName("bs_sgc_df_hdmtzz")
+@Data
+@ApiModel("横断面特征值")
+public class BsSgcDfHdmtzz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 堤防代码 */
+    @Excel(name = "堤防代码")
+    @ApiModelProperty("堤防代码")
+    private String dikeCode;
+
+    /** 堤防横断面代码 */
+    @Excel(name = "堤防横断面代码")
+    @ApiModelProperty("堤防横断面代码")
+    private String bntrCode;
+
+    /** 测量日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "测量日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("测量日期")
+    private Date srDate;
+
+    /** 断面桩号 */
+    @Excel(name = "断面桩号")
+    @ApiModelProperty("断面桩号")
+    private String trCh;
+
+    /** 起始断面位置 */
+    @Excel(name = "起始断面位置")
+    @ApiModelProperty("起始断面位置")
+    private String intrPl;
+
+    /** 起始断面桩号 */
+    @Excel(name = "起始断面桩号")
+    @ApiModelProperty("起始断面桩号")
+    private String intrCh;
+
+    /** 至起始断面距离 */
+    @Excel(name = "至起始断面距离")
+    @ApiModelProperty("至起始断面距离")
+    private String tointrDs;
+
+    /** 起测点位置 */
+    @Excel(name = "起测点位置")
+    @ApiModelProperty("起测点位置")
+    private String jmsrpnPl;
+
+    /** 起测点高程 */
+    @Excel(name = "起测点高程")
+    @ApiModelProperty("起测点高程")
+    private String jmsrpneLev;
+
+    /** 堤身土质 */
+    @Excel(name = "堤身土质")
+    @ApiModelProperty("堤身土质")
+    private String bnbdSlch;
+
+    /** 堤身防渗形式 */
+    @Excel(name = "堤身防渗形式")
+    @ApiModelProperty("堤身防渗形式")
+    private String bnbdAntp;
+
+    /** 堤基地质 */
+    @Excel(name = "堤基地质")
+    @ApiModelProperty("堤基地质")
+    private String bnbsGl;
+
+    /** 堤基防渗形式 */
+    @Excel(name = "堤基防渗形式")
+    @ApiModelProperty("堤基防渗形式")
+    private String bnbsAntp;
+
+    /** 堤身净高度 */
+    @Excel(name = "堤身净高度")
+    @ApiModelProperty("堤身净高度")
+    private String bnbdHigh;
+
+    /** 堤顶高程 */
+    @Excel(name = "堤顶高程")
+    @ApiModelProperty("堤顶高程")
+    private String bntpeLev;
+
+    /** 堤顶超高 */
+    @Excel(name = "堤顶超高")
+    @ApiModelProperty("堤顶超高")
+    private String bntpFr;
+
+    /** 堤顶宽度 */
+    @Excel(name = "堤顶宽度")
+    @ApiModelProperty("堤顶宽度")
+    private String bntpWd;
+
+    /** 迎河面堤脚高程 */
+    @Excel(name = "迎河面堤脚高程")
+    @ApiModelProperty("迎河面堤脚高程")
+    private String upbnToel;
+
+    /** 背河面堤脚高程 */
+    @Excel(name = "背河面堤脚高程")
+    @ApiModelProperty("背河面堤脚高程")
+    private String dwbnToel;
+
+    /** 迎河坡坡比 */
+    @Excel(name = "迎河坡坡比")
+    @ApiModelProperty("迎河坡坡比")
+    private String upslSlrt;
+
+    /** 背河坡坡比 */
+    @Excel(name = "背河坡坡比")
+    @ApiModelProperty("背河坡坡比")
+    private String dwslSlrt;
+
+    /** 迎河坡护坡情况 */
+    @Excel(name = "迎河坡护坡情况")
+    @ApiModelProperty("迎河坡护坡情况")
+    private String uspsIn;
+
+    /** 背河坡护坡情况 */
+    @Excel(name = "背河坡护坡情况")
+    @ApiModelProperty("背河坡护坡情况")
+    private String dspsIn;
+
+    /** 迎河面滩地宽度 */
+    @Excel(name = "迎河面滩地宽度")
+    @ApiModelProperty("迎河面滩地宽度")
+    private String upbtWide;
+
+    /** 迎河面平台(前戗)顶高程 */
+    @Excel(name = "迎河面平台(前戗)顶高程")
+    @ApiModelProperty("迎河面平台(前戗)顶高程")
+    private String ufrteLev;
+
+    /** 迎河面平台(前戗)顶宽 */
+    @Excel(name = "迎河面平台(前戗)顶宽")
+    @ApiModelProperty("迎河面平台(前戗)顶宽")
+    private String ufrtWide;
+
+    /** 迎河面平台(前戗)坡度 */
+    @Excel(name = "迎河面平台(前戗)坡度")
+    @ApiModelProperty("迎河面平台(前戗)坡度")
+    private String upflRfsl;
+
+    /** 背河面平台(后戗)顶高程 */
+    @Excel(name = "背河面平台(后戗)顶高程")
+    @ApiModelProperty("背河面平台(后戗)顶高程")
+    private String dfrtEl;
+
+    /** 背河面平台(后戗)顶宽 */
+    @Excel(name = "背河面平台(后戗)顶宽")
+    @ApiModelProperty("背河面平台(后戗)顶宽")
+    private String dfrtWide;
+
+    /** 背河面平台(后戗)坡度 */
+    @Excel(name = "背河面平台(后戗)坡度")
+    @ApiModelProperty("背河面平台(后戗)坡度")
+    private String dwflRfsl;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String note;
+
+    /** 记录生效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录生效时间")
+    private Date effDate;
+
+    /** 记录失效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录失效时间")
+    private Date exprDate;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "记录失效时间")
+    @ApiModelProperty("记录失效时间")
+    private String relation;
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java
index 4af0e2f6..d8f2e1a7 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java
@@ -1,11 +1,12 @@
 package com.kms.yg.df.domain;
 
-import com.shuili.common.core.domain.BaseEntity;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.shuili.common.annotation.Excel;
-
+import com.shuili.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 
@@ -14,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * 水文特征对象 bs_sgc_df_hydrographic_features
  *
  * @author kms
- * @date 2024-01-17
+ * @date 2024-02-28
  */
 @TableName("bs_sgc_df_hydrographic_features")
 @Data
@@ -23,104 +24,29 @@ public class BsSgcDfHydrographicFeatures extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 河道宽度 */
-    @Excel(name = "河道宽度")
-    @ApiModelProperty("河道宽度")
-    private Long channelWidth;
-
-    /** 河道比降 */
-    @Excel(name = "河道比降")
-    @ApiModelProperty("河道比降")
-    private String riverGradient;
-
-    /** 多年平均径流量 */
-    @Excel(name = "多年平均径流量")
-    @ApiModelProperty("多年平均径流量")
-    private String annualAverageRunoff;
-
-    /** 多年平均输沙量 */
-    @Excel(name = "多年平均输沙量")
-    @ApiModelProperty("多年平均输沙量")
-    private String averageSedimentTransport;
-
-    /** 多年平均最低气温 */
-    @Excel(name = "多年平均最低气温")
-    @ApiModelProperty("多年平均最低气温")
-    private String averageMinimumTemperature;
-
-    /** 设计重现期 */
-    @Excel(name = "设计重现期")
-    @ApiModelProperty("设计重现期")
-    private String designRecurrenceInterval;
-
-    /** 设计洪峰流量 */
-    @Excel(name = "设计洪峰流量")
-    @ApiModelProperty("设计洪峰流量")
-    private String peakFlowRate;
-
-    /** 校核重现期 */
-    @Excel(name = "校核重现期")
-    @ApiModelProperty("校核重现期")
-    private String checkReturnPeriod;
-
-    /** 校核洪峰流量 */
-    @Excel(name = "校核洪峰流量")
-    @ApiModelProperty("校核洪峰流量")
-    private String verifyPeakFlowRate;
-
-    /** 设计过闸流量 */
-    @Excel(name = "设计过闸流量")
-    @ApiModelProperty("设计过闸流量")
-    private String designGateFlowRate;
-
-    /** 设计闸上水位 */
-    @Excel(name = "设计闸上水位")
-    @ApiModelProperty("设计闸上水位")
-    private String waterLevelAboveGate;
-
-    /** 设计闸下水位 */
-    @Excel(name = "设计闸下水位")
-    @ApiModelProperty("设计闸下水位")
-    private String waterLevelBelowGate;
-
-    /** 校核过闸流量 */
-    @Excel(name = "校核过闸流量")
-    @ApiModelProperty("校核过闸流量")
-    private String verifyGateFlowRate;
-
-    /** 校核闸上水位 */
-    @Excel(name = "校核闸上水位")
-    @ApiModelProperty("校核闸上水位")
-    private String checkWaterAboveGate;
-
-    /** 校核闸下水位 */
-    @Excel(name = "校核闸下水位")
-    @ApiModelProperty("校核闸下水位")
-    private String checkWaterBelowGate;
-
     /** $column.columnComment */
-    @Excel(name = "校核闸下水位")
-    @ApiModelProperty("校核闸下水位")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String createUid;
 
     /** $column.columnComment */
-    @Excel(name = "校核闸下水位")
-    @ApiModelProperty("校核闸下水位")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String updateUid;
 
     /** $column.columnComment */
-    @Excel(name = "校核闸下水位")
-    @ApiModelProperty("校核闸下水位")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String proCode;
 
     /** $column.columnComment */
-    @Excel(name = "校核闸下水位")
-    @ApiModelProperty("校核闸下水位")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String proNo;
 
     /** $column.columnComment */
-    @Excel(name = "校核闸下水位")
-    @ApiModelProperty("校核闸下水位")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
     private String owerDept;
 
     /** 关联字段1 */
@@ -128,4 +54,93 @@ public class BsSgcDfHydrographicFeatures extends BaseEntity
     @ApiModelProperty("关联字段1")
     private String relations;
 
+    /** 堤防代码 */
+    @Excel(name = "堤防代码")
+    @ApiModelProperty("堤防代码")
+    private String dikeCode;
+
+    /** 设计洪水标准 */
+    @Excel(name = "设计洪水标准")
+    @ApiModelProperty("设计洪水标准")
+    private String dsflStd;
+
+    /** 设计洪水位 */
+    @Excel(name = "设计洪水位")
+    @ApiModelProperty("设计洪水位")
+    private String dsflLev;
+
+    /** 保证水位 */
+    @Excel(name = "保证水位")
+    @ApiModelProperty("保证水位")
+    private String gnwtLev;
+
+    /** 警戒水位 */
+    @Excel(name = "警戒水位")
+    @ApiModelProperty("警戒水位")
+    private String alwtLev;
+
+    /** 设防水位 */
+    @Excel(name = "设防水位")
+    @ApiModelProperty("设防水位")
+    private String frwLev;
+
+    /** 设计流量 */
+    @Excel(name = "设计流量")
+    @ApiModelProperty("设计流量")
+    private String dsFlow;
+
+    /** 警戒流量 */
+    @Excel(name = "警戒流量")
+    @ApiModelProperty("警戒流量")
+    private String alFlow;
+
+    /** 校核水位 */
+    @Excel(name = "校核水位")
+    @ApiModelProperty("校核水位")
+    private String chwLev;
+
+    /** 校核流量 */
+    @Excel(name = "校核流量")
+    @ApiModelProperty("校核流量")
+    private String chFlow;
+
+    /** 历史最高水位 */
+    @Excel(name = "历史最高水位")
+    @ApiModelProperty("历史最高水位")
+    private String hshgwtLev;
+
+    /** 历史最高水位发生日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "历史最高水位发生日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("历史最高水位发生日期")
+    private Date hhwlTime;
+
+    /** 历史最大洪峰流量 */
+    @Excel(name = "历史最大洪峰流量")
+    @ApiModelProperty("历史最大洪峰流量")
+    private String hmxfpFlow;
+
+    /** 历史最大洪峰流量发生日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "历史最大洪峰流量发生日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("历史最大洪峰流量发生日期")
+    private Date hmxflTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String note;
+
+    /**  记录生效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(" 记录生效时间")
+    private Date effDate;
+
+    /** 记录失效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录失效时间")
+    private Date exprDate;
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
index 4c6cf99b..dcfabc0f 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
@@ -2,43 +2,41 @@ package com.kms.yg.df.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.shuili.common.annotation.Excel;
-
+import com.shuili.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 
 
 /**
- * 水闸安全管理基本信息对象 bs_sgc_df_safe_jbxx
+ * 堤防安全管理基本信息对象 bs_sgc_df_safe_jbxx
  *
  * @author kms
- * @date 2024-01-17
+ * @date 2024-02-28
  */
 @TableName("bs_sgc_df_safe_jbxx")
 @Data
-@ApiModel("水闸安全管理基本信息")
+@ApiModel("堤防安全管理基本信息")
 public class BsSgcDfSafeJbxx extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 水闸名称 */
-    @Excel(name = "水闸名称")
-    @ApiModelProperty("水闸名称")
+    /** 堤防名称 */
+    @Excel(name = "堤防名称")
+    @ApiModelProperty("堤防名称")
     private String dikeName;
 
-    /** 水闸代码 */
-    @Excel(name = "水闸代码")
-    @ApiModelProperty("水闸代码")
+    /** 堤防代码 */
+    @ApiModelProperty("堤防名称")
     private String dikeCode;
 
-    /** 工程规模 */
-    @Excel(name = "工程规模")
-    @ApiModelProperty("工程规模")
-    private String engScal;
+    /** 堤防型式 */
+    @Excel(name = "堤防型式")
+    @ApiModelProperty("堤防型式")
+    private String dikePatt;
 
     /** 起点经度 */
     @Excel(name = "起点经度")
@@ -60,24 +58,24 @@ public class BsSgcDfSafeJbxx extends BaseEntity
     @ApiModelProperty("终点纬度")
     private String dikeEndLat;
 
-    /** 水闸所在位置 */
-    @Excel(name = "水闸所在位置")
-    @ApiModelProperty("水闸所在位置")
+    /** 堤防所在位置 */
+    @Excel(name = "堤防所在位置")
+    @ApiModelProperty("堤防所在位置")
     private String dikeLoc;
 
-    /** 水闸类型 */
-    @Excel(name = "水闸类型")
-    @ApiModelProperty("水闸类型")
+    /** 堤防类型 */
+    @Excel(name = "堤防类型")
+    @ApiModelProperty("堤防类型")
     private String dikeType;
 
-    /** 水闸用途 */
-    @Excel(name = "水闸用途")
-    @ApiModelProperty("水闸用途")
+    /** 堤防用途 */
+    @Excel(name = "堤防用途")
+    @ApiModelProperty("堤防用途")
     private String dikeUse;
 
-    /** 工程等别 */
-    @Excel(name = "工程等别")
-    @ApiModelProperty("工程等别")
+    /** 堤防级别 */
+    @Excel(name = "堤防级别")
+    @ApiModelProperty("堤防级别")
     private String engGrad;
 
     /** 主要建筑物级别 */
@@ -87,29 +85,29 @@ public class BsSgcDfSafeJbxx extends BaseEntity
 
     /** 最大过闸流量
 
-（m³/s） */
+     （m³/s） */
     @Excel(name = "最大过闸流量 ", readConverterExp = "m=³/s")
-    @ApiModelProperty("最大过闸流量")
-    private String desLockDisc;
-
-    /** 闸孔数量 */
-    @Excel(name = "闸孔数量")
-    @ApiModelProperty("闸孔数量")
-    private String gaorNum;
-
-    /** 闸孔总净宽 */
-    @Excel(name = "闸孔总净宽")
-    @ApiModelProperty("闸孔总净宽")
-    private String gaorTotNetWid;
-
-    /** 工程建设情况 */
-    @Excel(name = "工程建设情况")
-    @ApiModelProperty("工程建设情况")
-    private String engStat;
-
-    /** 开工时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开工时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("最大过闸流量 ")
+            private String desLockDisc;
+
+            /** 闸孔数量 */
+            @Excel(name = "闸孔数量")
+            @ApiModelProperty("闸孔数量")
+            private String gaorNum;
+
+            /** 闸孔总净宽 */
+            @Excel(name = "闸孔总净宽")
+            @ApiModelProperty("闸孔总净宽")
+            private String gaorTotNetWid;
+
+            /** 工程建设情况 */
+            @Excel(name = "工程建设情况")
+            @ApiModelProperty("工程建设情况")
+            private String engStat;
+
+            /** 开工时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "开工时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("开工时间")
     private Date startDate;
 
@@ -139,29 +137,29 @@ public class BsSgcDfSafeJbxx extends BaseEntity
     @ApiModelProperty("水准基面")
     private String levelDatum;
 
-    /** 水闸概况 */
-    @Excel(name = "水闸概况")
-    @ApiModelProperty("水闸概况")
+    /** 堤防概况 */
+    @Excel(name = "堤防概况")
+    @ApiModelProperty("堤防概况")
     private String dikeOverview;
 
     /** $column.columnComment */
-    @Excel(name = "水闸概况")
-    @ApiModelProperty("水闸概况")
+    @Excel(name = "堤防概况")
+    @ApiModelProperty("堤防概况")
     private String createUid;
 
     /** $column.columnComment */
-    @Excel(name = "水闸概况")
-    @ApiModelProperty("水闸概况")
+    @Excel(name = "堤防概况")
+    @ApiModelProperty("堤防概况")
     private String updateUid;
 
     /** $column.columnComment */
-    @Excel(name = "水闸概况")
-    @ApiModelProperty("水闸概况")
+    @Excel(name = "堤防概况")
+    @ApiModelProperty("堤防概况")
     private String owerDept;
 
     /** $column.columnComment */
-    @Excel(name = "水闸概况")
-    @ApiModelProperty("水闸概况")
+    @Excel(name = "堤防概况")
+    @ApiModelProperty("堤防概况")
     private String relation;
 
     /** 登记状态 */
@@ -189,17 +187,166 @@ public class BsSgcDfSafeJbxx extends BaseEntity
     @ApiModelProperty("注销状态")
     private String zxStatus;
 
+    /** $column.columnComment */
+    @Excel(name = "注销状态")
+    @ApiModelProperty("注销状态")
     private String reason;
-    //起点所在位置
-    private String startLocation;
-    //终点所在位置
-    private String endLocation;
-    //堤防长度
-    private String dikeLength;
-    //起点桩号
-    private String dikeStartPile;
-    //终点桩号
-    private String dikeEndPile;
-    //工程任务
-    private String engineerTask;
+
+    /** 起点所在位置 */
+    @Excel(name = "起点所在位置")
+    @ApiModelProperty("起点所在位置")
+    private String startLoc;
+
+    /** 终点所在位置 */
+    @Excel(name = "终点所在位置")
+    @ApiModelProperty("终点所在位置")
+    private String endLoc;
+
+    /** 堤防长度 */
+    @Excel(name = "堤防长度")
+    @ApiModelProperty("堤防长度")
+    private Long dikeLen;
+
+    /** 堤防起点桩号 */
+    @Excel(name = "堤防起点桩号")
+    @ApiModelProperty("堤防起点桩号")
+    private String dikeStartNum;
+
+    /** 堤防终点桩号 */
+    @Excel(name = "堤防终点桩号")
+    @ApiModelProperty("堤防终点桩号")
+    private String dikeEndNum;
+
+    /** 工程任务 */
+    @Excel(name = "工程任务")
+    @ApiModelProperty("工程任务")
+    private String engTask;
+
+    /** 所在河流 */
+    @Excel(name = "所在河流")
+    @ApiModelProperty("所在河流")
+    private String dikeRiver;
+
+    /** 河流岸别 */
+    @Excel(name = "河流岸别")
+    @ApiModelProperty("河流岸别")
+    private String dikeRvbk;
+
+    /** 规划防洪潮标准 */
+    @Excel(name = "规划防洪潮标准")
+    @ApiModelProperty("规划防洪潮标准")
+    private String dikePlnStda;
+
+    /** 现状防洪潮标准 */
+    @Excel(name = "现状防洪潮标准")
+    @ApiModelProperty("现状防洪潮标准")
+    private String dikeCrtStda;
+
+    /** 达标长度 */
+    @Excel(name = "达标长度")
+    @ApiModelProperty("达标长度")
+    private String dikeStdaLen;
+
+    /** 不达标长度 */
+    @Excel(name = "不达标长度")
+    @ApiModelProperty("不达标长度")
+    private String dikeNotStdaLen;
+
+    /** 不达标位置 */
+    @Excel(name = "不达标位置")
+    @ApiModelProperty("不达标位置")
+    private String dikeNotStdaLoc;
+
+    /** 高程系统 */
+    @Excel(name = "高程系统")
+    @ApiModelProperty("高程系统")
+    private String elevSys;
+
+    /** 起点堤顶高程 */
+    @Excel(name = "起点堤顶高程")
+    @ApiModelProperty("起点堤顶高程")
+    private String startDikeTopEl;
+
+    /** 终点堤顶高程 */
+    @Excel(name = "终点堤顶高程")
+    @ApiModelProperty("终点堤顶高程")
+    private String endDikeTopEl;
+
+    /** 防浪墙顶最低高程 */
+    @Excel(name = "防浪墙顶最低高程")
+    @ApiModelProperty("防浪墙顶最低高程")
+    private String dikeWawaMinElev;
+
+    /** 防浪墙顶最高高程 */
+    @Excel(name = "防浪墙顶最高高程")
+    @ApiModelProperty("防浪墙顶最高高程")
+    private String dikeWawaMaxElev;
+
+    /** 防浪墙顶最低高程位置 */
+    @Excel(name = "防浪墙顶最低高程位置")
+    @ApiModelProperty("防浪墙顶最低高程位置")
+    private String dikeWawaMinLoc;
+
+    /** 防浪墙顶最高高程位置 */
+    @Excel(name = "防浪墙顶最高高程位置")
+    @ApiModelProperty("防浪墙顶最高高程位置")
+    private String dikeWawaMaxLoc;
+
+    /** 堤顶最低高程 */
+    @Excel(name = "堤顶最低高程")
+    @ApiModelProperty("堤顶最低高程")
+    private String dikeElevMin;
+
+    /** 堤顶最高高程 */
+    @Excel(name = "堤顶最高高程")
+    @ApiModelProperty("堤顶最高高程")
+    private String dikeElevMax;
+
+    /** 堤防最小高度 */
+    @Excel(name = "堤防最小高度")
+    @ApiModelProperty("堤防最小高度")
+    private String dikeHeigMin;
+
+    /** 堤防最大高度 */
+    @Excel(name = "堤防最大高度")
+    @ApiModelProperty("堤防最大高度")
+    private String dikeHeigMax;
+
+    /** 堤顶最小宽度 */
+    @Excel(name = "堤顶最小宽度")
+    @ApiModelProperty("堤顶最小宽度")
+    private String dikeTopWidMin;
+
+    /** 堤顶最大宽度 */
+    @Excel(name = "堤顶最大宽度")
+    @ApiModelProperty("堤顶最大宽度")
+    private String dikeTopWidMax;
+
+    /** 穿堤水闸数 */
+    @Excel(name = "穿堤水闸数")
+    @ApiModelProperty("穿堤水闸数")
+    private String sluicesAmount;
+
+    /** 穿堤泵站数 */
+    @Excel(name = "穿堤泵站数")
+    @ApiModelProperty("穿堤泵站数")
+    private String pumpsAmount;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String note;
+
+    /** 记录生效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录生效时间")
+    private Date effDate;
+
+    /** 记录失效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("记录失效时间")
+    private Date exprDate;
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java
index 3d9ca1ec..02e502a3 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java
@@ -1,11 +1,10 @@
 package com.kms.yg.df.domain;
 
-import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.shuili.common.annotation.Excel;
-
+import com.shuili.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 
@@ -14,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * 设计参数对象 bs_sgc_df_sjcs
  *
  * @author kms
- * @date 2024-01-17
+ * @date 2024-02-28
  */
 @TableName("bs_sgc_df_sjcs")
 @Data
@@ -33,9 +32,9 @@ public class BsSgcDfSjcs extends BaseEntity
     @ApiModelProperty("近闸边坡稳定性")
     private String nrgtslst;
 
-    /** 水闸堰型 */
-    @Excel(name = "水闸堰型")
-    @ApiModelProperty("水闸堰型")
+    /** 堤防堰型 */
+    @Excel(name = "堤防堰型")
+    @ApiModelProperty("堤防堰型")
     private String slwrst;
 
     /** 闸孔数量 */
@@ -168,14 +167,11 @@ public class BsSgcDfSjcs extends BaseEntity
     @ApiModelProperty("交通桥面高程")
     private String relation;
 
-    /** 水闸id */
-    @Excel(name = "水闸id")
-    @ApiModelProperty("水闸id")
-    private String dikeId;
+
 
     /** $column.columnComment */
-    @Excel(name = "水闸id")
-    @ApiModelProperty("水闸id")
+    @Excel(name = "堤防id")
+    @ApiModelProperty("堤防id")
     private String dikeCode;
 
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java
index 3bf1294e..d0a715b1 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java
@@ -1,22 +1,21 @@
 package com.kms.yg.df.domain;
 
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.shuili.common.annotation.Excel;
-
+import com.shuili.common.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import java.util.Date;
 
 
 /**
  * 水文特征对象 bs_sgc_df_swtz
  *
  * @author kms
- * @date 2024-01-17
+ * @date 2024-02-28
  */
 @TableName("bs_sgc_df_swtz")
 @Data
@@ -130,52 +129,81 @@ public class BsSgcDfSwtz extends BaseEntity
     @ApiModelProperty("校核闸下水位")
     private String relation;
 
-    /** 水闸id */
-    @Excel(name = "水闸id")
-    @ApiModelProperty("水闸id")
+    /** 堤防id */
+    @Excel(name = "堤防id")
+    @ApiModelProperty("堤防id")
     private String dikeId;
 
     /** $column.columnComment */
-    @Excel(name = "水闸id")
-    @ApiModelProperty("水闸id")
+    @Excel(name = "堤防id")
+    @ApiModelProperty("堤防id")
     private String dikeCode;
 
-    //设计洪水标准
+    /** 设计洪水标准 */
+    @Excel(name = "设计洪水标准")
+    @ApiModelProperty("设计洪水标准")
     private String designFloodStandard;
-    //设计洪水位
+
+    /** 设计洪水位 */
+    @Excel(name = "设计洪水位")
+    @ApiModelProperty("设计洪水位")
     private String designFloodHigh;
 
-    //保证水位
+    /** 保证水位 */
+    @Excel(name = "保证水位")
+    @ApiModelProperty("保证水位")
     private String ensureLevel;
 
-    //警戒水位
+    /** 警戒水位 */
+    @Excel(name = "警戒水位")
+    @ApiModelProperty("警戒水位")
     private String alertLevel;
 
-    //设防水位
+    /** 设防水位 */
+    @Excel(name = "设防水位")
+    @ApiModelProperty("设防水位")
     private String fortificationLevel;
 
-    //设计流量
+    /** 设计流量 */
+    @Excel(name = "设计流量")
+    @ApiModelProperty("设计流量")
     private String designFlow;
 
-    //警戒流量
+    /** 警戒流量 */
+    @Excel(name = "警戒流量")
+    @ApiModelProperty("警戒流量")
     private String alertFlow;
 
-    //校核水位
+    /** 校核水位 */
+    @Excel(name = "校核水位")
+    @ApiModelProperty("校核水位")
     private String checkLevel;
 
-    //校核流量
+    /** 校核流量 */
+    @Excel(name = "校核流量")
+    @ApiModelProperty("校核流量")
     private String checkFlow;
 
-    //历史最高水位
+    /** 历史最高水位 */
+    @Excel(name = "历史最高水位")
+    @ApiModelProperty("历史最高水位")
     private String highestWaterLevel;
 
-    //历史最高水位时间
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    /** 最高水位日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最高水位日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("最高水位日期")
     private Date highestWaterLevelTime;
-    //历史最高流量
+
+    /** 历史最大洪峰流量 */
+    @Excel(name = "历史最大洪峰流量")
+    @ApiModelProperty("历史最大洪峰流量")
     private String highestWaterFlow;
 
-    //历史最高流量时间
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    /** 历史最大洪峰流量日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "历史最大洪峰流量日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("历史最大洪峰流量日期")
     private Date highestWaterFlowTime;
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java
new file mode 100644
index 00000000..a1cf4272
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java
@@ -0,0 +1,16 @@
+package com.kms.yg.df.mapper;
+
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.yg.df.domain.BsSgcDfFxyhdc;
+
+/**
+ * 风险隐患调查Mapper接口
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@Repository
+public interface BsSgcDfFxyhdcMapper extends BaseMapper<BsSgcDfFxyhdc> {
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java
new file mode 100644
index 00000000..6f6d3418
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java
@@ -0,0 +1,16 @@
+package com.kms.yg.df.mapper;
+
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.yg.df.domain.BsSgcDfHdmtzz;
+
+/**
+ * 横断面特征值Mapper接口
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@Repository
+public interface BsSgcDfHdmtzzMapper extends BaseMapper<BsSgcDfHdmtzz> {
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java
new file mode 100644
index 00000000..e8a5fb11
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java
@@ -0,0 +1,16 @@
+package com.kms.yg.df.service;
+
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.df.mapper.BsSgcDfFxyhdcMapper;
+import com.kms.yg.df.domain.BsSgcDfFxyhdc;
+import org.springframework.stereotype.Service;
+/**
+ * 风险隐患调查Service接口
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@Service
+public class BsSgcDfFxyhdcService extends BaseService<BsSgcDfFxyhdcMapper, BsSgcDfFxyhdc>{
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java
new file mode 100644
index 00000000..606954e5
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java
@@ -0,0 +1,16 @@
+package com.kms.yg.df.service;
+
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.df.mapper.BsSgcDfHdmtzzMapper;
+import com.kms.yg.df.domain.BsSgcDfHdmtzz;
+import org.springframework.stereotype.Service;
+/**
+ * 横断面特征值Service接口
+ *
+ * @author kms
+ * @date 2024-02-28
+ */
+@Service
+public class BsSgcDfHdmtzzService extends BaseService<BsSgcDfHdmtzzMapper, BsSgcDfHdmtzz>{
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
index 2cbd83b5..23b8dadb 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 public class BsSgcSzSafeJbxx extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+
     /**
      * 水闸名称
      */