Merge branch 'master' into release-sy-v1.0.0

1 year ago · cc8a834c21
38 changed files with 3248 additions and 10 deletions
--- a/shuili-admin/src/main/java/com/kms/TianhuiApplication.java
+++ b/shuili-admin/src/main/java/com/kms/TianhuiApplication.java
@ -16,7 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
 */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@ComponentScan(basePackages = {"com.shuili.*","com.kms.*"})
-@MapperScan("com.shuili.*")
+@MapperScan(basePackages = {"com.shuili.*","com.kms.*"})
 public class TianhuiApplication
 {
 	public static void main(String[] args)  {
--- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
+++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
@ -0,0 +1,155 @@
+package com.kms.web.controller.system;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.kms.common.utils.BaseEntityUtils;
+
+
+import com.kms.common.utils.UserUtils;
+import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+import com.shuili.common.annotation.Log;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.AjaxResult;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
+import com.shuili.common.enums.BusinessType;
+import com.shuili.common.utils.poi.ExcelUtil;
+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;
+
+
+
+
+/**
+ * 行政区划Controller
+ *
+ * @author kms
+ * @date 2023-12-04
+ */
+@RestController
+@RequestMapping("/xzqh/xzqh")
+@Api(tags = "行政区划")
+public class SysXzqhController extends BaseController
+{
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+
+
+
+    @GetMapping("/common")
+    public AjaxResult common(){
+        SysUser user = UserUtils.getUser();
+        String deptId = user.getDeptId();
+        SysDept sysDept = sysDeptService.get(deptId);
+        String xzqhId = sysDept.getXzqhId();
+        SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+        String userName = user.getUserName();
+        if (userName.equals("admin")) {
+            List<SysXzqh> list = sysXzqhService.list();
+            return AjaxResult.success(list);
+        }else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+            String substring = xzqh.getXzqhdm().substring(0, 2);
+            QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+            queryWrapper.likeRight("XZQHDM", substring);
+            List<SysXzqh> list = sysXzqhService.list(queryWrapper);
+            return AjaxResult.success(list);
+        } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+            String substring = xzqh.getXzqhdm().substring(0, 4);
+            QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+            queryWrapper.likeRight("XZQHDM", substring);
+            List<SysXzqh> list = sysXzqhService.list(queryWrapper);
+            return AjaxResult.success(list);
+        }else {
+            return AjaxResult.success(xzqh);
+        }
+    }
+
+    /**
+     * 查询行政区划列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("行政区划列表")
+    public IPage list(@RequestBody SearchParam<SysXzqh> sp)
+    {
+        return sysXzqhService.selectPage(sp);
+    }
+
+    /**
+     * 导出行政区划列表
+     */
+    @Log(title = "行政区划导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("行政区划导出")
+    public AjaxResult export(@RequestBody SysXzqh sysXzqh)
+    {
+        List<SysXzqh> list = sysXzqhService.listByIds(sysXzqh.getIds());
+        ExcelUtil<SysXzqh> util = new ExcelUtil<>(SysXzqh.class);
+        return util.exportExcel(list, "xzqh");
+    }
+
+    /**
+     * 获取行政区划详细信息
+     */
+    @ApiOperation(" 行政区划详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(sysXzqhService.getById(id));
+    }
+
+    /**
+     * 新增行政区划
+     */
+    @Log(title = "行政区划新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("行政区划新增")
+    public AjaxResult add(@RequestBody SysXzqh sysXzqh)
+    {
+        BaseEntityUtils.preInsert(sysXzqh);
+        return toAjax(sysXzqhService.save(sysXzqh));
+    }
+
+    /**
+     * 修改行政区划
+     */
+    @ApiOperation("行政区划修改")
+    @Log(title = "行政区划修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysXzqh sysXzqh)
+    {
+        return toAjax(sysXzqhService.updateById(sysXzqh));
+    }
+
+    /**
+     * 删除行政区划
+     */
+    @ApiOperation("行政区划删除")
+    @Log(title = "行政区划删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(sysXzqhService.removeByIds(Arrays.asList(ids)));
+    }
+}
--- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDept.java
+++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDept.java
@ -60,6 +60,11 @@ public class SysDept extends BaseEntity
    @TableField(exist = false)
    private String parentName;

+    private String xzqhId;
+
+
+    private String xzqhName;
+
    /** 子部门 */
    @TableField(exist = false)
    @NoQuery
--- a/shuili-generator/src/main/resources/vm/java/controller.java.vm
+++ b/shuili-generator/src/main/resources/vm/java/controller.java.vm
@ -48,6 +48,12 @@ public class ${ClassName}Controller extends BaseController
    @Autowired
    private ${ClassName}Service ${className}Service;

+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
    /**
     * 查询${functionName}列表
     */
--- a/shuili-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/shuili-generator/src/main/resources/vm/vue/index.vue.vm
@ -99,8 +99,8 @@
    </el-row>

    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50" align="center"/>
+      <el-table-column type="selection" width="55" align="center" fixed/>
+      <el-table-column label="序号" type="index" width="50" align="center" fixed/>
 #foreach($column in $columns)
 #set($javaField=$column.javaField)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@ -112,18 +112,18 @@
 #if($column.pk)

 #elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+      <el-table-column label="${comment}" align="center" prop="${javaField}" min-width="120">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
 #elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" min-width="120"/>
 #elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" min-width="120"/>
 #end
 #end
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
        <template slot-scope="scope">
          <el-button
            size="mini"
@ -152,7 +152,7 @@
    />

    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
@ -171,7 +171,7 @@
        </el-form-item>
 #elseif($column.htmlType == "select" && "" != $dictType)
        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}" style="width:100%">
            <el-option
              v-for="dict in ${field}Options"
              :key="dict.dictValue"
@ -296,7 +296,14 @@ export default {

                #end
            #end
-        }
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sort: "desc",
+        },

      },
      // 表单参数
--- a/shuili-system/src/main/java/com/kms/cms/service/CmsContentService.java
+++ b/shuili-system/src/main/java/com/kms/cms/service/CmsContentService.java
@ -1,8 +1,10 @@
 package com.kms.cms.service;

+import com.shuili.common.annotation.DataSource;
 import com.shuili.common.core.service.BaseService;
 import com.kms.cms.domain.CmsContent;
 import com.kms.cms.mapper.CmsContentMapper;
