From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java | 75 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 40 deletions(-)
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
index a5672f5..d374de6 100644
--- 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
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +32,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
private String guid;
/**
@@ -41,53 +43,46 @@
private String resGuid;
/**
- * 运行状态
- */
- @ApiModelProperty(value = "运行状态")
- @TableField("\"run_status\"")
- private Integer runStatus;
-
- /**
* 是否有水雨情测报雨量
*/
@ApiModelProperty(value = "是否有水雨情测报雨量")
@TableField("\"is_rain\"")
- private Integer isRain;
+ private String isRain;
/**
* 是否有水雨情测报水位
*/
@ApiModelProperty(value = "是否有水雨情测报水位")
@TableField("\"is_rsvr\"")
- private Integer isRsvr;
+ private String isRsvr;
/**
- * 是否有大坝安全监测水平位移
+ * 是否有大坝安全监测位移
*/
- @ApiModelProperty(value = "是否有大坝安全监测水平位移")
+ @ApiModelProperty(value = "是否有大坝安全监测位移")
@TableField("\"is_gnss_horizontal\"")
- private Integer isGnssHorizontal;
-
- /**
- * 是否有大坝安全监测垂直位移
- */
- @ApiModelProperty(value = "是否有大坝安全监测垂直位移")
- @TableField("\"is_gnss_vertical\"")
- private Integer isGnssVertical;
+ private String isGnssHorizontal;
+//
+// /**
+// * 是否有大坝安全监测垂直位移
+// */
+// @ApiModelProperty(value = "是否有大坝安全监测垂直位移")
+// @TableField("\"is_gnss_vertical\"")
+// private String isGnssVertical;
/**
* 是否有大坝安全监测渗透压力
*/
@ApiModelProperty(value = "是否有大坝安全监测渗透压力")
@TableField("\"is_sppr\"")
- private Integer isSppr;
+ private String isSppr;
/**
* 是否有大坝安全监测渗流（漏）量
*/
@ApiModelProperty(value = "是否有大坝安全监测渗流（漏）量")
@TableField("\"is_spqnmp\"")
- private Integer isSpqnmp;
+ private String isSpqnmp;
/**
@@ -95,29 +90,29 @@
*/
@ApiModelProperty(value = "是否有视频监视 ")
@TableField("\"is_wmst\"")
- private Integer isWmst;
+ private String isWmst;
/**
* 是否有白蚁监测
*/
@ApiModelProperty(value = "是否有白蚁监测 ")
@TableField("\"is_termites\"")
- private Integer isTermites;
+ private String isTermites;
/**
- * 填报状态（0:填写中，1:审核中，2:审核通过）
+ * 填报状态（0:未完成 2：已完成）
*/
- @ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+ @ApiModelProperty(value = "填报状态（0:未完成 2：已完成） ")
@TableField("\"check_state\"")
@JsonSerialize(using = ToStringSerializer.class)
private Integer checkState;
-
- /**
- * 审核记录
- */
- @ApiModelProperty(value = "审核记录 ")
- @TableField("\"check_log\"")
- private String checkLog;
+//
+// /**
+// * 审核记录
+// */
+// @ApiModelProperty(value = "审核记录 ")
+// @TableField("\"check_log\"")
+// private String checkLog;
/**
* 创建时间
@@ -127,12 +122,12 @@
@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;
+//
+// /**
+// * 操作记录
+// */
+// @ApiModelProperty(value = "操作记录 ")
+// @TableField("\"log\"")
+// private String log;
}
--
Gitblit v1.9.3