From a65ae7bcc2a3ae10bf31a89fc0d2e7dfd0038a41 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 15 Aug 2023 18:29:05 +0800
Subject: [PATCH] 水库数据填报实体类创建，水库基本信息填报接口新增

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java           |  130 +++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java         |  130 +++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResBaseService.java         |   36 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java          |   95 ++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResBaseController.java    |   72 +
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java         |  104 ++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java                  |  166 ++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java             |  103 ++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java        |  138 +++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.xml             |   62 +
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java |  188 ++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java               |  116 +++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java            |  200 +++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java            |   24 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java               |  186 ++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java    |  138 +++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java              |  373 +++++++++
 17 files changed, 2,261 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResBaseController.java
new file mode 100644
index 0000000..f650b79
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResBaseController.java
@@ -0,0 +1,72 @@
+package cn.gistack.sm.sjztmd.controller;
+
+import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.entity.TbAttResBase;
+import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @ClassName AttResBaseController
+ * @Description TODO
+ * @author zhongrj
+ * @Date 2023/8/14
+ * @Version 1.0
+ */
+@Slf4j
+@Api(tags = "中台水库信息填报")
+@RestController
+@RequestMapping("/sjztmd/tbAttRes")
+@AllArgsConstructor
+public class TbAttResBaseController{
+
+	private final ITbAttResBaseService tbAttResBaseService;
+
+
+	/**
+	 * 查询水库填报详情信息
+	 * @param guid
+	 * @return
+	 */
+	@ApiOperation(value = "中台水库-查询水库填报详情信息", notes = "中台水库-查询水库填报详情信息")
+	@GetMapping(value = "/getDetailByGuid")
+	public R getDetailByCode(String guid) {
+		TbAttResBase attResBase = tbAttResBaseService.getDetailByGuid(guid);
+		return R.data(attResBase);
+	}
+
+	/**
+	 * 编辑
+	 * @param tbAttResBase
+	 * @return
+	 */
+	@ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
+	@PostMapping(value = "/edit")
+	public R edit(@RequestBody TbAttResBase tbAttResBase) {
+		if (StringUtil.isBlank(tbAttResBase.getGuid())) {
+			return R.fail("参数不正确");
+		}
+		return R.status(tbAttResBaseService.updateByGuid(tbAttResBase));
+	}
+
+	/**
+	 * 审核
+	 * @param tbAttResBase
+	 * @return
+	 */
+	@ApiOperation(value = "水库信息-审核", notes = "水库信息-审核")
+	@PostMapping(value = "/audit")
+	public R audit(@RequestBody TbAttResBase tbAttResBase) {
+		if (StringUtil.isBlank(tbAttResBase.getGuid())) {
+			return R.fail("参数不正确");
+		}
+		return R.status(tbAttResBaseService.auditByGuid(tbAttResBase));
+	}
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
new file mode 100644
index 0000000..ffade78
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
@@ -0,0 +1,166 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-14
+ */
+@Data
+@TableName("\"att_res_base\"")
+@ApiModel(value = "水库对象", description = "水库对象")
+public class TbAttResBase implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库名称
+	 */
+	@ApiModelProperty(value = "水库名称")
+	@TableField("\"name\"")
+	private String name;
+
+	/**
+	 * 注册登记码
+	 */
+	@ApiModelProperty(value = "注册登记码")
+	@TableField("\"res_reg_code\"")
+	private String resRegCode;
+
+	/**
+	 * 建设地址
+	 */
+	@ApiModelProperty(value = "建设地址")
+	@TableField("\"build_address\"")
+	private String buildAddress;
+
+	/**
+	 * 工程规模
+	 */
+	@ApiModelProperty(value = "工程规模")
+	@TableField("\"res_scal\"")
+	private Integer resScal;
+
+	/**
+	 * 工程等别
+	 */
+	@ApiModelProperty(value = "工程等别")
+	@TableField("\"eng_grad\"")
+	private String engGrad;
+
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	@TableField("\"lgtd\"")
+	private String lgtd;
+
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	@TableField("\"lttd\"")
+	private String lttd;
+
+	/**
+	 * 高程系统
+	 */
+	@ApiModelProperty(value = "高程系统 ")
+	@TableField("\"elevation_system\"")
+	private String elevationSystem;
+
+	/**
+	 * 所在流域
+	 */
+	@ApiModelProperty(value = "所在流域 ")
+	@TableField("\"bas_code\"")
+	private String basCode;
+
+	/**
+	 * 所在水系
+	 */
+	@ApiModelProperty(value = "所在水系 ")
+	@TableField("\"river_sys_code\"")
+	private String riverSysCode;
+
+	/**
+	 * 综合治理流域
+	 */
+	@ApiModelProperty(value = "综合治理流域 ")
+	@TableField("\"com_control_bas\"")
+	private String comControlBas;
+
+	/**
+	 * 重要防洪流域
+	 */
+	@ApiModelProperty(value = "重要防洪流域 ")
+	@TableField("\"import_flood_bas\"")
+	private String importFloodBas;
+
+	/**
+	 * 所在河流
+	 */
+	@ApiModelProperty(value = "所在河流 ")
+	@TableField("\"loc_rv_name\"")
+	private String locRvName;
+
+	/**
+	 * 水库功能
+	 */
+	@ApiModelProperty(value = "水库功能 ")
+	@TableField("\"res_func\"")
+	private String resFunc;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
new file mode 100644
index 0000000..b2bb8ee
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
@@ -0,0 +1,103 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库建设信息实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"att_res_build_info\"")
+@ApiModel(value = "水库建设信息对象", description = "水库建设信息对象")
+public class TbAttResBuildInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 工程开工时间
+	 */
+	@ApiModelProperty(value = "工程开工时间")
+	@TableField("\"start_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date startTime;
+
+	/**
+	 * 蓄水验收时间
+	 */
+	@ApiModelProperty(value = "蓄水验收时间")
+	@TableField("\"completion_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date completionTime;
+
+
+	/**
+	 * 最近一次加固开始时间
+	 */
+	@ApiModelProperty(value = "最近一次加固开始时间")
+	@TableField("\"reinforce_tm\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date reinforceTm;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java
new file mode 100644
index 0000000..1b4fc03
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java
@@ -0,0 +1,186 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库效益实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_eng_bene\"")
+@ApiModel(value = "水库效益对象", description = "水库效益对象")
+public class TbAttResEngBene implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 防洪保护对象
+	 */
+	@ApiModelProperty(value = "防洪保护对象")
+	@TableField("\"fl_control_project\"")
+	private Integer flControlProject;
+
+	/**
+	 * 城市
+	 */
+	@ApiModelProperty(value = "城市")
+	@TableField("\"city\"")
+	private String city;
+
+	/**
+	 * 集镇
+	 */
+	@ApiModelProperty(value = "集镇")
+	@TableField("\"town\"")
+	private String town;
+
+	/**
+	 * 铁站
+	 */
+	@ApiModelProperty(value = "铁站")
+	@TableField("\"railway\"")
+	private String railway;
+
+	/**
+	 * 公路
+	 */
+	@ApiModelProperty(value = "公路")
+	@TableField("\"highway\"")
+	private String highway;
+
+	/**
+	 * 重要管线通信设施
+	 */
+	@ApiModelProperty(value = "重要管线通信设施 ")
+	@TableField("\"import_communication\"")
+	private String importCommunication;
+
+	/**
+	 * 重要厂矿企业
+	 */
+	@ApiModelProperty(value = "重要厂矿企业 ")
+	@TableField("\"import_factory\"")
+	private String importFactory;
+
+	/**
+	 * 其他重要设施
+	 */
+	@ApiModelProperty(value = "其他重要设施 ")
+	@TableField("\"import_other_fac\"")
+	private String importOtherFac;
+
+	/**
+	 * 防洪保护人口
+	 */
+	@ApiModelProperty(value = "防洪保护人口 ")
+	@TableField("\"fl_control_person\"")
+	private Integer flControlPerson;
+
+	/**
+	 * 防洪保护耕地
+	 */
+	@ApiModelProperty(value = "防洪保护耕地 ")
+	@TableField("\"fl_control_land\"")
+	private Double flControlLand;
+
+	/**
+	 * 多年平均灌溉水量
+	 */
+	@ApiModelProperty(value = "多年平均灌溉水量 ")
+	@TableField("\"moyear_irr_avg\"")
+	private Double moyearIrrAvg;
+
+	/**
+	 * 灌溉对象
+	 */
+	@ApiModelProperty(value = "灌溉对象 ")
+	@TableField("\"irr_object\"")
+	private String irrObject;
+
+	/**
+	 * 供水对象
+	 */
+	@ApiModelProperty(value = "供水对象 ")
+	@TableField("\"supply_object\"")
+	private String supplyObject;
+
+	/**
+	 * 多年平均供水量
+	 */
+	@ApiModelProperty(value = "多年平均供水量 ")
+	@TableField("\"moyear_supply_avg\"")
+	private Double moyearSupplyAvg;
+
+	/**
+	 * 多年平均年发电量
+	 */
+	@ApiModelProperty(value = "多年平均年发电量 ")
+	@TableField("\"moyear_power_avg\"")
+	private Double moyearPowerAvg;
+
+	/**
+	 * 生态流量
+	 */
+	@ApiModelProperty(value = "生态流量 ")
+	@TableField("\"ecological_flow\"")
+	private Double ecologicalFlow;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
new file mode 100644
index 0000000..a5672f5
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
@@ -0,0 +1,138 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库信息化建设实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_infomation_project\"")
+@ApiModel(value = "水库信息化建设对象", description = "水库信息化建设对象")
+public class TbAttResInformationProject implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 运行状态
+	 */
+	@ApiModelProperty(value = "运行状态")
+	@TableField("\"run_status\"")
+	private Integer runStatus;
+
+	/**
+	 * 是否有水雨情测报雨量
+	 */
+	@ApiModelProperty(value = "是否有水雨情测报雨量")
+	@TableField("\"is_rain\"")
+	private Integer isRain;
+
+	/**
+	 * 是否有水雨情测报水位
+	 */
+	@ApiModelProperty(value = "是否有水雨情测报水位")
+	@TableField("\"is_rsvr\"")
+	private Integer isRsvr;
+
+	/**
+	 * 是否有大坝安全监测水平位移
+	 */
+	@ApiModelProperty(value = "是否有大坝安全监测水平位移")
+	@TableField("\"is_gnss_horizontal\"")
+	private Integer isGnssHorizontal;
+
+	/**
+	 * 是否有大坝安全监测垂直位移
+	 */
+	@ApiModelProperty(value = "是否有大坝安全监测垂直位移")
+	@TableField("\"is_gnss_vertical\"")
+	private Integer isGnssVertical;
+
+	/**
+	 * 是否有大坝安全监测渗透压力
+	 */
+	@ApiModelProperty(value = "是否有大坝安全监测渗透压力")
+	@TableField("\"is_sppr\"")
+	private Integer isSppr;
+
+	/**
+	 * 是否有大坝安全监测渗流（漏）量
+	 */
+	@ApiModelProperty(value = "是否有大坝安全监测渗流（漏）量")
+	@TableField("\"is_spqnmp\"")
+	private Integer isSpqnmp;
+
+
+	/**
+	 * 是否有视频监视
+	 */
+	@ApiModelProperty(value = "是否有视频监视 ")
+	@TableField("\"is_wmst\"")
+	private Integer isWmst;
+
+	/**
+	 * 是否有白蚁监测
+	 */
+	@ApiModelProperty(value = "是否有白蚁监测 ")
+	@TableField("\"is_termites\"")
+	private Integer isTermites;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
new file mode 100644
index 0000000..b2f720d
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
@@ -0,0 +1,116 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库管理体制实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_mgr_sys_b\"")
+@ApiModel(value = "水库管理体制对象", description = "水库管理体制对象")
+public class TbAttResMgrSysB implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 管理单位名称
+	 */
+	@ApiModelProperty(value = "管理单位名称")
+	@TableField("\"m_unit_name\"")
+	private String mUnitName;
+
+	/**
+	 * 主管部门名称
+	 */
+	@ApiModelProperty(value = "主管部门名称")
+	@TableField("\"c_unit_name\"")
+	private String cUnitName;
+
+	/**
+	 * 管理单位性质
+	 */
+	@ApiModelProperty(value = "管理单位性质")
+	@TableField("\"m_unit_nature\"")
+	private String mUnitNature;
+
+	/**
+	 * 管理单位职工人数
+	 */
+	@ApiModelProperty(value = "管理单位职工人数")
+	@TableField("\"m_unit_person_number\"")
+	private Integer mUnitPersonNumber;
+
+	/**
+	 * 人员经费来源
+	 */
+	@ApiModelProperty(value = "人员经费来源")
+	@TableField("\"person_economic_source\"")
+	private Integer personEconomicSource;
+
+	/**
+	 * 维修养护经费来源
+	 */
+	@ApiModelProperty(value = "维修养护经费来源 ")
+	@TableField("\"maintenance_economic_source\"")
+	private Integer maintenanceEconomicSource;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
new file mode 100644
index 0000000..5b84774
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
@@ -0,0 +1,95 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库电站实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_power_station\"")
+@ApiModel(value = "水库电站对象", description = "水库电站对象")
+public class TbAttResPowerStation implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 厂房布置型式
+	 */
+	@ApiModelProperty(value = "厂房布置型式")
+	@TableField("\"plant_layout_type\"")
+	private Integer plantLayoutType;
+
+	/**
+	 * 装机容量
+	 */
+	@ApiModelProperty(value = "装机容量")
+	@TableField("\"installed_capacity\"")
+	private Integer installedCapacity;
+
+	/**
+	 * 平均年利用小时
+	 */
+	@ApiModelProperty(value = "平均年利用小时")
+	@TableField("\"year_avg_hour\"")
+	private Integer yearAvgHour;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
new file mode 100644
index 0000000..6af1930
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
@@ -0,0 +1,138 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库工程运用实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_project_utilize\"")
+@ApiModel(value = "水库工程运用对象", description = "水库工程运用对象")
+public class TbAttResProjectUtilize implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 水库最高水位
+	 */
+	@ApiModelProperty(value = "水库最高水位")
+	@TableField("\"res_max_stag\"")
+	private Double resMaxStag;
+
+	/**
+	 * 最高水位发生日期
+	 */
+	@ApiModelProperty(value = "最高水位发生日期")
+	@TableField("\"res_max_stag_date\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date resMaxStagDate;
+
+	/**
+	 * 水库最低水位
+	 */
+	@ApiModelProperty(value = "水库最低水位")
+	@TableField("\"res_min_stag\"")
+	private Double resMinStag;
+
+	/**
+	 * 最低水位发生日期
+	 */
+	@ApiModelProperty(value = "最低水位发生日期")
+	@TableField("\"res_min_stag_date\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date resMinStagDate;
+
+	/**
+	 * 水库最大入库流量
+	 */
+	@ApiModelProperty(value = "水库最大入库流量")
+	@TableField("\"res_max_in_flow\"")
+	private Double resMaxInFlow;
+
+	/**
+	 * 水库最大入库流量发生日期
+	 */
+	@ApiModelProperty(value = "水库最大入库流量发生日期 ")
+	@TableField("\"res_max_in_flow_date\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date resMaxInFlowDate;
+
+	/**
+	 * 水库最大出库流量
+	 */
+	@ApiModelProperty(value = "水库最大出库流量")
+	@TableField("\"res_max_out_flow\"")
+	private Double resMaxOutFlow;
+
+	/**
+	 * 水库最大出库流量发生日期
+	 */
+	@ApiModelProperty(value = "水库最大出库流量发生日期 ")
+	@TableField("\"res_max_out_flow_date\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date resMaxOutFlowDate;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
new file mode 100644
index 0000000..065d9c8
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
@@ -0,0 +1,130 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库泄洪洞实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_rsb_spillway\"")
+@ApiModel(value = "水库泄洪洞对象", description = "水库泄洪洞对象")
+public class TbAttResRsbSpillway implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 洞（孔）身型式
+	 */
+	@ApiModelProperty(value = "洞（孔）身型式")
+	@TableField("\"spillway_type\"")
+	private Integer spillwayType;
+
+	/**
+	 * 洞长
+	 */
+	@ApiModelProperty(value = "洞长")
+	@TableField("\"cove_length\"")
+	private Double coveLength;
+
+	/**
+	 * 进口底槛高程
+	 */
+	@ApiModelProperty(value = "进口底槛高程")
+	@TableField("\"threshold_elevation\"")
+	private Double thresholdElevation;
+
+	/**
+	 * 出口底槛高程
+	 */
+	@ApiModelProperty(value = "出口底槛高程")
+	@TableField("\"export_elevation\"")
+	private Double exportElevation;
+
+	/**
+	 * 断面尺寸
+	 */
+	@ApiModelProperty(value = "断面尺寸")
+	@TableField("\"section_size\"")
+	private Double sectionSize;
+
+	/**
+	 * 最大泄洪流量
+	 */
+	@ApiModelProperty(value = "最大泄洪流量 ")
+	@TableField("\"check_fl_dis_charge\"")
+	private Double checkFlDisCharge;
+
+	/**
+	 * 工作闸门型式
+	 */
+	@ApiModelProperty(value = "工作闸门型式 ")
+	@TableField("\"working_gate_type\"")
+	private Integer workingGateType;
+
+	/**
+	 * 启闭方式
+	 */
+	@ApiModelProperty(value = "启闭方式 ")
+	@TableField("\"oc_type\"")
+	private Double ocType;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java
new file mode 100644
index 0000000..dc8909b
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java
@@ -0,0 +1,104 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库安全鉴定实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_safety_monitor\"")
+@ApiModel(value = "水库安全鉴定对象", description = "水库安全鉴定对象")
+public class TbAttResSafetyMonitor implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 最近一次安全鉴定时间
+	 */
+	@ApiModelProperty(value = "最近一次安全鉴定时间")
+	@TableField("\"safety_appraisal_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date safetyAppraisalTime;
+
+	/**
+	 * 安全鉴定结论
+	 */
+	@ApiModelProperty(value = "安全鉴定结论")
+	@TableField("\"safety_appraisal_result\"")
+	private String safetyAppraisalResult;
+
+	/**
+	 * 控制运行水位
+	 */
+	@ApiModelProperty(value = "控制运行水位")
+	@TableField("\"control_rz\"")
+	private Double controlRz;
+
+	/**
+	 * 工程存在问题
+	 */
+	@ApiModelProperty(value = "工程存在问题")
+	@TableField("\"survey_problem\"")
+	private String surveyProblem;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
new file mode 100644
index 0000000..4fcf21c
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
@@ -0,0 +1,373 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库特征水位实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_stag_char\"")
+@ApiModel(value = "水库特征水位对象", description = "水库特征水位对象")
+public class TbAttResStagChar implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 坝址以上控制流域
+	 */
+	@ApiModelProperty(value = "坝址以上控制流域")
+	@TableField("\"con_area\"")
+	private Double conArea;
+
+	/**
+	 * 多年平均降雨量
+	 */
+	@ApiModelProperty(value = "多年平均降雨量")
+	@TableField("\"moyear_rain_avg\"")
+	private Double moyearRainAvg;
+
+	/**
+	 * 多年平均径流量
+	 */
+	@ApiModelProperty(value = "多年平均径流量")
+	@TableField("\"moyear_fl_avg\"")
+	private Double moyearFlAvg;
+
+	/**
+	 * 下游河道安全泄量
+	 */
+	@ApiModelProperty(value = "下游河道安全泄量")
+	@TableField("\"down_waco_safe_disc\"")
+	private Double downWacoSafeDisc;
+
+	/**
+	 * 设计洪水标准
+	 */
+	@ApiModelProperty(value = "设计洪水标准")
+	@TableField("\"des_fl_sta\"")
+	private String desFlSta;
+
+	/**
+	 * 设计洪水流量
+	 */
+	@ApiModelProperty(value = "设计洪水流量 ")
+	@TableField("\"des_fl_flow\"")
+	private Double desFlFlow;
+
+	/**
+	 * 设计洪水位
+	 */
+	@ApiModelProperty(value = "设计洪水位 ")
+	@TableField("\"des_fl_stag\"")
+	private Double desFlStag;
+
+	/**
+	 * 设计洪水1小时洪水洪量
+	 */
+	@ApiModelProperty(value = "设计洪水1小时洪水洪量 ")
+	@TableField("\"des_fl_1h_cap\"")
+	private Double desFl1hCap;
+
+	/**
+	 * 设计洪水3小时洪水洪量
+	 */
+	@ApiModelProperty(value = "设计洪水3小时洪水洪量 ")
+	@TableField("\"des_fl_3h_cap\"")
+	private Double desFl3hCap;
+
+	/**
+	 * 设计洪水6小时洪水洪量
+	 */
+	@ApiModelProperty(value = "设计洪水6小时洪水洪量 ")
+	@TableField("\"des_fl_6h_cap\"")
+	private Double desFl6hCap;
+
+	/**
+	 * 设计洪水12小时洪水洪量
+	 */
+	@ApiModelProperty(value = "设计洪水12小时洪水洪量 ")
+	@TableField("\"des_fl_12h_cap\"")
+	private Double desFl12hCap;
+
+	/**
+	 * 设计洪水1日洪水洪量
+	 */
+	@ApiModelProperty(value = "设计洪水1日洪水洪量 ")
+	@TableField("\"des_fl_1day_cap\"")
+	private Double desFl1dayCap;
+
+	/**
+	 * 设计洪水3日洪水洪量
+	 */
+	@ApiModelProperty(value = "设计洪水3日洪水洪量 ")
+	@TableField("\"des_fl_3day_cap\"")
+	private Double desFl3dayCap;
+
+	/**
+	 * 校核洪水标准
+	 */
+	@ApiModelProperty(value = "校核洪水标准")
+	@TableField("\"chec_fl_sta\"")
+	private String checFlSta;
+
+	/**
+	 * 校核洪水流量
+	 */
+	@ApiModelProperty(value = "校核洪水流量")
+	@TableField("\"chec_fl_flow\"")
+	private Double checFlFlow;
+
+	/**
+	 * 校核洪水位
+	 */
+	@ApiModelProperty(value = "校核洪水位")
+	@TableField("\"chec_fl_stag\"")
+	private Double checFlStag;
+
+	/**
+	 * 校核洪水1小时洪水洪量
+	 */
+	@ApiModelProperty(value = "校核洪水1小时洪水洪量")
+	@TableField("\"chec_fl_1h_cap\"")
+	private Double checFl1hCap;
+
+	/**
+	 * 校核洪水3小时洪水洪量
+	 */
+	@ApiModelProperty(value = "校核洪水3小时洪水洪量")
+	@TableField("\"chec_fl_3h_cap\"")
+	private Double checFl3hCap;
+
+	/**
+	 * 校核洪水6小时洪水洪量
+	 */
+	@ApiModelProperty(value = "校核洪水6小时洪水洪量")
+	@TableField("\"chec_fl_6h_cap\"")
+	private Double checFl6hCap;
+
+	/**
+	 * 校核洪水12小时洪水洪量
+	 */
+	@ApiModelProperty(value = "校核洪水12小时洪水洪量")
+	@TableField("\"chec_fl_12h_cap\"")
+	private Double checFl12hCap;
+
+	/**
+	 * 校核洪水1日洪水洪量
+	 */
+	@ApiModelProperty(value = "校核洪水1日洪水洪量")
+	@TableField("\"chec_fl_1day_cap\"")
+	private Double checFl1dayCap;
+
+	/**
+	 * 校核洪水3日洪水洪量
+	 */
+	@ApiModelProperty(value = "校核洪水3日洪水洪量")
+	@TableField("\"chec_fl_3day_cap\"")
+	private Double checFl3dayCap;
+
+	/**
+	 * 调节性能
+	 */
+	@ApiModelProperty(value = "调节性能")
+	@TableField("\"adjust_prop\"")
+	private String adjustProp;
+
+	/**
+	 * 防洪高水位
+	 */
+	@ApiModelProperty(value = "防洪高水位")
+	@TableField("\"fl_con_top_stag\"")
+	private Double flConTopStag;
+
+	/**
+	 * 正常蓄水位
+	 */
+	@ApiModelProperty(value = "正常蓄水位")
+	@TableField("\"cor_norm_stag\"")
+	private Double corNormStag;
+
+	/**
+	 * 死水位
+	 */
+	@ApiModelProperty(value = "死水位")
+	@TableField("\"dead_stag\"")
+	private Double deadStag;
+
+	/**
+	 * 总库容
+	 */
+	@ApiModelProperty(value = "总库容")
+	@TableField("\"total_cap\"")
+	private Double totalCap;
+	/**
+	 * 调洪库容
+	 */
+	@ApiModelProperty(value = "调洪库容")
+	@TableField("\"flpr_cap\"")
+	private Double flprCap;
+
+	/**
+	 * 防洪库容
+	 */
+	@ApiModelProperty(value = "防洪库容")
+	@TableField("\"fl_stor_cap\"")
+	private Double flStorCap;
+
+	/**
+	 * 兴利库容
+	 */
+	@ApiModelProperty(value = "兴利库容")
+	@TableField("\"adjust_stor_cap\"")
+	private Double adjustStorCap;
+
+	/**
+	 * 死库容
+	 */
+	@ApiModelProperty(value = "死库容")
+	@TableField("\"dead_cap\"")
+	private Double deadCap;
+
+	/**
+	 * 前汛期水位
+	 */
+	@ApiModelProperty(value = "前汛期水位")
+	@TableField("\"before_flood_stag\"")
+	private Double beforeFloodStag;
+
+	/**
+	 * 中汛期水位
+	 */
+	@ApiModelProperty(value = "中汛期水位")
+	@TableField("\"mid_flood_stag\"")
+	private Double midFloodStag;
+
+
+	/**
+	 * 后汛期水位
+	 */
+	@ApiModelProperty(value = "后汛期水位")
+	@TableField("\"after_flood_stag\"")
+	private Double afterFloodStag;
+
+
+	/**
+	 * 前汛期结束时间
+	 */
+	@ApiModelProperty(value = "前汛期结束时间 ")
+	@TableField("\"before_flood_end\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date beforeFloodEnd;
+
+	/**
+	 * 中汛期开始时间
+	 */
+	@ApiModelProperty(value = "中汛期开始时间 ")
+	@TableField("\"mid_flood_start\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date midFloodStart;
+
+	/**
+	 * 中汛期结束时间
+	 */
+	@ApiModelProperty(value = "中汛期结束时间 ")
+	@TableField("\"mid_flood_end\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date midFloodEnd;
+
+	/**
+	 * 后汛期开始时间
+	 */
+	@ApiModelProperty(value = "后汛期开始时间 ")
+	@TableField("\"after_flood_start\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date afterFloodStart;
+
+	/**
+	 * 后汛期结束时间
+	 */
+	@ApiModelProperty(value = "后汛期结束时间 ")
+	@TableField("\"after_flood_end\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date afterFloodEnd;
+
+	/**
+	 * 设计洪水位最大下泄流量
+	 */
+	@ApiModelProperty(value = "设计洪水位最大下泄流量 ")
+	@TableField("\"des_flood_flow_max\"")
+	private Double desFloodFlowMax;
+
+	/**
+	 * 校核洪水位是最大下泄流量
+	 */
+	@ApiModelProperty(value = "校核洪水位是最大下泄流量 ")
+	@TableField("\"chec_flood_flow_max\"")
+	private Double checFloodFlowMax;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
new file mode 100644
index 0000000..3d98047
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
@@ -0,0 +1,200 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库挡水建筑物实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_water_block\"")
+@ApiModel(value = "水库挡水建筑物对象", description = "水库挡水建筑物对象")
+public class TbAttResWaterBlock implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 坝型
+	 */
+	@ApiModelProperty(value = "坝型")
+	@TableField("\"dam_type\"")
+	private String damType;
+
+	/**
+	 * 主坝地基岩性
+	 */
+	@ApiModelProperty(value = "主坝地基岩性")
+	@TableField("\"dam_main_foundation\"")
+	private String damMainFoundation;
+
+	/**
+	 * 坝顶高程
+	 */
+	@ApiModelProperty(value = "坝顶高程")
+	@TableField("\"dam_top_elevation\"")
+	private Double damTopElevation;
+
+	/**
+	 * 最大坝高
+	 */
+	@ApiModelProperty(value = "最大坝高")
+	@TableField("\"dam_height\"")
+	private Double damHeight;
+
+	/**
+	 * 坝顶长度
+	 */
+	@ApiModelProperty(value = "坝顶长度")
+	@TableField("\"dam_top_length\"")
+	private Double damTopLength;
+
+	/**
+	 * 坝顶宽度
+	 */
+	@ApiModelProperty(value = "坝顶宽度 ")
+	@TableField("\"dam_width\"")
+	private Double damWidth;
+
+	/**
+	 * 主坝是否兼作交通公路
+	 */
+	@ApiModelProperty(value = "主坝是否兼作交通公路 ")
+	@TableField("\"is_traffic\"")
+	private Integer isTraffic;
+
+	/**
+	 * 防浪墙顶高程
+	 */
+	@ApiModelProperty(value = "防浪墙顶高程 ")
+	@TableField("\"wave_wall_top_elevation\"")
+	private Double waveWallTopElevation;
+
+	/**
+	 * 上游护坝型式
+	 */
+	@ApiModelProperty(value = "上游护坝型式 ")
+	@TableField("\"up_dam_protect_type\"")
+	private Integer upDamProtectType;
+
+	/**
+	 * 下游护坝型式
+	 */
+	@ApiModelProperty(value = "下游护坝型式 ")
+	@TableField("\"down_dam_protect_type\"")
+	private Integer downDamProtectType;
+
+	/**
+	 * 主坝坝体防渗型式
+	 */
+	@ApiModelProperty(value = "主坝坝体防渗型式 ")
+	@TableField("\"dam_main_body_type\"")
+	private Integer damMainBodyType;
+
+	/**
+	 * 主坝防渗体顶部高程
+	 */
+	@ApiModelProperty(value = "主坝防渗体顶部高程 ")
+	@TableField("\"dam_main_body_top_elevation\"")
+	private Double damMainBodyTopElevation;
+
+	/**
+	 * 主坝排水形式
+	 */
+	@ApiModelProperty(value = "主坝排水形式 ")
+	@TableField("\"dam_main_drain_type\"")
+	private Integer damMainDrainType;
+
+	/**
+	 * 坝基防渗型式
+	 */
+	@ApiModelProperty(value = "坝基防渗型式")
+	@TableField("\"dam_body_type\"")
+	private Integer damBodyType;
+
+	/**
+	 * 副坝座数
+	 */
+	@ApiModelProperty(value = "副坝座数")
+	@TableField("\"sub_dam_num\"")
+	private Integer subDamNum;
+
+	/**
+	 * 副坝总长度
+	 */
+	@ApiModelProperty(value = "副坝总长度")
+	@TableField("\"sub_dam_tot_length\"")
+	private Double subDamTotLength;
+
+	/**
+	 * 副坝最大坝高
+	 */
+	@ApiModelProperty(value = "副坝最大坝高")
+	@TableField("\"sub_dam_max_height\"")
+	private Double subDamMaxHeight;
+
+	/**
+	 * 副坝坝顶宽度
+	 */
+	@ApiModelProperty(value = "副坝坝顶宽度")
+	@TableField("\"sub_dam_top_width\"")
+	private Double subDamTopWidth;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
new file mode 100644
index 0000000..88bf1bc
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
@@ -0,0 +1,130 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 中台水库输水建筑物实体类-填报
+ *
+ * @author zhongrj
+ * @date 2023-08-15
+ */
+@Data
+@TableName("\"tb_att_res_water_delivery\"")
+@ApiModel(value = "水库输水建筑物对象", description = "水库输水建筑物对象")
+public class TbAttResWaterDelivery implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "主键")
+	@TableField("\"guid\"")
+	private String guid;
+
+	/**
+	 * 水库编码
+	 */
+	@ApiModelProperty(value = "水库编码")
+	@TableField("\"res_guid\"")
+	private String resGuid;
+
+	/**
+	 * 输水道型式
+	 */
+	@ApiModelProperty(value = "输水道型式")
+	@TableField("\"aqueduct_type\"")
+	private Integer aqueductType;
+
+	/**
+	 * 输水道长度
+	 */
+	@ApiModelProperty(value = "输水道长度")
+	@TableField("\"aqueduct_length\"")
+	private Double aqueductLength;
+
+	/**
+	 * 进口底槛高程
+	 */
+	@ApiModelProperty(value = "进口底槛高程")
+	@TableField("\"threshold_elevation\"")
+	private Double thresholdElevation;
+
+	/**
+	 * 出口底槛高程
+	 */
+	@ApiModelProperty(value = "出口底槛高程")
+	@TableField("\"export_elevation\"")
+	private Double exportElevation;
+
+	/**
+	 * 断面尺寸
+	 */
+	@ApiModelProperty(value = "断面尺寸")
+	@TableField("\"section_size\"")
+	private Double sectionSize;
+
+	/**
+	 * 设计流量
+	 */
+	@ApiModelProperty(value = "设计流量 ")
+	@TableField("\"design_flow\"")
+	private Double designFlow;
+
+	/**
+	 * 工作闸门型式
+	 */
+	@ApiModelProperty(value = "工作闸门型式 ")
+	@TableField("\"working_gate_type\"")
+	private Integer workingGateType;
+
+	/**
+	 * 启闭方式
+	 */
+	@ApiModelProperty(value = "启闭方式 ")
+	@TableField("\"oc_type\"")
+	private Double ocType;
+
+	/**
+	 * 填报状态（0:填写中，1:审核中，2:审核通过）
+	 */
+	@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+	@TableField("\"check_state\"")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Integer checkState;
+
+	/**
+	 * 审核记录
+	 */
+	@ApiModelProperty(value = "审核记录 ")
+	@TableField("\"check_log\"")
+	private String checkLog;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间 ")
+	@TableField("\"create_time\"")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 操作记录
+	 */
+	@ApiModelProperty(value = "操作记录 ")
+	@TableField("\"log\"")
+	private String log;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java
new file mode 100644
index 0000000..4753b08
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java
@@ -0,0 +1,24 @@
+package cn.gistack.sm.sjztmd.mapper;
+
+import cn.gistack.sm.sjztmd.entity.TbAttResBase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * AttResBaseMapper 接口
+ *
+ * @author Chill
+ */
+public interface TbAttResBaseMapper extends BaseMapper<TbAttResBase> {
+
+	/**
+	 * 查询水库填报详情信息
+	 * @param guid
+	 * @return
+	 */
+	TbAttResBase getDetailByGuid(@Param("guid") String guid);
+
+
+	int updateByGuid(@Param("tbAttResBase") TbAttResBase tbAttResBase);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.xml
new file mode 100644
index 0000000..ba8fae7
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.xml
@@ -0,0 +1,62 @@
+<?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="cn.gistack.sm.sjztmd.mapper.TbAttResBaseMapper">
+
+    <!--查询水库填报详情信息-->
+    <select id="getDetailByGuid" resultType="cn.gistack.sm.sjztmd.entity.TbAttResBase">
+        SELECT * FROM "tb_att_res_base" WHERE "guid" = #{guid}
+    </select>
+
+    <!--更新水库填报信息-->
+    <update id="updateByGuid">
+        UPDATE "tb_att_res_base" SET
+        <if test="tbAttResBase.buildAddress !=null and tbAttResBase.buildAddress != ''">
+            "build_address" = #{tbAttResBase.buildAddress},
+        </if>
+        <if test="tbAttResBase.resScal !=null">
+            "res_scal" = #{tbAttResBase.resScal},
+        </if>
+        <if test="tbAttResBase.engGrad !=null and tbAttResBase.engGrad != ''">
+            "eng_grad" = #{tbAttResBase.engGrad},
+        </if>
+        <if test="tbAttResBase.lgtd !=null and tbAttResBase.lgtd != ''">
+            "lgtd" = #{tbAttResBase.lgtd},
+        </if>
+        <if test="tbAttResBase.lttd !=null and tbAttResBase.lttd != ''">
+            "lttd" = #{tbAttResBase.lttd},
+        </if>
+        <if test="tbAttResBase.elevationSystem !=null and tbAttResBase.elevationSystem != ''">
+            "elevation_system" = #{tbAttResBase.elevationSystem},
+        </if>
+        <if test="tbAttResBase.basCode !=null and tbAttResBase.basCode != ''">
+            "bas_code" = #{tbAttResBase.basCode},
+        </if>
+        <if test="tbAttResBase.riverSysCode !=null and tbAttResBase.riverSysCode != ''">
+            "river_sys_code" = #{tbAttResBase.riverSysCode},
+        </if>
+        <if test="tbAttResBase.comControlBas !=null and tbAttResBase.comControlBas != ''">
+            "com_control_bas" = #{tbAttResBase.comControlBas},
+        </if>
+        <if test="tbAttResBase.importFloodBas !=null and tbAttResBase.importFloodBas != ''">
+            "import_flood_bas" = #{tbAttResBase.importFloodBas},
+        </if>
+        <if test="tbAttResBase.locRvName !=null and tbAttResBase.locRvName != ''">
+            "loc_rv_name" = #{tbAttResBase.locRvName},
+        </if>
+        <if test="tbAttResBase.resFunc !=null and tbAttResBase.resFunc != ''">
+            "res_func" = #{tbAttResBase.resFunc},
+        </if>
+        <if test="tbAttResBase.checkState !=null">
+            "check_state" = #{tbAttResBase.checkState},
+        </if>
+        <if test="tbAttResBase.checkLog !=null and tbAttResBase.checkLog != ''">
+            "check_log" = #{tbAttResBase.checkLog},
+        </if>
+        <if test="tbAttResBase.log !=null and tbAttResBase.log != ''">
+            "log" = #{tbAttResBase.log},
+        </if>
+        "name" = #{tbAttResBase.name}
+        WHERE "guid" = #{tbAttResBase.guid}
+    </update>
+
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResBaseService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResBaseService.java
new file mode 100644
index 0000000..8dd9097
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResBaseService.java
@@ -0,0 +1,36 @@
+package cn.gistack.sm.sjztmd.service;
+
+import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.entity.TbAttResBase;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @ClassName IAttResBaseService
+ * @Description TODO
+ * @author zhongrj
+ * @date 2023/8/14
+ * @Version 1.0
+ */
+public interface ITbAttResBaseService extends IService<TbAttResBase> {
+
+	/**
+	 * 查询水库填报详情信息
+	 * @param guid
+	 * @return
+	 */
+	TbAttResBase getDetailByGuid(String guid);
+
+	/**
+	 * 编辑
+	 * @param tbAttResBase
+	 * @return
+	 */
+	boolean updateByGuid(TbAttResBase tbAttResBase);
+
+	/**
+	 * 审核
+	 * @param tbAttResBase
+	 * @return
+	 */
+	boolean auditByGuid(TbAttResBase tbAttResBase);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
new file mode 100644
index 0000000..91f54c7
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
@@ -0,0 +1,188 @@
+package cn.gistack.sm.sjztmd.service.impl;
+
+import cn.gistack.sm.feedback.service.IFeedbackService;
+import cn.gistack.sm.sjztmd.entity.TbAttResBase;
+import cn.gistack.sm.sjztmd.mapper.TbAttResBaseMapper;
+import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
+import cn.gistack.system.user.feign.IUserClient;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @ClassName AttResBaseServiceImpl
+ * @Description TODO
+ * @author zhongrj
+ * @date 2023/8/14
+ * @Version 1.0
+ */
+@Service
+@DS("zt")
+public class TbAttResBaseServiceImpl extends ServiceImpl<TbAttResBaseMapper, TbAttResBase> implements ITbAttResBaseService {
+
+	@Autowired
+	private IUserClient userClient;
+
+	/**
+	 * 查询水库填报详情信息
+	 * @param guid
+	 * @return
+	 */
+	@Override
+	public TbAttResBase getDetailByGuid(String guid) {
+		return baseMapper.getDetailByGuid(guid);
+	}
+
+	/**
+	 * 编辑
+	 * @param tbAttResBase
+	 * @return
+	 */
+	@Override
+	public boolean updateByGuid(TbAttResBase tbAttResBase) {
+		// 查询是否存在
+		TbAttResBase detail = baseMapper.getDetailByGuid(tbAttResBase.getGuid());
+		// 更新审核日志
+		setUpdateLog(detail,tbAttResBase);
+		// 修改
+		int i = addOrUpdateByGuid(tbAttResBase);
+		if (i>0){
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 审核
+	 * @param tbAttResBase
+	 * @return
+	 */
+	@Override
+	public boolean auditByGuid(TbAttResBase tbAttResBase) {
+		// 查询是否存在
+		TbAttResBase detail = baseMapper.getDetailByGuid(tbAttResBase.getGuid());
+		// 更新审核日志
+		setUpdateCheckLog(detail,tbAttResBase);
+		// 更新操作日志
+		setUpdateLog(detail,tbAttResBase);
+		if (null!=detail){
+			tbAttResBase.setGuid(detail.getGuid());
+		}
+		// 驳回情况下将状态修改回0即已填写未提交状态
+		if (tbAttResBase.getCheckState()==3){
+			tbAttResBase.setCheckState(0);
+		}
+		// 更新数据
+		int i = baseMapper.updateByGuid(tbAttResBase);
+		if (i>0){
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 更新
+	 * @param tbAttResBase
+	 * @return
+	 */
+	private int addOrUpdateByGuid(TbAttResBase tbAttResBase){
+		int i = 0;
+		if (null!=tbAttResBase.getGuid()){
+			// 更新
+			i = baseMapper.updateByGuid(tbAttResBase);
+		}else {
+			i = baseMapper.insert(tbAttResBase);
+		}
+		// 返回
+		return i;
+	}
+
+	/**
+	 * @param oldAbAttResBase
+	 * @param newTbAttResBase
+	 * 更新审核记录
+	 */
+	private void setUpdateCheckLog(TbAttResBase oldAbAttResBase,TbAttResBase newTbAttResBase) {
+		String fillName = "";
+		if (newTbAttResBase.getCheckState()==2){
+			fillName = "审核";
+		}
+		if (newTbAttResBase.getCheckState()==3){
+			fillName = "退回" + (null==newTbAttResBase.getCheckLog()?"":":" + newTbAttResBase.getCheckLog());
+		}
+
+		// 拼接
+		String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
+		String userName = AuthUtil.getUser().getUserName();
+		String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
+		StringBuilder builder = new StringBuilder();
+		builder.append(time)
+			.append(",")
+			.append(fillName)
+			.append(",")
+			.append(userName)
+			.append(",")
+			.append(phone)
+			.append(";");
+		// 判断是否存在
+		if (null==oldAbAttResBase){
+			// 填报
+			newTbAttResBase.setCheckLog(builder.toString());
+		}else {
+			StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
+			stringBuilder.append(builder);
+			// 填报
+			newTbAttResBase.setCheckLog(stringBuilder.toString());
+		}
+	}
+
+	/**
+	 * @param oldAbAttResBase
+	 * @param newTbAttResBase
+	 * 更新操作记录
+	 */
+	private void setUpdateLog(TbAttResBase oldAbAttResBase,TbAttResBase newTbAttResBase) {
+		String fillName = "";
+		if (newTbAttResBase.getCheckState()==0){
+			fillName = "编辑";
+		}
+		if (newTbAttResBase.getCheckState()==1){
+			fillName = "提交";
+		}
+		if (newTbAttResBase.getCheckState()==2){
+			fillName = "审核";
+		}
+		if (newTbAttResBase.getCheckState()==3){
+			fillName = "退回" + (null==newTbAttResBase.getLog()?"":":" + newTbAttResBase.getLog());
+		}
+
+		// 拼接
+		String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
+		String userName = AuthUtil.getUser().getUserName();
+		String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
+		StringBuilder builder = new StringBuilder();
+		builder.append(time)
+			.append(",")
+			.append(fillName)
+			.append(",")
+			.append(userName)
+			.append(",")
+			.append(phone)
+			.append(";");
+		// 判断是否存在
+		if (null==oldAbAttResBase){
+			// 填报
+			newTbAttResBase.setLog(builder.toString());
+		}else {
+			StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
+			stringBuilder.append(builder);
+			// 填报
+			newTbAttResBase.setLog(stringBuilder.toString());
+		}
+	}
+}

--
Gitblit v1.9.3