From 0b968fb17aedfb8a50d5d8900a7fcbc907da775e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 24 十一月 2022 15:56:36 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/data/DownloadMapper.xml | 8 ++++----
data/db_tab.sql | 2 +-
src/main/java/com/lf/server/controller/show/ExportController.java | 4 ++--
src/main/java/com/lf/server/mapper/data/DownloadMapper.java | 6 ++++--
src/main/java/com/lf/server/service/data/DownloadService.java | 8 ++++----
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index bbd0e77..be28a21 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -797,7 +797,7 @@
comment on table lf.sys_download is '涓嬭浇璁板綍琛�';
comment on column lf.sys_download.id is '涓婚敭ID';
comment on column lf.sys_download.name is '鍚嶇О';
-comment on column lf.sys_download.type is '绫诲瀷锛�1-ShapeFile锛�2-涓撻鍥�';
+comment on column lf.sys_download.type is '绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹�';
comment on column lf.sys_download.depid is '鍗曚綅ID';
comment on column lf.sys_download.sizes is '鏂囦欢澶у皬锛氬崟浣峂B';
comment on column lf.sys_download.dcount is '涓嬭浇娆℃暟';
diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java
index 2dea184..46fec9c 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -59,11 +59,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForExport(ue.getCreateUser(), name);
+ int count = downloadService.selectCountForUser(ue.getCreateUser(), 2, name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForExport(ue.getCreateUser(), name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 2, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/mapper/data/DownloadMapper.java b/src/main/java/com/lf/server/mapper/data/DownloadMapper.java
index 4be3671..6b3556e 100644
--- a/src/main/java/com/lf/server/mapper/data/DownloadMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DownloadMapper.java
@@ -35,21 +35,23 @@
* 鏍规嵁鐢ㄦ埛ID鏌ヨ璁板綍鏁帮紙鍦ㄧ嚎鍒跺浘锛�
*
* @param createUser 鐢ㄦ埛ID
+ * @param type 绫诲埆
* @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectCountForExport(Integer createUser, String name);
+ public Integer selectCountForUser(Integer createUser, Integer type, String name);
/**
* 鏍规嵁鐢ㄦ埛ID鍒嗛〉鏌ヨ锛堝湪绾垮埗鍥撅級
*
* @param createUser 鐢ㄦ埛ID
+ * @param type 绫诲埆
* @param name 鍚嶇О
* @param limit 璁板綍琛�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<DownloadEntity> selectByPageForExport(Integer createUser, String name, Integer limit, Integer offset);
+ public List<DownloadEntity> selectByPageForUser(Integer createUser, Integer type, String name, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index 10ec12b..0199d31 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -43,17 +43,17 @@
}
@Override
- public Integer selectCountForExport(Integer createUser, String name) {
+ public Integer selectCountForUser(Integer createUser, Integer type, String name) {
name = StringHelper.getLikeStr(name);
- return downloadMapper.selectCountForExport(createUser, name);
+ return downloadMapper.selectCountForUser(createUser, type, name);
}
@Override
- public List<DownloadEntity> selectByPageForExport(Integer createUser, String name, Integer limit, Integer offset) {
+ public List<DownloadEntity> selectByPageForUser(Integer createUser, Integer type, String name, Integer limit, Integer offset) {
name = StringHelper.getLikeStr(name);
- return downloadMapper.selectByPageForExport(createUser, name, limit, offset);
+ return downloadMapper.selectByPageForUser(createUser, type, name, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/DownloadMapper.xml b/src/main/resources/mapper/data/DownloadMapper.xml
index e9c3b4f..8ad23ff 100644
--- a/src/main/resources/mapper/data/DownloadMapper.xml
+++ b/src/main/resources/mapper/data/DownloadMapper.xml
@@ -21,20 +21,20 @@
limit #{limit} offset #{offset}
</select>
- <select id="selectCountForExport" resultType="java.lang.Integer">
+ <select id="selectCountForUser" resultType="java.lang.Integer">
select count(*) from lf.sys_download
<where>
- create_user = #{createUser} and type = 2
+ create_user = #{createUser} and type = #{type}
<if test="name != null">
and name like #{name}
</if>
</where>
</select>
- <select id="selectByPageForExport" resultType="com.lf.server.entity.data.DownloadEntity">
+ <select id="selectByPageForUser" resultType="com.lf.server.entity.data.DownloadEntity">
select * from lf.sys_download
<where>
- create_user = #{createUser} and type = 2
+ create_user = #{createUser} and type = #{type}
<if test="name != null">
and name like #{name}
</if>
--
Gitblit v1.9.3