From 35b68d05c92ae1eab2e409529a070a217ba492ae Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 09:53:23 +0800
Subject: [PATCH] fix 客户列表bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 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 826bcbd..0716675 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
@@ -1,11 +1,21 @@
package com.sandu.ximon.admin.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
+import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* @Author liuhaonan
@@ -17,21 +27,64 @@
@AllArgsConstructor
public class LedPlayerEntityService extends BaseServiceImpl<LedPlayerEntityMapper, LedPlayerEntity> {
private final LedPlayerEntityMapper ledPlayerEntityMapper;
+ private VnnoxAPIUtil vnnoxAPIUtil;
- public LedPlayerEntity getBySn(String sn){
+ public LedPlayerEntity getBySn(String sn) {
return getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
}
- public LedPlayerEntity getByPlayerId(String playerId){
- return getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getPlayerId,playerId));
+
+ public LedPlayerEntity getByPlayerId(String playerId) {
+ return getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getPlayerId, playerId));
}
- public boolean saveLed(LedPlayerEntity ledPlayerEntity){
+ public boolean saveLed(LedPlayerEntity ledPlayerEntity) {
return ledPlayerEntityMapper.saveLed(ledPlayerEntity);
}
- /* public void listLed(String keyWord){
+ /**
+ * 璇虹摝纭欢璁惧
+ */
+ public LedPlayerEntity getBySnAndPlayerSn(String sn) {
+ LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
+ if (one == null) {
+ throw new RuntimeException("璇虹摝璁惧涓嶅瓨鍦�");
+ }
+ List list = new ArrayList();
+ list.add(one);
+ List<LedPlayerEntity> led = vnnoxAPIUtil.syncCurrentInfo(list);
+ 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;
+ }
- Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::get)
- }*/
+
+ public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword) {
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ List<LedPlayerEntity> list;
+ //瓒呯
+ if (SecurityUtils.getClientId() == null) {
+ list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, null);
+ } else {
+ list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, SecurityUtils.getUserId());
+ }
+ return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+ }
+
+// public List<LedPlayerEntity> ledPlayerEntityList() {
+// List<LedPlayerEntity> list;
+// //瓒呯
+// if (SecurityUtils.getClientId() == null) {
+// list = ledPlayerEntityMapper.ledPlayerEntityList(null, null);
+// } else {
+// list = ledPlayerEntityMapper.ledPlayerEntityList(null, SecurityUtils.getUserId());
+// }
+// return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+// }
}
--
Gitblit v1.9.3