From 2b170e6c4c20a4fe4f113c5a7ca0f3210c278d7f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 04 二月 2023 15:19:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 0f8d739..cc96e06 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
@@ -9,6 +9,7 @@
import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
+import com.lf.server.service.all.UploadAttachService;
import com.lf.server.service.data.UploadService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -54,6 +55,42 @@
@PostMapping(value = "/uploadFiles")
public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
try {
+ List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
+ if (null == list || list.isEmpty()) {
+ return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
+ }
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ /**
+ * 鎺ユ敹鏁扮粍1锛欯RequestParam(value = "ids")List<Integer> ids
+ * &ids=1209&ids=1180&ids=1387
+ * 鎺ユ敹鏁版嵁2锛欼nteger[] ids
+ * formData.append("ids", 1209); formData.append("ids", 1180); formData.append("ids", 1387);
+ */
+ @SysLog()
+ @ApiOperation(value = "涓婁紶Excel闄勪欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query"),
+ @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹泦鍚�", dataType = "Integer", paramType = "query")
+ })
+ @ResponseBody
+ @PostMapping(value = "/uploadXlsAnnex")
+ public ResponseMsg<Object> uploadXlsAnnex(String path, Integer[] ids, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == ids || ids.length == 0) {
+ return fail("鎵句笉鍒板厓鏁版嵁鐨処D闆嗗悎");
+ }
+
+ List<MetaEntity> ms = metaService.selectXlsAnnex(ids, UploadAttachService.getTabs());
+ if (null == ms || ms.isEmpty()) {
+ return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勫厓鏁版嵁");
+ }
+
List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
@@ -158,9 +195,9 @@
return fail("鍏冩暟鎹枃浠堕泦鍚堜负绌�", null);
}
- List<MetaEntity> metas = uploadService.insertFiles(ue, list, req);
+ uploadService.insertFiles(ue, list, req);
- return success("鎴愬姛", metas);
+ return success("鎴愬姛", list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3