From a63297ded71c8478dbad4f727de14f2be5546d9f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 14 四月 2022 09:50:23 +0800
Subject: [PATCH] 设备汇总
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 1a767db..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,14 +145,18 @@
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));
entities.forEach(
- led->{
+ led -> {
PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
.eq(PoleBinding::getDeviceType, 1).eq(PoleBinding::getDeviceCode, led.getSn()));
- if(binding!=null){
+ if (binding != null) {
led.setPoleId(poleService.getById(binding.getPoleId()).getId());
led.setPoleName(poleService.getById(binding.getPoleId()).getPoleName());
}
@@ -184,4 +188,9 @@
return ResponseUtil.success(online);
}
}
+
+ @GetMapping("/getVnnoxInfo/{sn}")
+ public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
+ return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
+ }
}
--
Gitblit v1.9.3