From 5c3482e853299bcc786a244ca22a05a3a8d380fe Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 17:18:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataLoaderController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 9d2f667..f9bcfc8 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
@@ -7,12 +7,12 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseUploadController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.ctrl.TabMapperEntity;
import com.lf.server.entity.ctrl.UploadEntity;
import com.lf.server.entity.data.DictEntity;
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.StringHelper;
@@ -51,8 +51,6 @@
@Autowired
DataLoaderService dataLoaderService;
- private final static String FILE_TYPES = "'xls','shp','gdb','mdb'";
-
public static List<String> extList = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
@SysLog()
@@ -71,12 +69,12 @@
UserEntity ue = tokenService.getCurrentUser(req);
- int count = metaService.selectCountForUpload(name, ue.getId(), FILE_TYPES);
+ int count = metaService.selectCountForUpload(name, ue.getId(), StaticData.FILE_TYPES);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), StaticData.FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
return success(count, list);
} catch (Exception ex) {
@@ -90,9 +88,9 @@
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
})
@GetMapping(value = "/selectFiles")
- public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
+ public ResponseMsg<List<MetaEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, extList);
+ List<MetaEntity> list = baseUploadService.selectFiles(path, extList);
return success(list);
} catch (Exception ex) {
@@ -152,7 +150,7 @@
MetaEntity me = entity.getMetaEntity();
me.setCreateTime(WebHelper.getCurrentTimestamp());
- me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())));
+ // me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())))
me.setCreateUser(ue.getId());
dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
@@ -166,32 +164,34 @@
@SysLog()
@ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "113"),
+ @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 = "/selectDbData")
public ResponseMsg<Object> selectDbData(Integer id, Integer pageIndex, Integer pageSize) {
+ // noinspection AlibabaRemoveCommentedCode
try {
if (null == id || id < 0) {
return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(".")) {
+ if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
}
QueryWrapper wrapper = new QueryWrapper();
- wrapper.eq("dirid", meta.getDirid());
- wrapper.eq("depid", meta.getDepid());
- wrapper.eq("verid", meta.getVerid());
+ //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);
--
Gitblit v1.9.3