From 3450b025b47c0d32e4c7476370ecbf09b60b75f7 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Tue, 29 Jul 2025 15:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FysEquipmentAlarmRecordController.java         | 14 +++++++-------
 pom.xml                                            | 12 ++++++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/FysEquipmentAlarmRecordController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/FysEquipmentAlarmRecordController.java
index fc5a192..4349f65 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/FysEquipmentAlarmRecordController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/FysEquipmentAlarmRecordController.java
@@ -31,7 +31,7 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/equipmentAlarmRecord")
+@RequestMapping("/equipment/equipmentAlarmRecord")
 public class FysEquipmentAlarmRecordController extends BaseController {
 
     private final IFysEquipmentAlarmRecordService fysEquipmentAlarmRecordService;
@@ -39,7 +39,7 @@ public class FysEquipmentAlarmRecordController extends BaseController {
     /**
      * 查询设备报警记录列表
      */
-    @SaCheckPermission("system:equipmentAlarmRecord:list")
+    @SaCheckPermission("equipment:equipmentAlarmRecord:list")
     @GetMapping("/list")
     public TableDataInfo<FysEquipmentAlarmRecordVo> list(FysEquipmentAlarmRecordBo bo, PageQuery pageQuery) {
         return fysEquipmentAlarmRecordService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class FysEquipmentAlarmRecordController extends BaseController {
     /**
      * 导出设备报警记录列表
      */
-    @SaCheckPermission("system:equipmentAlarmRecord:export")
+    @SaCheckPermission("equipment:equipmentAlarmRecord:export")
     @Log(title = "设备报警记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(FysEquipmentAlarmRecordBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class FysEquipmentAlarmRecordController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:equipmentAlarmRecord:query")
+    @SaCheckPermission("equipment:equipmentAlarmRecord:query")
     @GetMapping("/{id}")
     public R<FysEquipmentAlarmRecordVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -71,7 +71,7 @@ public class FysEquipmentAlarmRecordController extends BaseController {
     /**
      * 新增设备报警记录
      */
-    @SaCheckPermission("system:equipmentAlarmRecord:add")
+    @SaCheckPermission("equipment:equipmentAlarmRecord:add")
     @Log(title = "设备报警记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +82,7 @@ public class FysEquipmentAlarmRecordController extends BaseController {
     /**
      * 修改设备报警记录
      */
-    @SaCheckPermission("system:equipmentAlarmRecord:edit")
+    @SaCheckPermission("equipment:equipmentAlarmRecord:edit")
     @Log(title = "设备报警记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -95,7 +95,7 @@ public class FysEquipmentAlarmRecordController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:equipmentAlarmRecord:remove")
+    @SaCheckPermission("equipment:equipmentAlarmRecord:remove")
     @Log(title = "设备报警记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
diff --git a/pom.xml b/pom.xml
index 3920c97..fda3a54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
 
         </profile>
         <profile>
@@ -93,10 +97,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <!-- <activation> -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+            <!--     <activeByDefault>true</activeByDefault> -->
+            <!-- </activation> -->
             <!-- <activation> -->
             <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
             <!--     <activeByDefault>true</activeByDefault> -->