From 1b77c2724e38d087f3eab4a2f27b3b165f4265dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 14:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide

---
 src/main/java/com/ruoyi/safety/controller/SafetyTrainingMaterialController.java |   76 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/safety/controller/SafetyTrainingMaterialController.java b/src/main/java/com/ruoyi/safety/controller/SafetyTrainingMaterialController.java
new file mode 100644
index 0000000..8db910a
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/controller/SafetyTrainingMaterialController.java
@@ -0,0 +1,76 @@
+package com.ruoyi.safety.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.AjaxResult;
+import com.ruoyi.safety.pojo.SafetyTrainingMaterial;
+import com.ruoyi.safety.service.SafetyTrainingMaterialService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 瀹夌幆绠$悊-鍩硅璧勬枡鎺ュ彛銆�
+ */
+@RestController
+@Api(tags = "瀹夌幆绠$悊-鍩硅璧勬枡")
+@RequestMapping("/safety/training/material")
+public class SafetyTrainingMaterialController extends SafetyControllerSupport {
+
+    @Autowired
+    private SafetyTrainingMaterialService materialService;
+
+    /**
+     * 鍒嗛〉鏌ヨ鍩硅璧勬枡銆�
+     */
+    @Log(title = "瀹夌幆绠$悊-鍩硅璧勬枡-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+    @ApiOperation("鍒嗛〉鏌ヨ鍩硅璧勬枡")
+    @GetMapping("/list")
+    public AjaxResult list(Page<SafetyTrainingMaterial> page, SafetyTrainingMaterial query,
+                           @RequestParam(value = "pageNum", required = false) Long pageNum,
+                           @RequestParam(value = "pageSize", required = false) Long pageSize) {
+        return AjaxResult.success(materialService.queryPage(buildPage(page, pageNum, pageSize), query));
+    }
+
+    /**
+     * 涓婁紶鍩硅璧勬枡鍏冩暟鎹��
+     */
+    @Log(title = "瀹夌幆绠$悊-鍩硅璧勬枡-涓婁紶", businessType = BusinessType.INSERT)
+    @ApiOperation("涓婁紶鍩硅璧勬枡")
+    @PostMapping("/upload")
+    public AjaxResult upload(@RequestBody SafetyTrainingMaterial material) {
+        return toAjax(materialService.saveSafety(material));
+    }
+
+    /**
+     * 淇敼鍩硅璧勬枡銆�
+     */
+    @Log(title = "瀹夌幆绠$悊-鍩硅璧勬枡-淇敼", businessType = BusinessType.UPDATE)
+    @ApiOperation("淇敼鍩硅璧勬枡")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody SafetyTrainingMaterial material) {
+        return toAjax(materialService.updateSafety(material));
+    }
+
+    /**
+     * 鍒犻櫎鍩硅璧勬枡銆�
+     */
+    @Log(title = "瀹夌幆绠$悊-鍩硅璧勬枡-鍒犻櫎", businessType = BusinessType.DELETE)
+    @ApiOperation("鍒犻櫎鍩硅璧勬枡")
+    @DeleteMapping("/delete/{id}")
+    public AjaxResult delete(@PathVariable Long id) {
+        return toAjax(materialService.deleteSafetyById(id));
+    }
+
+    /**
+     * 鏌ヨ鍩硅璧勬枡璇︽儏銆�
+     */
+    @Log(title = "瀹夌幆绠$悊-鍩硅璧勬枡-璇︽儏", businessType = BusinessType.OTHER)
+    @ApiOperation("鏌ヨ鍩硅璧勬枡璇︽儏")
+    @GetMapping("/detail/{id}")
+    public AjaxResult detail(@PathVariable Long id) {
+        return AjaxResult.success(materialService.getById(id));
+    }
+}

--
Gitblit v1.9.3