From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 13 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 93ecfa3..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
@@ -1,41 +1,46 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.service.AirDataService;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirEquipmentService;
-import com.sandu.ximon.dao.domain.AirData;
-import com.sandu.ximon.dao.domain.AirEquipment;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+/**
+ * 澶ф皵璁惧
+ */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/admin/airequipment")
public class AirEquipmentController {
private final AirEquipmentService airEquipmentService;
-
- @GetMapping
- public ResponseVO<Object> listAirEquipment() {
- List<AirEquipment> list = airEquipmentService.listAirEquipment();
- return ResponseUtil.successPage(list);
- }
+ private PermissionConfig permissionConfig;
/**
- * 妯＄硦鏌ヨ
+ * 鏌ヨ澶ф皵璁惧
*
* @return
*/
- @GetMapping("/listAirEquipmentByKeyword/{keyword}")
- public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
- List<AirEquipment> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
+ @GetMapping("/listAirEquipment")
+ 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<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
@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);
@@ -43,4 +48,93 @@
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
}
+
+ /**
+ * 鏌ヨ澶ф皵璁惧蹇冭烦鍖呮椂闂�
+ *
+ * @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