From e0a2e0aa70bdb102412d7c639f83afe49812ddbc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 07 三月 2023 14:19:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 24ceada..ff88ebd 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -1,7 +1,6 @@
package com.lf.server.controller.show;
import com.lf.server.annotation.SysLog;
-import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.HttpStatus;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
@@ -11,13 +10,12 @@
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.show.PipelineEntity;
import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
-import com.lf.server.mapper.show.MarkMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.all.UploadAttachService;
+import com.lf.server.service.data.DataQueryService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.MarkService;
import com.lf.server.service.show.PipelineService;
@@ -42,7 +40,7 @@
@Api(tags = "缁煎悎灞曠ず\\棣栭〉")
@RestController
@RequestMapping("/comprehensive")
-public class ComprehensiveController extends BaseController {
+public class ComprehensiveController extends ModelController {
@Autowired
BaseQueryService baseQueryService;
@@ -66,6 +64,9 @@
@Autowired
UploadAttachService uploadAttachService;
+
+ @Autowired
+ DataQueryService dataQueryService;
@SysLog()
@ApiOperation(value = "鏌ヨ绠＄嚎")
@@ -155,6 +156,32 @@
}
@SysLog()
+ @ApiOperation(value = "涓婁紶鏂囦欢")
+ @ResponseBody
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tabName", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "lf.sys_style"),
+ @ApiImplicitParam(name = "eventid", value = "涓婚敭", dataType = "String", paramType = "query", example = "fa25979a5ef8b43ba82a0be35b3fb0d4")
+ })
+ @PostMapping(value = "/uploadFiles")
+ public ResponseMsg<Integer> uploadFiles(String tabName, String eventid, @RequestParam("file") MultipartFile[] files, HttpServletRequest req) {
+ try {
+ if (StringHelper.isEmpty(tabName) || StringHelper.isEmpty(eventid)) {
+ return fail("鍙傛暟涓嶈兘涓虹┖", null);
+ }
+ if (null == files || files.length == 0) {
+ return fail("鏂囦欢涓婁紶涓虹┖", 0);
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ Integer count = dataQueryService.uploadFiles(ue, tabName, eventid, files, req);
+
+ return success(count);
+ } catch (Exception ex) {
+ return fail(ex, 0);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "涓嬭浇鏂囦欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "guid", value = "鏂囦欢GUID", dataType = "String", paramType = "query")
--
Gitblit v1.9.3