From e64b967ba5eba17e3b497fa35abc1aa39e7f07aa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 02 九月 2023 08:54:22 +0800
Subject: [PATCH] 资源表添加pubid，发布表去除regid、添加layerid和serviceid
---
src/main/java/com/moon/server/service/data/PublishService.java | 58 -------------------
src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java | 8 ++
src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java | 15 ++++
src/main/resources/mapper/sys/ResMapper.xml | 12 ++--
src/main/java/com/moon/server/entity/data/PublishEntity.java | 30 ++++++---
src/main/java/com/moon/server/entity/sys/ResEntity.java | 10 +++
src/main/resources/application.yml | 2
src/main/resources/mapper/data/PublishMapper.xml | 14 ++--
8 files changed, 64 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/moon/server/entity/data/PublishEntity.java b/src/main/java/com/moon/server/entity/data/PublishEntity.java
index f239ba6..bccbfd8 100644
--- a/src/main/java/com/moon/server/entity/data/PublishEntity.java
+++ b/src/main/java/com/moon/server/entity/data/PublishEntity.java
@@ -12,8 +12,6 @@
private int id;
- private String regid;
-
private String name;
private String url;
@@ -54,6 +52,10 @@
private String updateName;
+ private Integer layerid;
+
+ private Integer serviceid;
+
public PublishEntity() {
}
@@ -63,14 +65,6 @@
public void setId(int id) {
this.id = id;
- }
-
- public String getRegid() {
- return regid;
- }
-
- public void setRegid(String regid) {
- this.regid = regid;
}
public String getName() {
@@ -232,4 +226,20 @@
public void setUpdateName(String updateName) {
this.updateName = updateName;
}
+
+ public Integer getLayerid() {
+ return layerid;
+ }
+
+ public void setLayerid(Integer layerid) {
+ this.layerid = layerid;
+ }
+
+ public Integer getServiceid() {
+ return serviceid;
+ }
+
+ public void setServiceid(Integer serviceid) {
+ this.serviceid = serviceid;
+ }
}
diff --git a/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java b/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java
index d5eed70..383c7a0 100644
--- a/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java
+++ b/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java
@@ -1,4 +1,17 @@
package com.moon.server.entity.shujian;
-public class ColorTableEntity {
+import java.io.Serializable;
+
+/**
+ * 鏁扮畝.棰滆壊琛ㄥ疄浣撶被
+ *
+ * @author WWW
+ * @date 2023-08-31
+ */
+@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
+public class ColorTableEntity implements Serializable {
+ private static final long serialVersionUID = -7178280280689493423L;
+
+ public ColorTableEntity() {
+ }
}
diff --git a/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java b/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java
index 4bd9403..bb25ded 100644
--- a/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java
+++ b/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java
@@ -1,13 +1,17 @@
package com.moon.server.entity.shujian;
+import java.io.Serializable;
+
/**
- * 鏁扮畝.棰滆壊琛ㄥ疄浣撶被
+ * 鏁扮畝.娓愬彉棰滆壊琛ㄥ疄浣撶被
*
* @author WWW
* @date 2023-08-31
*/
@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-public class GradientColorTableEntity {
+public class GradientColorTableEntity implements Serializable {
+ private static final long serialVersionUID = 3436664443231697504L;
+
private Double r_start;
private Double g_start;
diff --git a/src/main/java/com/moon/server/entity/sys/ResEntity.java b/src/main/java/com/moon/server/entity/sys/ResEntity.java
index f54221f..8a510bc 100644
--- a/src/main/java/com/moon/server/entity/sys/ResEntity.java
+++ b/src/main/java/com/moon/server/entity/sys/ResEntity.java
@@ -56,6 +56,8 @@
private String updateName;
+ private Integer pubid;
+
public ResEntity() {
}
@@ -242,4 +244,12 @@
public void setUpdateName(String updateName) {
this.updateName = updateName;
}
+
+ public Integer getPubid() {
+ return pubid;
+ }
+
+ public void setPubid(Integer pubid) {
+ this.pubid = pubid;
+ }
}
diff --git a/src/main/java/com/moon/server/service/data/PublishService.java b/src/main/java/com/moon/server/service/data/PublishService.java
index cb0e886..818636b 100644
--- a/src/main/java/com/moon/server/service/data/PublishService.java
+++ b/src/main/java/com/moon/server/service/data/PublishService.java
@@ -179,10 +179,6 @@
return 0;
}
- if (msg.getCount() > 0) {
- serverRegister(msg.getResult(), req);
- }
-
return msg.getCount();
}
@@ -212,36 +208,6 @@
}
/**
- * 鏈嶅姟娉ㄥ唽
- */
- private void serverRegister(String ids, HttpServletRequest req) {
- List<PublishEntity> list = selectByIds(ids);
- if (null == list || list.isEmpty()) {
- return;
- }
-
- for (PublishEntity entity : list) {
- // 閬垮厤閲嶅娉ㄥ唽
- if (null != entity.getUpdateTime()) {
- continue;
- }
-
- String url = entity.getUrl().replace("{host}", iisHost);
- String type = getServerType(entity);
-
- RegisterEntity reg = fmeService.serverRegister(entity.getName(), url, type, req);
- if (null == reg || StringHelper.isEmpty(reg.getSerialnum())) {
- continue;
- }
-
- fmeService.serverApply(reg.getSerialnum(), entity.getId(), req);
-
- entity.setRegid(reg.getHashid());
- update(entity);
- }
- }
-
- /**
* 鑾峰彇鏈嶅姟绫诲瀷
*/
private String getServerType(PublishEntity entity) {
@@ -267,31 +233,7 @@
public Integer deletes(List<Integer> idList, HttpServletRequest req) {
String ids = StringHelper.join(idList, ",");
- deleteRes(ids, req);
-
return deletes(ids);
- }
-
- /**
- * 鍒犻櫎璧勬簮
- */
- private void deleteRes(String ids, HttpServletRequest req) {
- List<PublishEntity> list = selectByIds(ids);
- if (null == list || list.isEmpty()) {
- return;
- }
-
- for (PublishEntity entity : list) {
- if (StringHelper.isEmpty(entity.getRegid())) {
- continue;
- }
-
- try {
- fmeService.deleteRes(entity.getRegid(), req);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0b1279f..a5e509c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -47,7 +47,7 @@
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
#url: jdbc:postgresql://127.0.0.1:5433/moon?useAffectedRows=true
- username : postgres
+ username: postgres
password: Postgres!_14_moon
#password: postgres
driver-class-name: org.postgresql.Driver
diff --git a/src/main/resources/mapper/data/PublishMapper.xml b/src/main/resources/mapper/data/PublishMapper.xml
index 10ce798..3e6cf74 100644
--- a/src/main/resources/mapper/data/PublishMapper.xml
+++ b/src/main/resources/mapper/data/PublishMapper.xml
@@ -24,7 +24,7 @@
select
(select c.url from lf.sys_meta_pub b inner join lf.sys_publish c on b.pubid = c.id where b.metaid = a.id limit 1) "url",
(select ST_AsText(c.geom) from lf.sys_meta_pub b inner join lf.sys_publish c on b.pubid = c.id where b.metaid = a.id limit 1) "geom",
- a.*, fn_uname(a.create_user) uname, fn_get_fullname(a.depcode, 1) depName, fn_get_fullname(a.dircode, 2) dirName, fn_ver(a.verid) verName
+ a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_get_fullname(a.dircode, 2) dirName, fn_ver(a.verid) verName
from lf.sys_meta a
<where>
${types}
@@ -115,9 +115,9 @@
<insert id="insert" parameterType="com.moon.server.entity.data.PublishEntity">
insert into lf.sys_publish
- (regid,name,url,path,type,status,dirid,depid,min,max,json,create_user,create_time,bak)
+ (layerid,serviceid,name,url,path,type,status,dirid,depid,min,max,json,create_user,create_time,geom,bak)
values
- (#{regid},#{name},#{url},#{path},#{type},#{status},#{dirid},#{depid},#{min},#{max},#{json},#{createUser},now(),#{bak})
+ (#{layerid},#{serviceid},#{name},#{url},#{path},#{type},#{status},#{dirid},#{depid},#{min},#{max},#{json},#{createUser},now(),${geom},#{bak})
</insert>
<insert id="insertPubDown">
@@ -126,10 +126,10 @@
<insert id="inserts">
insert into lf.sys_publish
- (regid,name,url,path,type,status,dirid,depid,min,max,json,create_user,create_time,bak)
+ (layerid,serviceid,,name,url,path,type,status,dirid,depid,min,max,json,create_user,create_time,geom,bak)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.regid},#{item.name},#{item.url},#{item.path},#{item.type},#{item.status},#{item.dirid},#{item.depid},#{item.min},#{item.max},#{item.json},#{item.createUser},now(),#{item.bak})
+ (#{item.layerid},#{item.serviceid},#{item.name},#{item.url},#{item.path},#{item.type},#{item.status},#{item.dirid},#{item.depid},#{item.min},#{item.max},#{item.json},#{item.createUser},now(),${item.geom},#{item.bak})
</foreach>
</insert>
@@ -145,7 +145,7 @@
<update id="update">
update lf.sys_publish
- set regid=#{regid},name=#{name},url=#{url},path=#{path},type=#{type},status=#{status},dirid=#{dirid},depid=#{depid},min=#{min},max=#{max},json=#{json},update_user=#{updateUser},update_time=now(),bak=#{bak}
+ set layerid=#{layerid},serviceid=#{serviceid},name=#{name},url=#{url},path=#{path},type=#{type},status=#{status},dirid=#{dirid},depid=#{depid},min=#{min},max=#{max},json=#{json},update_user=#{updateUser},update_time=now(),geom=${geom},bak=#{bak}
where id=#{id}
</update>
@@ -153,7 +153,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_publish
<set>
- regid=#{item.regid},name=#{item.name},url=#{item.url},path=#{item.path},type=#{item.type},status=#{item.status},dirid=#{item.dirid},depid=#{item.depid},min=#{item.min},max=#{item.max},json=#{item.json},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak}
+ layerid=#{item.layerid},serviceid=#{item.serviceid},name=#{item.name},url=#{item.url},path=#{item.path},type=#{item.type},status=#{item.status},dirid=#{item.dirid},depid=#{item.depid},min=#{item.min},max=#{item.max},json=#{item.json},update_user=#{item.updateUser},update_time=now(),geom=#{item.geom},bak=#{item.bak}
</set>
where id = #{item.id}
</foreach>
diff --git a/src/main/resources/mapper/sys/ResMapper.xml b/src/main/resources/mapper/sys/ResMapper.xml
index 812adac..b9d506d 100644
--- a/src/main/resources/mapper/sys/ResMapper.xml
+++ b/src/main/resources/mapper/sys/ResMapper.xml
@@ -85,17 +85,17 @@
<insert id="insert" parameterType="com.moon.server.entity.sys.ResEntity">
insert into lf.sys_res
- (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
+ (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args,pubid)
values
- (#{cnName},#{enName},#{status},#{type},#{data},#{category},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{createUser},now(),#{bak},#{tab},#{args})
+ (#{cnName},#{enName},#{status},#{type},#{data},#{category},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{createUser},now(),#{bak},#{tab},#{args},#{pubid})
</insert>
<insert id="inserts">
insert into lf.sys_res
- (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
+ (cn_name,en_name,status,type,data,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args,pubid)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.cnName},#{item.enName},#{item.status},#{item.type},#{item.data},#{item.category},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args})
+ (#{item.cnName},#{item.enName},#{item.status},#{item.type},#{item.data},#{item.category},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args},#{item.pubid})
</foreach>
</insert>
@@ -112,14 +112,14 @@
<update id="update">
update lf.sys_res
- set cn_name=#{cnName},en_name=#{enName},status=#{status},type=#{type},data=#{data},category=#{category},url=#{url},test=#{test},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab},args=#{args}
+ set cn_name=#{cnName},en_name=#{enName},status=#{status},type=#{type},data=#{data},category=#{category},url=#{url},test=#{test},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab},args=#{args},pubid=#{pubid}
where id=#{id}
</update>
<update id="updates">
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_res
- set cn_name=#{item.cnName},en_name=#{item.enName},status=#{item.status},type=#{item.type},data=#{item.data},category=#{item.category},url=#{item.url},test=#{item.test},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args}
+ set cn_name=#{item.cnName},en_name=#{item.enName},status=#{item.status},type=#{item.type},data=#{item.data},category=#{item.category},url=#{item.url},test=#{item.test},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args},pubid=#{item.pubid}
where id = #{item.id}
</foreach>
</update>
--
Gitblit v1.9.3