From ade1aadab51ad5d46292267ff4e59809526908cc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 20 十一月 2022 16:04:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/md/MdZxcgEntity.java | 4
src/main/java/com/lf/server/entity/md/MdGdcgEntity.java | 4
src/main/java/com/lf/server/entity/all/BsBaseGeoEntity.java | 49 ++++++++++++++++
data/db_tab.sql | 20 +++---
src/main/java/com/lf/server/entity/all/BsBaseEntity.java | 49 ++++++++++++++++
src/main/java/com/lf/server/entity/all/BaseEntity.java | 42 --------------
src/main/java/com/lf/server/service/data/DataLoaderService.java | 10 --
7 files changed, 114 insertions(+), 64 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 5393048..cd31a10 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -967,18 +967,18 @@
x float8,
y float8,
z float8,
- create_user integer,
- create_time timestamp(6) without time zone default now(),
- update_user integer,
- update_time timestamp(6) without time zone,
+ createuser integer,
+ createtime timestamp(6) without time zone default now(),
+ updateuser integer,
+ updatetime timestamp(6) without time zone,
geom geometry(Point, 4490)
);
create index if not exists md_zxcg_geom_idx on md.md_zxcg using gist (geom);
-drop index if exists md_zxcg_geom_idx cascade;
+/*drop index if exists md_zxcg_geom_idx cascade;
comment on table md.md_zxcg is '涓嚎鎴愭灉琛�';
vacuum analyze md.md_zxcg;
insert into md.md_zxcg (zh, geom) values ('A01', ST_GeomFromText('POINT(95.80461853400004 34.13862467200005)'));
-insert into md.md_zxcg (zh, geom) values ('A02', ST_GeomFromText('POINT(119.873000 39.392000)'));
+insert into md.md_zxcg (zh, geom) values ('A02', ST_GeomFromText('POINT(119.873000 39.392000)'));*/
select gid,zh,ST_ASText(geom) from md.md_zxcg;
select * from md.md_zxcg;
@@ -1004,10 +1004,10 @@
gkpl varchar(100),
dldy varchar(100),
bz varchar(100),
- create_user integer,
- create_time timestamp(6) without time zone default now(),
- update_user integer,
- update_time timestamp(6) without time zone
+ createuser integer,
+ createtime timestamp(6) without time zone default now(),
+ updateuser integer,
+ updatetime timestamp(6) without time zone
);
comment on table md.md_gdcg is '绠￠亾鎴愭灉琛�';
diff --git a/src/main/java/com/lf/server/entity/all/BaseEntity.java b/src/main/java/com/lf/server/entity/all/BaseEntity.java
index a060f51..016f927 100644
--- a/src/main/java/com/lf/server/entity/all/BaseEntity.java
+++ b/src/main/java/com/lf/server/entity/all/BaseEntity.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.sql.Timestamp;
-
/**
* 鍩虹瀹炰綋绫�
* @author WWW
@@ -13,51 +11,11 @@
@TableId(type = IdType.AUTO)
private Integer gid;
- private Integer createUser;
-
- private Timestamp createTime;
-
- private Integer updateUser;
-
- private Timestamp updateTime;
-
public Integer getGid() {
return gid;
}
public void setGid(Integer gid) {
this.gid = gid;
- }
-
- public Integer getCreateUser() {
- return createUser;
- }
-
- public void setCreateUser(Integer createUser) {
- this.createUser = createUser;
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
}
}
diff --git a/src/main/java/com/lf/server/entity/all/BsBaseEntity.java b/src/main/java/com/lf/server/entity/all/BsBaseEntity.java
new file mode 100644
index 0000000..fb11e4a
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/all/BsBaseEntity.java
@@ -0,0 +1,49 @@
+package com.lf.server.entity.all;
+
+import java.sql.Timestamp;
+
+/**
+ * 涓氬姟鍩虹瀹炰綋绫�
+ * @author WWW
+ */
+public class BsBaseEntity extends BaseEntity {
+ private Integer createuser;
+
+ private Timestamp createtime;
+
+ private Integer updateuser;
+
+ private Timestamp updatetime;
+
+ public Integer getCreateuser() {
+ return createuser;
+ }
+
+ public void setCreateuser(Integer createuser) {
+ this.createuser = createuser;
+ }
+
+ public Timestamp getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Timestamp createtime) {
+ this.createtime = createtime;
+ }
+
+ public Integer getUpdateuser() {
+ return updateuser;
+ }
+
+ public void setUpdateuser(Integer updateuser) {
+ this.updateuser = updateuser;
+ }
+
+ public Timestamp getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Timestamp updatetime) {
+ this.updatetime = updatetime;
+ }
+}
diff --git a/src/main/java/com/lf/server/entity/all/BsBaseGeoEntity.java b/src/main/java/com/lf/server/entity/all/BsBaseGeoEntity.java
new file mode 100644
index 0000000..0f316f9
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/all/BsBaseGeoEntity.java
@@ -0,0 +1,49 @@
+package com.lf.server.entity.all;
+
+import java.sql.Timestamp;
+
+/**
+ * 涓氬姟绌洪棿鍩虹瀹炰綋绫�
+ * @author WWW
+ */
+public class BsBaseGeoEntity extends BaseGeoEntity {
+ private Integer createuser;
+
+ private Timestamp createtime;
+
+ private Integer updateuser;
+
+ private Timestamp updatetime;
+
+ public Integer getCreateuser() {
+ return createuser;
+ }
+
+ public void setCreateuser(Integer createuser) {
+ this.createuser = createuser;
+ }
+
+ public Timestamp getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Timestamp createtime) {
+ this.createtime = createtime;
+ }
+
+ public Integer getUpdateuser() {
+ return updateuser;
+ }
+
+ public void setUpdateuser(Integer updateuser) {
+ this.updateuser = updateuser;
+ }
+
+ public Timestamp getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Timestamp updatetime) {
+ this.updatetime = updatetime;
+ }
+}
diff --git a/src/main/java/com/lf/server/entity/md/MdGdcgEntity.java b/src/main/java/com/lf/server/entity/md/MdGdcgEntity.java
index 7f1a481..df95d8f 100644
--- a/src/main/java/com/lf/server/entity/md/MdGdcgEntity.java
+++ b/src/main/java/com/lf/server/entity/md/MdGdcgEntity.java
@@ -3,7 +3,7 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableName;
import com.lf.server.annotation.ExcelHead;
-import com.lf.server.entity.all.BaseEntity;
+import com.lf.server.entity.all.BsBaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,7 +21,7 @@
@TableName("md.md_gdcg")
@ExcelHead(headRows = 3,excludeSheets = "灏侀潰,鐩綍")
@EqualsAndHashCode(callSuper = true)
-public class MdGdcgEntity extends BaseEntity implements Serializable {
+public class MdGdcgEntity extends BsBaseEntity implements Serializable {
private static final long serialVersionUID = -221347663194025408L;
@ExcelProperty(index = 0)
diff --git a/src/main/java/com/lf/server/entity/md/MdZxcgEntity.java b/src/main/java/com/lf/server/entity/md/MdZxcgEntity.java
index 49f9750..4862c4a 100644
--- a/src/main/java/com/lf/server/entity/md/MdZxcgEntity.java
+++ b/src/main/java/com/lf/server/entity/md/MdZxcgEntity.java
@@ -3,7 +3,7 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableName;
import com.lf.server.annotation.ExcelHead;
-import com.lf.server.entity.all.BaseGeoEntity;
+import com.lf.server.entity.all.BsBaseGeoEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,7 +21,7 @@
@TableName("md.md_zxcg")
@ExcelHead(headRows = 1)
@EqualsAndHashCode(callSuper = true)
-public class MdZxcgEntity extends BaseGeoEntity implements Serializable {
+public class MdZxcgEntity extends BsBaseGeoEntity implements Serializable {
private static final long serialVersionUID = 686714648588893312L;
@ExcelProperty(index = 0)
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index 50ad4f8..f60c840 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -230,19 +230,13 @@
private <T> void setCreateInfo(List<T> list, MetaFileEntity mfe) {
try {
for (T t : list) {
- /*Field cuField = t.getClass().getDeclaredField("createUser");
+ Field cuField = t.getClass().getDeclaredField("createUser");
cuField.setAccessible(true);
cuField.set(t, mfe.getCreateUser());
Field ctField = t.getClass().getDeclaredField("createTime");
ctField.setAccessible(true);
- ctField.set(t, mfe.getCreateTime());*/
-
- if (t instanceof BaseEntity) {
- BaseEntity be = (BaseEntity) t;
- be.setCreateUser(mfe.getCreateUser());
- be.setCreateTime(mfe.getCreateTime());
- }
+ ctField.set(t, mfe.getCreateTime());
}
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
--
Gitblit v1.9.3