From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java
index dc2c4dd..0cb640a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java
@@ -6,6 +6,7 @@
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirEquipmentNongGengService;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
+import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -71,44 +72,17 @@
}
/**
- * 鏌ヨ澶ф皵璁惧蹇冭烦鍖呮椂闂�
+ * 璁剧疆澶ф皵璁惧鍐滆�曡澶囩被鍨�
*
* @return
*/
- @GetMapping("/QueryHeartBeatTime")
- public ResponseVO<Object> QueryHeartBeatTime(@RequestParam(value = "mac", required = false) String mac) {
- if (!permissionConfig.check(MenuEnum.AIR_HEARTBEATTIME.getCode())) {
+ @PostMapping("/setType")
+ public ResponseVO<Object> setAirEquipmentType(@RequestBody AirEquipmentNongGeng param) {
+ //鍙傛暟浣跨敤鏋氫妇浼犲��
+ if (!permissionConfig.check(MenuEnum.AIR_SET_TYPE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(airEquipmentNongGengService.QueryHeartBeatTime(mac));
+ return ResponseUtil.success(airEquipmentNongGengService.setAirEquipmentType(param));
}
-
- /**
- * 鏌ヨ杞‖浠剁増鏈�
- *
- * @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(airEquipmentNongGengService.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(airEquipmentNongGengService.Reboot(mac));
- }
}
--
Gitblit v1.9.3