From e5f711997c3247dc74d5a820673cc911bd2fbcf4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 三月 2022 15:42:42 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index 38ebf21..bbd845f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.api.R;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
@@ -50,6 +51,9 @@
@GetMapping("/screenShot")
public ResponseVO<Object> screenShot(@RequestBody VnnoxParam vnnoxWebRequest) {
Map<String, String> map = vnnoxService.getScreenShotUrl(vnnoxWebRequest.getId());
+ if(map.get("code").equals("500")) {
+ return ResponseUtil.fail(map.get("msg"));
+ }
return ResponseUtil.success(map.get("url"));
}
@@ -67,7 +71,7 @@
/**
* @param vnnoxWebRequest
- * @return
+ * @return 寮�鍏冲睆骞�
*/
@GetMapping("/screenStatusChange")
public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
@@ -99,11 +103,6 @@
return ResponseUtil.success(vnnoxResult);
}
- /* @RequestMapping("/changeLedName")
- public R changeLedName(@RequestBody VnnoxParam vnnoxWebRequest) {
- vnnoxService.changeLedName(vnnoxWebRequest.getId(),vnnoxWebRequest.getPlayerName());
- return ResponseUtil.success();
- }*/
@PostMapping("/validateSN")
public ResponseVO<Object> validateSN(@RequestBody Map map) throws URISyntaxException {
@@ -136,9 +135,14 @@
//wrapper.eq(LedPlayerEntity::get)
return ResponseUtil.success(""); // todo
} else {
- wrapper.like(LedPlayerEntity::getPlayerName, keyword);
+ wrapper.like(LedPlayerEntity::getPlayerName, keyword)
+ .or(
+ querywrapper->{
+ querywrapper.like(LedPlayerEntity::getName, keyword);
+ }
+ );
List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
- List<LedPlayerEntity> entities = vnnoxAPIUtil.syncCurrentInfo(list);
+ List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
return ResponseUtil.success(entities);
}
}
@@ -155,7 +159,7 @@
} else {
wrapper.like(LedPlayerEntity::getPlayerName, keyword);
List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
- List<LedPlayerEntity> entities = vnnoxAPIUtil.syncCurrentInfo(list);
+ List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
List<LedPlayerEntity> online = new ArrayList<>();
for (LedPlayerEntity ledPlayer : entities) {
if (ledPlayer.getOnlineStatus() == 1) {
--
Gitblit v1.9.3