From 56c25bcb0dc03aae78aba23f32ebbf548b866332 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期三, 22 二月 2023 14:11:09 +0800
Subject: [PATCH] 20230221@xingjs@提交官网一张图相关内容接口
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 7cf4573..671e0b4 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,6 +3,7 @@
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;
@@ -21,7 +22,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
-import java.util.Map;
/**
* 鏁版嵁鍏ュ簱
@@ -59,7 +59,7 @@
@PostMapping(value = "/uploadFiles")
public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
try {
- List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
+ List<MetaFileEntity> list = uploadService.uploadData(null, path, false, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
@@ -82,32 +82,36 @@
@ApiOperation(value = "涓婁紶Excel闄勪欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query"),
- @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹泦鍚�", dataType = "Integer", 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 {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
if (null == ids || ids.length == 0) {
- return fail("鎵句笉鍒板厓鏁版嵁鐨処D闆嗗悎");
+ return fail("鎵句笉鍒版簮鏁版嵁鐨処D闆嗗悎");
}
List<MetaEntity> ms = metaService.selectXlsAnnex(ids, UploadAttachService.getTabs());
if (null == ms || ms.isEmpty()) {
- return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勫厓鏁版嵁");
+ return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勬簮鏁版嵁");
}
- List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
+ List<MetaFileEntity> list = uploadService.uploadData(null, path, false, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
- Map<String, Integer> map = uploadAttachService.uploadXlsAnnex(ms, list, path);
- if (null == map || map.size() == 0) {
- return fail("娌℃湁瑕佹洿鏂扮殑鍏冩暟鎹�");
+ List<KeyValueEntity> rs = uploadAttachService.uploadXlsAnnex(ue, ms, list, path);
+ if (null == rs || rs.size() == 0) {
+ return fail("娌℃湁瑕佹洿鏂扮殑婧愭暟鎹�");
}
- return success(map);
+ return success(rs);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -192,7 +196,7 @@
@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "鍏冩暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ @ApiImplicitParam(name = "list", value = "婧愭暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/insertFiles")
@@ -203,7 +207,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
if (null == list || list.isEmpty()) {
- return fail("鍏冩暟鎹枃浠堕泦鍚堜负绌�", null);
+ return fail("婧愭暟鎹枃浠堕泦鍚堜负绌�", null);
}
uploadService.insertFiles(ue, list, req);
@@ -215,7 +219,7 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
+ @ApiOperation(value = "鍒犻櫎婧愭暟鎹�")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
--
Gitblit v1.9.3