From 25a9a1681f2e540b22366ef90f1de753538f0bef Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 八月 2023 10:31:02 +0800
Subject: [PATCH] 修改元数据表
---
src/main/java/com/moon/server/entity/sys/LayerEntity.java | 10 ++
src/main/java/com/moon/server/entity/data/MetaEntity.java | 190 +++++++++++++++++++++++++++++++++++++----------
src/main/resources/mapper/sys/LayerMapper.xml | 12 +-
src/main/resources/mapper/data/MetaMapper.xml | 20 ++--
4 files changed, 175 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/moon/server/entity/data/MetaEntity.java b/src/main/java/com/moon/server/entity/data/MetaEntity.java
index 8f3c7a1..aade87b 100644
--- a/src/main/java/com/moon/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/moon/server/entity/data/MetaEntity.java
@@ -16,12 +16,6 @@
private int metaid;
- private short ismeta;
-
- private String dircode;
-
- private String depcode;
-
private int verid;
private String name;
@@ -36,8 +30,6 @@
private String tab;
- private String layer;
-
private int rows;
private int createUser;
@@ -51,6 +43,36 @@
private String bak;
private String geom;
+
+ private String layer;
+
+ private String depcode;
+
+ private String dircode;
+
+ private int ismeta;
+
+ private String sensortype;
+
+ private Timestamp acqTime;
+
+ private String resolution;
+
+ private String gridsize;
+
+ private String coorSys;
+
+ private String epsg;
+
+ private String hDatum;
+
+ private String mataType;
+
+ private String bands;
+
+ private String bandType;
+
+ private String ct;
private String uname;
@@ -93,30 +115,6 @@
public void setMetaid(int metaid) {
this.metaid = metaid;
- }
-
- public short getIsmeta() {
- return ismeta;
- }
-
- public void setIsmeta(short ismeta) {
- this.ismeta = ismeta;
- }
-
- public String getDircode() {
- return dircode;
- }
-
- public void setDircode(String dircode) {
- this.dircode = dircode;
- }
-
- public String getDepcode() {
- return depcode;
- }
-
- public void setDepcode(String depcode) {
- this.depcode = depcode;
}
public int getVerid() {
@@ -175,14 +173,6 @@
this.tab = tab;
}
- public String getLayer() {
- return layer;
- }
-
- public void setLayer(String layer) {
- this.layer = layer;
- }
-
public int getRows() {
return rows;
}
@@ -239,6 +229,126 @@
this.geom = geom;
}
+ public String getLayer() {
+ return layer;
+ }
+
+ public void setLayer(String layer) {
+ this.layer = layer;
+ }
+
+ public String getDepcode() {
+ return depcode;
+ }
+
+ public void setDepcode(String depcode) {
+ this.depcode = depcode;
+ }
+
+ public String getDircode() {
+ return dircode;
+ }
+
+ public void setDircode(String dircode) {
+ this.dircode = dircode;
+ }
+
+ public int getIsmeta() {
+ return ismeta;
+ }
+
+ public void setIsmeta(int ismeta) {
+ this.ismeta = ismeta;
+ }
+
+ public String getSensortype() {
+ return sensortype;
+ }
+
+ public void setSensortype(String sensortype) {
+ this.sensortype = sensortype;
+ }
+
+ public Timestamp getAcqTime() {
+ return acqTime;
+ }
+
+ public void setAcqTime(Timestamp acqTime) {
+ this.acqTime = acqTime;
+ }
+
+ public String getResolution() {
+ return resolution;
+ }
+
+ public void setResolution(String resolution) {
+ this.resolution = resolution;
+ }
+
+ public String getGridsize() {
+ return gridsize;
+ }
+
+ public void setGridsize(String gridsize) {
+ this.gridsize = gridsize;
+ }
+
+ public String getCoorSys() {
+ return coorSys;
+ }
+
+ public void setCoorSys(String coorSys) {
+ this.coorSys = coorSys;
+ }
+
+ public String getEpsg() {
+ return epsg;
+ }
+
+ public void setEpsg(String epsg) {
+ this.epsg = epsg;
+ }
+
+ public String gethDatum() {
+ return hDatum;
+ }
+
+ public void sethDatum(String hDatum) {
+ this.hDatum = hDatum;
+ }
+
+ public String getMataType() {
+ return mataType;
+ }
+
+ public void setMataType(String mataType) {
+ this.mataType = mataType;
+ }
+
+ public String getBands() {
+ return bands;
+ }
+
+ public void setBands(String bands) {
+ this.bands = bands;
+ }
+
+ public String getBandType() {
+ return bandType;
+ }
+
+ public void setBandType(String bandType) {
+ this.bandType = bandType;
+ }
+
+ public String getCt() {
+ return ct;
+ }
+
+ public void setCt(String ct) {
+ this.ct = ct;
+ }
+
public String getUname() {
return uname;
}
diff --git a/src/main/java/com/moon/server/entity/sys/LayerEntity.java b/src/main/java/com/moon/server/entity/sys/LayerEntity.java
index b20e54d..0fdfb5a 100644
--- a/src/main/java/com/moon/server/entity/sys/LayerEntity.java
+++ b/src/main/java/com/moon/server/entity/sys/LayerEntity.java
@@ -22,6 +22,8 @@
private int isLayer;
+ private int isShow;
+
private String icon;
private int level;
@@ -105,6 +107,14 @@
this.isLayer = isLayer;
}
+ public int getIsShow() {
+ return isShow;
+ }
+
+ public void setIsShow(int isShow) {
+ this.isShow = isShow;
+ }
+
public String getIcon() {
return icon;
}
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 1abc389..c70b3eb 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -21,7 +21,7 @@
</select>
<select id="selectByPage" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select st_astext(geom) "geom",a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
ismeta between 0 and 1
@@ -100,7 +100,7 @@
</select>
<select id="selectByPageForUpload" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select st_astext(geom) "geom",a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
create_user = #{createUser}
@@ -144,7 +144,7 @@
</select>
<select id="selectByGuid" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select st_astext(geom) "geom",a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where guid = #{guid}
<if test="dircode != null">
@@ -205,17 +205,17 @@
</selectKey>
insert into lf.sys_meta
- (eventid,metaid,ismeta,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
+ (eventid,metaid,verid,name,type,guid,path,sizes,tab,rows,create_user,create_time,bak,geom,layer,depcode,dircode,ismeta,sensortype,acq_time,resolution,gridsize,coor_sys,epsg,h_datum,mata_type,bands,band_type,ct)
values
- (#{eventid},#{metaid},#{ismeta},#{dircode},#{depcode},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{tab},#{layer},#{rows},#{createUser},#{createTime},#{bak},#{geom})
+ (#{eventid},#{metaid},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{tab},#{rows},#{createUser},now(),#{bak},#{geom},#{layer},#{depcode},#{dircode},#{ismeta},#{sensortype},now(),#{resolution},#{gridsize},#{coorSys},#{epsg},#{hDatum},#{mataType},#{bands},#{bandType},#{ct})
</insert>
<insert id="inserts">
insert into lf.sys_meta
- (eventid,metaid,ismeta,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
+ (eventid,metaid,verid,name,type,guid,path,sizes,tab,rows,create_user,create_time,bak,geom,layer,depcode,dircode,ismeta,sensortype,acq_time,resolution,gridsize,coor_sys,epsg,h_datum,mata_type,bands,band_type,ct)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.eventid},#{item.metaid},#{item.ismeta},#{item.dircode},#{item.depcode},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.tab},#{item.layer},#{item.rows},#{item.createUser},#{item.createTime},#{item.bak},#{item.geom})
+ (#{item.eventid},#{item.metaid},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.tab},#{item.rows},#{item.createUser},now(),#{item.bak},#{item.geom},#{item.layer},#{item.depcode},#{item.dircode},#{item.ismeta},#{item.sensortype},now(),#{item.resolution},#{item.gridsize},#{item.coorSys},#{item.epsg},#{item.hDatum},#{item.mataType},#{item.bands},#{item.bandType},#{item.ct})
</foreach>
</insert>
@@ -235,16 +235,14 @@
<update id="update">
update lf.sys_meta
- set eventid=#{eventid},metaid=#{metaid},ismeta=#{ismeta},dircode=#{dircode},depcode=#{depcode},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},tab=#{tab},layer=#{layer},rows=#{rows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
+ set eventid=#{eventid},metaid=#{metaid},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},tab=#{tab},rows=#{rows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom},layer=#{layer},depcode=#{depcode},dircode=#{dircode},ismeta=#{ismeta},sensortype=#{sensortype},acq_time=now(),resolution=#{resolution},gridsize=#{gridsize},coor_sys=#{coorSys},epsg=#{epsg},h_datum=#{hDatum},mata_type=#{mataType},bands=#{bands},band_type=#{bandType},ct=#{ct}
where id=#{id}
</update>
<update id="updates">
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_meta
- <set>
- eventid=#{item.eventid},metaid=#{item.metaid},ismeta=#{item.ismeta},dircode=#{item.dircode},depcode=#{item.depcode},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},tab=#{item.tab},layer=#{item.layer},rows=#{item.rows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom}
- </set>
+ set eventid=#{item.eventid},metaid=#{item.metaid},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},tab=#{item.tab},rows=#{item.rows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom},layer=#{item.layer},depcode=#{item.depcode},dircode=#{item.dircode},ismeta=#{item.ismeta},sensortype=#{item.sensortype},acq_time=now(),resolution=#{item.resolution},gridsize=#{item.gridsize},coor_sys=#{item.coorSys},epsg=#{item.epsg},h_datum=#{item.hDatum},mata_type=#{item.mataType},bands=#{item.bands},band_type=#{item.bandType},ct=#{item.ct}
where id = #{item.id}
</foreach>
</update>
diff --git a/src/main/resources/mapper/sys/LayerMapper.xml b/src/main/resources/mapper/sys/LayerMapper.xml
index f7f9a17..8a6ca5f 100644
--- a/src/main/resources/mapper/sys/LayerMapper.xml
+++ b/src/main/resources/mapper/sys/LayerMapper.xml
@@ -47,17 +47,17 @@
<insert id="insert" parameterType="com.moon.server.entity.sys.LayerEntity">
insert into lf.sys_layer
- (pid,cn_name,en_name,url,is_layer,icon,level,order_num,status,create_user,create_time,bak,elev,resid,type,data,tab,category)
+ (pid,cn_name,en_name,url,is_layer,is_show,icon,level,order_num,status,create_user,create_time,bak,elev,resid,type,data,tab,category)
values
- (#{pid},#{cnName},#{enName},#{url},#{isLayer},#{icon},#{level},#{orderNum},#{status},#{createUser},now(),#{bak},#{elev},#{resid},#{type},#{data},#{tab},#{category})
+ (#{pid},#{cnName},#{enName},#{url},#{isLayer},#{isShow},#{icon},#{level},#{orderNum},#{status},#{createUser},now(),#{bak},#{elev},#{resid},#{type},#{data},#{tab},#{category})
</insert>
<insert id="inserts">
insert into lf.sys_layer
- (pid,cn_name,en_name,url,is_layer,icon,level,order_num,status,create_user,create_time,bak,elev,resid,type,data,tab,category)
+ (pid,cn_name,en_name,url,is_layer,is_show,icon,level,order_num,status,create_user,create_time,bak,elev,resid,type,data,tab,category)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.isLayer},#{item.icon},#{item.level},#{item.orderNum},#{item.status},#{item.createUser},now(),#{item.bak},#{item.elev},#{item.resid},#{item.type},#{item.data},#{item.tab},#{item.category})
+ (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.isLayer},#{item.isShow},#{item.icon},#{item.level},#{item.orderNum},#{item.status},#{item.createUser},now(),#{item.bak},#{item.elev},#{item.resid},#{item.type},#{item.data},#{item.tab},#{item.category})
</foreach>
</insert>
@@ -74,14 +74,14 @@
<update id="update">
update lf.sys_layer
- set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},is_layer=#{isLayer},icon=#{icon},level=#{level},order_num=#{orderNum},status=#{status},update_user=#{updateUser},update_time=now(),bak=#{bak},elev=#{elev},resid=#{resid},type=#{type},data=#{data},tab=#{tab},category=#{category}
+ set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},is_layer=#{isLayer},is_show=#{isShow},,icon=#{icon},level=#{level},order_num=#{orderNum},status=#{status},update_user=#{updateUser},update_time=now(),bak=#{bak},elev=#{elev},resid=#{resid},type=#{type},data=#{data},tab=#{tab},category=#{category}
where id=#{id}
</update>
<update id="updates">
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_layer
- set pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},is_layer=#{item.isLayer},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},status=#{item.status},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},elev=#{item.elev},resid=#{item.resid},type=#{item.type},data=#{item.data},tab=#{item.tab},category=#{item.category}
+ set pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},is_layer=#{item.isLayer},is_show=#{item.isShow},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},status=#{item.status},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},elev=#{item.elev},resid=#{item.resid},type=#{item.type},data=#{item.data},tab=#{item.tab},category=#{item.category}
where id = #{item.id}
</foreach>
</update>
--
Gitblit v1.9.3