From dfa9258c8879dbb0d1bfc00d7f939031d0bb623b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 18:32:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
new file mode 100644
index 0000000..3ea4689
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
@@ -0,0 +1,81 @@
+package com.ruoyi.safe.controller;
+
+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 org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-29 10:54:06
+ */
+@RestController
+@RequestMapping("/safeTraining")
+@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+public class SafeTrainingController {
+
+ @Autowired
+ private SafeTrainingService safeTrainingService;
+
+ @Autowired
+ private SafeTrainingDetailsService safeTrainingDetailsService;
+
+ @GetMapping("/page")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ public R page(Page page, SafeTrainingDto safeTrainingDto) {
+ return R.ok(safeTrainingService.pageSafeTraining(page, safeTrainingDto));
+ }
+
+ @ApiOperation("鏂板/缂栬緫瀹夊叏鍩硅鑰冩牳")
+ @PostMapping()
+ public R addOrUpdate(@RequestBody SafeTraining safeTraining) {
+ return R.ok(safeTrainingService.addOrUpdate(safeTraining));
+ }
+
+ @ApiOperation("绛惧埌")
+ @PostMapping ("/sign")
+ public R sign(@RequestBody SafeTrainingDetails safeTrainingDetails) {
+ return R.ok(safeTrainingDetailsService.save(safeTrainingDetails));
+ }
+
+ @ApiOperation("缁撴灉鏄庣粏鏌ヨ")
+ @GetMapping ("/getSafeTraining")
+ public R getSafeTraining(Long id) {
+ return R.ok(safeTrainingService.getSafeTraining(id));
+ }
+
+ @ApiOperation("缁撴灉鏄庣粏淇濆瓨")
+ @PostMapping ("/saveSafeTraining")
+ public R saveSafeTraining(@RequestBody SafeTrainingDto safeTrainingDto) {
+ return R.ok(safeTrainingService.saveSafeTraining(safeTrainingDto));
+ }
+
+ @ApiOperation("鍒犻櫎瀹夊叏鍩硅鑰冩牳")
+ @DeleteMapping("/{ids}")
+ public R delSafeTraining(@RequestBody List<Integer> ids) {
+ return R.ok(safeTrainingService.delSafeTraining(ids));
+ }
+
+ @ApiOperation("瀵煎嚭")
+ @PostMapping ("/export")
+ public void export(HttpServletResponse response, @RequestBody SafeTraining safeTraining) {
+ safeTrainingService.export(response,safeTraining.getId());
+ }
+
+}
--
Gitblit v1.9.3