From 97a90aef9561782d60546c7a2a98cb75b2fc34f4 Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期四, 20 十月 2022 12:01:29 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 23cdf9b..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.*;
@@ -31,12 +32,12 @@
* @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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<AirEquipmentNongGengBo> list = airEquipmentNongGengService.listAirEquipmentByKeyword(baseConditionVO, keyword);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
@PostMapping("/delete/{id}")
@@ -51,6 +52,40 @@
@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));
}
+
+ /**
+ * 璁剧疆蹇冭烦鍖呴棿闅旀椂闂�
+ *
+ * @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(airEquipmentNongGengService.setHeartBeatTime(mac, time));
+ }
+
+ /**
+ * 璁剧疆澶ф皵璁惧鍐滆�曡澶囩被鍨�
+ *
+ * @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