From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 5f404c3..c81b710 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
@@ -89,7 +89,7 @@
*/
public EquipmentInfomation getBySnAndPlayerSnInfo(String sn) {
EquipmentInfomation equipmentInfo = new EquipmentInfomation();
- equipmentInfo.setEquipmentType("璇虹摝LED");
+ equipmentInfo.setEquipmentType("NLED");
if (sn == null || sn.trim().length() == 0) {
return equipmentInfo;
}
@@ -125,7 +125,7 @@
* @param seq
* @return
*/
- public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
+ public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq, Long groupId) {
//鎺掑簭瀛楁
String orderByResult = OrderByEnums.VNNOX_ID.getCode();
//姝ｅ簭銆佸�掑彊
@@ -163,9 +163,9 @@
List<LedPlayerEntity> list;
//瓒呯
if (SecurityUtils.getClientId() == null) {
- list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, null);
+ list = ledPlayerEntityMapper.ledListByGroupId(keyword, null, groupId);
} else {
- list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, SecurityUtils.getUserId());
+ list = ledPlayerEntityMapper.ledListByGroupId(keyword, SecurityUtils.getUserId(), groupId);
}
return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
}
@@ -206,10 +206,18 @@
/**
* 鑾峰彇鏁寸粍鐨勫睆骞�
+ *
* @param groupId
*/
public List<LEDNovaGroupListBo> getListByGroupId(Long groupId) {
List<LEDNovaGroupListBo> listByGroupId = baseMapper.getListByGroupId(groupId, SecurityUtils.getClientId());
+ listByGroupId.forEach(
+ bo -> {
+ if (bo.getName() == null || bo.getName().equals("")) {
+ bo.setName(bo.getPlayerName());
+ }
+ }
+ );
return listByGroupId;
}
}
--
Gitblit v1.9.3