From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
index 950da62..3588d6c 100644
--- a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
+++ b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
@@ -10,8 +10,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -28,21 +29,21 @@
* @date : 2025/9/4 14:16
*/
@RestController
-@Api(tags = "鍔炲叕鐗╄祫")
+@Tag(name = "鍔炲叕鐗╄祫")
@RequestMapping("/officeSupplies")
+@AllArgsConstructor
public class OfficeSuppliesController extends BaseController {
- @Autowired
private OfficeSuppliesService officeSuppliesService;
@GetMapping("/listPage")
- @ApiOperation("鍔炲叕鐗╄祫-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍔炲叕鐗╄祫-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
return officeSuppliesService.listPage(page, officeSupplies);
}
@PostMapping("/add")
- @ApiOperation("鍔炲叕鐗╄祫-娣诲姞")
+ @Operation(summary = "鍔炲叕鐗╄祫-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody OfficeSupplies officeSupplies) {
// 鎸夌収褰撳墠鏃堕棿yyyyMMdd + 褰撳ぉ鏂板鏁伴噺 + 1鐢熸垚缂栧彿
@@ -58,14 +59,14 @@
}
@PostMapping("/update")
- @ApiOperation("鍔炲叕鐗╄祫-淇敼")
+ @Operation(summary = "鍔炲叕鐗╄祫-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody OfficeSupplies officeSupplies) {
return officeSuppliesService.updateById(officeSupplies) ? success() : error();
}
@DeleteMapping("/delete")
- @ApiOperation("鍔炲叕鐗╄祫-鍒犻櫎")
+ @Operation(summary = "鍔炲叕鐗╄祫-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -77,7 +78,7 @@
*/
@Log(title = "瀵煎嚭鍔炲叕鐗╄祫", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鍔炲叕鐗╄祫")
+ @Operation(summary = "瀵煎嚭鍔炲叕鐗╄祫")
public void export(HttpServletResponse response) {
ExcelUtil<OfficeSupplies> util = new ExcelUtil<OfficeSupplies>(OfficeSupplies.class);
List<OfficeSupplies> list = officeSuppliesService.list();
--
Gitblit v1.9.3