From 46581a1be3737bf25a57d48e82fc90a4bd0fcd1a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 19 五月 2022 15:23:26 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 aa11e70..9e92e85 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
@@ -100,7 +100,7 @@
public List<LightBo> listLight(int pageNo, int pageSize, String keyword) {
Long clientId = SecurityUtils.getClientId();
- // PageHelper.startPage(pageNo, pageSize);
+ PageHelper.startPage(pageNo, pageSize);
List<LightBo> listLight = baseMapper.listLight(clientId, keyword);
@@ -109,19 +109,19 @@
//鎷嗗垎list
List<List<String>> split = CollectionUtil.split(deviceCodeList, 100);
- List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses=null;
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = null;
for (List<String> splist : split) {
- deviceStatuses=MainBoardInvokeSyncService.getInstance().batchGetDeviceState(splist);
+ deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(splist);
if (deviceStatuses != null) {
for (LightBo lightBo : listLight) {
for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
if (lightBo.getDeviceCode() != null && lightBo.getDeviceCode().equals(deviceStatus.getDeviceName())) {
- if("ONLINE".equals(deviceStatus.getStatus()) ){
+ if ("ONLINE".equals(deviceStatus.getStatus())) {
lightBo.setOnlineStatus(0);
- }else if("OFFLINE".equals(deviceStatus.getStatus())){
+ } else if ("OFFLINE".equals(deviceStatus.getStatus())) {
lightBo.setOnlineStatus(1);
- }else {
+ } else {
lightBo.setOnlineStatus(2);
}
@@ -336,7 +336,7 @@
currentWeekValue = 7;
}
map = new LinkedHashMap();
- map.put("time",localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ map.put("time", localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
map.put("value", getlist(currentWeekValue));
temp.add(map);
}
@@ -408,7 +408,7 @@
currentWeekValue = 7;
}
map = new LinkedHashMap();
- map.put("time",localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ map.put("time", localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
map.put("value", getlistEnergy(currentWeekValue));
temp.add(map);
}
--
Gitblit v1.9.3