From 5459d714b3d6fd4a2fc8b48775ccdc9ea8678279 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 14 四月 2022 10:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 5dc0884..ba5b236 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
@@ -145,6 +145,10 @@
querywrapper -> {
querywrapper.like(LedPlayerEntity::getName, keyword);
}
+ ).or(
+ sn->{
+ sn.like(LedPlayerEntity::getSn,keyword);
+ }
);
List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
@@ -187,6 +191,6 @@
@GetMapping("/getVnnoxInfo/{sn}")
public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
- return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerId(sn));
+ return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
}
}
--
Gitblit v1.9.3