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/safe/controller/SafeTrainingController.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
index 3ea4689..dd8b6f5 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
@@ -3,18 +3,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.dto.SafeTrainingDto;
-import com.ruoyi.safe.pojo.SafeAccident;
import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
-import com.ruoyi.safe.service.SafeAccidentService;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
import com.ruoyi.safe.service.SafeTrainingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -27,52 +25,50 @@
*/
@RestController
@RequestMapping("/safeTraining")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+@RequiredArgsConstructor
public class SafeTrainingController {
- @Autowired
- private SafeTrainingService safeTrainingService;
-
- @Autowired
- private SafeTrainingDetailsService safeTrainingDetailsService;
+ private final SafeTrainingService safeTrainingService;
+ private final SafeTrainingDetailsService safeTrainingDetailsService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeTrainingDto safeTrainingDto) {
return R.ok(safeTrainingService.pageSafeTraining(page, safeTrainingDto));
}
- @ApiOperation("鏂板/缂栬緫瀹夊叏鍩硅鑰冩牳")
+ @Operation(summary = "鏂板/缂栬緫瀹夊叏鍩硅鑰冩牳")
@PostMapping()
public R addOrUpdate(@RequestBody SafeTraining safeTraining) {
return R.ok(safeTrainingService.addOrUpdate(safeTraining));
}
- @ApiOperation("绛惧埌")
+ @Operation(summary = "绛惧埌")
@PostMapping ("/sign")
public R sign(@RequestBody SafeTrainingDetails safeTrainingDetails) {
return R.ok(safeTrainingDetailsService.save(safeTrainingDetails));
}
- @ApiOperation("缁撴灉鏄庣粏鏌ヨ")
+ @Operation(summary = "缁撴灉鏄庣粏鏌ヨ")
@GetMapping ("/getSafeTraining")
public R getSafeTraining(Long id) {
return R.ok(safeTrainingService.getSafeTraining(id));
}
- @ApiOperation("缁撴灉鏄庣粏淇濆瓨")
+ @Operation(summary = "缁撴灉鏄庣粏淇濆瓨")
@PostMapping ("/saveSafeTraining")
public R saveSafeTraining(@RequestBody SafeTrainingDto safeTrainingDto) {
return R.ok(safeTrainingService.saveSafeTraining(safeTrainingDto));
}
- @ApiOperation("鍒犻櫎瀹夊叏鍩硅鑰冩牳")
+ @Operation(summary = "鍒犻櫎瀹夊叏鍩硅鑰冩牳")
@DeleteMapping("/{ids}")
public R delSafeTraining(@RequestBody List<Integer> ids) {
return R.ok(safeTrainingService.delSafeTraining(ids));
}
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
@PostMapping ("/export")
public void export(HttpServletResponse response, @RequestBody SafeTraining safeTraining) {
safeTrainingService.export(response,safeTraining.getId());
--
Gitblit v1.9.3