From 0ebc3b238ba7ce52e92ea575f10c12c76d125b26 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 26 五月 2023 18:02:35 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/data/DownloadMapper.xml | 4 ++--
src/main/java/com/lf/server/controller/data/MetaController.java | 4 ++--
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 4 ++--
data/db_cx.sql | 7 +++++++
src/main/java/com/lf/server/controller/show/ExportController.java | 4 ++--
src/main/java/com/lf/server/mapper/data/DownloadMapper.java | 8 ++++----
src/main/java/com/lf/server/controller/show/PipelineController.java | 4 ++--
src/main/java/com/lf/server/service/data/DownloadService.java | 8 ++++----
8 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 1404512..d05b666 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -46,6 +46,13 @@
where type = 2 and serve_type is not null
order by id;
+-- update lf.sys_publish a set url = replace(url, '192.168.20.205:80', '{host}') where position('192.' in url) > 0;
+select * from lf.sys_meta where dircode like '0A%' and type in ('jpg','png') order by name
+select * from lf.sys_model order by id desc limit 200;
+select * from lf.sys_download order by id desc;
+
+
+
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index caebfd1..f116f94 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -714,11 +714,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getId(), 4, name);
+ int count = downloadService.selectCountForUser(ue.getId(), "3,4", name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 4, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "3,4", name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 75c2560..c565155 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -356,11 +356,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getId(), 3, name);
+ int count = downloadService.selectCountForUser(ue.getId(), "3,4", name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 3, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "3,4", name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
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 960f34a..3ba965b 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -63,11 +63,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getId(), 2, name);
+ int count = downloadService.selectCountForUser(ue.getId(), "2", name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 2, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "2", name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/show/PipelineController.java b/src/main/java/com/lf/server/controller/show/PipelineController.java
index e716129..c57fc39 100644
--- a/src/main/java/com/lf/server/controller/show/PipelineController.java
+++ b/src/main/java/com/lf/server/controller/show/PipelineController.java
@@ -157,11 +157,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getId(), 5, name);
+ int count = downloadService.selectCountForUser(ue.getId(), "5", name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 5, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "5", 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 303095f..a20c113 100644
--- a/src/main/java/com/lf/server/mapper/data/DownloadMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DownloadMapper.java
@@ -35,23 +35,23 @@
* 鏍规嵁鐢ㄦ埛ID鏌ヨ璁板綍鏁帮紙鍦ㄧ嚎鍒跺浘锛�
*
* @param createUser 鐢ㄦ埛ID
- * @param type 绫诲埆
+ * @param types 绫诲埆
* @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectCountForUser(Integer createUser, Integer type, String name);
+ public Integer selectCountForUser(Integer createUser, String types, String name);
/**
* 鏍规嵁鐢ㄦ埛ID鍒嗛〉鏌ヨ锛堝湪绾垮埗鍥撅級
*
* @param createUser 鐢ㄦ埛ID
- * @param type 绫诲埆
+ * @param types 绫诲埆
* @param name 鍚嶇О
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<DownloadEntity> selectByPageForUser(Integer createUser, Integer type, String name, Integer limit, Integer offset);
+ public List<DownloadEntity> selectByPageForUser(Integer createUser, String types, 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 8ec1d31..6d4e5f3 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -42,17 +42,17 @@
}
@Override
- public Integer selectCountForUser(Integer createUser, Integer type, String name) {
+ public Integer selectCountForUser(Integer createUser, String types, String name) {
name = StringHelper.getLikeUpperStr(name);
- return downloadMapper.selectCountForUser(createUser, type, name);
+ return downloadMapper.selectCountForUser(createUser, types, name);
}
@Override
- public List<DownloadEntity> selectByPageForUser(Integer createUser, Integer type, String name, Integer limit, Integer offset) {
+ public List<DownloadEntity> selectByPageForUser(Integer createUser, String types, String name, Integer limit, Integer offset) {
name = StringHelper.getLikeUpperStr(name);
- return downloadMapper.selectByPageForUser(createUser, type, name, limit, offset);
+ return downloadMapper.selectByPageForUser(createUser, types, name, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/DownloadMapper.xml b/src/main/resources/mapper/data/DownloadMapper.xml
index 6d5eac0..b830ce4 100644
--- a/src/main/resources/mapper/data/DownloadMapper.xml
+++ b/src/main/resources/mapper/data/DownloadMapper.xml
@@ -24,7 +24,7 @@
<select id="selectCountForUser" resultType="java.lang.Integer">
select count(*) from lf.sys_download
<where>
- create_user = #{createUser} and type = #{type}
+ create_user = #{createUser} and type in (${types})
<if test="name != null">
and (upper(name) like #{name} or upper(descr) like #{name})
</if>
@@ -34,7 +34,7 @@
<select id="selectByPageForUser" resultType="com.lf.server.entity.data.DownloadEntity">
select *, fn_uname(create_user) createName from lf.sys_download
<where>
- create_user = #{createUser} and type = #{type}
+ create_user = #{createUser} and type in (${types})
<if test="name != null">
and (upper(name) like #{name} or upper(descr) like #{name})
</if>
--
Gitblit v1.9.3