From f774d0c4961f5e3f7a760ffaf2dac13b4da1fac4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 04 十二月 2025 11:41:49 +0800
Subject: [PATCH] 电子巡更表字段调整
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java | 23 +++++++++++++++++++----
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java | 16 ++--------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java | 20 +++++++++++++++++---
3 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
index 81da056..b6e96eb 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
@@ -11,6 +11,12 @@
import javax.persistence.Table;
import java.io.Serializable;
+
+/**
+ * @Description 鐢靛瓙宸￠�昏褰曚富琛�
+ * @Author sgj
+ * @Date 2025/12/04 11:38
+ */
@Data
@Entity
@Table(name = "d_patrol")
@@ -23,20 +29,29 @@
*/
private static final long serialVersionUID = 1L;
+ //鐢熸垚瑙勫垯 骞存湀鏃�
@Id
@Column(name = "id", columnDefinition = "varchar(40) COMMENT '涓婚敭'")
@TableField("id")
private String id;
- @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
- @TableField("dept_id")
- private String deptId;
-
+ @Id
@Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
@TableField("batch_id")
private String batchId;
+ @Id
+ @Column(name = "user_id", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉璐﹀彿'")
+ @TableField("user_id")
+ private String userId;
+
@Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
@TableField("user_name")
private String userName;
+
+ @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+ @TableField("dept_id")
+ private String deptId;
+
+
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
index 19aa3fd..2344a0b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,13 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
+import java.util.Date;
+/**
+ * @Description 鐢靛瓙宸￠�婚厤缃�
+ * @Author sgj
+ * @Date 2025/12/04 11:38
+ */
@Data
@Entity
@Table(name = "d_patrol_conf")
@@ -32,8 +39,15 @@
@TableField("batch_name")
private String batchName;
- @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
- @TableField("user_name")
- private String userName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Column(name = "start_time", columnDefinition = "datetime COMMENT '宸￠�诲紑濮嬫椂闂�'")
+ @TableField("start_time")
+ private Date startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Column(name = "end_time", columnDefinition = "datetime COMMENT '宸￠�荤粨鏉熸椂闂�'")
+ @TableField("end_time")
+ private Date endTime;
+
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java
index d2a61c2..3451ff1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java
@@ -2,16 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.*;
import java.io.Serializable;
-import java.util.Date;
/**
- * @Description 鐢靛瓙宸￠��
+ * @Description 鐢靛瓙宸￠�昏褰曞瓙琛�
* @Author CZT
* @Date 2025/11/25 19:38
*/
@@ -42,11 +40,6 @@
@TableField("point_name")
private String pointName;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(name = "create_time", columnDefinition = "datetime COMMENT '宸￠�绘椂闂�'")
- @TableField("create_time")
- private Date createTime;
-
@Column(name = "longitude", columnDefinition = "decimal(20,6) COMMENT '缁忓害'")
@TableField("longitude")
private String longitude;
@@ -58,16 +51,11 @@
/**
* --------楦熺灠鍥句俊鎭�--------
**/
- @Column(name = "img_id", columnDefinition = "varchar(50) COMMENT '宸℃洿鐓х墖'")
- @TableField("img_id")
- private String imgId;
+
@Column(name = "file_name", columnDefinition = "varchar(50) COMMENT '宸℃洿鐓х墖'")
@TableField("file_name")
private String imgName;
- //宸℃洿鐓х墖鍏ㄨ矾寰�
- @Transient
- private String imgPath;
}
--
Gitblit v1.9.3