From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 99 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 c50620a..3c19b5d 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,6 +1,5 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -8,9 +7,11 @@
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.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -39,8 +40,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;
}
@@ -96,9 +118,49 @@
}
- public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword) {
+ /**
+ * 璇虹摝鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param keyword
+ * @param order
+ * @param seq
+ * @return
+ */
+ public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.VNNOX_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.VNNOX_POLE_NAME.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.VNNOX_CREATE_TIMESTAMP.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
+
if (baseConditionVO != null) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
}
List<LedPlayerEntity> list;
//瓒呯
@@ -107,16 +169,41 @@
} else {
list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, SecurityUtils.getUserId());
}
- List<List<LedPlayerEntity>> split = CollectionUtil.split(list, 100);
+ return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+ }
- List<LedPlayerEntity> ledPlayerEntities=null;
- for (List<LedPlayerEntity> splist : split) {
- List<LedPlayerEntity> ledPlayerEntitie = SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(splist));
- if (ledPlayerEntitie != null) {
- ledPlayerEntities.addAll(ledPlayerEntitie);
- }
+ /**
+ * 璇虹摝鍒楄〃锛堢敤浜庨椤垫暟鎹粺璁★級
+ *
+ * @return
+ */
+ public List<LedPlayerEntity> ledPlayerEntityListOnHome() {
+ List<LedPlayerEntity> list;
+ //瓒呯
+ if (SecurityUtils.getClientId() == null) {
+ list = ledPlayerEntityMapper.ledPlayerEntityList(null, null);
+ } else {
+ list = ledPlayerEntityMapper.ledPlayerEntityList(null, SecurityUtils.getUserId());
}
- return ledPlayerEntities;
+ return list == null ? new ArrayList<>() : list;
+ }
+
+ /**
+ * 璇虹摝鍒楄〃锛堢敤浜庣粦瀹氾級
+ *
+ * @param keyword
+ * @return
+ */
+ public List<LedPlayerEntity> ledPlayerEntityListOnBinding(String keyword) {
+
+ List<LedPlayerEntity> list;
+ //瓒呯
+ if (SecurityUtils.getClientId() == null) {
+ list = ledPlayerEntityMapper.ledPlayerEntityListOnBinding(keyword, null);
+ } else {
+ list = ledPlayerEntityMapper.ledPlayerEntityListOnBinding(keyword, SecurityUtils.getUserId());
+ }
+ return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
}
}
--
Gitblit v1.9.3