From bd8da139decc60e8c7765e375ffda037f5209e3a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 18 五月 2022 14:32:13 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 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 2b02621..03d895a 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
@@ -204,7 +204,9 @@
map.put("deviceCode", param.getDeviceCode());
WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame
= MainBoardInvokeSyncService.getInstance().sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
+ //瀛樺偍鎺у埗甯ф寚浠�
StoreOperationRecordsUtils.storeInnerFrameData(param.getDeviceCode(), "鍗曠伅甯�-浜害鎺у埗", a5Frame, frame);
+
if (frame == null) {
map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
resultList.add(map);
@@ -227,6 +229,20 @@
}
}
+ /**
+ * 鏈嶅姟绔壒閲忔帶鐏棩蹇楄褰曞紑濮�
+ */
+ String content = "{鎺х伅璇锋眰锛�" + paramList.toString()
+ + "锛� 鎺х伅缁撴灉锛�" + resultList.toString() + "}";
+ List<String> codeList = new ArrayList<>();
+ for (LightControlParam bean : paramList) {
+ codeList.add(bean.getDeviceCode());
+ }
+ StoreOperationRecordsUtils.storeOperationData(codeList, null, "鏈嶅姟绔壒閲忔帶鐏�", content);
+ /**
+ * 鏈嶅姟绔壒閲忔帶鐏棩蹇楄褰曠粨鏉�
+ */
+
return resultList;
}
@@ -235,7 +251,7 @@
*
* @return
*/
- public Map controlEnergySaving() {
+ public List controlEnergySaving() {
//鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
LocalDateTime now = LocalDateTime.now();
@@ -250,7 +266,6 @@
for (LightTaskDto lightTaskDto : lightTaskDtos) {
List<Integer> weekList = lightTaskDto.getWeekList();
- System.out.println(weekList + "===========================");
for (Integer one : weekList) {
switch (one) {
case 1:
@@ -282,23 +297,26 @@
//鑾峰彇褰撳墠鏄熸湡鍑� 1-7
- int week = now.getDayOfWeek().getValue();
- Map map = new LinkedHashMap();
+ int currentWeekValue = now.getDayOfWeek().getValue();
+ Map map;
+ List<Map> temp = new ArrayList<>();
//鑾峰彇鏃ユ湡 绮剧‘鍒板ぉ
LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
- week--;
- if (week < 1) {
- week = 7;
+ currentWeekValue--;
+ if (currentWeekValue < 1) {
+ currentWeekValue = 7;
}
- String format = localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlist(week));
+ map = new LinkedHashMap();
+ map.put("time",localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ map.put("value", getlist(currentWeekValue));
+ temp.add(map);
}
- return map;
+ return temp;
}
@@ -307,7 +325,7 @@
*
* @return
*/
- public Map controlEnergy() {
+ public List controlEnergy() {
//鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
LocalDateTime now = LocalDateTime.now();
@@ -351,23 +369,26 @@
}
}
- Integer week = now.getDayOfWeek().getValue();
-
- Map map = new LinkedHashMap();
+ Integer currentWeekValue = now.getDayOfWeek().getValue();
+ Map map;
+ List<Map> temp = new ArrayList<>();
//鑾峰彇褰撳墠鏃ユ湡 鏍煎紡涓簓yyy-MM-dd
LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
- week--;
- if (week < 1) {
- week = 7;
+ currentWeekValue--;
+ if (currentWeekValue < 1) {
+ currentWeekValue = 7;
}
- map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlistEnergy(week));
+ map = new LinkedHashMap();
+ map.put("time",localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ map.put("value", getlistEnergy(currentWeekValue));
+ temp.add(map);
}
- return map;
+ return temp;
}
--
Gitblit v1.9.3