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

---
 src/main/java/com/lf/server/controller/data/DataUploadController.java |   93 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 87 insertions(+), 6 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 58298a5..a2a10c5 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,19 @@
 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.ctrl.UploadEntity;
+import com.lf.server.entity.data.DirEntity;
+import com.lf.server.entity.data.MetaEntity;
 import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.VerEntity;
+import com.lf.server.entity.sys.DepEntity;
 import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
 import com.lf.server.service.data.DataUploadService;
+import com.lf.server.service.data.DirService;
+import com.lf.server.service.data.VerService;
+import com.lf.server.service.sys.DepService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,6 +26,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,13 +39,71 @@
 @RequestMapping("/dataUpload")
 public class DataUploadController extends BaseController {
     @Autowired
+    DepService depService;
+
+    @Autowired
+    DirService dirService;
+
+    @Autowired
+    VerService verService;
+
+    @Autowired
     TokenService tokenService;
 
     @Autowired
     DataUploadService dataUploadService;
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ鐩綍")
+    @ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
+    @GetMapping(value = "/selectDepAll")
+    public ResponseMsg<List<DepEntity>> selectDepAll() {
+        try {
+            List<DepEntity> list = depService.selectDepAll();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ鎵�鏈夌洰褰�")
+    @GetMapping(value = "/selectDirAll")
+    public ResponseMsg<List<DirEntity>> selectDirAll() {
+        try {
+            List<DirEntity> list = dirService.selectDirAll();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
+    })
+    @GetMapping(value = "/selectVerByDirid")
+    public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
+        try {
+            if (null == dirid || dirid < 0) {
+                dirid = 0;
+            }
+
+            List<VerEntity> list = verService.selectByDirid(dirid);
+            if (null == list || list.isEmpty()) {
+                list = verService.selectByDirid(0);
+            }
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ璺緞")
     @GetMapping(value = "/selectPath")
     public ResponseMsg<String> selectPath() {
         try {
@@ -114,21 +184,32 @@
     @SysLog()
     @ApiOperation(value = "鎻掑叆鏂囦欢")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+            @ApiImplicitParam(name = "entity", value = "涓婁紶瀹炰綋绫�", dataType = "UploadEntity", paramType = "body")
     })
     @ResponseBody
     @PostMapping(value = "/insertFiles")
-    public ResponseMsg<Object> insertFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
+    public ResponseMsg<Object> insertFiles(@RequestBody UploadEntity entity, 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 || null == entity.getMetaEntity()) {
+                return fail("鍏冩暟鎹俊鎭负绌�", null);
             }
 
-            return null;
+            if (null == entity.getFileEntities() || entity.getFileEntities().isEmpty()) {
+                return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
+            }
+
+            MetaEntity me = entity.getMetaEntity();
+            me.setCreateTime(WebHelper.getCurrentTimestamp());
+            me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())));
+            me.setCreateUser(ue.getId());
+
+            int rows = dataUploadService.insertFiles(me, entity.getFileEntities());
+
+            return success("鎴愬姛", rows);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }

--
Gitblit v1.9.3