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 |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 20d37e1..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;
@@ -41,11 +40,12 @@
     @SysLog()
     @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")
     })
     @GetMapping(value = "/selectByPageForUpload")
-    public ResponseMsg<Object> selectByPageForUpload(Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+    public ResponseMsg<Object> selectByPageForUpload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -53,12 +53,12 @@
 
             UserEntity ue = tokenService.getCurrentUser(req);
 
-            int count = metaService.selectCountForUpload(ue.getId(), FILE_TYPES);
+            int count = metaService.selectCountForUpload(name, ue.getId(), FILE_TYPES);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<MetaEntity> list = metaService.selectByPageForUpload(ue.getId(), FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+            List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, list);
         } catch (Exception ex) {
@@ -72,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) {
@@ -105,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