From a79ccae02cf7125735e5c1c4c0541fd288338828 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 13 二月 2023 15:43:33 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/data/DirMapper.xml | 2 +-
data/db_fn.sql | 14 ++++++++++++++
data/db_tab.sql | 6 +++++-
src/main/resources/mapper/sys/LayerMapper.xml | 12 ++++++------
src/main/java/com/lf/server/entity/sys/LayerEntity.java | 20 ++++++++++++++++++++
5 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 1aa9547..a02170e 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -343,8 +343,22 @@
/*insert into lf.sys_dep (pid,name,level,order_num) values (0,'鏂板崟浣�',1,2);
delete from lf.sys_dep where pid = 0 and id > 1;*/
----------------------------------------------------------------------------------------------------- 15.鐩綍琛ㄨЕ鍙戝櫒
+-- drop function fn_dir_insert();
+create or replace function fn_dir_insert() returns trigger as $$
+ begin
+ update lf.sys_dir set code = fn_get_next_code(new.pid, 2) where id = new.id;
+
+ return new;
+ end;
+$$ language plpgsql;
+-- drop trigger fn_dir_trigger on lf.sys_dep;
+create or replace trigger fn_dir_trigger after insert on lf.sys_dir
+for each row execute procedure fn_dir_insert();
+select * from lf.sys_dir where pid = 0 order by id;
+/*insert into lf.sys_dir (pid,name,level,order_num) values (0,'鏂扮洰褰�',1,6);
+delete from lf.sys_dir where pid = 0 and id > 309;*/
----------------------------------------------------------------------------------------------------- 16.璺緞鍒嗘瀽
-- 鍒犻櫎宸插瓨鍦ㄧ殑鍑芥暟
drop function pgr_fromAtoB(varchar, double precision, double precision, double precision, double precision);
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 145a649..442fa9b 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1091,6 +1091,8 @@
level integer,
order_num integer,
is_show smallint,
+ serve_type varchar(10),
+ data_type varchar(20),
create_user integer,
create_time timestamp(6) without time zone default now(),
update_user integer,
@@ -1109,13 +1111,15 @@
comment on column lf.sys_layer.level is '灞傜骇锛�0-鏍硅妭鐐�';
comment on column lf.sys_layer.order_num is '鎺掑簭鍙�';
comment on column lf.sys_layer.is_show is '鏄惁鏄剧ず';
+comment on column lf.sys_layer.serve_type is '鏈嶅姟绫诲瀷';
+comment on column lf.sys_layer.data_type is '鏁版嵁绫诲瀷';
comment on column lf.sys_layer.create_user is '鍒涘缓浜篒D';
comment on column lf.sys_layer.create_time is '鍒涘缓鏃堕棿';
comment on column lf.sys_layer.update_user is '鏇存柊浜篒D';
comment on column lf.sys_layer.update_time is '鏇存柊鏃堕棿';
comment on column lf.sys_layer.bak is '澶囨敞';
-select * from lf.sys_layer;
+select * from lf.sys_layer order by id;
----------------------------------------------------------------------------------------------------- 33.鏈嶅姟鏃ュ織琛�
-- DROP TABLE IF EXISTS lf.sys_serve_log;
create table lf.sys_serve_log(
diff --git a/src/main/java/com/lf/server/entity/sys/LayerEntity.java b/src/main/java/com/lf/server/entity/sys/LayerEntity.java
index ffb1e29..a83e7c0 100644
--- a/src/main/java/com/lf/server/entity/sys/LayerEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/LayerEntity.java
@@ -42,6 +42,10 @@
private String bak;
+ private String serveType;
+
+ private String dataType;
+
public LayerEntity() {
}
@@ -172,4 +176,20 @@
public void setBak(String bak) {
this.bak = bak;
}
+
+ public String getServeType() {
+ return serveType;
+ }
+
+ public void setServeType(String serveType) {
+ this.serveType = serveType;
+ }
+
+ public String getDataType() {
+ return dataType;
+ }
+
+ public void setDataType(String dataType) {
+ this.dataType = dataType;
+ }
}
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index d917a0e..7d9a71a 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -22,7 +22,7 @@
select * from rs order by order_num;
</select>
<!-- 鎻掑叆涓�鏉� -->
- <insert id="insert" parameterType="com.lf.server.entity.sys.DirEntity">
+ <insert id="insert" parameterType="com.lf.server.entity.data.DirEntity">
<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
select currval('lf.sys_dir_id_seq'::regclass) as id
</selectKey>
diff --git a/src/main/resources/mapper/sys/LayerMapper.xml b/src/main/resources/mapper/sys/LayerMapper.xml
index 8ed1596..458cf96 100644
--- a/src/main/resources/mapper/sys/LayerMapper.xml
+++ b/src/main/resources/mapper/sys/LayerMapper.xml
@@ -31,17 +31,17 @@
<insert id="insert" parameterType="com.lf.server.entity.sys.LayerEntity">
insert into lf.sys_layer
- (pid,cn_name,en_name,url,test_url,type,icon,level,order_num,is_show,create_user,create_time,bak)
+ (pid,cn_name,en_name,url,test_url,type,icon,level,order_num,is_show,create_user,create_time,bak,serve_type,data_type)
values
- (#{pid},#{cnName},#{enName},#{url},#{testUrl},#{type},#{icon},#{level},#{orderNum},#{isShow},#{createUser},now(),#{bak})
+ (#{pid},#{cnName},#{enName},#{url},#{testUrl},#{type},#{icon},#{level},#{orderNum},#{isShow},#{createUser},now(),#{bak},#{serveType},#{dataType})
</insert>
<insert id="inserts">
insert into lf.sys_layer
- (pid,cn_name,en_name,url,test_url,type,icon,level,order_num,is_show,create_user,create_time,bak)
+ (pid,cn_name,en_name,url,test_url,type,icon,level,order_num,is_show,create_user,create_time,bak,serve_type,data_type)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.testUrl},#{item.type},#{item.icon},#{item.level},#{item.orderNum},#{item.isShow},#{item.createUser},now(),#{item.bak})
+ (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.testUrl},#{item.type},#{item.icon},#{item.level},#{item.orderNum},#{item.isShow},#{item.createUser},now(),#{item.bak},#{item.serveType},#{item.dataType})
</foreach>
</insert>
@@ -58,7 +58,7 @@
<update id="update">
update lf.sys_layer
- set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},test_url=#{testUrl},type=#{type},icon=#{icon},level=#{level},order_num=#{orderNum},is_show=#{isShow},update_user=#{updateUser},update_time=now(),bak=#{bak}
+ set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},test_url=#{testUrl},type=#{type},icon=#{icon},level=#{level},order_num=#{orderNum},is_show=#{isShow},update_user=#{updateUser},update_time=now(),bak=#{bak},serve_type=#{serveType},data_type=#{dataType}
where id=#{id}
</update>
@@ -66,7 +66,7 @@
<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},test_url=#{item.testUrl},type=#{item.type},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},is_show=#{item.isShow},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak}
+ pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},test_url=#{item.testUrl},type=#{item.type},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},is_show=#{item.isShow},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},serve_type=#{item.serveType},data_type=#{item.dataType}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3