From de5c10c0c692dc3cad552821ca78f7ddb4074491 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 二月 2023 16:41:56 +0800
Subject: [PATCH] 1
---
data/db_tab.sql | 3 ++-
src/main/java/com/lf/server/entity/all/StaticData.java | 5 +++++
data/db_cx.sql | 3 +--
data/update.sql | 23 ++++++++++++++++++++++-
src/main/java/com/lf/server/service/all/BaseUploadService.java | 19 +++++++++++++------
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 2 +-
6 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 1e58a1a..39a9a2a 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -375,9 +375,8 @@
order by name;
select modular1, count(*) from lf.sys_operate group by modular1;
-select modular1,modular2,count(*) from lf.sys_operate group by modular1,modular2 order by modular1;
+select modular1,modular2 from lf.sys_operate where modular1 not in ('缁煎悎灞曠ず','鏁版嵁璐ㄦ','鏁版嵁绠＄悊','鏁版嵁浜ゆ崲','鏈嶅姟绠＄悊','绯荤粺瀵规帴','杩愮淮绠＄悊');
delete from lf.sys_operate where modular1 not in ('缁煎悎灞曠ず','鏁版嵁璐ㄦ','鏁版嵁绠＄悊','鏁版嵁浜ゆ崲','鏈嶅姟绠＄悊','绯荤粺瀵规帴','杩愮淮绠＄悊');
-
select id,cn_name,elev from lf.sys_layer where cn_name in ('鐏溅绔�','鍦颁笅绠＄嚎','涓崼绔�','搴嗛槼绔�','鍦板眰绀轰緥');
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 42972da..d20b3ce 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -679,7 +679,7 @@
tabletype varchar(20),
unit varchar(50),
domain_na varchar(100),
- showtype smallint,
+ showtype smallint default 0,
editable smallint,
status smallint default 0,
bak varchar(1024)
@@ -706,6 +706,7 @@
comment on column lf.sys_dict.editable is '鏄惁鍙紪杈�';
comment on column lf.sys_dict.status is '鐘舵�侊細0-姝ｅ父锛�1-鍒犻櫎锛�-1-搴熷純';
comment on column lf.sys_dict.bak is '澶囨敞';
+-- alter table lf.sys_dict alter column showtype set default 0;
-- alter sequence lf.sys_dict_id_seq restart with 300;
select count(*) from lf.sys_dict where status=0 and tab='sys_user';
diff --git a/data/update.sql b/data/update.sql
index cb81795..d2cce58 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -205,6 +205,10 @@
order by c.id limit 1;
select * from lf.sys_role;
+--------------------------------------------------------- 09 lf.sys_dict 1810琛�
+select * from lf.sys_dict where field in ('geom', 'gid', 'eventid', 'parentid');
+
+update lf.sys_dict set showtype = 0 where field in ('geom', 'gid', 'eventid', 'parentid');
--------------------------------------------------------- 09 娴嬭瘯SQL
with rs as (select code from lf.sys_dir where name='瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116DT02锛�')
select fn_rec_query(a.dirid,'dir'),a.* from lf.sys_meta a where dirid = ANY(fn_rec_array((select id from rs), 'dir'));
@@ -286,6 +290,22 @@
from bs.m_pipeline a
group by medium;
-- select * from lf.sys_domain where dom_name='dsg0016';
+
+-- 鎵�鏈夐」鐩殑涓嬭浇涓暟銆佷笅杞芥鏁板拰鏁版嵁鎬婚噺
+with rs as (
+ select a.dircode, c.dcount, c.sizes
+ from lf.sys_meta a
+ inner join lf.sys_meta_down b on a.id = b.metaid
+ inner join lf.sys_download c on b.downid = c.id
+)
+select
+ d.name "椤圭洰鍚嶇О",
+ (select count(*) from rs where rs.dircode like d.code || '%') "涓嬭浇涓暟",
+ (select coalesce(sum(rs.dcount), 0) from rs where rs.dircode like d.code || '%') "涓嬭浇鏁伴噺",
+ (select round(coalesce(sum(rs.dcount * rs.sizes), 0)::numeric, 3) from rs where rs.dircode like d.code || '%') "鏁伴噺鎬婚噺(MB)"
+from lf.sys_dir d
+where pid = 0
+order by d.code;
---------------------------------------------------------
select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value"
from lf.sys_dir a
@@ -305,7 +325,8 @@
select * from lf.sys_user order by id desc
select * from lf.sys_dep where id=36
-
+select * from lf.sys_dict where tab='bs_project'
+select * from bs.bs_project
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index a850243..28ff4cf 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -126,7 +126,7 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = uploadService.selectFiles(path, StaticData.ALL_EXTENSION);
+ List<MetaFileEntity> list = uploadService.selectFiles(path);
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index f2629c0..e82525c 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -235,6 +235,11 @@
public final static List<String> SHP_EXT = new ArrayList<>(Arrays.asList(".shx", ".dbf", ".prj", ".cpg"));
/**
+ * Mapper鎺掗櫎鎵╁睍鍚�
+ */
+ public final static List<String> MAPPER_EXCLUDE_EXT = new ArrayList<>(Arrays.asList(".img.aux.xml", ".img.xml", ".tif.aux.xml", ".tif.xml", ".tiff.aux.xml", ".tiff.xml", ".shp.xml"));
+
+ /**
* 鎵�鏈夋枃浠舵墿灞曞悕
*/
public final static List<String> ALL_EXTENSION = new ArrayList<>(Arrays.asList(".txt", ".xml", ".pdf", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx", ".shp", ".gdb", ".mdb", ".dwg", ".las", ".laz", ".cpt", ".mpt", ".fly", ".efb", ".g3d", ".fbx", ".obj", ".3dm", ".3dml", ".osgb", ".rvt", ".ifc", ".jpg", ".png", ".img", ".tif", ".tiff", ".bmp", ".gif", ".rmvb", ".rm", ".mp3", ".mp4", ".avi", ".wma", ".wmv", ".7z", ".rar", ".zip"));
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index 59d474e..b7c21c7 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -129,7 +129,7 @@
/**
* 鏌ヨ鏂囦欢
*/
- public List<MetaFileEntity> selectFiles(String subPath, List<String> extList) {
+ public List<MetaFileEntity> selectFiles(String subPath) {
String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
File file = new File(root);
@@ -145,7 +145,7 @@
for (File f : files) {
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (null != extList && !extList.contains(extName)) {
+ if (!isExtValid(extName)) {
continue;
}
@@ -190,7 +190,7 @@
* 鏌ヨ鏄犲皠
*/
public List<MetaFileEntity> selectMappers(UserEntity ue, String path, DirEntity dir, VerEntity ver, String epsgCode) {
- List<MetaFileEntity> metas = selectFiles(path, StaticData.ALL_EXTENSION);
+ List<MetaFileEntity> metas = selectFiles(path);
if (null == metas || metas.isEmpty()) {
return null;
}
@@ -252,7 +252,7 @@
File file = new File(path);
if (!file.isDirectory()) {
String extName = FileHelper.getExtension(file);
- if (StaticData.ALL_EXTENSION.contains(extName)) {
+ if (isExtValid(extName)) {
list.add(file);
}
return;
@@ -272,11 +272,18 @@
getFilesByPath(list, f.getPath());
} else {
String extName = FileHelper.getExtension(f);
- if (StaticData.ALL_EXTENSION.contains(extName)) {
+ if (isExtValid(extName)) {
list.add(f);
}
}
}
+ }
+
+ /**
+ * 鎵╁睍鏄惁鏈夋晥
+ */
+ private boolean isExtValid(String extName) {
+ return StaticData.ALL_EXTENSION.contains(extName) && !StaticData.MAPPER_EXCLUDE_EXT.contains(extName);
}
/**
@@ -292,7 +299,7 @@
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (!StaticData.ALL_EXTENSION.contains(extName) || fileName.startsWith("~")) {
+ if (!isExtValid(extName) || fileName.startsWith("~")) {
continue;
}
--
Gitblit v1.9.3