From 48c95dfdcbfe721ff31133fed869fb024e63086d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 11 一月 2022 10:07:08 +0800
Subject: [PATCH] 轮播图
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index a0b0fdd..4a752bd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -1,11 +1,15 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
@@ -19,6 +23,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.DeviceStateEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
@@ -35,6 +40,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鐏潌鐩稿叧
@@ -82,7 +88,7 @@
/**
* 鐢熸垚鐏潌缂栧彿
*/
- private Long generatePoleCode() {
+ public Long generatePoleCode() {
StringBuilder sb = new StringBuilder();
String date = new SimpleDateFormat("yyMMdd").format(new Date());
sb.append(date);
@@ -103,9 +109,10 @@
*
* @return
*/
- public List<Pole> queryStatesAndList() {
+ public List<Pole> queryStatesAndList(Integer pageNo,Integer pageSize) {
// List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
//List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
+ PageHelper.startPage(pageNo,pageSize);
List<Pole> list = new ArrayList<>();
if (SecurityUtils.getClientId() == null) {
list = list(Wrappers.lambdaQuery(Pole.class));
@@ -277,4 +284,35 @@
}
return setMac;
}
+
+ public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
+ if(CollectionUtil.isEmpty(poleIdList)){
+ return null;
+ }
+ return list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode))
+ .stream().map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
+ }
+
+ /**
+ * 鎵归噺鑾峰彇闃块噷浜戣澶囩殑鐘舵��
+ * @param deviceCodeList 闃块噷浜戣澶囩爜
+ * @return 璁惧鐘舵�佸垪琛�
+ */
+ public List<DeviceStatus> listStatusByDeviceCode(ArrayList<String> deviceCodeList) {
+ // 鏈�澶у彧鑳芥煡50涓�
+ List<List<String>> split = CollectionUtil.split(deviceCodeList, 50);
+ List<DeviceStatus> statusList = new ArrayList<>();
+ for (List<String> list : split) {
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(list);
+ if(CollectionUtil.isNotEmpty(deviceStatuses)){
+ for (BatchGetDeviceStateResponse.DeviceStatus d : deviceStatuses) {
+ DeviceStatus deviceStatus = new DeviceStatus();
+ deviceStatus.setDeviceCode(d.getDeviceName());
+ deviceStatus.setStatus(DeviceStateEnum.getCode(d.getStatus()));
+ statusList.add(deviceStatus);
+ }
+ }
+ }
+ return statusList;
+ }
}
--
Gitblit v1.9.3