From 0a30812acaa26ebe654340f7e749a6801b63b194 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 16:32:36 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java |   95 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
index d53c732..44448f1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
@@ -28,7 +28,7 @@
      * @return
      */
     @GetMapping("/listAirEquipment")
-    public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+    public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
         if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
@@ -38,6 +38,9 @@
 
     @PostMapping("/delete/{id}")
     public ResponseVO<Object> deleteAirEquipment(@PathVariable Long id) {
+        if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         boolean result = airEquipmentService.deleteAirEquipment(id);
         if (result) {
             return ResponseUtil.success(null);
@@ -46,8 +49,92 @@
         }
     }
 
-    @GetMapping("/getAirEquipment/{mac}")
-    public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
-        return ResponseUtil.success(airEquipmentService.getAirEquipment(mac));
+    /**
+     * 鏌ヨ澶ф皵璁惧蹇冭烦鍖呮椂闂�
+     *
+     * @return
+     */
+    @GetMapping("/QueryHeartBeatTime")
+    public ResponseVO<Object> QueryHeartBeatTime(@RequestParam(value = "mac", required = false) String mac) {
+        if (!permissionConfig.check(MenuEnum.AIR_HEARTBEATTIME.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(airEquipmentService.QueryHeartBeatTime(mac));
     }
+
+    /**
+     * 璁剧疆蹇冭烦鍖呴棿闅旀椂闂�
+     *
+     * @param mac
+     * @param time
+     * @return
+     */
+    @GetMapping("/setHeartBeatTime")
+    public ResponseVO<Object> setHeartBeatTime(@RequestParam(value = "mac", required = false) String mac,
+                                               @RequestParam(value = "time", required = false) Integer time) {
+        if (!permissionConfig.check(MenuEnum.AIR_HEARTBEATTIME.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(airEquipmentService.setHeartBeatTime(mac, time));
+    }
+
+    /**
+     * 鏌ヨ浼犳劅鍣ㄦ暟閲�/鏁呴殰
+     *
+     * @param mac
+     * @return
+     */
+    @GetMapping("/QuerySensorInfo")
+    public ResponseVO<Object> QuerySensorInfo(@RequestParam(value = "mac", required = false) String mac) {
+        return ResponseUtil.success(airEquipmentService.QuerySensorInfo(mac));
+    }
+
+    /**
+     * 鏌ヨ杞‖浠剁増鏈�
+     *
+     * @param mac
+     * @return
+     */
+    @GetMapping("/QueryVersion")
+    public ResponseVO<Object> QueryVersion(@RequestParam(value = "mac", required = false) String mac) {
+        if (!permissionConfig.check(MenuEnum.AIR_QUERYVERSION.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(airEquipmentService.QueryVersion(mac));
+    }
+
+    /**
+     * 杞噸鍚�
+     *
+     * @param mac
+     * @return
+     */
+    @GetMapping("/Reboot")
+    public ResponseVO<Object> Reboot(@RequestParam(value = "mac", required = false) String mac) {
+        if (!permissionConfig.check(MenuEnum.AIR_REBOOT.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(airEquipmentService.Reboot(mac));
+    }
+
+
+    /**
+     * 璁剧疆鏁版嵁淇鍊�
+     *
+     * @param mac             鐏潌MAC
+     * @param type            鏁版嵁淇璁惧绫诲瀷
+     * @param valueOfReal     浼犳劅鍣ㄦ暟鍊�
+     * @param valueOfStandard 鏍囧噯浠櫒鏁板��
+     * @return
+     */
+    @GetMapping("/ModifiedData")
+    public ResponseVO<Object> ModifiedData(@RequestParam(value = "mac", required = false) String mac,
+                                           @RequestParam(value = "type", required = false) String type,
+                                           @RequestParam(value = "valueOfReal", required = false) String valueOfReal,
+                                           @RequestParam(value = "valueOfStandard", required = false) String valueOfStandard) {
+        airEquipmentService.ModifiedData(mac, type, valueOfReal, valueOfStandard);
+        return ResponseUtil.success(null);
+    }
+
+
 }

--
Gitblit v1.9.3