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 | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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 7c7cf83..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.*;
@@ -53,4 +54,35 @@
public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
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