From cf547f4d9c56cf2d86ae60132aa7496bee93bf9c Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 17:12:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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..fe8635a 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
@@ -54,6 +54,37 @@
protected BaseQueryService baseQueryService;
@SysLog()
+ @ApiOperation(value = "鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "metaid", value = "鐖禝D", dataType = "String", paramType = "query", example = "0"),
+ @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 = "/selectPageAndCountByPid")
+ public ResponseMsg<List<MetaEntity>> selectPageAndCountByPid(Integer metaid, String name, Integer pageSize, Integer pageIndex) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+ if (null == metaid || metaid < 1) {
+ return fail("鐖禝D涓嶈兘涓虹┖涓斿ぇ浜�1", null);
+ }
+
+ int count = metaService.selectCountByPid(metaid, name);
+ if (count == 0) {
+ return success(0, null);
+ }
+
+ List<MetaEntity> rs = metaService.selectPageByPid(metaid, name, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
@GetMapping(value = "/selectDepAll")
public ResponseMsg<List<DepEntity>> selectDepAll() {
@@ -168,7 +199,7 @@
@SysLog()
@ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
+ @ApiImplicitParam(name = "id", value = "婧愭暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
})
@@ -177,12 +208,12 @@
// noinspection AlibabaRemoveCommentedCode
try {
if (null == id || id < 0) {
- return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
+ return fail("婧愭暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
MetaEntity meta = metaService.selectById(id);
if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
- return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
+ return fail("鎵句笉鍒版簮鏁版嵁淇℃伅", null);
}
String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
@@ -220,12 +251,12 @@
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);
}
- List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), StaticData.FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), null, pageSize, pageSize * (pageIndex - 1));
return success(count, list);
} catch (Exception ex) {
--
Gitblit v1.9.3