From f2878af9a5edf96407e5a6740d8e89fe4f4c27c1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 14:46:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataUploadController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataUploadController.java b/src/main/java/com/lf/server/controller/data/DataUploadController.java
index 21f8af6..bcc5505 100644
--- a/src/main/java/com/lf/server/controller/data/DataUploadController.java
+++ b/src/main/java/com/lf/server/controller/data/DataUploadController.java
@@ -5,7 +5,6 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.ctrl.UploadEntity;
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.StringHelper;
import com.lf.server.helper.WebHelper;
@@ -73,9 +72,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, null);
+ List<MetaEntity> list = baseUploadService.selectFiles(path, null);
return success(list);
} catch (Exception ex) {
@@ -106,7 +105,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());
int rows = dataUploadService.insertFiles(me, entity.getFileEntities());
--
Gitblit v1.9.3