+import com.shuili.common.enums.DataSourceType;
 import org.springframework.stereotype.Service;

 /**
--- a/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java
+++ b/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java
@ -0,0 +1,67 @@
+package com.kms.system.domain;
+
+import java.math.BigDecimal;
+
+import com.shuili.common.annotation.Excel;
+import com.shuili.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+
+
+/**
+ * 行政区划对象 sys_xzqh
+ *
+ * @author kms
+ * @date 2023-12-04
+ */
+@TableName("sys_xzqh")
+@Data
+@ApiModel("行政区划")
+public class SysXzqh extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 行政区划代码 */
+    @Excel(name = "行政区划代码")
+    @ApiModelProperty("行政区划代码")
+    private String xzqhdm;
+
+    /** 父级区划id */
+    @Excel(name = "父级区划id")
+    @ApiModelProperty("父级区划id")
+    private String parentid;
+
+    /** 区划名称 */
+    @Excel(name = "区划名称")
+    @ApiModelProperty("区划名称")
+    private String name;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    @ApiModelProperty("层级")
+    private BigDecimal layer;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    @ApiModelProperty("类型")
+    private String type;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    @ApiModelProperty("状态")
+    private String status;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    @ApiModelProperty("排序")
+    private BigDecimal orderno;
+
+}
--- a/shuili-system/src/main/java/com/kms/system/mapper/SysXzqhMapper.java
+++ b/shuili-system/src/main/java/com/kms/system/mapper/SysXzqhMapper.java
@ -0,0 +1,17 @@
+package com.kms.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.system.domain.SysXzqh;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * 行政区划Mapper接口
+ *
+ * @author kms
+ * @date 2023-12-04
+ */
+@Repository
+public interface SysXzqhMapper extends BaseMapper<SysXzqh> {
+
+}
--- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
+++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
@ -0,0 +1,19 @@
+package com.kms.system.service;
+
+import com.kms.system.domain.SysXzqh;
+import com.kms.system.mapper.SysXzqhMapper;
+import com.shuili.common.core.service.BaseService;
+import org.springframework.stereotype.Service;
+
+
+
+/**
+ * 行政区划Service接口
+ *
+ * @author kms
+ * @date 2023-12-04
+ */
+@Service
+public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
@ -0,0 +1,238 @@
+package com.kms.yg.df.controller;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kms.common.utils.UserUtils;
+import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import com.kms.yg.sz.domain.BsSgcSzBzbp;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
+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.BsSgcDfBzbp;
+import com.kms.yg.df.service.BsSgcDfBzbpService;
+
+
+/**
+ * 堤防标识标牌Controller
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@RestController
+@RequestMapping("/df/dikeMark")
+@Api(tags = "堤防标识标牌")
+public class BsSgcDfBzbpController extends BaseController
+{
+    @Autowired
+    private BsSgcDfBzbpService bsSgcDfBzbpService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 查询堤防标识标牌列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("堤防标识标牌列表")
+    public IPage list(@RequestBody SearchParam<BsSgcDfBzbp> sp)
+    {
+
+        BsSgcDfBzbp projectInfo = sp.getData();
+        String adcd = null;
+        if (projectInfo != null) {
+            adcd = projectInfo.getAdcd();
+        }
+
+        SysUser sysUser = UserUtils.getUser();
+        if (sysUser.getUserName().equals("admin")) {
+            if (projectInfo != null && projectInfo.getAdcd() != null) {
+                String infoAdcd = projectInfo.getAdcd();
+                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
+                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+                if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
+
+                } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
+
+                }else {
+                    infoAdcd = xzqh.getXzqhdm();
+                }
+                return bsSgcDfBzbpService.selectPage(sp,infoAdcd);
+            }else {
+                return bsSgcDfBzbpService.selectPage(sp,null);
+            }
+
+        }else if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.get(deptId);
+            String xzqhId = sysDept.getXzqhId();
+            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+            String substring = "";
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                substring = xzqh.getXzqhdm();
+            }
+
+            return bsSgcDfBzbpService.selectPage(sp,substring);
+        }else {
+
+            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
+
+            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                adcd = xzqh.getXzqhdm();
+            }
+            return bsSgcDfBzbpService.selectPage(sp, adcd);
+        }
+//        return bsSgcDfBzbpService.selectPage(sp);
+    }
+
+    /**
+     * 导出堤防标识标牌列表
+     */
+    @Log(title = "堤防标识标牌导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("堤防标识标牌导出")
+    public AjaxResult export(@RequestBody BsSgcDfBzbp bsSgcDfBzbp)
+    {
+        List<BsSgcDfBzbp> list = bsSgcDfBzbpService.listByIds(bsSgcDfBzbp.getIds());
+        ExcelUtil<BsSgcDfBzbp> util = new ExcelUtil<>(BsSgcDfBzbp.class);
+        return util.exportExcel(list, "dikeMark");
+    }
+
+    /**
+     * 获取堤防标识标牌详细信息
+     */
+    @ApiOperation(" 堤防标识标牌详情")
+    @GetMapping(value = "/{embankmentCode}")
+    public AjaxResult getInfo(@PathVariable("embankmentCode") String embankmentCode)
+    {
+        QueryWrapper<BsSgcDfBzbp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("embankment_code", embankmentCode);
+        queryWrapper.orderByAsc("sort_time");
+        List<BsSgcDfBzbp> list = bsSgcDfBzbpService.list(queryWrapper);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 新增堤防标识标牌
+     */
+    @Log(title = "堤防标识标牌新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("堤防标识标牌新增")
+    public AjaxResult add(@RequestBody List<BsSgcDfBzbp> list)
+    {
+        for (BsSgcDfBzbp bsSgcDfBzbp : list) {
+            BaseEntityUtils.preInsert(bsSgcDfBzbp);
+            bsSgcDfBzbp.setSortTime(new Date());
+            String adcd = bsSgcDfBzbp.getAdcd();
+            if (adcd == null) {
+                SysUser user = UserUtils.getUser();
+                String deptId = user.getDeptId();
+                SysDept sysDept = sysDeptService.get(deptId);
+                bsSgcDfBzbp.setAdcd(sysDept.getXzqhName());
+            }
+            bsSgcDfBzbpService.save(bsSgcDfBzbp);
+        }
+
+
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改堤防标识标牌
+     */
+    @ApiOperation("堤防标识标牌修改")
+    @Log(title = "堤防标识标牌修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody List<BsSgcDfBzbp> list)
+    {
+        for (BsSgcDfBzbp bsSgcDfBzbp : list) {
+            String adcd = bsSgcDfBzbp.getAdcd();
+            if (bsSgcDfBzbp.getSortTime() == null) {
+                bsSgcDfBzbp.setSortTime(new Date());
+            }
+            if (adcd == null) {
+                SysUser user = UserUtils.getUser();
+                String deptId = user.getDeptId();
+                SysDept sysDept = sysDeptService.get(deptId);
+                bsSgcDfBzbp.setAdcd(sysDept.getXzqhName());
+            }
+            bsSgcDfBzbpService.saveOrUpdate(bsSgcDfBzbp);
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除堤防标识标牌
+     */
+    @ApiOperation("堤防标识标牌删除")
+    @Log(title = "堤防标识标牌删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcDfBzbpService.removeByIds(Arrays.asList(ids)));
+    }
+
+    @DeleteMapping("/del/{embankmentCodes}")
+    public AjaxResult del(@PathVariable String[] embankmentCodes) {
+        for (String embankmentCode : embankmentCodes) {
+            QueryWrapper<BsSgcDfBzbp> queryWrapper = new QueryWrapper<>();
+
+            queryWrapper.eq("embankment_code", embankmentCode);
+
+            bsSgcDfBzbpService.remove(queryWrapper);
+        }
+
+
+        return AjaxResult.success();
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java
@ -0,0 +1,131 @@
+package com.kms.yg.df.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import com.kms.yg.df.domain.BsSgcDfGcgl;
+import com.kms.yg.df.service.BsSgcDfGcglService;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.BeanUtils;
+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.annotation.Log;
+import com.shuili.common.core.domain.AjaxResult;
+import com.shuili.common.enums.BusinessType;
+
+
+
+
+/**
+ * 水闸工程管理信息Controller
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@RestController
+@RequestMapping("/yg/engineerManageInfo")
+@Api(tags = "水闸工程管理信息")
+public class BsSgcDfGcglController extends BaseController
+{
+    @Autowired
+    private BsSgcDfGcglService bsSgcDfGcglService;
+
+    /**
+     * 查询水闸工程管理信息列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸工程管理信息列表")
+    public IPage list(@RequestBody SearchParam<BsSgcDfGcgl> sp)
+    {
+        return bsSgcDfGcglService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸工程管理信息列表
+     */
+    @Log(title = "水闸工程管理信息导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸工程管理信息导出")
+    public AjaxResult export(@RequestBody BsSgcDfGcgl bsSgcDfGcgl)
+    {
+        List<BsSgcDfGcgl> list = bsSgcDfGcglService.listByIds(bsSgcDfGcgl.getIds());
+        ExcelUtil<BsSgcDfGcgl> util = new ExcelUtil<>(BsSgcDfGcgl.class);
+        return util.exportExcel(list, "engineerManageInfo");
+    }
+
+    /**
+     * 获取水闸工程管理信息详细信息
+     */
+    @ApiOperation(" 水闸工程管理信息详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcDfGcglService.getById(id));
+    }
+
+    /**
+     * 新增水闸工程管理信息
+     */
+    @Log(title = "水闸工程管理信息新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸工程管理信息新增")
+    public AjaxResult add(@RequestBody BsSgcDfGcgl bsSgcDfGcgl)
+    {
+        BaseEntityUtils.preInsert(bsSgcDfGcgl);
+        bsSgcDfGcgl.setRecordTakeEffectTime(new Date());
+        return toAjax(bsSgcDfGcglService.save(bsSgcDfGcgl));
+    }
+
+    /**
+     * 修改水闸工程管理信息
+     */
+    @ApiOperation("水闸工程管理信息修改")
+    @Log(title = "水闸工程管理信息修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcDfGcgl bsSgcDfGcgl)
+    {
+        String id = bsSgcDfGcgl.getId();
+        BsSgcDfGcgl byId = bsSgcDfGcglService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcDfGcglService.save(byId);
+
+        bsSgcDfGcgl.setRecordTakeEffectTime(new Date());
+        bsSgcDfGcgl.setRecordLoseEfficacyTime(null);
+
+
+
+        return toAjax(bsSgcDfGcglService.updateById(bsSgcDfGcgl));
+    }
+
+    /**
+     * 删除水闸工程管理信息
+     */
+    @ApiOperation("水闸工程管理信息删除")
+    @Log(title = "水闸工程管理信息删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcDfGcglService.removeByIds(Arrays.asList(ids)));
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java
@ -0,0 +1,233 @@
+package com.kms.yg.df.controller;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kms.common.utils.UserUtils;
+import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import com.kms.yg.df.service.BsSgcDfJbxxService;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
+import com.shuili.common.utils.BeanUtils;
+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;
+
+
+
+/**
+ * 堤防基本信息Controller
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@RestController
+@RequestMapping("/yg/dikeInfo")
+@Api(tags = "堤防基本信息")
+public class BsSgcDfJbxxController extends BaseController
+{
+    @Autowired
+    private BsSgcDfJbxxService bsSgcDfJbxxService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 查询堤防基本信息列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("堤防基本信息列表")
+    public IPage list(@RequestBody SearchParam<BsSgcDfJbxx> sp)
+    {
+        BsSgcDfJbxx projectInfo = sp.getData();
+        String adcd = null;
+        if (projectInfo != null) {
+            adcd = projectInfo.getAdcd();
+        }
+
+        SysUser sysUser = UserUtils.getUser();
+        if (sysUser.getUserName().equals("admin")) {
+            if (projectInfo != null && projectInfo.getAdcd() != null) {
+                String infoAdcd = projectInfo.getAdcd();
+                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
+                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+                if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
+
+                } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
+
+                }else {
+                    infoAdcd = xzqh.getXzqhdm();
+                }
+                return bsSgcDfJbxxService.selectPage(sp,infoAdcd);
+            }else {
+                return bsSgcDfJbxxService.selectPage(sp,null);
+            }
+
+        }else if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.get(deptId);
+            String xzqhId = sysDept.getXzqhId();
+            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+            String substring = "";
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                substring = xzqh.getXzqhdm();
+            }
+
+            return bsSgcDfJbxxService.selectPage(sp,substring);
+        }else {
+
+            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
+
+            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                adcd = xzqh.getXzqhdm();
+            }
+            return bsSgcDfJbxxService.selectPage(sp, adcd);
+        }
+
+
+
+
+
+//        return bsSgcDfJbxxService.selectPage(sp);
+    }
+
+    /**
+     * 导出堤防基本信息列表
+     */
+    @Log(title = "堤防基本信息导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("堤防基本信息导出")
+    public AjaxResult export(@RequestBody BsSgcDfJbxx bsSgcDfJbxx)
+    {
+        List<BsSgcDfJbxx> list = bsSgcDfJbxxService.listByIds(bsSgcDfJbxx.getIds());
+        ExcelUtil<BsSgcDfJbxx> util = new ExcelUtil<>(BsSgcDfJbxx.class);
+        return util.exportExcel(list, "dikeInfo");
+    }
+
+    /**
+     * 获取堤防基本信息详细信息
+     */
+    @ApiOperation(" 堤防基本信息详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcDfJbxxService.getById(id));
+    }
+
+    /**
+     * 新增堤防基本信息
+     */
+    @Log(title = "堤防基本信息新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("堤防基本信息新增")
+    public AjaxResult add(@RequestBody BsSgcDfJbxx bsSgcDfJbxx)
+    {
+        String embankmentCode = bsSgcDfJbxx.getEmbankmentCode();
+
+        QueryWrapper<BsSgcDfJbxx> queryWrapper = new QueryWrapper<>();
+
+        queryWrapper.eq("EMBANKMENT_CODE", embankmentCode);
+
+        BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper);
+        if (one != null) {
+            return AjaxResult.error("该堤防编码已存在");
+        }
+
+
+        BaseEntityUtils.preInsert(bsSgcDfJbxx);
+        String adcd = bsSgcDfJbxx.getAdcd();
+        if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.get(deptId);
+            bsSgcDfJbxx.setAdcd(sysDept.getXzqhName());
+        }
+        bsSgcDfJbxx.setRecordTakeEffectTime(new Date());
+        return toAjax(bsSgcDfJbxxService.save(bsSgcDfJbxx));
+    }
+
+    /**
+     * 修改堤防基本信息
+     */
+    @ApiOperation("堤防基本信息修改")
+    @Log(title = "堤防基本信息修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcDfJbxx bsSgcDfJbxx)
+    {
+        String id = bsSgcDfJbxx.getId();
+        BsSgcDfJbxx byId = bsSgcDfJbxxService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcDfJbxxService.save(byId);
+
+
+        bsSgcDfJbxx.setRecordTakeEffectTime(new Date());
+        bsSgcDfJbxx.setRecordLoseEfficacyTime(null);
+
+
+
+
+        return toAjax(bsSgcDfJbxxService.updateById(bsSgcDfJbxx));
+    }
+
+    /**
+     * 删除堤防基本信息
+     */
+    @ApiOperation("堤防基本信息删除")
+    @Log(title = "堤防基本信息删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcDfJbxxService.removeByIds(Arrays.asList(ids)));
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java
@ -0,0 +1,91 @@
+package com.kms.yg.df.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kms.yg.df.domain.BsSgcDfGcgl;
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import com.kms.yg.df.service.BsSgcDfGcglService;
+import com.kms.yg.df.service.BsSgcDfJbxxService;
+import com.kms.yg.sz.controller.SzContrastController;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.kms.yg.sz.domain.BsSgcSzGcgl;
+import com.shuili.common.core.domain.AjaxResult;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/df/contrast")
+public class DfContrastController {
+
+    @Autowired
+    private BsSgcDfGcglService bsSgcDfGcglService;
+
+    @Autowired
+    private BsSgcDfJbxxService bsSgcDfJbxxService;
+
+
+    @GetMapping("/{embankmentCode}")
+    public AjaxResult contrast(@PathVariable String embankmentCode) {
+        ContrastResult contrastResult = new ContrastResult();
+
+        //基本信息
+        //查询当前使用的版本
+        QueryWrapper<BsSgcDfJbxx> queryWrapper = Wrappers.query();
+        queryWrapper.isNull("record_lose_efficacy_time");
+        queryWrapper.eq("embankment_code", embankmentCode);
+
+        BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfJbxx> query = Wrappers.query();
+        query.eq("embankment_code", embankmentCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcDfJbxx> list = bsSgcDfJbxxService.list(query);
+        if (one != null) {
+            list.add(0,one);
+
+        }
+
+        contrastResult.setJbxx(list);
+
+        //工程管理
+        //查询当前版本
+        QueryWrapper<BsSgcDfGcgl> wrapper = new QueryWrapper<>();
+        wrapper.isNull("record_lose_efficacy_time");
+        wrapper.eq("embankment_code", embankmentCode);
+
+        BsSgcDfGcgl one1 = bsSgcDfGcglService.getOne(wrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfGcgl> query1 = Wrappers.query();
+        query1.eq("embankment_code", embankmentCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcDfGcgl> list1 = bsSgcDfGcglService.list(query1);
+
+        if (one1 != null){
+            list1.add(0,one1);
+        }
+        contrastResult.setGcgl(list1);
+        return AjaxResult.success(contrastResult);
+    }
+
+
+    @Data
+    public class ContrastResult {
+        private List<BsSgcDfJbxx> jbxx;
+
+        private List<BsSgcDfGcgl> gcgl;
+
+    }
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java
@ -0,0 +1,104 @@
+package com.kms.yg.df.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+
+/**
+ * 堤防标识标牌对象 bs_sgc_df_bzbp
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@TableName("bs_sgc_df_bzbp")
+@Data
+@ApiModel("堤防标识标牌")
+public class BsSgcDfBzbp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 标志名称 */
+    @Excel(name = "标志名称")
+    @ApiModelProperty("标志名称")
+    private String markName;
+
+    /** 堤防id */
+    @Excel(name = "堤防编码")
+    @ApiModelProperty("堤防编码")
+    private String embankmentCode;
+
+    /** 标识位置 */
+    @Excel(name = "标识位置")
+    @ApiModelProperty("标识位置")
+    private String markLocation;
+
+    /** 标牌类型 */
+    @Excel(name = "标牌类型")
+    @ApiModelProperty("标牌类型")
+    private String type;
+
+    /** 标识类型 */
+    @Excel(name = "标识类型")
+    @ApiModelProperty("标识类型")
+    private String markType;
+
+    /** 上传图片 */
+    @Excel(name = "上传图片")
+    @ApiModelProperty("上传图片")
+    private String photo;
+
+    /** 标牌编号 */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String markCode;
+
+    /** $column.columnComment */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String proCode;
+
+    /** $column.columnComment */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String proNo;
+
+    /** $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;
+
+    private String adcd;
+
+    private String embankmentName;
+
+    @TableField(exist = false)
+    private String number;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8")
+    private Date sortTime;
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java
@ -0,0 +1,208 @@
+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.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 水闸工程管理信息对象 bs_sgc_df_gcgl
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@TableName("bs_sgc_df_gcgl")
+@Data
+@ApiModel("水闸工程管理信息")
+public class BsSgcDfGcgl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工程管理单位 */
+    @Excel(name = "工程管理单位")
+    @ApiModelProperty("工程管理单位")
+    private String engineeringManagementUnit;
+
+    /** 工程管理单位性质 */
+    @Excel(name = "工程管理单位性质")
+    @ApiModelProperty("工程管理单位性质")
+    private String managementUnitNature;
+
+    /** 工程管理单位权属 */
+    @Excel(name = "工程管理单位权属")
+    @ApiModelProperty("工程管理单位权属")
+    private String engineeringManagementOwnership;
+
+    /** 工程管理单位责任人 */
+    @Excel(name = "工程管理单位责任人")
+    @ApiModelProperty("工程管理单位责任人")
+    private String engineeringManagementPerson;
+
+    /** 工程管理单位责任人职务 */
+    @Excel(name = "工程管理单位责任人职务")
+    @ApiModelProperty("工程管理单位责任人职务")
+    private String engineeringManagementPosition;
+
+    /** 工程管理单位责任人手机号码 */
+    @Excel(name = "工程管理单位责任人手机号码")
+    @ApiModelProperty("工程管理单位责任人手机号码")
+    private String engineeringManagementPhone;
+
+    /** 水行政主管部门 */
+    @Excel(name = "水行政主管部门")
+    @ApiModelProperty("水行政主管部门")
+    private String waterAdministrativeDepartment;
+
+    /** 水行政主管部门性质 */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentNature;
+
+    /** $column.columnComment */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentPerson;
+
+    /** $column.columnComment */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentPosition;
+
+    /** $column.columnComment */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentPhone;
+
+    /** 行业归口管理部门 */
+    @Excel(name = "行业归口管理部门")
+    @ApiModelProperty("行业归口管理部门")
+    private String centralizedManagementDepartment;
+
+    /** 管理范围划界 */
+    @Excel(name = "管理范围划界")
+    @ApiModelProperty("管理范围划界")
+    private String managementDelimitation;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("完成时间")
+    private Date delimitationTime;
+
+    /** 证明材料 */
+    @Excel(name = "证明材料")
+    @ApiModelProperty("证明材料")
+    private String delimitationEvidence;
+
+    /** 管理范围确权 */
+    @Excel(name = "管理范围确权")
+    @ApiModelProperty("管理范围确权")
+    private String managementConfirmation;
+
+    /** $column.columnComment */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "管理范围确权", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("管理范围确权")
+    private Date confirmationTime;
+
+    /** $column.columnComment */
+    @Excel(name = "管理范围确权")
+    @ApiModelProperty("管理范围确权")
+    private String confirmationEvidence;
+
+    /** 保护范围划界 */
+    @Excel(name = "保护范围划界")
+    @ApiModelProperty("保护范围划界")
+    private String protectionDelimitation;
+
+    /** $column.columnComment */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "保护范围划界", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("保护范围划界")
+    private Date protectionTime;
+
+    /** $column.columnComment */
+    @Excel(name = "保护范围划界")
+    @ApiModelProperty("保护范围划界")
+    private String protectionEvidence;
+
+    /** 闸门操作规程 */
+    @Excel(name = "闸门操作规程")
+    @ApiModelProperty("闸门操作规程")
+    private String gateOperatingProcedures;
+
+    /** 水闸控制运用计划(方案)批复文件 */
+    @Excel(name = "水闸控制运用计划(方案)批复文件")
+    @ApiModelProperty("水闸控制运用计划(方案)批复文件")
+    private String waterGateControlOperation;
+
+    /** 工程竣工验收鉴定书 */
+    @Excel(name = "工程竣工验收鉴定书")
+    @ApiModelProperty("工程竣工验收鉴定书")
+    private String engineeringCompletionAcceptance;
+
+    /** 工程图表 */
+    @Excel(name = "工程图表")
+    @ApiModelProperty("工程图表")
+    private String engineeringChart;
+
+    /** 工程全景照片 */
+    @Excel(name = "工程全景照片")
+    @ApiModelProperty("工程全景照片")
+    private String engineeringPanoramicPhotos;
+
+    /** 降等批复文件 */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String approvalDocumentsDowngrade;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String proCode;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private Long proNo;
+
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String relations;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordTakeEffectTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordLoseEfficacyTime;
+
+
+    private String embankmentCode;
+    private String monitoringType;
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java
@ -0,0 +1,220 @@
+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.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 堤防基本信息对象 bs_sgc_df_jbxx
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@TableName("bs_sgc_df_jbxx")
+@Data
+@ApiModel("堤防基本信息")
+public class BsSgcDfJbxx extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 堤防名称 */
+    @Excel(name = "堤防名称")
+    @ApiModelProperty("堤防名称")
+    private String embankmentName;
+
+    /** 起点行政区划 */
+    @Excel(name = "起点行政区划")
+    @ApiModelProperty("起点行政区划")
+    private String adcdStart;
+
+    /** 堤防编码 */
+    @Excel(name = "堤防编码")
+    @ApiModelProperty("堤防编码")
+    private String embankmentCode;
+
+    /** 标绘堤防 */
+    @Excel(name = "标绘堤防")
+    @ApiModelProperty("标绘堤防")
+    private String plotEmbankments;
+
+    /** 终点行政区划 */
+    @Excel(name = "终点行政区划")
+    @ApiModelProperty("终点行政区划")
+    private String adcdEnd;
+
+    /** 起点桩号 */
+    @Excel(name = "起点桩号")
+    @ApiModelProperty("起点桩号")
+    private String startingStationNumber;
+
+    /** 终点桩号 */
+    @Excel(name = "终点桩号")
+    @ApiModelProperty("终点桩号")
+    private String endStationNumber;
+
+    /** 堤防类型 */
+    @Excel(name = "堤防类型")
+    @ApiModelProperty("堤防类型")
+    private String embankmentType;
+
+    /** 是否为蓄滞洪区堤防 */
+    @Excel(name = "是否为蓄滞洪区堤防")
+    @ApiModelProperty("是否为蓄滞洪区堤防")
+    private String isFloodStorageDetention;
+
+    /** 所在蓄滞洪区名称 */
+    @Excel(name = "所在蓄滞洪区名称")
+    @ApiModelProperty("所在蓄滞洪区名称")
+    private String storageDetentionAreaName;
+
+    /** $column.columnComment */
+    @Excel(name = "所在蓄滞洪区名称")
+    @ApiModelProperty("所在蓄滞洪区名称")
+    private String areaStartingStationNumber;
+
+    /** $column.columnComment */
+    @Excel(name = "所在蓄滞洪区名称")
+    @ApiModelProperty("所在蓄滞洪区名称")
+    private String areaEndStationNumber;
+
+    /** 堤防蓄滞洪区段总长度(m) */
+    @Excel(name = "堤防蓄滞洪区段总长度(m)")
+    @ApiModelProperty("堤防蓄滞洪区段总长度(m)")
+    private String totalLengthFloodStorage;
+
+    /** 蓄滞洪区特殊情况说明 */
+    @Excel(name = "蓄滞洪区特殊情况说明")
+    @ApiModelProperty("蓄滞洪区特殊情况说明")
+    private String floodStorageDetentionAreasExplanation;
+
+    /** 堤防跨界情况 */
+    @Excel(name = "堤防跨界情况")
+    @ApiModelProperty("堤防跨界情况")
+    private String crossBorderSituation;
+
+    /** 堤防型式 */
+    @Excel(name = "堤防型式")
+    @ApiModelProperty("堤防型式")
+    private String embankmentTyper;
+
+    /** 建成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "建成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("建成时间")
+    private Date completionTime;
+
+    /** 最近达标加固完工状态 */
+    @Excel(name = "最近达标加固完工状态")
+    @ApiModelProperty("最近达标加固完工状态")
+    private String recentComplianceReinforcementStatus;
+
+    /** 最近达标加固完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最近达标加固完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("最近达标加固完成时间")
+    private Date recentComplianceReinforcementTime;
+
+    /** 工程任务 */
+    @Excel(name = "工程任务")
+    @ApiModelProperty("工程任务")
+    private String engineeringTasks;
+
+    /** 堤防级别 */
+    @Excel(name = "堤防级别")
+    @ApiModelProperty("堤防级别")
+    private String embankmentLevel;
+
+    /** 设计防洪（潮）标准[重现期（年）] */
+    @Excel(name = "设计防洪", readConverterExp = "潮=")
+    @ApiModelProperty("设计防洪")
+    private String designFloodControl;
+
+    /** 堤防长度(m) */
+    @Excel(name = "堤防长度(m)")
+    @ApiModelProperty("堤防长度(m)")
+    private String embankmentLength;
+
+    /** 规划防洪（潮）标准[重现期（年）] */
+    @Excel(name = "规划防洪", readConverterExp = "潮=")
+    @ApiModelProperty("规划防洪")
+    private String planningFloodControl;
+
+    /** 达到规划标准的堤防长度(m) */
+    @Excel(name = "达到规划标准的堤防长度(m)")
+    @ApiModelProperty("达到规划标准的堤防长度(m)")
+    private String embankmentLengthPlanningStandards;
+
+    /** 保护人口（单位：万人） */
+    @Excel(name = "保护人口", readConverterExp = "单=位：万人")
+    @ApiModelProperty("保护人口")
+    private String populationProtection;
+
+    /** 保护农田（单位：万亩） */
+    @Excel(name = "保护农田", readConverterExp = "单=位：万亩")
+    @ApiModelProperty("保护农田")
+    private String protectingFarmland;
+
+    /** 重要基础设施 */
+    @Excel(name = "重要基础设施")
+    @ApiModelProperty("重要基础设施")
+    private String criticalInfrastructure;
+
+    /** $column.columnComment */
+    @Excel(name = "重要基础设施")
+    @ApiModelProperty("重要基础设施")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "重要基础设施")
+    @ApiModelProperty("重要基础设施")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "重要基础设施")
+    @ApiModelProperty("重要基础设施")
+    private String proCode;
+
+    /** $column.columnComment */
+    @Excel(name = "重要基础设施")
+    @ApiModelProperty("重要基础设施")
+    private String proNo;
+
+    /** $column.columnComment */
+    @Excel(name = "重要基础设施")
+    @ApiModelProperty("重要基础设施")
+    private String owerDept;
+
+
+    /** 关联字段1 */
+    @Excel(name = "关联字段1")
+    @ApiModelProperty("关联字段1")
+    private String relations;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordTakeEffectTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordLoseEfficacyTime;
+
+    private String adcd;
+
+    //所在河流
+    private String riverLocation;
+    //河流岸别
+    private String riversideClassification;
+    //所在湖泊名称
+    private String lakeName;
+    //所在海岸名称
+    private String coastlineName;
+
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java
@ -0,0 +1,20 @@
+package com.kms.yg.df.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.yg.df.domain.BsSgcDfBzbp;
+
+import java.util.List;
+
+/**
+ * 堤防标识标牌Mapper接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Repository
+public interface BsSgcDfBzbpMapper extends BaseMapper<BsSgcDfBzbp> {
+
+    List<BsSgcDfBzbp> selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd);
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGcglMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGcglMapper.java
@ -0,0 +1,17 @@
+package com.kms.yg.df.mapper;
+
+import com.kms.yg.df.domain.BsSgcDfGcgl;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 水闸工程管理信息Mapper接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Repository
+public interface BsSgcDfGcglMapper extends BaseMapper<BsSgcDfGcgl> {
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
@ -0,0 +1,17 @@
+package com.kms.yg.df.mapper;
+
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 堤防基本信息Mapper接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Repository
+public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java
@ -0,0 +1,65 @@
+package com.kms.yg.df.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.df.mapper.BsSgcDfBzbpMapper;
+import com.kms.yg.df.domain.BsSgcDfBzbp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 堤防标识标牌Service接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Service
+public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBzbp>{
+
+    @Autowired
+    private BsSgcDfBzbpMapper bsSgcDfBzbpMapper;
+
+    public IPage selectPage(SearchParam<BsSgcDfBzbp> sp, String adcd) {
+
+        QueryWrapper<BsSgcDfBzbp> queryWrapper = new QueryWrapper<>();
+        BsSgcDfBzbp projectInfo = sp.getData();
+
+        if (projectInfo != null) {
+            String projectName = projectInfo.getEmbankmentName();
+//            String projectType = projectInfo.getEmbankmentType();
+
+            queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
+            queryWrapper.like(projectName != null, "embankment_name", projectName);
+//            queryWrapper.like(projectType != null, "embankment_type", projectType);
+            queryWrapper.likeRight(adcd != null, "ADCD", adcd);
+        }
+
+
+        Map<String, Object> params = sp.getParams();
+        if (params!=null) {
+            //create_time
+            if (params.get("orderBy") != null) {
+                String orderBy = (String) params.get("orderBy");
+                queryWrapper.orderByDesc(orderBy != null, orderBy);
+            }
+        }
+
+
+        Page<BsSgcDfBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
+        List<BsSgcDfBzbp> infoPage = bsSgcDfBzbpMapper
+                .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getEmbankmentName(), adcd);
+        Page<BsSgcDfBzbp> bsSgcDfBzbpPage = new Page<>();
+
+        bsSgcDfBzbpPage.setRecords(infoPage);
+        bsSgcDfBzbpPage.setTotal(infoPage.size());
+        return bsSgcDfBzbpPage;
+    }
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java
@ -0,0 +1,40 @@
+package com.kms.yg.df.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.df.domain.BsSgcDfGcgl;
+import com.kms.yg.df.mapper.BsSgcDfGcglMapper;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.service.BaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+/**
+ * 水闸工程管理信息Service接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Service
+public class BsSgcDfGcglService extends BaseService<BsSgcDfGcglMapper, BsSgcDfGcgl>{
+
+
+    @Autowired
+    private BsSgcDfGcglMapper bsSgcDfGcglMapper;
+
+
+    public IPage selectPage(SearchParam<BsSgcDfGcgl> sp) {
+        QueryWrapper<BsSgcDfGcgl> queryWrapper = new QueryWrapper<>();
+
+        queryWrapper.eq("embankment_code", sp.getData().getEmbankmentCode());
+        queryWrapper.isNull("record_lose_efficacy_time");
+
+        return bsSgcDfGcglMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), queryWrapper);
+
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java
@ -0,0 +1,61 @@
+package com.kms.yg.df.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import com.kms.yg.df.mapper.BsSgcDfJbxxMapper;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.service.BaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+/**
+ * 堤防基本信息Service接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Service
+public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJbxx>{
+
+    @Autowired
+    private BsSgcDfJbxxMapper bsSgcDfJbxxMapper;
+
+
+    public IPage selectPage(SearchParam<BsSgcDfJbxx> sp, String adcd) {
+
+        QueryWrapper<BsSgcDfJbxx> queryWrapper = new QueryWrapper<>();
+        BsSgcDfJbxx projectInfo = sp.getData();
+
+        if (projectInfo != null) {
+            String projectName = projectInfo.getEmbankmentName();
+            String projectType = projectInfo.getEmbankmentType();
+
+            queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
+            queryWrapper.like(projectName != null, "embankment_name", projectName);
+            queryWrapper.like(projectType != null, "embankment_type", projectType);
+            queryWrapper.likeRight(adcd != null, "ADCD", adcd);
+            queryWrapper.isNull("record_lose_efficacy_time");
+        }
+
+
+        Map<String, Object> params = sp.getParams();
+        if (params!=null) {
+            //create_time
+            if (params.get("orderBy") != null) {
+                String orderBy = (String) params.get("orderBy");
+                queryWrapper.orderByDesc(orderBy != null, orderBy);
+            }
+        }
+
+
+        Page<BsSgcDfJbxx> page = new Page<>(sp.getPageNum(),sp.getPageSize());
+        Page<BsSgcDfJbxx> infoPage = bsSgcDfJbxxMapper.selectPage(page, queryWrapper);
+        return infoPage;
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
@ -0,0 +1,238 @@
+package com.kms.yg.sz.controller;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kms.common.utils.UserUtils;
+import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfBzbp;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
+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.sz.domain.BsSgcSzBzbp;
+import com.kms.yg.sz.service.BsSgcSzBzbpService;
+
+
+/**
+ * 水闸标识标牌Controller
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@RestController
+@RequestMapping("/sz/sluiceMark")
+@Api(tags = "水闸标识标牌")
+public class BsSgcSzBzbpController extends BaseController
+{
+    @Autowired
+    private BsSgcSzBzbpService bsSgcSzBzbpService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+    /**
+     * 查询水闸标识标牌列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸标识标牌列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzBzbp> sp)
+    {
+        BsSgcSzBzbp projectInfo = sp.getData();
+        String adcd = null;
+        if (projectInfo != null) {
+            adcd = projectInfo.getAdcd();
+        }
+
+        SysUser sysUser = UserUtils.getUser();
+        if (sysUser.getUserName().equals("admin")) {
+            if (projectInfo != null && projectInfo.getAdcd() != null) {
+                String infoAdcd = projectInfo.getAdcd();
+                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
+                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+                if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
+
+                } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
+
+                }else {
+                    infoAdcd = xzqh.getXzqhdm();
+                }
+                return bsSgcSzBzbpService.selectPage(sp,infoAdcd);
+            }else {
+                return bsSgcSzBzbpService.selectPage(sp,null);
+            }
+
+        }else if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.get(deptId);
+            String xzqhId = sysDept.getXzqhId();
+            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+            String substring = "";
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                substring = xzqh.getXzqhdm();
+            }
+
+            return bsSgcSzBzbpService.selectPage(sp,substring);
+        }else {
+
+            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
+
+            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                adcd = xzqh.getXzqhdm();
+            }
+            return bsSgcSzBzbpService.selectPage(sp, adcd);
+        }
+    }
+
+    /**
+     * 导出水闸标识标牌列表
+     */
+    @Log(title = "水闸标识标牌导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸标识标牌导出")
+    public AjaxResult export(@RequestBody BsSgcSzBzbp bsSgcSzBzbp)
+    {
+        List<BsSgcSzBzbp> list = bsSgcSzBzbpService.listByIds(bsSgcSzBzbp.getIds());
+        ExcelUtil<BsSgcSzBzbp> util = new ExcelUtil<>(BsSgcSzBzbp.class);
+        return util.exportExcel(list, "sluiceMark");
+    }
+
+    /**
+     * 获取水闸标识标牌详细信息
+     */
+    @ApiOperation(" 水闸标识标牌详情")
+    @GetMapping(value = "/{sluiceCode}")
+    public AjaxResult getInfo(@PathVariable("sluiceCode") String sluiceCode)
+    {
+        QueryWrapper<BsSgcSzBzbp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("sluice_code", sluiceCode);
+        queryWrapper.orderByAsc("sort_time");
+        List<BsSgcSzBzbp> list = bsSgcSzBzbpService.list(queryWrapper);
+
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 新增水闸标识标牌
+     */
+    @Log(title = "水闸标识标牌新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸标识标牌新增")
+    public AjaxResult add(@RequestBody List<BsSgcSzBzbp> list)
+    {
+        for (BsSgcSzBzbp bsSgcSzBzbp : list) {
+            BaseEntityUtils.preInsert(bsSgcSzBzbp);
+            bsSgcSzBzbp.setSortTime(new Date());
+            String adcd = bsSgcSzBzbp.getAdcd();
+            if (adcd == null) {
+                SysUser user = UserUtils.getUser();
+                String deptId = user.getDeptId();
+                SysDept sysDept = sysDeptService.get(deptId);
+                bsSgcSzBzbp.setAdcd(sysDept.getXzqhName());
+            }
+            bsSgcSzBzbpService.save(bsSgcSzBzbp);
+        }
+
+
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改水闸标识标牌
+     */
+    @ApiOperation("水闸标识标牌修改")
+    @Log(title = "水闸标识标牌修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody List<BsSgcSzBzbp> list)
+    {
+
+        for (BsSgcSzBzbp bsSgcSzBzbp : list) {
+            String adcd = bsSgcSzBzbp.getAdcd();
+            if (bsSgcSzBzbp.getSortTime() == null) {
+                bsSgcSzBzbp.setSortTime(new Date());
+            }
+            if (adcd == null) {
+                SysUser user = UserUtils.getUser();
+                String deptId = user.getDeptId();
+                SysDept sysDept = sysDeptService.get(deptId);
+                bsSgcSzBzbp.setAdcd(sysDept.getXzqhName());
+            }
+            bsSgcSzBzbpService.saveOrUpdate(bsSgcSzBzbp);
+        }
+
+
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除水闸标识标牌
+     */
+    @ApiOperation("水闸标识标牌删除")
+    @Log(title = "水闸标识标牌删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzBzbpService.removeByIds(Arrays.asList(ids)));
+    }
+
+
+    @DeleteMapping("/del/{sluiceCodes}")
+    public AjaxResult del(@PathVariable String[] sluiceCodes) {
+        for (String sluiceCode : sluiceCodes) {
+            QueryWrapper<BsSgcSzBzbp> queryWrapper = new QueryWrapper<>();
+
+            queryWrapper.eq("sluice_code", sluiceCode);
+
+            bsSgcSzBzbpService.remove(queryWrapper);
+        }
+
+        return AjaxResult.success();
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java
@ -0,0 +1,227 @@
+package com.kms.yg.sz.controller;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kms.common.utils.UserUtils;
+import com.kms.system.domain.SysXzqh;
+import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysXzqhService;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.kms.yg.sz.service.BsSgcSzGcdaService;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysUser;
+import com.shuili.common.utils.BeanUtils;
+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;
+
+
+
+/**
+ * 水闸工程基础信息Controller
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@RestController
+@RequestMapping("/yg/sluiceInfo")
+@Api(tags = "水闸工程基础信息")
+public class BsSgcSzGcdaController extends BaseController
+{
+    @Autowired
+    private BsSgcSzGcdaService bsSgcSzGcdaService;
+
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    /**
+     * 查询水闸工程基础信息列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸工程基础信息列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzGcda> sp)
+    {
+
+        BsSgcSzGcda projectInfo = sp.getData();
+        String adcd = null;
+        if (projectInfo != null) {
+            adcd = projectInfo.getAdcd();
+        }
+
+        SysUser sysUser = UserUtils.getUser();
+        if (sysUser.getUserName().equals("admin")) {
+            if (projectInfo != null && projectInfo.getAdcd() != null) {
+                String infoAdcd = projectInfo.getAdcd();
+                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
+                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+                if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
+
+                } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
+
+                }else {
+                    infoAdcd = xzqh.getXzqhdm();
+                }
+                return bsSgcSzGcdaService.selectPage(sp,infoAdcd);
+            }else {
+                return bsSgcSzGcdaService.selectPage(sp,null);
+            }
+
+        }else if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.get(deptId);
+            String xzqhId = sysDept.getXzqhId();
+            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
+            String substring = "";
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                substring = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                substring = xzqh.getXzqhdm();
+            }
+
+            return bsSgcSzGcdaService.selectPage(sp,substring);
+        }else {
+
+            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
+
+            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                adcd = xzqh.getXzqhdm();
+            }
+            return bsSgcSzGcdaService.selectPage(sp, adcd);
+        }
+
+
+
+
+//        return bsSgcSzGcdaService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸工程基础信息列表
+     */
+    @Log(title = "水闸工程基础信息导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸工程基础信息导出")
+    public AjaxResult export(@RequestBody BsSgcSzGcda bsSgcSzGcda)
+    {
+        List<BsSgcSzGcda> list = bsSgcSzGcdaService.listByIds(bsSgcSzGcda.getIds());
+        ExcelUtil<BsSgcSzGcda> util = new ExcelUtil<>(BsSgcSzGcda.class);
+        return util.exportExcel(list, "sluiceInfo");
+    }
+
+    /**
+     * 获取水闸工程基础信息详细信息
+     */
+    @ApiOperation(" 水闸工程基础信息详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcSzGcdaService.getById(id));
+    }
+
+    /**
+     * 新增水闸工程基础信息
+     */
+    @Log(title = "水闸工程基础信息新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸工程基础信息新增")
+    public AjaxResult add(@RequestBody BsSgcSzGcda bsSgcSzGcda)
+    {
+        String sluiceCode = bsSgcSzGcda.getSluiceCode();
+
+        QueryWrapper<BsSgcSzGcda> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("sluice_code", sluiceCode);
+
+        BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper);
+        if (one != null){
+            return AjaxResult.error("水闸编码已存在");
+        }
+
+        BaseEntityUtils.preInsert(bsSgcSzGcda);
+        String adcd = bsSgcSzGcda.getAdcd();
+        if (adcd == null) {
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.get(deptId);
+            bsSgcSzGcda.setAdcd(sysDept.getXzqhName());
+        }
+        bsSgcSzGcda.setRecordTakeEffectTime(new Date());
+        return toAjax(bsSgcSzGcdaService.save(bsSgcSzGcda));
+    }
+
+    /**
+     * 修改水闸工程基础信息
+     */
+    @ApiOperation("水闸工程基础信息修改")
+    @Log(title = "水闸工程基础信息修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcSzGcda bsSgcSzGcda)
+    {
+
+        String id = bsSgcSzGcda.getId();
+        BsSgcSzGcda byId = bsSgcSzGcdaService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcSzGcdaService.save(byId);
+
+        bsSgcSzGcda.setRecordTakeEffectTime(new Date());
+        bsSgcSzGcda.setRecordLoseEfficacyTime(null);
+
+        return toAjax(bsSgcSzGcdaService.updateById(bsSgcSzGcda));
+    }
+
+    /**
+     * 删除水闸工程基础信息
+     */
+    @ApiOperation("水闸工程基础信息删除")
+    @Log(title = "水闸工程基础信息删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzGcdaService.removeByIds(Arrays.asList(ids)));
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java
@ -0,0 +1,129 @@
+package com.kms.yg.sz.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import com.kms.yg.sz.domain.BsSgcSzGcgl;
+import com.kms.yg.sz.service.BsSgcSzGcglService;
+import com.shuili.common.core.controller.BaseController;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.utils.BeanUtils;
+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;
+
+
+
+/**
+ * 水闸工程管理信息Controller
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@RestController
+@RequestMapping("/yg/sluiceEngineerMangeInfo")
+@Api(tags = "水闸工程管理信息")
+public class BsSgcSzGcglController extends BaseController
+{
+    @Autowired
+    private BsSgcSzGcglService bsSgcSzGcglService;
+
+    /**
+     * 查询水闸工程管理信息列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("水闸工程管理信息列表")
+    public IPage list(@RequestBody SearchParam<BsSgcSzGcgl> sp)
+    {
+        return bsSgcSzGcglService.selectPage(sp);
+    }
+
+    /**
+     * 导出水闸工程管理信息列表
+     */
+    @Log(title = "水闸工程管理信息导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("水闸工程管理信息导出")
+    public AjaxResult export(@RequestBody BsSgcSzGcgl bsSgcSzGcgl)
+    {
+        List<BsSgcSzGcgl> list = bsSgcSzGcglService.listByIds(bsSgcSzGcgl.getIds());
+        ExcelUtil<BsSgcSzGcgl> util = new ExcelUtil<>(BsSgcSzGcgl.class);
+        return util.exportExcel(list, "sluiceEngineerMangeInfo");
+    }
+
+    /**
+     * 获取水闸工程管理信息详细信息
+     */
+    @ApiOperation(" 水闸工程管理信息详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcSzGcglService.getById(id));
+    }
+
+    /**
+     * 新增水闸工程管理信息
+     */
+    @Log(title = "水闸工程管理信息新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("水闸工程管理信息新增")
+    public AjaxResult add(@RequestBody BsSgcSzGcgl bsSgcSzGcgl)
+    {
+        BaseEntityUtils.preInsert(bsSgcSzGcgl);
+        bsSgcSzGcgl.setRecordTakeEffectTime(new Date());
+        return toAjax(bsSgcSzGcglService.save(bsSgcSzGcgl));
+    }
+
+    /**
+     * 修改水闸工程管理信息
+     */
+    @ApiOperation("水闸工程管理信息修改")
+    @Log(title = "水闸工程管理信息修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcSzGcgl bsSgcSzGcgl)
+    {
+
+        String id = bsSgcSzGcgl.getId();
+        BsSgcSzGcgl byId = bsSgcSzGcglService.getById(id);
+        byId.setRecordLoseEfficacyTime(new Date());
+        byId.setId(UUID.randomUUID().toString());
+        bsSgcSzGcglService.save(byId);
+
+        bsSgcSzGcgl.setRecordTakeEffectTime(new Date());
+        bsSgcSzGcgl.setRecordLoseEfficacyTime(null);
+
+        return toAjax(bsSgcSzGcglService.updateById(bsSgcSzGcgl));
+    }
+
+    /**
+     * 删除水闸工程管理信息
+     */
+    @ApiOperation("水闸工程管理信息删除")
+    @Log(title = "水闸工程管理信息删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcSzGcglService.removeByIds(Arrays.asList(ids)));
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java
@ -0,0 +1,89 @@
+package com.kms.yg.sz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.kms.yg.sz.domain.BsSgcSzGcgl;
+import com.kms.yg.sz.service.BsSgcSzGcdaService;
+import com.kms.yg.sz.service.BsSgcSzGcglService;
+import com.shuili.common.core.domain.AjaxResult;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/sz/contrast")
+public class SzContrastController {
+
+    @Autowired
+    private BsSgcSzGcdaService bsSgcSzGcdaService;
+
+    @Autowired
+    private BsSgcSzGcglService bsSgcSzGcglService;
+
+
+    @GetMapping("/{sluiceCode}")
+    public AjaxResult contrast(@PathVariable String sluiceCode) {
+
+        ContrastResult contrastResult = new ContrastResult();
+
+        //基本信息
+        //查询当前使用的版本
+        QueryWrapper<BsSgcSzGcda> queryWrapper = Wrappers.query();
+        queryWrapper.isNull("record_lose_efficacy_time");
+        queryWrapper.eq("sluice_code", sluiceCode);
+
+        BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzGcda> query = Wrappers.query();
+        query.eq("sluice_code", sluiceCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcSzGcda> list = bsSgcSzGcdaService.list(query);
+        if (one != null) {
+            list.add(0,one);
+
+        }
+
+        contrastResult.setJbxx(list);
+
+        //工程管理
+        //查询当前版本
+        QueryWrapper<BsSgcSzGcgl> wrapper = new QueryWrapper<>();
+        wrapper.isNull("record_lose_efficacy_time");
+        wrapper.eq("sluice_code", sluiceCode);
+
+        BsSgcSzGcgl one1 = bsSgcSzGcglService.getOne(wrapper);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzGcgl> query1 = Wrappers.query();
+        query1.eq("sluice_code", sluiceCode).isNotNull("record_lose_efficacy_time")
+                .orderByDesc("record_lose_efficacy_time")
+                .last("limit 10");
+
+        List<BsSgcSzGcgl> list1 = bsSgcSzGcglService.list(query1);
+
+        if (one1 != null){
+            list1.add(0,one1);
+
+        }
+        contrastResult.setGcgl(list1);
+        return AjaxResult.success(contrastResult);
+
+    }
+
+    @Data
+    public class ContrastResult {
+        private List<BsSgcSzGcda> jbxx;
+
+        private List<BsSgcSzGcgl> gcgl;
+
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java
@ -0,0 +1,100 @@
+package com.kms.yg.sz.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+
+/**
+ * 水闸标识标牌对象 bs_sgc_sz_bzbp
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@TableName("bs_sgc_sz_bzbp")
+@Data
+@ApiModel("水闸标识标牌")
+public class BsSgcSzBzbp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 标志名称 */
+    @Excel(name = "标志名称")
+    @ApiModelProperty("标志名称")
+    private String markName;
+
+    /** 水闸id */
+    @Excel(name = "水闸编码")
+    @ApiModelProperty("水闸编码")
+    private String sluiceCode;
+
+    /** 标识位置 */
+    @Excel(name = "标识位置")
+    @ApiModelProperty("标识位置")
+    private String markLocation;
+
+    /** 标牌类型 */
+    @Excel(name = "标牌类型")
+    @ApiModelProperty("标牌类型")
+    private String type;
+
+    /** 标识类型 */
+    @Excel(name = "标识类型")
+    @ApiModelProperty("标识类型")
+    private String markType;
+
+    /** 上传图片 */
+    @Excel(name = "上传图片")
+    @ApiModelProperty("上传图片")
+    private String photo;
+
+    /** 标牌编号 */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String markCode;
+
+    /** $column.columnComment */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String proNo;
+
+    /** $column.columnComment */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String proCode;
+
+    /** $column.columnComment */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "标牌编号")
+    @ApiModelProperty("标牌编号")
+    private String owerDept;
+
+    private String adcd;
+
+    private String sluiceName;
+
+
+    @TableField(exist = false)
+    private String number;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8")
+    private Date sortTime;
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java
@ -0,0 +1,238 @@
+package com.kms.yg.sz.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.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 水闸工程基础信息对象 bs_sgc_sz_gcda
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@TableName("bs_sgc_sz_jbxx")
+@Data
+@ApiModel("水闸工程基础信息")
+public class BsSgcSzGcda extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 水闸名称 */
+    @Excel(name = "水闸名称")
+    @ApiModelProperty("水闸名称")
+    private String sluiceName;
+
+    /** 行政区划 */
+    @Excel(name = "行政区划")
+    @ApiModelProperty("行政区划")
+    private String adcd;
+
+    /** 水闸编码 */
+    @Excel(name = "水闸编码")
+    @ApiModelProperty("水闸编码")
+    private String sluiceCode;
+
+    /** 所在位置 */
+    @Excel(name = "所在位置")
+    @ApiModelProperty("所在位置")
+    private String location;
+
+    /** 标绘水闸 */
+    @Excel(name = "标绘水闸")
+    @ApiModelProperty("标绘水闸")
+    private String plottingSluice;
+
+    /** 验收情况 */
+    @Excel(name = "验收情况")
+    @ApiModelProperty("验收情况")
+    private String acceptanceStatus;
+
+    /** 除险加固情况 */
+    @Excel(name = "除险加固情况")
+    @ApiModelProperty("除险加固情况")
+    private String riskEliminationStatus;
+
+    /** 是否为枢纽工程 */
+    @Excel(name = "是否为枢纽工程")
+    @ApiModelProperty("是否为枢纽工程")
+    private String isHubProject;
+
+    /** 是否为闸站工程 */
+    @Excel(name = "是否为闸站工程")
+    @ApiModelProperty("是否为闸站工程")
+    private String isGateStation;
+
+    /** 是否为套闸工程 */
+    @Excel(name = "是否为套闸工程")
+    @ApiModelProperty("是否为套闸工程")
+    private String isSetGateProject;
+
+    /** 水闸类型 */
+    @Excel(name = "水闸类型")
+    @ApiModelProperty("水闸类型")
+    private String sluiceType;
+
+    /** 设计过闸流量（m³/s） */
+    @Excel(name = "设计过闸流量", readConverterExp = "m=³/s")
+    @ApiModelProperty("设计过闸流量")
+    private String designGateFlow;
+
+    /** 校核过闸流量（m³/s） */
+    @Excel(name = "校核过闸流量", readConverterExp = "m=³/s")
+    @ApiModelProperty("校核过闸流量")
+    private String verifiedGateFlow;
+
+    /** 工程规模 */
+    @Excel(name = "工程规模")
+    @ApiModelProperty("工程规模")
+    private String projectScale;
+
+    /** 建筑物级别 */
+    @Excel(name = "建筑物级别")
+    @ApiModelProperty("建筑物级别")
+    private String buildingLevel;
+
+    /** 设计标准[重现期（年）] */
+    @Excel(name = "设计标准[重现期", readConverterExp = "年=")
+    @ApiModelProperty("设计标准[重现期")
+    private String designStandards;
+
+    /** 校核标准[重现期（年）] */
+    @Excel(name = "校核标准[重现期", readConverterExp = "年=")
+    @ApiModelProperty("校核标准[重现期")
+    private String verificationStandards;
+
+    /** 历史最大过闸流量(m³/s) */
+    @Excel(name = "历史最大过闸流量(m³/s)")
+    @ApiModelProperty("历史最大过闸流量(m³/s)")
+    private String historicalMaximumGate;
+
+    /** 历史最大过闸流量日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "历史最大过闸流量日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("历史最大过闸流量日期")
+    private Date historicalMaximumDate;
+
+    /** 设计地震烈度 */
+    @Excel(name = "设计地震烈度")
+    @ApiModelProperty("设计地震烈度")
+    private String designSeismicIntensity;
+
+    /** 闸孔数量 */
+    @Excel(name = "闸孔数量")
+    @ApiModelProperty("闸孔数量")
+    private String gateHolesNumber;
+
+    /** 闸孔总净宽(m) */
+    @Excel(name = "闸孔总净宽(m)")
+    @ApiModelProperty("闸孔总净宽(m)")
+    private String gateHoleWidth;
+
+    /** 闸门型式 */
+    @Excel(name = "闸门型式")
+    @ApiModelProperty("闸门型式")
+    private String gateType;
+
+    /** 启闭机数量 */
+    @Excel(name = "启闭机数量")
+    @ApiModelProperty("启闭机数量")
+    private String hoistsNumber;
+
+    /** 观测项目 */
+    @Excel(name = "观测项目")
+    @ApiModelProperty("观测项目")
+    private String observationProject;
+
+    /** 闸室结构 */
+    @Excel(name = "闸室结构")
+    @ApiModelProperty("闸室结构")
+    private String lockChamberStructure;
+
+    /** 启闭机形式 */
+    @Excel(name = "启闭机形式")
+    @ApiModelProperty("启闭机形式")
+    private String machineForm;
+
+    /** 消能方式 */
+    @Excel(name = "消能方式")
+    @ApiModelProperty("消能方式")
+    private String energyDissipationMethod;
+
+    /** 自动化控制 */
+    @Excel(name = "自动化控制")
+    @ApiModelProperty("自动化控制")
+    private String automationControl;
+
+    /** $column.columnComment */
+    @Excel(name = "自动化控制")
+    @ApiModelProperty("自动化控制")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "自动化控制")
+    @ApiModelProperty("自动化控制")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "自动化控制")
+    @ApiModelProperty("自动化控制")
+    private String proNo;
+
+    /** $column.columnComment */
+    @Excel(name = "自动化控制")
+    @ApiModelProperty("自动化控制")
+    private String proCode;
+
+    /** 关联字段1 */
+    @Excel(name = "关联字段1")
+    @ApiModelProperty("关联字段1")
+    private String relation;
+
+    /** 建成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "建成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("建成时间")
+    private Date completionTime;
+
+    /** 竣工验收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "竣工验收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("竣工验收时间")
+    private Date completionAcceptanceTime;
+
+    /** 最近除险加固完工时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最近除险加固完工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("最近除险加固完工时间")
+    private Date recentCompletionTime;
+
+    /** 枢纽建筑物 */
+    @Excel(name = "枢纽建筑物")
+    @ApiModelProperty("枢纽建筑物")
+    private String hubBuildings;
+
+    /** 副闸闸孔数量 */
+    @Excel(name = "副闸闸孔数量")
+    @ApiModelProperty("副闸闸孔数量")
+    private String auxiliaryGateHoles;
+
+    /** 副闸闸孔总净宽 */
+    @Excel(name = "副闸闸孔总净宽")
+    @ApiModelProperty("副闸闸孔总净宽")
+    private String auxiliaryGateHolesWidth;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordTakeEffectTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordLoseEfficacyTime;
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java
@ -0,0 +1,207 @@
+package com.kms.yg.sz.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.baomidou.mybatisplus.annotation.TableName;
+
+
+
+/**
+ * 水闸工程管理信息对象 bs_sgc_sz_gcgl
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@TableName("bs_sgc_sz_gcgl")
+@Data
+@ApiModel("水闸工程管理信息")
+public class BsSgcSzGcgl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工程管理单位 */
+    @Excel(name = "工程管理单位")
+    @ApiModelProperty("工程管理单位")
+    private String engineeringManagementUnit;
+
+    /** 工程管理单位性质 */
+    @Excel(name = "工程管理单位性质")
+    @ApiModelProperty("工程管理单位性质")
+    private String managementUnitNature;
+
+    /** 工程管理单位权属 */
+    @Excel(name = "工程管理单位权属")
+    @ApiModelProperty("工程管理单位权属")
+    private String engineeringManagementOwnership;
+
+    /** 工程管理单位责任人 */
+    @Excel(name = "工程管理单位责任人")
+    @ApiModelProperty("工程管理单位责任人")
+    private String engineeringManagementPerson;
+
+    /** 工程管理单位责任人职务 */
+    @Excel(name = "工程管理单位责任人职务")
+    @ApiModelProperty("工程管理单位责任人职务")
+    private String engineeringManagementPosition;
+
+    /** 工程管理单位责任人手机号码 */
+    @Excel(name = "工程管理单位责任人手机号码")
+    @ApiModelProperty("工程管理单位责任人手机号码")
+    private String engineeringManagementPhone;
+
+    /** 水行政主管部门 */
+    @Excel(name = "水行政主管部门")
+    @ApiModelProperty("水行政主管部门")
+    private String waterAdministrativeDepartment;
+
+    /** 水行政主管部门性质 */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentNature;
+
+    /** $column.columnComment */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentPerson;
+
+    /** $column.columnComment */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentPosition;
+
+    /** $column.columnComment */
+    @Excel(name = "水行政主管部门性质")
+    @ApiModelProperty("水行政主管部门性质")
+    private String administrationDepartmentPhone;
+
+    /** 行业归口管理部门 */
+    @Excel(name = "行业归口管理部门")
+    @ApiModelProperty("行业归口管理部门")
+    private String centralizedManagementDepartment;
+
+    /** 管理范围划界 */
+    @Excel(name = "管理范围划界")
+    @ApiModelProperty("管理范围划界")
+    private String managementDelimitation;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("完成时间")
+    private Date delimitationTime;
+
+    /** 证明材料 */
+    @Excel(name = "证明材料")
+    @ApiModelProperty("证明材料")
+    private String delimitationEvidence;
+
+    /** 管理范围确权 */
+    @Excel(name = "管理范围确权")
+    @ApiModelProperty("管理范围确权")
+    private String managementConfirmation;
+
+    /** $column.columnComment */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "管理范围确权", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("管理范围确权")
+    private Date confirmationTime;
+
+    /** $column.columnComment */
+    @Excel(name = "管理范围确权")
+    @ApiModelProperty("管理范围确权")
+    private String confirmationEvidence;
+
+    /** 保护范围划界 */
+    @Excel(name = "保护范围划界")
+    @ApiModelProperty("保护范围划界")
+    private String protectionDelimitation;
+
+    /** $column.columnComment */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "保护范围划界", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("保护范围划界")
+    private Date protectionTime;
+
+    /** $column.columnComment */
+    @Excel(name = "保护范围划界")
+    @ApiModelProperty("保护范围划界")
+    private String protectionEvidence;
+
+    /** 闸门操作规程 */
+    @Excel(name = "闸门操作规程")
+    @ApiModelProperty("闸门操作规程")
+    private String gateOperatingProcedures;
+
+    /** 水闸控制运用计划(方案)批复文件 */
+    @Excel(name = "水闸控制运用计划(方案)批复文件")
+    @ApiModelProperty("水闸控制运用计划(方案)批复文件")
+    private String waterGateControlOperation;
+
+    /** 工程竣工验收鉴定书 */
+    @Excel(name = "工程竣工验收鉴定书")
+    @ApiModelProperty("工程竣工验收鉴定书")
+    private String engineeringCompletionAcceptance;
+
+    /** 工程图表 */
+    @Excel(name = "工程图表")
+    @ApiModelProperty("工程图表")
+    private String engineeringChart;
+
+    /** 工程全景照片 */
+    @Excel(name = "工程全景照片")
+    @ApiModelProperty("工程全景照片")
+    private String engineeringPanoramicPhotos;
+
+    /** 降等批复文件 */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String approvalDocumentsDowngrade;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String updateUid;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String proCode;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private Long proNo;
+
+
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String owerDept;
+
+    /** $column.columnComment */
+    @Excel(name = "降等批复文件")
+    @ApiModelProperty("降等批复文件")
+    private String relations;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordTakeEffectTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordLoseEfficacyTime;
+
+    private String sluiceCode;
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java
@ -0,0 +1,20 @@
+package com.kms.yg.sz.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.yg.sz.domain.BsSgcSzBzbp;
+
+import java.util.List;
+
+/**
+ * 水闸标识标牌Mapper接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Repository
+public interface BsSgcSzBzbpMapper extends BaseMapper<BsSgcSzBzbp> {
+
+    List<BsSgcSzBzbp> selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("sluiceName") String sluiceName, @Param("adcd") String adcd);
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
@ -0,0 +1,17 @@
+package com.kms.yg.sz.mapper;
+
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 水闸工程基础信息Mapper接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Repository
+public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java
@ -0,0 +1,17 @@
+package com.kms.yg.sz.mapper;
+
+import com.kms.yg.sz.domain.BsSgcSzGcgl;
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 水闸工程管理信息Mapper接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Repository
+public interface BsSgcSzGcglMapper extends BaseMapper<BsSgcSzGcgl> {
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java
@ -0,0 +1,67 @@
+package com.kms.yg.sz.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.df.domain.BsSgcDfBzbp;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.service.BaseService;
+import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper;
+import com.kms.yg.sz.domain.BsSgcSzBzbp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 水闸标识标牌Service接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Service
+public class BsSgcSzBzbpService extends BaseService<BsSgcSzBzbpMapper, BsSgcSzBzbp>{
+
+    @Autowired
+    private BsSgcSzBzbpMapper bsSgcSzBzbpMapper;
+
+    public IPage selectPage(SearchParam<BsSgcSzBzbp> sp, String adcd) {
+
+        QueryWrapper<BsSgcSzBzbp> queryWrapper = new QueryWrapper<>();
+        BsSgcSzBzbp projectInfo = sp.getData();
+
+        if (projectInfo != null) {
+            String projectName = projectInfo.getSluiceName();
+//            String projectType = projectInfo.getEmbankmentType();
+
+            queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
+            queryWrapper.like(projectName != null, "sluice_name", projectName);
+//            queryWrapper.like(projectType != null, "embankment_type", projectType);
+            queryWrapper.likeRight(adcd != null, "ADCD", adcd);
+        }
+
+
+        Map<String, Object> params = sp.getParams();
+        if (params!=null) {
+            //create_time
+            if (params.get("orderBy") != null) {
+                String orderBy = (String) params.get("orderBy");
+                queryWrapper.orderByDesc(orderBy != null, orderBy);
+            }
+        }
+
+
+        Page<BsSgcSzBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
+        List<BsSgcSzBzbp> infoPage = bsSgcSzBzbpMapper.selectList1(sp.getPageNum(),sp.getPageSize(),
+                projectInfo.getSluiceName(),adcd);
+
+        Page<BsSgcSzBzbp> bzbpPage = new Page<>();
+
+        bzbpPage.setRecords(infoPage);
+        bzbpPage.setTotal(infoPage.size());
+
+        return bzbpPage;
+    }
+
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java
@ -0,0 +1,60 @@
+package com.kms.yg.sz.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.sz.domain.BsSgcSzGcda;
+import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.service.BaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+/**
+ * 水闸工程基础信息Service接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Service
+public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGcda>{
+
+    @Autowired
+    private BsSgcSzGcdaMapper bsSgcSzGcdaMapper;
+
+    public IPage selectPage(SearchParam<BsSgcSzGcda> sp, String adcd) {
+
+        QueryWrapper<BsSgcSzGcda> queryWrapper = new QueryWrapper<>();
+        BsSgcSzGcda projectInfo = sp.getData();
+
+        if (projectInfo != null) {
+            String projectName = projectInfo.getSluiceName();
+            String projectType = projectInfo.getSluiceType();
+
+            queryWrapper.isNull("record_lose_efficacy_time");
+            queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
+            queryWrapper.like(projectName != null, "sluice_name", projectName);
+            queryWrapper.like(projectType != null, "sluice_type", projectType);
+            queryWrapper.likeRight(adcd != null, "ADCD", adcd);
+
+        }
+
+
+        Map<String, Object> params = sp.getParams();
+        if (params!=null) {
+            //create_time
+            if (params.get("orderBy") != null) {
+                String orderBy = (String) params.get("orderBy");
+                queryWrapper.orderByDesc(orderBy != null, orderBy);
+            }
+        }
+
+
+        Page<BsSgcSzGcda> page = new Page<>(sp.getPageNum(),sp.getPageSize());
+        Page<BsSgcSzGcda> infoPage = bsSgcSzGcdaMapper.selectPage(page, queryWrapper);
+        return infoPage;
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java
@ -0,0 +1,39 @@
+package com.kms.yg.sz.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.df.domain.BsSgcDfGcgl;
+import com.kms.yg.sz.domain.BsSgcSzGcgl;
+import com.kms.yg.sz.mapper.BsSgcSzGcglMapper;
+import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.service.BaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 水闸工程管理信息Service接口
+ *
+ * @author kms
+ * @date 2023-12-25
+ */
+@Service
+public class BsSgcSzGcglService extends BaseService<BsSgcSzGcglMapper, BsSgcSzGcgl>{
+
+    @Autowired
+    private  BsSgcSzGcglMapper bsSgcSzGcglMapper;
+
+
+
+
+    public IPage selectPage(SearchParam<BsSgcSzGcgl> sp) {
+        QueryWrapper<BsSgcSzGcgl> queryWrapper = new QueryWrapper<>();
+
+        queryWrapper.eq("sluice_code", sp.getData().getSluiceCode());
+        queryWrapper.isNull("record_lose_efficacy_time");
+
+        return bsSgcSzGcglMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), queryWrapper);
+
+    }
+}
--- a/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java
@ -3,6 +3,7 @@ package com.kms.yxgh.base;

 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+
 import com.kms.common.utils.BaseEntityUtils;
 import com.shuili.common.exception.BaseException;
 import java.util.Date;
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml
@ -0,0 +1,33 @@
+<?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.kms.yg.df.mapper.BsSgcDfBzbpMapper">
+
+
+    <resultMap type="com.kms.yg.df.domain.BsSgcDfBzbp" id="Result">
+        <id     property="id"     column="id"     />
+        <result property="embankmentName"   column="embankment_name"   />
+        <result property="adcd"   column="adcd"   />
+        <result property="number"   column="number"   />
+        <result property="embankmentCode"   column="embankment_code"   />
+
+    </resultMap>
+
+    <select id="selectList1" resultMap="Result">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        SELECT embankment_name, adcd, COUNT(1) number,embankment_code
+        FROM bs_sgc_df_bzbp
+        <where>
+            <if test="embankmentName != null and embankmentName != ''">
+                embankment_name like concat('%', #{embankmentName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY embankment_code
+        ORDER BY create_time DESC
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
+</mapper>
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml
@ -0,0 +1,33 @@
+<?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.kms.yg.sz.mapper.BsSgcSzBzbpMapper">
+
+
+    <resultMap type="com.kms.yg.sz.domain.BsSgcSzBzbp" id="Result">
+        <id     property="id"     column="id"     />
+        <result property="sluiceName"   column="sluice_name"   />
+        <result property="adcd"   column="adcd"   />
+        <result property="number"   column="number"   />
+        <result property="sluiceCode"   column="sluice_code"   />
+
+    </resultMap>
+
+    <select id="selectList1" resultMap="Result">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        SELECT sluice_name, adcd, COUNT(1) number,sluice_code
+        FROM bs_sgc_sz_bzbp
+        <where>
+            <if test="sluiceName != null and sluiceName != ''">
+                sluice_name like concat('%', #{sluiceName}, '%')
+            </if>
+            <if test="adcd != null and adcd != ''">
+                and adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        GROUP BY sluice_code
+        ORDER BY create_time DESC
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
+</mapper>