From d709e8a7117704ac4717db5201e40964b90d4791 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 16:17:03 +0800
Subject: [PATCH] Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
index 48857aa..a1cd796 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
@@ -1,14 +1,16 @@
package com.ruoyi.safe.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.dto.SafeTrainingDto;
import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
import com.ruoyi.safe.service.SafeTrainingService;
-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 jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -25,50 +27,55 @@
*/
@RestController
@RequestMapping("/safeTraining")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
@RequiredArgsConstructor
public class SafeTrainingController {
- private SafeTrainingService safeTrainingService;
- 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 = "鏂板/缂栬緫瀹夊叏鍩硅鑰冩牳")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.INSERT)
@PostMapping()
public R addOrUpdate(@RequestBody SafeTraining safeTraining) {
return R.ok(safeTrainingService.addOrUpdate(safeTraining));
}
- @ApiOperation("绛惧埌")
+ @Operation(summary = "绛惧埌")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.INSERT)
@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 = "缁撴灉鏄庣粏淇濆瓨")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.UPDATE)
@PostMapping ("/saveSafeTraining")
public R saveSafeTraining(@RequestBody SafeTrainingDto safeTrainingDto) {
return R.ok(safeTrainingService.saveSafeTraining(safeTrainingDto));
}
- @ApiOperation("鍒犻櫎瀹夊叏鍩硅鑰冩牳")
+ @Operation(summary = "鍒犻櫎瀹夊叏鍩硅鑰冩牳")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R delSafeTraining(@RequestBody List<Integer> ids) {
return R.ok(safeTrainingService.delSafeTraining(ids));
}
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
+ @Log(title = "瀹夊叏鍩硅", businessType = BusinessType.EXPORT)
@PostMapping ("/export")
public void export(HttpServletResponse response, @RequestBody SafeTraining safeTraining) {
safeTrainingService.export(response,safeTraining.getId());
--
Gitblit v1.9.3