From 3d00d26d872305635ba041d1e33f1b807c0e818b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 06 十二月 2022 14:52:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/MetaController.java | 50 +++++++++++++++++++++++++++++++++++---------------
src/main/java/com/lf/server/controller/data/DataLoaderController.java | 4 +---
src/main/java/com/lf/server/entity/all/StaticData.java | 5 +++++
3 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataLoaderController.java b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
index 04ca77a..30952e6 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
@@ -52,8 +52,6 @@
@Autowired
DataLoaderService dataLoaderService;
- private final static String POINT = ".";
-
public static List<String> extList = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
@SysLog()
@@ -180,7 +178,7 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(POINT)) {
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
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 ed110b9..652638a 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -1,5 +1,9 @@
package com.lf.server.controller.data;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.HttpStatus;
@@ -11,9 +15,11 @@
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.Md5Helper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
+import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
@@ -109,29 +115,43 @@
}
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ涓婁紶鏁版嵁骞惰繑鍥炶褰曟暟")
+ @ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
@ApiImplicitParams({
- @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")
+ @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")
})
- @GetMapping(value = "/selectByPageForUpload")
- public ResponseMsg<Object> selectByPageForUpload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+ @GetMapping(value = "/selectDbData")
+ public ResponseMsg<Object> selectDbData(Integer id, Integer pageIndex, Integer pageSize) {
+ // noinspection AlibabaRemoveCommentedCode
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ if (null == id || id < 0) {
+ return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
- UserEntity ue = tokenService.getCurrentUser(req);
-
- int count = metaService.selectCountForUpload(name, ue.getId(), StaticData.FILE_TYPES);
- if (count == 0) {
- return success(0, null);
+ MetaEntity meta = metaService.selectById(id);
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
+ return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), StaticData.FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+ String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
+ if (null == baseMapper) {
+ return null;
+ }
- return success(count, list);
+ QueryWrapper wrapper = new QueryWrapper();
+ //wrapper.eq("dirid", meta.getDirid());
+ //wrapper.eq("depid", meta.getDepid());
+ //wrapper.eq("verid", meta.getVerid());
+ wrapper.eq("createuser", meta.getCreateUser());
+ wrapper.eq("createtime", meta.getCreateTime());
+
+ Page<Object> page = new Page<>(pageIndex, pageSize);
+ page.addOrder(OrderItem.asc("gid"));
+ IPage<Object> paged = baseMapper.selectPage(page, wrapper);
+
+ return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
return fail(ex.getMessage(), 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 698a3de..9bde5c2 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -54,4 +54,9 @@
* 涓婁紶鏂囦欢绫诲瀷
*/
public final static String FILE_TYPES = "'xls','shp','gdb','mdb'";
+
+ /**
+ * 瀛楃鐐�
+ */
+ public final static String POINT = ".";
}
--
Gitblit v1.9.3