From 8139f928347aaa2185a6d5820605f5cdffdc7353 Mon Sep 17 00:00:00 2001
From: Yang <17363321594@163.com>
Date: Thu, 27 Nov 2025 15:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=85=B3=E9=97=AD=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DryEquipmentScreenController.java         | 24 +++++++-------
 .../service/IDryEquipmentScreenService.java   | 10 +++---
 .../impl/DryEquipmentScreenServiceImpl.java   | 32 +++++++++----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentScreenController.java b/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentScreenController.java
index 048d7a1..b0d0acd 100644
--- a/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentScreenController.java
+++ b/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentScreenController.java
@@ -18,8 +18,8 @@ import java.util.List;
 @RequestMapping("/dry/screen")
 public class DryEquipmentScreenController extends BaseController {
 //
-//    @Autowired
-//    private IDryEquipmentScreenService  dryEquipmentScreenService;
+    @Autowired
+    private IDryEquipmentScreenService  dryEquipmentScreenService;
 //
 //    /**
 //     * 干燥机列表
@@ -43,14 +43,14 @@ public class DryEquipmentScreenController extends BaseController {
 //        return AjaxResult.success(list);
 //    }
 //
-//    /**
-//     * 一键关闭报警
-//     * @return
-//     */
-//    @GetMapping("/closeAlarm")
-//    public AjaxResult closeAlarm(){
-//        // MqttConsole c = new MqttConsole();
-//        int result = dryEquipmentScreenService.closeAlarm();
-//        return AjaxResult.success(result);
-//    }
+    /**
+     * 一键关闭报警
+     * @return
+     */
+    @GetMapping("/closeAlarm")
+    public AjaxResult closeAlarm(){
+        // MqttConsole c = new MqttConsole();
+        int result = dryEquipmentScreenService.closeAlarm();
+        return AjaxResult.success(result);
+    }
 }
diff --git a/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/IDryEquipmentScreenService.java b/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/IDryEquipmentScreenService.java
index 343088b..bbd0b04 100644
--- a/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/IDryEquipmentScreenService.java
+++ b/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/IDryEquipmentScreenService.java
@@ -24,9 +24,9 @@ public interface IDryEquipmentScreenService {
 //     */
 //    public List<EquipmentScreenDTO.DrynessDTO> drynessList();
 //
-//    /**
-//     * 一键关闭报警
-//     * @return
-//     */
-//    public int closeAlarm();
+    /**
+     * 一键关闭报警
+     * @return
+     */
+    public int closeAlarm();
 }
diff --git a/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/impl/DryEquipmentScreenServiceImpl.java b/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/impl/DryEquipmentScreenServiceImpl.java
index 3498641..a4cc21a 100644
--- a/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/impl/DryEquipmentScreenServiceImpl.java
+++ b/shgx-dryingroom/src/main/java/com/shgx/dryingroom/web/service/impl/DryEquipmentScreenServiceImpl.java
@@ -35,8 +35,8 @@ import java.util.stream.Collectors;
 @DS("postgres")
 public class DryEquipmentScreenServiceImpl implements IDryEquipmentScreenService {
 
-//    @Autowired
-//    private DryEquipmentInfoMapper infoMapper;
+    @Autowired
+    private DryEquipmentInfoMapper infoMapper;
 //
 //    @Autowired
 //    private DryMonitoringDataMapper dataMapper;
@@ -44,8 +44,8 @@ public class DryEquipmentScreenServiceImpl implements IDryEquipmentScreenService
 //    @Autowired
 //    private DryParamThresholdMapper paramMapper;
 //
-//    @Autowired
-//    private AlarmLightService alarmLightService;
+    @Autowired
+    private AlarmLightService alarmLightService;
 //
 //    @Resource
 //    private RedisTemplate<String, Object> redisTemplate;
@@ -331,16 +331,16 @@ public class DryEquipmentScreenServiceImpl implements IDryEquipmentScreenService
 //                ));
 //    }
 //
-//    /**
-//     * 一键关闭报警（无需修改）
-//     */
-//    @Override
-//    @Transactional
-//    public int closeAlarm() {
-//        LambdaUpdateWrapper<DryEquipmentInfo> updateWrapper = new LambdaUpdateWrapper<>();
-//        updateWrapper.set(DryEquipmentInfo::getStatus, "1");
-//        alarmLightService.stopAllAlarms();
-//        int result = infoMapper.update(null, updateWrapper);
-//        return result;
-//    }
+    /**
+     * 一键关闭报警（无需修改）
+     */
+    @Override
+    @Transactional
+    public int closeAlarm() {
+        LambdaUpdateWrapper<DryEquipmentInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(DryEquipmentInfo::getStatus, "1");
+        alarmLightService.stopAllAlarms();
+        int result = infoMapper.update(null, updateWrapper);
+        return result;
+    }
 }
\ No newline at end of file