From ca53e4ba17c2e085762794023bf795498fcd13f1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 二月 2023 19:20:04 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/data/DirMapper.xml | 12 ++++--
data/ts.sql | 27 ++++++++-----
src/main/java/com/lf/server/controller/data/DirController.java | 4 +-
data/db_tab.sql | 35 +++++++++++++++++
src/main/resources/mapper/sys/UserMapper.xml | 6 +-
5 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index e71eb40..366ccce 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1122,4 +1122,39 @@
comment on column lf.sys_layer.bak is '澶囨敞';
select * from lf.sys_layer;
+----------------------------------------------------------------------------------------------------- 34.鏈嶅姟鏃ュ織琛�
+-- DROP TABLE IF EXISTS lf.sys_serve_log;
+create table lf.sys_serve_log(
+ id serial8,
+ resid integer,
+ name varchar(100),
+ type varchar(50),
+ url varchar(4096),
+ create_user integer,
+ create_time timestamp(6) without time zone default now(),
+ bak varchar(1024)
+) partition by range(create_time);
+
+create table lf.sys_serve_log_2023 partition of lf.sys_serve_log for values from ('2023-01-01') to ('2024-01-01');
+create INDEX index_sys_serve_log_2023_optime on lf.sys_serve_log_2023 (create_time);
+create table lf.sys_serve_log_2024 partition of lf.sys_serve_log for values from ('2024-01-01') to ('2025-01-01');
+create INDEX index_sys_serve_log_2024_optime on lf.sys_serve_log_2024 (create_time);
+create table lf.sys_serve_log_2025 partition of lf.sys_serve_log for values from ('2025-01-01') to ('2026-01-01');
+create INDEX index_sys_serve_log_2025_optime on lf.sys_serve_log_2025 (create_time);
+create table lf.sys_serve_log_2026 partition of lf.sys_serve_log for values from ('2026-01-01') to ('2027-01-01');
+create INDEX index_sys_serve_log_2026_optime on lf.sys_serve_log_2026 (create_time);
+create table lf.sys_serve_log_2027 partition of lf.sys_serve_log for values from ('2027-01-01') to ('2028-01-01');
+create INDEX index_sys_serve_log_2027_optime on lf.sys_serve_log_2027 (create_time);
+
+comment on table lf.sys_serve_log is '鏈嶅姟鏃ュ織琛�';
+comment on column lf.sys_serve_log.id is '涓婚敭ID';
+comment on column lf.sys_serve_log.resid is '鏈嶅姟ID';
+comment on column lf.sys_serve_log.name is '鍚嶇О';
+comment on column lf.sys_serve_log.type is '绫诲瀷';
+comment on column lf.sys_serve_log.url is '鍥惧眰鍦板潃';
+comment on column lf.sys_serve_log.create_user is '璁块棶浜篒D';
+comment on column lf.sys_serve_log.create_time is '璁块棶鏃堕棿';
+comment on column lf.sys_serve_log.bak is '澶囨敞';
+
+select * from lf.sys_serve_log;
----------------------------------------------------------------------------------------------------- vacuum analyze md.md_zxcg;
diff --git a/data/ts.sql b/data/ts.sql
index 05e029c..acb8123 100644
--- a/data/ts.sql
+++ b/data/ts.sql
@@ -98,9 +98,6 @@
select depid from bd.dlg_agnp group by depid;
-- update bd.dlg_agnp set depid=1 where depid is null or depid=0
-select * from lf.sys_meta order by id desc limit 10;
-select * from lf.sys_fme_log order by id desc;
-
select * from lf.sys_flow where applyid = 9; -- 47,48,49
select id,userid,depids,tabs,entities,pwd,status,count,descr,wkt from lf.sys_apply;
-- status is '鐘舵�侊細-10-浣滃簾锛�-1-鎵撳洖锛�0~9-瀹℃牳涓紝10-閫氳繃';
@@ -110,20 +107,30 @@
select * from lf.sys_user where id in (47,48,49);
select * from lf.sys_download;
-select * from bs.m_marker where parentid is not null; -- 涓夋々涓�鐗� photono
+select * from bs.m_marker where parentid is not null; -- delete from bs.m_marker; createtime
+select * from bs.m_hydraulic_protection;
-- update bs.m_marker set parentid='df150a0d-eb8c-48d6-887d-c0901f4f61c5' where photono in ('璀︾ず鐗�10002', '璀︾ず鐗�10004', '璀︾ず鐗�10013');
-- INSERT INTO bs.m_marker(eventid, segname, markername, photono, createtime, createuser, dirid, depid, verid) VALUES (md5(''), 'seg', '10002', '璀︾ず鐗�10002', now(), 1, 1, 1, 0);
-- INSERT INTO bs.m_marker(eventid, segname, markername, photono, createtime, createuser, dirid, depid, verid) VALUES (md5(''), 'seg', '10004', '璀︾ず鐗�10004', now(), 1, 1, 1, 0);
-select * from lf.sys_meta where type='xls' order by id desc;
+select * from lf.sys_meta where type='xls' or type='xlsx' order by id desc;
+select * from lf.sys_fme_log order by id desc;
+insert into lf.sys_fme_log (pg_ns,tcdm,create_time) values ('bs','m_marker','2023-02-06 13:26:01');
+insert into lf.sys_fme_log (pg_ns,tcdm) values ('bs','m_marker');
+delete from lf.sys_fme_log where id > 99;
+select * from bs.m_geocontrolpoint where createtime is not null;
+-- delete from bs.m_geocontrolpoint; insert into bs.m_geocontrolpoint(eventid,createtime) values (md5(''),now());
+
+insert into lf.sys_fme_log (pg_ns,tcdm,create_time) values ('bs','m_marker',20230206132933); delete lf.sys_fme_log where id = 99;
select * from lf.sys_meta where type in ('xls', 'xlsx') and eventid is not null and tab is not null and rows > 0 and id in (1209,1180,1387);
select * from lf.sys_attach order by id desc;
+select * from lf.sys_dir where id = 74;
+select * from lf.sys_dict where field='gid';
+select field,type,count(*) from lf.sys_dict where field='gid' group by field,type;
+update lf.sys_dict set type='integer' where field='updateuser';
-
-
-
-
-
+select * from lf.sys_layer;
+alter sequence lf.sys_layer_id_seq restart with 1;
diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java
index 0bd8e77..1fba8f2 100644
--- a/src/main/java/com/lf/server/controller/data/DirController.java
+++ b/src/main/java/com/lf/server/controller/data/DirController.java
@@ -46,9 +46,9 @@
entity.setCreateUser(ue.getId());
}
- int count = dirService.insertDir(entity);
+ dirService.insertDir(entity);
- return success(count);
+ return success(entity.getId());
} catch (Exception ex) {
return fail(ex.getMessage(), -1);
}
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index f6d40df..19a7c28 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -23,10 +23,14 @@
</select>
<insert id="insertDir" parameterType="com.lf.server.entity.data.DirEntity">
- insert into lf.sys_dir
- (pid,name,code,descr,level,order_num,create_user,create_time,bak)
- values
- (#{pid},#{name},#{code},#{descr},#{level} ,#{orderNum},#{createUser},now(),#{bak});
+ <selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
+ select currval('lf.sys_dir_id_seq'::regclass) as id
+ </selectKey>
+
+ insert into lf.sys_dir
+ (pid,name,code,descr,level,order_num,create_user,create_time,bak)
+ values
+ (#{pid},#{name},#{code},#{descr},#{level} ,#{orderNum},#{createUser},now(),#{bak});
</insert>
<insert id="insertDirs">
diff --git a/src/main/resources/mapper/sys/UserMapper.xml b/src/main/resources/mapper/sys/UserMapper.xml
index 30c48d6..dde8de7 100644
--- a/src/main/resources/mapper/sys/UserMapper.xml
+++ b/src/main/resources/mapper/sys/UserMapper.xml
@@ -26,7 +26,7 @@
uname like #{uname}
</if>
</where>
- order by a.id
+ order by a.id desc
limit #{limit} offset #{offset}
</select>
@@ -62,12 +62,12 @@
and a.depid = ANY(fn_rec_array(#{depid}, 'dep'))
</if>
</where>
- order by a.id
+ order by a.id desc
limit #{limit} offset #{offset}
</select>
<select id="selectUserAll" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
- select a.*, fn_rec_query(a.depid, 'dep') depName from lf.sys_user a order by a.id
+ select a.*, fn_rec_query(a.depid, 'dep') depName from lf.sys_user a order by a.id desc
</select>
<select id="selectUser" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
--
Gitblit v1.9.3