From 680ff9e2cca45bcb23e373aaa221a1e1dfab2472 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 15:01:37 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java | 61 +++++++++---------------------
1 files changed, 19 insertions(+), 42 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 dfb6811..eed4f74 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.*;
@@ -36,7 +37,7 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<AirEquipmentNongGengBo> list = airEquipmentNongGengService.listAirEquipmentByKeyword(baseConditionVO, keyword);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
@PostMapping("/delete/{id}")
@@ -51,6 +52,9 @@
@GetMapping("/getAirEquipment/{mac}")
public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
+ if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_INFO.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(airEquipmentNongGengService.getAirEquipment(mac));
}
@@ -70,45 +74,18 @@
return ResponseUtil.success(airEquipmentNongGengService.setHeartBeatTime(mac, time));
}
-// /**
-// * 鏌ヨ澶ф皵璁惧蹇冭烦鍖呮椂闂�
-// *
-// * @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(airEquipmentNongGengService.QueryHeartBeatTime(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(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));
-// }
+ /**
+ * 璁剧疆澶ф皵璁惧鍐滆�曡澶囩被鍨�
+ *
+ * @return
+ */
+ @PostMapping("/setType")
+ public ResponseVO<Object> setAirEquipmentType(@RequestBody AirEquipmentNongGeng param) {
+ //鍙傛暟浣跨敤鏋氫妇浼犲��
+ if (!permissionConfig.check(MenuEnum.AIR_SET_TYPE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(airEquipmentNongGengService.setAirEquipmentType(param));
+ }
+
}
--
Gitblit v1.9.3