From 1499a57bc919fc1480ca1036040e50d0db204601 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 17:48:48 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 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 6469109..446dd8b 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,7 @@
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;
@@ -9,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;
@@ -31,7 +34,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.util.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -196,26 +203,61 @@
*
* @return
*/
- public Map controlEnergySaving() {
+ 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<LightBo> listLight = baseMapper.listLight(clientId, null);
+// List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
+ List<String> deviceCodeList = new ArrayList<>();
+ deviceCodeList.add("32313243305005ffa633ffff");
+// DateTime startDate = DateUtil.date();
+// DateTime endDate = DateUtil.offsetDay(startDate, 3);
+// if (CollectionUtil.isNotEmpty(deviceCodeList)) {
+//
+// List<LightReportDataBo> reportDataList = lightReportDataService.reportDataList(deviceCodeList, startDate, endDate);
+// }
//鑾峰彇鐢ㄦ埛鏈�杩�7澶╃殑鍗曠伅鏁版嵁
List<LightReportData> reportDataList = lightReportDataService.list(Wrappers.<LightReportData>lambdaQuery()
.in(LightReportData::getDeviceCode, deviceCodeList)
- .ge(LightReportData::getCreateTime, DateUtil.offsetDay(new Date(), -7))
+ .ge(LightReportData::getCreateTime, DateUtil.offsetDay(DateUtil.yesterday(), -7))
.orderByDesc(LightReportData::getCreateTime));
+ List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listLightTask(null, null);
+ lightTaskDtos.forEach(Task -> {
- if (CollectionUtil.isEmpty(reportDataList)) {
- throw new BusinessException("娌℃湁璺伅鏁版嵁");
- }
+ });
+
+
+ LocalDateTime dateTime = LocalDateTime.now();
+ dateTime.plusDays(7L);
+ reportDataList.forEach(
+ reportData -> {
+ LocalDateTime createTime = reportData.getCreateTime();
+ if(dateTime.plusDays(-1L).getDayOfMonth()==createTime.getDayOfMonth()){
+
+ }
+ }
+ );
+
+
Map map = new HashMap();
- map.put("7", reportDataList);
+ map.put("-1", null);
- return map;
+ return reportDataList;
+ }
+
+ /**
+ * 瑙ｆ瀽寮�鍏崇伅鎸囦护
+ */
+ 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));
+ }
+
}
/**
@@ -224,8 +266,12 @@
* @return
*/
public List<Light> listLight() {
- Long clientId = SecurityUtils.getClientId();
- List<LightBo> listLight = baseMapper.listLight(clientId, null);
+ 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());
--
Gitblit v1.9.3