From 2f5f60384a5f469787edbe333aaa265fae58bf2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 28 Nov 2023 17:21:27 +0800
Subject: [PATCH] 网格，网格员相关修改
---
src/main/java/org/springblade/modules/grid/entity/GridEntity.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/entity/GridEntity.java b/src/main/java/org/springblade/modules/grid/entity/GridEntity.java
index 9f6dc3b..5181bb4 100644
--- a/src/main/java/org/springblade/modules/grid/entity/GridEntity.java
+++ b/src/main/java/org/springblade/modules/grid/entity/GridEntity.java
@@ -16,10 +16,8 @@
*/
package org.springblade.modules.grid.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.alibaba.fastjson.support.geo.Geometry;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -32,6 +30,7 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.modules.grid.handle.GeometryTypeHandler;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -53,6 +52,16 @@
@ApiModelProperty("主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ /**
+ * 机构id
+ */
+ @ApiModelProperty(value = "机构id")
+ private Long deptId;
+ /**
+ * 社区编号
+ */
+ @ApiModelProperty(value = "社区编号")
+ private String communityCode;
/**
* 社区名称
*/
@@ -82,13 +91,21 @@
* 网格面数据
*/
@ApiModelProperty(value = "网格面数据")
+// @TableField(typeHandler = GeometryTypeHandler.class)
private String geom;
+
+ /**
+ * 排序
+ */
+ @ApiModelProperty(value = "排序")
+ private Integer sort;
/**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
@@ -97,6 +114,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -104,6 +122,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
@@ -112,12 +131,13 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
- * 备注
+ * 备注/简介
*/
- @ApiModelProperty(value = "备注")
+ @ApiModelProperty(value = "备注/简介")
private String remark;
/**
--
Gitblit v1.9.3