From 9f21969b69703a35bde9d659be19f3e39795010d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 12 五月 2022 11:58:01 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java |   81 ++++++++++++++++++++++++++++++++++------
 1 files changed, 69 insertions(+), 12 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 3a221d7..fa11ba3 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,9 +1,14 @@
 package com.sandu.ximon.admin.service;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.execption.BusinessException;
+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.admin.vo.EquipmentInfomation;
 import com.sandu.ximon.dao.domain.LedPlayerEntity;
 import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
 import lombok.AllArgsConstructor;
@@ -25,14 +30,15 @@
     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);
     }
 
@@ -40,26 +46,77 @@
     /**
      * 璇虹摝纭欢璁惧
      */
-    public LedPlayerEntity getBySnAndPlayerSn(String sn){
+    public LedPlayerEntity getBySnAndPlayerSn(String sn) {
         LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
-        if(one==null){
-            throw new RuntimeException("璇虹摝璁惧涓嶅瓨鍦�");
+        if (one == null) {
+            throw new BusinessException("璇虹摝璁惧涓嶅瓨鍦�");
         }
-        List list=new ArrayList();
+        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")){
+        if (screenShotUrl.get("code").equals("200")) {
             one.setScreenShotUrl(screenShotUrl.get("url"));
-        }else {
+        } else {
             one.setScreenShotUrl("缂╃暐鍥捐幏鍙栧け璐�");
         }
         return one;
     }
 
+    /**
+     * 棣栭〉鐏潌缁戝畾淇℃伅
+     */
+    public EquipmentInfomation getBySnAndPlayerSnInfo(String sn) {
+        EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+        equipmentInfo.setEquipmentType("璇虹摝LED");
+        if (sn == null || sn.trim().length() == 0) {
+            return equipmentInfo;
+        }
+
+        LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
+        if (one == null) {
+            return equipmentInfo;
+        }
+        List<LedPlayerEntity> list = new ArrayList<>();
+        list.add(one);
+        List<LedPlayerEntity> ledPlayerEntities = vnnoxAPIUtil.syncCurrentInfo(list);
+        Integer onlineStatus = ledPlayerEntities.get(0).getOnlineStatus();
+        if (one != null) {
+            equipmentInfo.setEquipmentMac(one.getSn());
+            equipmentInfo.setEquipmentName(one.getName());
+            if (onlineStatus == 0) {
+                equipmentInfo.setEquipmentState("鍦ㄧ嚎");
+            } else {
+                equipmentInfo.setEquipmentName("绂荤嚎");
+            }
+        }
+
+        return equipmentInfo;
+    }
 
 
+    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