From da4495adb23e6bd4e0cbf70f98f35ba04231a78b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 04 二月 2024 17:36:04 +0800
Subject: [PATCH] 添加 根据资料类别查询目录 接口
---
src/main/java/com/lf/server/service/show/DataLibService.java | 55 +++++++++++++++++++++++----
src/main/java/com/lf/server/service/all/BaseQueryService.java | 7 +++
src/main/resources/mapper/all/BaseQueryMapper.xml | 19 +++++++++
src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java | 9 ++++
src/main/java/com/lf/server/controller/show/DataLibController.java | 7 ++-
5 files changed, 85 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 9694661..a98f2c6 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -21,7 +21,6 @@
import com.lf.server.service.data.MetaService;
import com.lf.server.service.data.VerService;
import com.lf.server.service.show.DataLibService;
-import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -87,19 +86,21 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
@ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
- @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
+ @ApiImplicitParam(name = "types", value = "璧勬枡绫诲埆", dataType = "String", paramType = "query", example = "鍩虹娴嬬粯,鍩虹鍦扮伨,鍩虹鍕樺療,鍚堣鏁版嵁,绠＄悊鏁版嵁,娴嬬粯锛圗SV锛�,鍕樺療锛圗GE锛�,鍦扮伨锛圗GD锛�,娲炲簱锛圗GD锛�"),
+ @ApiImplicitParam(name = "dirs", value = "椤圭洰缂栫爜", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectMetasForPage")
- public ResponseMsg<Object> selectMetasForPage(String depcode, String dirs, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<Object> selectMetasForPage(String depcode, String types, String dirs, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
dirs = DataLibService.copeCodes(dirs, "dircode");
+
int count = metaService.selectMetasForCount(depcode, dirs, name);
if (count == 0) {
return success(0, null);
diff --git a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
index 60a360a..dab9b53 100644
--- a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
+++ b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
@@ -103,6 +103,15 @@
public List<KeyValueEntity> selectDirTypes(String name);
/**
+ * 鏍规嵁璧勬枡绫诲埆鏌ヨ鐩綍
+ *
+ * @param types
+ * @param dirs
+ * @return
+ */
+ public List<KeyValueEntity> selectDirsByTypes(String types, String dirs);
+
+ /**
* 鏍规嵁琛ㄥ悕鏌ヨ闄勪欢
*
* @param tab 琛ㄥ悕
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index bb7b110..e8e8e7b 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -79,7 +79,7 @@
if (Character.isUpperCase(ch)) {
sb.append('_');
sb.append(Character.toLowerCase(ch));
- }else {
+ } else {
sb.append(ch);
}
}
@@ -324,6 +324,11 @@
}
@Override
+ public List<KeyValueEntity> selectDirsByTypes(String types, String dirs) {
+ return baseQueryMapper.selectDirsByTypes(types, dirs);
+ }
+
+ @Override
public List<AttachEntity> selectAnnexByTab(String tab, String gids) {
return baseQueryMapper.selectAnnexByTab(tab, gids);
}
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index cb9c738..88f9bf4 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.lf.server.entity.ctrl.DownloadReqEntity;
+import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.sys.AttachEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -17,6 +18,7 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.io.File;
import java.util.*;
@@ -26,6 +28,7 @@
* @author WWW
*/
@Service
+@SuppressWarnings("ALL")
public class DataLibService {
@Autowired
PathHelper pathHelper;
@@ -284,15 +287,16 @@
return null;
}
- List<String> list = codesAsList(codes);
- list = copeDirCodes(list);
+ List<String> list = Arrays.asList(codes.split(","));
+ //List<String> list = codesAsList(codes);
+ //list = copeDirCodes(list);
setRightLike(list, field);
return "(" + StringHelper.join(list, " or ") + ")";
}
/**
- * 鍗曚綅缂栫爜杞泦鍚�
+ * 鍗曚綅缂栫爜杞泦鍚� *
*/
private static List<String> codesAsList(String codes) {
List<String> list = Arrays.asList(codes.split(","));
@@ -305,7 +309,7 @@
}
/**
- * 澶勭悊鐩綍缂栫爜
+ * 澶勭悊鐩綍缂栫爜 *
*/
private static List<String> copeDirCodes(List<String> list) {
List<String> prjList = getDirCodesByLen(list, 0, 2);
@@ -324,7 +328,7 @@
}
/**
- * 鏍规嵁闀垮害鑾峰彇鍗曚綅缂栫爜
+ * 鏍规嵁闀垮害鑾峰彇鍗曚綅缂栫爜 *
*/
private static List<String> getDirCodesByLen(List<String> list, int start, int end) {
List<String> rs = new ArrayList<>();
@@ -342,7 +346,7 @@
}
/**
- * 杩囨护椤圭洰缂栫爜
+ * 杩囨护椤圭洰缂栫爜 *
*/
private static List<String> filterCodes(List<String> prjList, List<String> appList) {
int i = 0;
@@ -369,14 +373,49 @@
* 璁剧疆 鍙砽ike
*/
private static void setRightLike(List<String> list, String field) {
- if (list.isEmpty()) {
+ /*if (list.isEmpty()) {
list.add("1 = 2");
return;
- }
+ }*/
for (int i = 0, c = list.size(); i < c; i++) {
String str = String.format("%s like '%s%%'", field, list.get(i));
list.set(i, str);
}
}
+
+ /**
+ * 鏍规嵁璧勬枡绫诲埆鑾峰彇鐩綍缂栫爜
+ */
+ public String getDirsByTypes(String types, String dirs, String field) {
+ if (StringUtils.isEmpty(types) && StringUtils.isEmpty(dirs)) {
+ return null;
+ }
+
+ if (!StringUtils.isEmpty(types)) {
+ List<KeyValueEntity> list = baseQueryService.selectDirsByTypes(types, dirs);
+ if (null == list || list.isEmpty()) {
+ return null;
+ }
+
+ return copeDirs(list, field);
+ }
+
+ return copeCodes(dirs, field);
+ }
+
+ /**
+ * 澶勭悊鐩綍缂栫爜
+ */
+ public static String copeDirs(List<KeyValueEntity> kvs, String field) {
+ List<String> list = new ArrayList<>();
+ for (KeyValueEntity kv : kvs) {
+ String[] dirs = kv.getValue().split(",");
+ for (String dir : dirs) {
+ list.add(String.format("%s like '%s%%'", field, dir));
+ }
+ }
+
+ return "(" + StringHelper.join(list, " or ") + ")";
+ }
}
diff --git a/src/main/resources/mapper/all/BaseQueryMapper.xml b/src/main/resources/mapper/all/BaseQueryMapper.xml
index 9c2b957..4ee9e12 100644
--- a/src/main/resources/mapper/all/BaseQueryMapper.xml
+++ b/src/main/resources/mapper/all/BaseQueryMapper.xml
@@ -86,6 +86,25 @@
order by key
</select>
+ <select id="selectDirsByTypes" resultType="com.lf.server.entity.ctrl.KeyValueEntity">
+ select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value"
+ from lf.sys_dir a
+ <where>
+ 1 = 1
+ <if test="types != null">
+ and name in
+ <foreach item="type" collection="types" open="(" separator="," close=")">
+ #{type}
+ </foreach>
+ </if>
+ <if test="dirs != null">
+ and ${dirs}
+ </if>
+ </where>
+ group by name
+ order by key
+ </select>
+
<select id="selectAnnexByTab" resultType="com.lf.server.entity.sys.AttachEntity">
select a.* from lf.sys_attach a
<where>
--
Gitblit v1.9.3