From 94e23a3d587846f10ea9517bd2e6705093d6a99a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 17:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
new file mode 100644
index 0000000..9e4e139
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
@@ -0,0 +1,57 @@
+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.SafeHazardRecordDto;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.ruoyi.safe.service.SafeHazardRecordService;
+import com.ruoyi.safe.service.SafeHazardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@RestController
+@RequestMapping("/safeHazardRecord")
+@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+public class SafeHazardRecordController {
+
+    @Autowired
+    private SafeHazardRecordService safeHazardRecordService;
+
+    @GetMapping("/page")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public R page(Page page, SafeHazardRecordDto safeHazardRecordDto) {
+        return R.ok(safeHazardRecordService.pageSafeHazardRecord(page, safeHazardRecordDto));
+    }
+
+    @ApiOperation("棰嗙敤")
+    @PostMapping("/borrow")
+    public R borrow(@RequestBody SafeHazardRecord safeHazardRecord) {
+        return R.ok(safeHazardRecordService.borrow(safeHazardRecord));
+    }
+
+    @ApiOperation("褰掕繕")
+    @PutMapping("/return")
+    public R returnSafeHazardRecord(@RequestBody  SafeHazardRecord safeHazardRecord) {
+        return R.ok(safeHazardRecordService.returnSafeHazardRecord(safeHazardRecord));
+    }
+
+    @ApiOperation("鍒犻櫎")
+    @DeleteMapping("/{ids}")
+    public R delSafeHazardRecord(@RequestBody List<Integer> ids) {
+        return R.ok(safeHazardRecordService.delSafeHazardRecord(ids));
+    }
+
+}

--
Gitblit v1.9.3