From 14521111ed38f83278e9ffb80c45cf45b8efff24 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 19 十一月 2022 13:18:13 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/DataUploadController.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 11 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 64f2fe8..2707aa2 100644
--- a/src/main/java/com/lf/server/controller/data/DataUploadController.java
+++ b/src/main/java/com/lf/server/controller/data/DataUploadController.java
@@ -3,9 +3,12 @@
 import com.lf.server.annotation.SysLog;
 import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
+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.service.data.UploaderService;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
+import com.lf.server.service.data.DataUploadService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,6 +19,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,15 +34,32 @@
     TokenService tokenService;
 
     @Autowired
-    UploaderService uploaderService;
+    DataUploadService dataUploadService;
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ鐩綍")
-    public ResponseMsg<String> selectPath(HttpServletRequest req) {
+    @GetMapping(value = "/selectPath")
+    public ResponseMsg<String> selectPath() {
         try {
-            //
+            String pathName = dataUploadService.selectPath();
 
-            return success("");
+            return success(pathName);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ鏂囦欢")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+    })
+    @GetMapping(value = "/selectFiles")
+    public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
+        try {
+            List<MetaFileEntity> list = dataUploadService.selectFiles(path);
+
+            return success(list);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
@@ -58,12 +79,12 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            List<MetaFileEntity> list = uploaderService.uploadData(null, path, req, res);
+            List<MetaFileEntity> list = dataUploadService.uploadData(null, path, req, res);
             if (null == list || list.isEmpty()) {
                 return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
             }
 
-            return success(list);
+            return success(list.size());
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
@@ -86,7 +107,7 @@
                 return fail("娌℃湁鎵惧埌鏂囦欢", null);
             }
 
-            int rows = uploaderService.deleteFiles(list);
+            int rows = dataUploadService.deleteFiles(list);
 
             return success("鎴愬姛", rows);
         } catch (Exception ex) {
@@ -97,15 +118,31 @@
     @SysLog()
     @ApiOperation(value = "鎻掑叆鏂囦欢")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "entity", value = "鍏冩暟鎹疄浣撶被", dataType = "MetaEntity", paramType = "body"),
             @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body")
     })
     @ResponseBody
     @PostMapping(value = "/insertFiles")
-    public ResponseMsg<Object> insertFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
+    public ResponseMsg<Object> insertFiles(@RequestBody MetaEntity entity, @RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
         try {
-            //
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
+            }
+            if (null == list || list.isEmpty()) {
+                return fail("娌℃湁鎵惧埌鏂囦欢", null);
+            }
+            if (null == entity) {
+                return fail("鍏冩暟鎹俊鎭负绌�", null);
+            }
 
-            return null;
+            entity.setCreateTime(WebHelper.getCurrentTimestamp());
+            entity.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(entity.getCreateTime().getTime())));
+            entity.setCreateUser(ue.getId());
+
+            int rows = dataUploadService.insertFiles(entity, list);
+
+            return success("鎴愬姛", rows);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }

--
Gitblit v1.9.3