From 2d4afbbcfda71f826ed532d01de860395c4da2b6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 14:40:36 +0800
Subject: [PATCH] 角色等级FIX

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java |   70 ++++++++++++++++++++++++++++------
 1 files changed, 57 insertions(+), 13 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 0716675..e99a694 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,13 +2,15 @@
 
 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.StoreOperationRecordsUtils;
 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.domain.PoleBinding;
 import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -37,8 +39,29 @@
         return getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getPlayerId, playerId));
     }
 
+    /**
+     * 璇虹摝璁惧鏂板
+     *
+     * @param ledPlayerEntity
+     * @return
+     */
     public boolean saveLed(LedPlayerEntity ledPlayerEntity) {
-        return ledPlayerEntityMapper.saveLed(ledPlayerEntity);
+        boolean b = ledPlayerEntityMapper.saveLed(ledPlayerEntity);
+        /**
+         * 璇虹摝璁惧鏂板 鏃ュ織璁板綍寮�濮�
+         */
+        List<String> listCode = new ArrayList<>(1);
+        listCode.add(ledPlayerEntity.getSn());
+        String content = "{ 璁惧id:" + ledPlayerEntity.getId() + "璁惧code锛�" + ledPlayerEntity.getSn()
+                + "璇虹摝playId:" + ledPlayerEntity.getPlayerId()
+                + "璇虹摝璁惧鍚嶇О:" + ledPlayerEntity.getName() +
+                "}";
+
+        StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝璁惧鏂板", content);
+        /**
+         * 璇虹摝璁惧鏂板 鏃ュ織璁板綍缁撴潫
+         */
+        return b;
     }
 
 
@@ -48,7 +71,7 @@
     public LedPlayerEntity getBySnAndPlayerSn(String sn) {
         LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
         if (one == null) {
-            throw new RuntimeException("璇虹摝璁惧涓嶅瓨鍦�");
+            throw new BusinessException("璇虹摝璁惧涓嶅瓨鍦�");
         }
         List list = new ArrayList();
         list.add(one);
@@ -60,6 +83,37 @@
             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.setEquipmentState("绂荤嚎");
+            }
+        }
+
+        return equipmentInfo;
     }
 
 
@@ -77,14 +131,4 @@
         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