From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
index 58d6743..7a43920 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
@@ -2,13 +2,16 @@
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;
/**
* 中台水库实体类
@@ -16,7 +19,7 @@
* @author Chill
*/
@Data
-@TableName("\"tb_res_base\"")
+@TableName("\"att_res_base\"")
@ApiModel(value = "水库对象", description = "水库对象")
public class AttResBase implements Serializable {
private static final long serialVersionUID = 1L;
@@ -63,6 +66,13 @@
@ApiModelProperty(value = "注册登记码")
@TableField("\"res_reg_code\"")
private String resRegCode;
+
+ /**
+ * 注册登记码
+ */
+ @ApiModelProperty(value = "标签")
+ @TableField("\"label\"")
+ private String label;
//
// /**
// * 其他行业注册号
@@ -148,6 +158,14 @@
// @TableField("\"rv_guid\"")
// private String rvGuid;
//
+
+ /**
+ * 闸门控制
+ */
+ @ApiModelProperty(value = "闸门控制 ")
+ @TableField("\"is_gate\"")
+ private String isGate;
+
/**
* 河流名称
*/
@@ -183,12 +201,12 @@
// @TableField("\"mgr_ad_guid\"")
// private String mgrAdGuid;
//
-// /**
-// * 内部行政区划guid
-// */
-// @ApiModelProperty(value = "内部行政区划guid ")
-// @TableField("\"interior_ad_guid\"")
-// private String interiorAdGuid;
+ /**
+ * 内部行政区划guid
+ */
+ @ApiModelProperty(value = "内部行政区划guid ")
+ @TableField("\"interior_ad_guid\"")
+ private String interiorAdGuid;
//
/**
* 水库所在位置
@@ -309,12 +327,14 @@
// @TableField("\"create_time\"")
// private String createTime;
//
-// /**
-// * 更新时间
-// */
-// @ApiModelProperty(value = "更新时间 ")
-// @TableField("\"update_time\"")
-// private String updateTime;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间 ")
+ @TableField("\"update_time\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
//
// /**
// * 采集时间
@@ -330,5 +350,12 @@
// @TableField("\"sys_resource\"")
// private String sysResource;
+ @ApiModelProperty(value = "抗震设计烈度 ")
+ @TableField("\"is_show\"")
+ private String isShow;
+
+ //这个字段为SJZT_ODS."yg_rsvr_b"的字段
+ @TableField("\"height_base_std_tp\"")
+ private String heightBaseStdTp;
}
--
Gitblit v1.9.3