From e26af85e049516e6ce2b082bc2bc90bf71643e95 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 24 三月 2023 09:06:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataQueryController.java | 57 +++++++++++++--------------------------------------------
1 files changed, 13 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataQueryController.java b/src/main/java/com/lf/server/controller/data/DataQueryController.java
index f9f3f00..ede92a2 100644
--- a/src/main/java/com/lf/server/controller/data/DataQueryController.java
+++ b/src/main/java/com/lf/server/controller/data/DataQueryController.java
@@ -3,10 +3,10 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseQueryController;
import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.sys.AttachEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.DataQueryService;
-import com.lf.server.service.sys.AttachService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -16,75 +16,44 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
-import java.util.List;
/**
* 鏁版嵁妫�绱�
* @author WWW
*/
-@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁妫�绱�")
+@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁鏌ヨ")
@RestController
@RequestMapping("/dataQuery")
public class DataQueryController extends BaseQueryController {
@Autowired
- AttachService attachService;
+ TokenService tokenService;
@Autowired
DataQueryService dataQueryService;
@SysLog()
- @ApiOperation(value = "鏌ヨ鏂囦欢")
+ @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")
})
- @GetMapping(value = "/selectFiles")
- public ResponseMsg<List<AttachEntity>> selectFiles(String tabName, String eventid) {
+ @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);
}
-
- List<AttachEntity> list = attachService.selectByTab(tabName, eventid);
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒犻櫎鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "tabName", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "bd.b_pac_frozensoil"),
- @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);
+ if (null == files || files.length == 0) {
+ return fail("鏂囦欢涓婁紶涓虹┖", 0);
}
- int rows = attachService.deletes(ids);
-
- return success(rows);
- } catch (Exception ex) {
- return fail(ex.getMessage(), 0);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓婁紶鏂囦欢")
- @ResponseBody
- @PostMapping(value = "/uploadFiles")
- public ResponseMsg<Integer> uploadFiles(@RequestParam("file") MultipartFile[] files, HttpServletRequest req) {
- try {
- Integer count = dataQueryService.uploadFiles(files, req);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ Integer count = dataQueryService.uploadFiles(ue, tabName, eventid, files, req);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), 0);
+ return fail(ex, 0);
}
}
}
--
Gitblit v1.9.3