From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index 09cd5c5..9bf1e71 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.ctrl.TabMapperEntity;
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.WebHelper;
import com.lf.server.service.all.BaseUploadService;
@@ -30,7 +31,7 @@
@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁涓婁紶")
@RestController
@RequestMapping("/dataLoader")
-public class UploadController extends SelectController {
+public class UploadController extends QueryController {
@Autowired
protected DataLoaderService dataLoaderService;
@@ -40,7 +41,7 @@
@Autowired
protected DataUploadService dataUploadService;
- private final static List<String> extList = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
+ private final static List<String> EXT_LIST = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
@SysLog()
@ApiOperation(value = "鏌ヨ璺緞")
@@ -50,6 +51,26 @@
String pathName = baseUploadService.selectPath();
return success(pathName);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓婁紶鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+ })
+ @ResponseBody
+ @PostMapping(value = "/uploadFiles")
+ public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ List<MetaFileEntity> list = baseUploadService.uploadData(null, path, req, res);
+ if (null == list || list.isEmpty()) {
+ return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
+ }
+
+ return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -79,7 +100,7 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaEntity>> selectFiles(String path) {
try {
- List<MetaEntity> list = baseUploadService.selectFiles(path, extList);
+ List<MetaEntity> list = baseUploadService.selectFiles(path, EXT_LIST);
return success(list);
} catch (Exception ex) {
@@ -166,31 +187,6 @@
dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
return success("鎴愬姛", entity.getTabEntities());
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓婁紶鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
- })
- @ResponseBody
- @PostMapping(value = "/uploadFiles")
- public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- return fail("鐢ㄦ埛鏈櫥褰�", null);
- }
-
- List<MetaEntity> list = baseUploadService.uploadData(null, path, req, res);
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
- }
-
- return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3