From ec4a6960e2a8347b4860aeab4fbf641c8640c633 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 23 三月 2023 11:20:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/data/PublishEntity.java | 10 +++++
src/main/java/com/lf/server/helper/RestHelper.java | 9 ++++
src/main/resources/mapper/show/PublishMapper.xml | 12 +++---
src/main/java/com/lf/server/service/data/FmeService.java | 30 +++++++++++++++
data/db_tab.sql | 3 +
data/db_cx.sql | 4 +-
src/main/resources/application.yml | 4 +-
7 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 887aba6..e67cb4b 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -34,8 +34,8 @@
select * from bd.b_borehole limit 10;
select * from lf.sys_layer order by id desc;
-
-
+select * from lf.sys_publish
+select length('a31a2492-66f0-430a-875b-24eb6f4752c2')
diff --git a/data/db_tab.sql b/data/db_tab.sql
index e18d3ba..7ba6609 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1250,6 +1250,7 @@
-- drop table if exists lf.sys_publish;
create table lf.sys_publish(
id serial primary key,
+ regid varchar(40),
name varchar(50),
url varchar(512),
path varchar(200),
@@ -1271,6 +1272,7 @@
create index idx_sys_publish_geom on lf.sys_publish using gist (geom);
comment on table lf.sys_publish is '鏁版嵁鍙戝竷琛�';
comment on column lf.sys_publish.id is '涓婚敭ID';
+comment on column lf.sys_publish.regid is '娉ㄥ唽ID';
comment on column lf.sys_publish.name is '鍚嶇О';
comment on column lf.sys_publish.url is '鍦板潃';
comment on column lf.sys_publish.path is '璺緞';
@@ -1286,6 +1288,7 @@
comment on column lf.sys_publish.update_user is '鏇存柊浜篒D';
comment on column lf.sys_publish.update_time is '鏇存柊鏃堕棿';
comment on column lf.sys_publish.bak is '澶囨敞';
+-- alter table lf.sys_publish add column regid varchar(40);
-- insert into lf.sys_publish (name,geom) values ('Test',ST_GeomFromText('POINT Z (101.9281 36.58675 2199.5)'));
select st_astext(geom) "wkt",a.* from lf.sys_publish a;
diff --git a/src/main/java/com/lf/server/entity/data/PublishEntity.java b/src/main/java/com/lf/server/entity/data/PublishEntity.java
index 2a5f4b0..bbb6d7f 100644
--- a/src/main/java/com/lf/server/entity/data/PublishEntity.java
+++ b/src/main/java/com/lf/server/entity/data/PublishEntity.java
@@ -12,6 +12,8 @@
private int id;
+ private String regid;
+
private String name;
private String url;
@@ -63,6 +65,14 @@
this.id = id;
}
+ public String getRegid() {
+ return regid;
+ }
+
+ public void setRegid(String regid) {
+ this.regid = regid;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/com/lf/server/helper/RestHelper.java b/src/main/java/com/lf/server/helper/RestHelper.java
index b519371..654686e 100644
--- a/src/main/java/com/lf/server/helper/RestHelper.java
+++ b/src/main/java/com/lf/server/helper/RestHelper.java
@@ -237,4 +237,13 @@
return rest.postForObject(uri, list, String.class);
}
+
+ /**
+ * DELETE璇锋眰锛圧EST锛�
+ */
+ public static void deleteForRest(String uri) {
+ RestTemplate rest = getRestTemplate();
+
+ rest.delete(uri);
+ }
}
diff --git a/src/main/java/com/lf/server/service/data/FmeService.java b/src/main/java/com/lf/server/service/data/FmeService.java
index dad628a..e2c204e 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -3,6 +3,7 @@
import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.entity.ctrl.NameValueEntity;
import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.PublishEntity;
import com.lf.server.helper.RestHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
@@ -253,6 +254,35 @@
}
/**
+ * 鏈嶅姟娉ㄥ唽
+ */
+ public void serverRegiste() {
+ //
+ }
+
+ /**
+ * 鏈嶅姟鐢宠
+ */
+ public String serverApply(String id, Integer pubid, HttpServletRequest req) {
+ String url = getUrl("resource/res/request", req) + "&resourceid=" + id;
+
+ List<NameValueEntity> list = new ArrayList<>();
+ list.add(new NameValueEntity("reason", "娉ㄥ唽"));
+ list.add(new NameValueEntity("serialnum", pubid.toString()));
+
+ return RestHelper.postForRest(url, list);
+ }
+
+ /**
+ * 鍒犻櫎璧勬簮
+ */
+ public void deleteRes(String id, HttpServletRequest req) {
+ String url = getUrl("resource/res/hashid", req) + "&hashid=" + id;
+
+ RestHelper.deleteForRest(url);
+ }
+
+ /**
* 鑾峰彇Url
*/
public String getUrl(String subUrl, HttpServletRequest req) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2e59a86..db6c6c2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,8 +41,8 @@
datasource:
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
- #url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
- url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
#url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
username : postgres
password: Postgres!_14_Lf
diff --git a/src/main/resources/mapper/show/PublishMapper.xml b/src/main/resources/mapper/show/PublishMapper.xml
index 87a99fd..555f3e0 100644
--- a/src/main/resources/mapper/show/PublishMapper.xml
+++ b/src/main/resources/mapper/show/PublishMapper.xml
@@ -78,17 +78,17 @@
<insert id="insert" parameterType="com.lf.server.entity.data.PublishEntity">
insert into lf.sys_publish
- (name,url,path,type,status,dirid,depid,min,max,json,create_user,create_time,geom,bak)
+ (regid,name,url,path,type,status,dirid,depid,min,max,json,create_user,create_time,geom,bak)
values
- (#{name},#{url},#{path},#{type},#{status},#{dirid},#{depid},#{min},#{max},#{json},#{createUser},now(),#{geom},#{bak})
+ (#{regid},#{name},#{url},#{path},#{type},#{status},#{dirid},#{depid},#{min},#{max},#{json},#{createUser},now(),#{geom},#{bak})
</insert>
<insert id="inserts">
insert into lf.sys_publish
- (name,url,path,type,status,dirid,depid,min,max,json,create_user,create_time,geom,bak)
+ (regid,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.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})
+ (#{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.geom},#{item.bak})
</foreach>
</insert>
@@ -104,7 +104,7 @@
<update id="update">
update lf.sys_publish
- set 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}
+ 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(),geom=#{geom},bak=#{bak}
where id=#{id}
</update>
@@ -112,7 +112,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_publish
<set>
- 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}
+ 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(),geom=#{item.geom},bak=#{item.bak}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3