From 5459d7d124fc4c4eb93e8074354dd72c9527081e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 18:14:33 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 88 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index d966d0f..4903e14 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -1,6 +1,8 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,6 +10,8 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightBrightnessReqInnerFrame;
@@ -30,6 +34,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -100,12 +105,12 @@
for (LightBo lightBo : listLight) {
deviceCodeList.forEach(code -> {
PoleBinding bind = bindingService.getPoleIdByMac(code);
- if (bind != null&&lightBo.getDeviceCode().equals(bind.getDeviceCode())) {
+ if (bind != null && lightBo.getDeviceCode().equals(bind.getDeviceCode())) {
Long poleId = bind.getPoleId();
- Pole pole = poleService.getById(poleId);
- lightBo.setPoleId(pole.getId());
- lightBo.setPoleCode(pole.getDeviceCode());
- lightBo.setPoleName(pole.getPoleName());
+ Pole pole = poleService.getById(poleId);
+ lightBo.setPoleId(pole.getId());
+ lightBo.setPoleCode(pole.getDeviceCode());
+ lightBo.setPoleName(pole.getPoleName());
}
}
);
@@ -119,6 +124,23 @@
}
return listLight;
+ }
+
+ /**
+ * 鑾峰彇鍗曚釜璺伅淇℃伅
+ *
+ * @param deviceCode 璁惧鐮�
+ * @return
+ */
+ public Light getLight(String deviceCode) {
+ Light one = getOne(Wrappers.<Light>lambdaQuery().eq(Light::getDeviceCode, deviceCode));
+ Object o = redisService.get(LightKey.REPORT_MAC.key(deviceCode));
+ if (o != null) {
+ one.setOnlineStatus(1);
+ } else {
+ one.setOnlineStatus(0);
+ }
+ return one;
}
public boolean addRemark(LightRemarkParam param) {
@@ -175,4 +197,60 @@
return resultList;
}
+
+ /**
+ * 鍗曠伅鑺傝兘鐜�
+ *
+ * @return
+ */
+ public List<LightReportData> controlEnergySaving() {
+ Long clientId = SecurityUtils.getClientId();
+// List<LightBo> listLight = baseMapper.listLight(clientId, null);
+// List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
+
+ List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listLightTask(null, null);
+ lightTaskDtos.forEach(Task -> {
+
+
+ });
+
+
+
+
+ return null;
+ }
+
+ /**
+ * 瑙ｆ瀽寮�鍏崇伅鎸囦护
+ */
+ public void parseSwitchLightCommand(String command) {
+ char[] chars = command.toCharArray();
+ if(chars.length==7){
+ int hour = Integer.valueOf(command.substring(0,2));
+ int min = Integer.valueOf(command.substring(2,4));
+ int brightness = Integer.valueOf(command.substring(4,7));
+ }
+
+ }
+
+ /**
+ * 鐢ㄦ埛鎷ユ湁鐨勮矾鐏�
+ *
+ * @return
+ */
+ public List<Light> listLight() {
+ List<LightBo> listLight;
+ if (SecurityUtils.getClientId() != null) {
+ listLight = baseMapper.listLight(SecurityUtils.getUserId(), null);
+ } else {
+ listLight = baseMapper.listLight(null, null);
+ }
+ List<Light> lightList = new ArrayList<>();
+ for (LightBo bean : listLight) {
+ Light light = getLight(bean.getDeviceCode());
+ lightList.add(light);
+ }
+ return lightList;
+ }
+
}
--
Gitblit v1.9.3