From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-tools/src/main/java/com/oying/rest/LocalStorageController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java b/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java
index 47ffe3b..9db5c12 100644
--- a/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java
+++ b/oying-tools/src/main/java/com/oying/rest/LocalStorageController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.service.LocalStorageService;
+import com.oying.utils.R;
import lombok.RequiredArgsConstructor;
import com.oying.annotation.Log;
import com.oying.domain.LocalStorage;
@@ -16,13 +17,14 @@
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
-* @author Z
-* @date 2019-09-05
-*/
+ * @author Z
+ * @date 2019-09-05
+ */
@RestController
@RequiredArgsConstructor
@Api(tags = "工具：本地存储管理")
@@ -34,9 +36,9 @@
@GetMapping
@ApiOperation("查询文件")
@PreAuthorize("@el.check('storage:list')")
- public ResponseEntity<PageResult<LocalStorage>> queryFile(LocalStorageQueryCriteria criteria){
+ public ResponseEntity<Object> queryFile(LocalStorageQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(localStorageService.queryAll(criteria,page),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(localStorageService.queryAll(criteria, page)), HttpStatus.OK);
}
@ApiOperation("导出数据")
@@ -49,30 +51,30 @@
@PostMapping
@ApiOperation("上传文件")
@PreAuthorize("@el.check('storage:add')")
- public ResponseEntity<Object> createFile(@RequestParam String name, @RequestParam("file") MultipartFile file){
+ public ResponseEntity<Object> createFile(@RequestParam String name, @RequestParam("file") MultipartFile file) {
localStorageService.create(name, file);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@ApiOperation("上传图片")
@PostMapping("/pictures")
- public ResponseEntity<LocalStorage> uploadPicture(@RequestParam MultipartFile file){
+ public ResponseEntity<Object> uploadPicture(@RequestParam MultipartFile file) {
// 判断文件是否为图片
String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
- if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){
+ if (!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))) {
throw new BadRequestException("只能上传图片");
}
LocalStorage localStorage = localStorageService.create(null, file);
- return new ResponseEntity<>(localStorage, HttpStatus.OK);
+ return new ResponseEntity<>(R.success(localStorage), HttpStatus.OK);
}
@PutMapping
@Log("修改文件")
@ApiOperation("修改文件")
@PreAuthorize("@el.check('storage:edit')")
- public ResponseEntity<Object> updateFile(@Validated @RequestBody LocalStorage resources){
+ public ResponseEntity<Object> updateFile(@Validated @RequestBody LocalStorage resources) {
localStorageService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除文件")
@@ -80,6 +82,6 @@
@ApiOperation("多选删除")
public ResponseEntity<Object> deleteFile(@RequestBody Long[] ids) {
localStorageService.deleteAll(ids);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3