From d91c78e445e49cda5430bd33ef281f60f56a0a2d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 05 二月 2023 20:09:10 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 20 ++++++++++++++++++--
1 files changed, 18 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 e45ef20..3850d3c 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
@@ -3,12 +3,14 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.KeyValueEntity;
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.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;
@@ -31,6 +33,9 @@
public class UploadController extends QueryController {
@Autowired
UploadService uploadService;
+
+ @Autowired
+ UploadAttachService uploadAttachService;
@SysLog()
@ApiOperation(value = "鏌ヨ璺緞")
@@ -59,6 +64,8 @@
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
+ uploadService.copePath(list);
+
return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
@@ -81,11 +88,15 @@
@PostMapping(value = "/uploadXlsAnnex")
public ResponseMsg<Object> uploadXlsAnnex(String path, Integer[] ids, HttpServletRequest req, HttpServletResponse res) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
if (null == ids || ids.length == 0) {
return fail("鎵句笉鍒板厓鏁版嵁鐨処D闆嗗悎");
}
- List<MetaEntity> ms = metaService.selectXlsAnnex(ids);
+ List<MetaEntity> ms = metaService.selectXlsAnnex(ids, UploadAttachService.getTabs());
if (null == ms || ms.isEmpty()) {
return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勫厓鏁版嵁");
}
@@ -95,7 +106,12 @@
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
- return success(list);
+ List<KeyValueEntity> rs = uploadAttachService.uploadXlsAnnex(ue, ms, list, path);
+ if (null == rs || rs.size() == 0) {
+ return fail("娌℃湁瑕佹洿鏂扮殑鍏冩暟鎹�");
+ }
+
+ return success(rs);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3