From b351d83856603abbca985508000828b71712894d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 10 十二月 2021 15:58:44 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
index 360b58c..1925744 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
@@ -1,14 +1,13 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.lang.Snowflake;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LampPostParam;
import com.sandu.ximon.admin.security.CountSet;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.LampCount;
import com.sandu.ximon.dao.domain.LampPost;
import com.sandu.ximon.dao.mapper.ClientMapper;
@@ -82,7 +81,7 @@
/**
* @param group
- * @param Id 缂栬緫鍒嗙粍--閫夋嫨鐏潌
+ * @param Id 缂栬緫鍒嗙粍--閫夋嫨鐏潌
*/
public void setGroup(String group, List<Long> Id) {
@@ -97,10 +96,32 @@
public List<LampPost> listLamp() {
List<LampPost> list = lampPostMapper.listLamp();
- // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
+ // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
return list;
}
+ public List<LampPost> queryStates() {
+ // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
+ List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
+ List<String> MacCodes = new ArrayList<>();
+
+ for (LampPost post : list) {
+ MacCodes.add(post.getMacCode());
+ }
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
+ for (LampPost post : list) {
+ for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
+ if(post.getMacCode().equals(deviceStatus.getDeviceName())){
+ post.setOnLineState(deviceStatus.getStatus());
+ }
+ }
+ MacCodes.add(post.getMacCode());
+ }
+
+
+ return list;
+ }
+
}
--
Gitblit v1.9.3