From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 99 insertions(+), 5 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..c19eb80 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;
@@ -9,18 +8,21 @@
import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.PublishEntity;
import com.lf.server.entity.show.PipelineEntity;
+import com.lf.server.entity.sys.AttachEntity;
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.data.PublishService;
import com.lf.server.service.show.MarkService;
import com.lf.server.service.show.PipelineService;
+import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -42,7 +44,7 @@
@Api(tags = "缁煎悎灞曠ず\\棣栭〉")
@RestController
@RequestMapping("/comprehensive")
-public class ComprehensiveController extends BaseController {
+public class ComprehensiveController extends ModelController {
@Autowired
BaseQueryService baseQueryService;
@@ -53,10 +55,13 @@
TokenService tokenService;
@Autowired
- BaseUploadService baseUploadService;
+ AttachService attachService;
@Autowired
DownlogService downlogService;
+
+ @Autowired
+ PublishService publishService;
@Autowired
DownloadService downloadService;
@@ -65,7 +70,29 @@
PipelineService pipelineService;
@Autowired
+ DataQueryService dataQueryService;
+
+ @Autowired
+ BaseUploadService baseUploadService;
+
+ @Autowired
UploadAttachService uploadAttachService;
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ鍙戝竷娓呭崟")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectPubById")
+ public ResponseMsg<PublishEntity> selectPubById(int id) {
+ try {
+ PublishEntity entity = publishService.selectById(id);
+
+ return success(entity);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
@SysLog()
@ApiOperation(value = "鏌ヨ绠＄嚎")
@@ -155,6 +182,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")
@@ -239,4 +292,45 @@
return fail(ex, null);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tabName", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "lf.sys_style"),
+ @ApiImplicitParam(name = "eventid", value = "涓婚敭", dataType = "String", paramType = "query", example = "fa25979a5ef8b43ba82a0be35b3fb0d4")
+ })
+ @GetMapping(value = "/selectFiles")
+ public ResponseMsg<List<AttachEntity>> selectFiles(String tabName, String eventid) {
+ try {
+ if (StringHelper.isEmpty(tabName) || StringHelper.isEmpty(eventid)) {
+ return fail("鍙傛暟涓嶈兘涓虹┖", null);
+ }
+
+ List<AttachEntity> list = attachService.selectByTab(tabName, eventid);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鍒犻櫎鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
+ })
+ @GetMapping(value = "/deletes")
+ public ResponseMsg<Integer> deleteFiles(@RequestParam List<Integer> ids) {
+ try {
+ if (ids == null || ids.isEmpty()) {
+ return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
+ }
+
+ int rows = attachService.deletes(ids);
+
+ return success(rows);
+ } catch (Exception ex) {
+ return fail(ex, 0);
+ }
+ }
}
--
Gitblit v1.9.3