From 3ce864cbadc8a9cd6340fc4db9e605b496f6ac81 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 14 四月 2022 10:57:42 +0800
Subject: [PATCH] 设备汇总
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
index ce25411..3a221d7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
@@ -10,6 +11,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @Author liuhaonan
@@ -38,7 +40,7 @@
/**
* 璇虹摝纭欢璁惧
*/
- public LedPlayerEntity getBySnAndPlayerId(String sn){
+ public LedPlayerEntity getBySnAndPlayerSn(String sn){
LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
if(one==null){
throw new RuntimeException("璇虹摝璁惧涓嶅瓨鍦�");
@@ -46,7 +48,13 @@
List list=new ArrayList();
list.add(one);
List<LedPlayerEntity> led = vnnoxAPIUtil.syncCurrentInfo(list);
- return led.get(0);
+ Map<String, String> screenShotUrl = SpringContextHolder.getBean(VnnoxService.class).getScreenShotUrl(one.getId().intValue());
+ if(screenShotUrl.get("code").equals("200")){
+ one.setScreenShotUrl(screenShotUrl.get("url"));
+ }else {
+ one.setScreenShotUrl("缂╃暐鍥捐幏鍙栧け璐�");
+ }
+ return one;
}
--
Gitblit v1.9.3