From 5e94332935da62448c17f89a807acf46a5ae3e75 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 15 十二月 2022 10:08:22 +0800
Subject: [PATCH] 本地诺瓦调整
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java
index 403e753..c1bb9be 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java
@@ -7,6 +7,7 @@
import com.sandu.ximon.admin.newnova.grouping.NewNovaGroupService;
import com.sandu.ximon.admin.newnova.param.NewNovaLedParam;
import com.sandu.ximon.admin.newnova.param.NewNovaStatusParam;
+import com.sandu.ximon.admin.newnova.program.LEDInfoParam;
import com.sandu.ximon.admin.newnova.utils.NovaAPIUtil;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -75,12 +76,24 @@
*/
@GetMapping("/listLed")
public ResponseVO listLed(BaseConditionVO baseConditionVO, @RequestParam(required = false, value = "keyword") String keyword,
- @RequestParam(required = false, value = "onlineStatus") boolean onlineStatus,
+ @RequestParam(required = true, value = "onlineStatus", defaultValue = "false") boolean onlineStatus,
@RequestParam(required = false, value = "groupId") Long groupId) {
if (!permissionConfig.check(MenuEnum.LED_NEW_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
return ResponseUtil.success(newNovaLedService.listLed(baseConditionVO, keyword, groupId, onlineStatus));
+ }
+
+
+ /**
+ * 鐘舵�佸垪琛�
+ */
+ @PostMapping("/ledInfo")
+ public ResponseVO ledInfo(@RequestBody @Validated LEDInfoParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(newNovaLedService.infoList(param));
}
/**
@@ -196,6 +209,7 @@
if (param.getNovaList() == null || param.getNovaList().isEmpty()) {
return ResponseUtil.fail("璇烽�夋嫨璁惧");
}
+// return ResponseUtil.success("666");
return ResponseUtil.success(NovaAPIUtil.getInstanceUtil().reboot(param));
}
@@ -259,7 +273,7 @@
if (!permissionConfig.check(MenuEnum.LED_NEW_PUSH_AIR.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(newNovaLedService.pushAirData(id, duration,fontSize));
+ return ResponseUtil.success(newNovaLedService.pushAirData(id, duration, fontSize));
}
--
Gitblit v1.9.3