From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java | 124 +++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 17 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 703ae72..9b8e87e 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
@@ -1,22 +1,18 @@
package com.sandu.ximon.admin.newnova.led;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.newnova.param.NewNovaLedParam;
+import com.sandu.ximon.admin.newnova.param.NewNovaStatusParam;
import com.sandu.ximon.admin.newnova.utils.NovaAPIUtil;
-import com.sandu.ximon.admin.newnova.vo.StatusVO;
import com.sandu.ximon.admin.security.PermissionConfig;
-import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.net.URISyntaxException;
-import java.util.Map;
+import java.util.List;
/**
* @author LiuHaoNan
@@ -28,20 +24,114 @@
public class NewNovaLedController {
private final PermissionConfig permissionConfig;
private final NewNovaLedService newNovaLedService;
- private final NovaAPIUtil novaApiUtil;
+
+ /**
+ * 灞忓箷娉ㄥ唽
+ *
+ * @param param
+ * @return
+ */
@PostMapping("/validateSN")
- public ResponseVO<Object> validateSN(@RequestBody @Validated NewNovaLedParam param) {
- if (!permissionConfig.check(MenuEnum.VNNOX_ADD.getCode())) {
+ public ResponseVO<Object> validateSN(@RequestBody @Validated NewNovaLedParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_ADD.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean b= newNovaLedService.saveLed(param);
- return ResponseUtil.success("ledV2RegisterResultEntity");
+ boolean b = newNovaLedService.saveLed(param);
+ return ResponseUtil.success(b);
}
- @PostMapping("/test")
- public ResponseVO<Object> validateSN() {
- StatusVO mzva51930N2113017308 = novaApiUtil.login("MZVA51930N2113017308");
- return ResponseUtil.success(mzva51930N2113017308);
+
+ /**
+ * 缂栬緫灞忓箷鍚嶇О
+ */
+ @PostMapping("/editLed")
+ public ResponseVO editLed(@RequestBody NewNovaLedParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_EDIT.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(newNovaLedService.editLed(param));
}
+ /**
+ * 鍒犻櫎灞忓箷
+ */
+ @PostMapping("/delLed")
+ public ResponseVO delLEd(@RequestBody List<Long> ids) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_DEL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(newNovaLedService.delLed(ids));
+ }
+
+
+ /**
+ * 灞忓箷鍒楄〃
+ */
+ @GetMapping("/listLed")
+ public ResponseVO listLed(BaseConditionVO baseConditionVO, @RequestParam(required = false, value = "keyword") String keyword,
+ @RequestParam(required = false, value = "onlineStatus") boolean onlineStatus) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(newNovaLedService.listLed(baseConditionVO, keyword, onlineStatus));
+ }
+
+ /**
+ * 璇︾粏淇℃伅
+ *
+ * @param ledId
+ * @return
+ */
+ @GetMapping("/getInfo")
+ public ResponseVO getInfo(@RequestParam(required = true, value = "ledId") Long ledId) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_INFO.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(newNovaLedService.getInfo(ledId));
+ }
+
+ /**
+ * 璁剧疆浜害
+ */
+ @PostMapping("/setBrightness")
+ public ResponseVO setScreenBrightness(@RequestBody @Validated NewNovaStatusParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_NEW_VOL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if (param.getBrightness() == null) {
+ return ResponseUtil.fail("浜害涓嶈兘涓虹┖");
+ } else {
+ if (param.getBrightness() > 100 || param.getBrightness() < 0) {
+ return ResponseUtil.fail("浜害鑼冨洿涓�: 0-100");
+ }
+ }
+ if (newNovaLedService.getById(param.getId()) == null) {
+ return ResponseUtil.fail("璁惧涓嶅瓨鍦�");
+ }
+ return ResponseUtil.success(NovaAPIUtil.getInstanceUtil().setScreenBrightness(param));
+ }
+
+
+// @PostMapping("/tranPro")
+// public ResponseVO<Object> tranPro(@RequestBody Map pageInfo) throws InterruptedException {
+// NovaAPIUtil a = NovaAPIUtil.getInstanceUtil();
+// StatusVO login = a.login("MZVA51930N2113017308");
+// if (login.getStatusCode() != 0) {
+// return ResponseUtil.fail("genVO");
+// }
+// StatusVO createPro = a.createPro(new ProWHVO("jiemu 1", 128, 256));
+// System.out.println(createPro + "createPro");
+// StatusVO editPro = a.editProgram(Integer.valueOf(createPro.getStatusData()), pageInfo);
+// StatusVO genVO = a.genrateProgram(Integer.valueOf(createPro.getStatusData()));
+// ProgramPrarm page = new ProgramPrarm();
+// page.setInsertPlay(true);
+// page.setProgramID(Integer.valueOf(createPro.getStatusData()));
+// page.setStartPlayAfterTransferred(true);
+// List<String> sns = new ArrayList<String>();
+// sns.add("MZVA51930N2113017308");
+// page.setSnList(sns);
+// List<TrasfromStatusVO> trasfromStatusVOS = a.trasfromProgram(page);
+// return ResponseUtil.success(trasfromStatusVOS);
+// }
+
}
--
Gitblit v1.9.3