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 | 13 +++++--------
1 files changed, 5 insertions(+), 8 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..f9bcfc8 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
@@ -13,7 +13,6 @@
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;
@@ -52,8 +51,6 @@
@Autowired
DataLoaderService dataLoaderService;
- private final static String POINT = ".";
-
public static List<String> extList = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
@SysLog()
@@ -91,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) {
@@ -153,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());
@@ -180,11 +177,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(POINT)) {
+ 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;
--
Gitblit v1.9.3