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 | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 3c19b5d..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
@@ -10,6 +10,7 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
+import com.sandu.ximon.dao.bo.LEDNovaGroupListBo;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
@@ -53,10 +54,7 @@
*/
List<String> listCode = new ArrayList<>(1);
listCode.add(ledPlayerEntity.getSn());
- String content = "{ 璁惧id:" + ledPlayerEntity.getId() + "璁惧code锛�" + ledPlayerEntity.getSn()
- + "璇虹摝playId:" + ledPlayerEntity.getPlayerId()
- + "璇虹摝璁惧鍚嶇О:" + ledPlayerEntity.getName() +
- "}";
+ String content = "{ 璁惧id:" + ledPlayerEntity.getId() + "璁惧code锛�" + ledPlayerEntity.getSn() + "璇虹摝playId:" + ledPlayerEntity.getPlayerId() + "璇虹摝璁惧鍚嶇О:" + ledPlayerEntity.getName() + "}";
StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝璁惧鏂板", content);
/**
@@ -91,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;
}
@@ -127,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();
//姝ｅ簭銆佸�掑彊
@@ -165,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,4 +204,20 @@
return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
}
+ /**
+ * 鑾峰彇鏁寸粍鐨勫睆骞�
+ *
+ * @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