From e8e9d29c54249d8eb1ae458bacc01085e58dc3d8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 11 一月 2023 11:56:26 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/all/StaticData.java | 27 ++++++++++++++++-----------
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 2 +-
src/main/resources/mapper/data/MetaMapper.xml | 5 ++++-
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index f3fc760..3e40e0e 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -220,7 +220,7 @@
UserEntity ue = tokenService.getCurrentUser(req);
- int count = metaService.selectCountForUpload(name, ue.getId(), StaticData.FILE_TYPES);
+ int count = metaService.selectCountForUpload(name, ue.getId(), null);
if (count == 0) {
return success(0, null);
}
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 c171178..7fe9f62 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -80,9 +80,9 @@
public final static String XLS = ".xls";
/**
- * SHP鏂囦欢
+ * xlsx鏂囦欢
*/
- public final static String SHP = ".shp";
+ public final static String XLSX = ".xlsx";
/**
* MDB鏂囦欢
@@ -90,19 +90,24 @@
public final static String MDB = ".mdb";
/**
+ * SHP鏂囦欢
+ */
+ public final static String SHP = ".shp";
+
+ /**
* GDB鏂囦欢
*/
public final static String GDB = ".gdb";
/**
- * xlsx鏂囦欢
- */
- public final static String XLSX = ".xlsx";
-
- /**
* IMG鏂囦欢
*/
public final static String IMG = ".img";
+
+ /**
+ * MPT鏂囦欢
+ */
+ public final static String MPT = ".mpt";
/**
* TIF鏂囦欢
@@ -150,7 +155,7 @@
public final static String DRUID_COOKIE_KEY = "JSESSIONID";
/**
- * 涓婁紶鏂囦欢绫诲瀷
+ * 涓婁紶鏂囦欢绫诲瀷 *
*/
public final static String FILE_TYPES = "'xls','shp','gdb','mdb'";
@@ -167,17 +172,17 @@
/**
* MPT鏂囦欢鎵╁睍鍚�
*/
- public final static List<String> MPT_EXTENSIONS = new ArrayList<>(Arrays.asList(".mpt", ".midx", ".strmi"));
+ public final static List<String> MPT_EXTE = new ArrayList<>(Arrays.asList(".midx", ".strmi"));
/**
* IMG鏂囦欢鎵╁睍鍚�
*/
- public final static List<String> IMG_EXT = new ArrayList<>(Arrays.asList( ".rrd", ".img.aux.xml", ".hdr", ".img.enp", ".img.xml"));
+ public final static List<String> IMG_EXT = new ArrayList<>(Arrays.asList(".rrd", ".img.aux.xml", ".hdr", ".img.enp", ".img.xml"));
/**
* TIF鏂囦欢鎵╁睍鍚�
*/
- public final static List<String> TIF_EXTENSIONS = new ArrayList<>(Arrays.asList(".prj", ".tfw", ".tif.ovr", ".tif.aux.xml", ".tif.enp", ".tif.xml"));
+ public final static List<String> TIF_EXT = new ArrayList<>(Arrays.asList(".prj", ".tfw", ".tif.ovr", ".tif.aux.xml", ".tif.enp", ".tif.xml"));
/**
* TIFF鏂囦欢鎵╁睍鍚�
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 09e5acc..4477401 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -39,7 +39,10 @@
<select id="selectCountForUpload" resultType="java.lang.Integer">
select count(*) from lf.sys_meta
<where>
- create_user = #{createUser} and type in (${types})
+ create_user = #{createUser}
+ <if test="types != null">
+ and type in (${types})
+ </if>
<if test="name != null">
and name like #{name}
</if>
--
Gitblit v1.9.3