From b6dccb271639d18249f796a51a492ed1a4c3f2a6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 16 五月 2022 16:17:16 +0800
Subject: [PATCH] 操作日志
---
dao/src/main/resources/mapper/PoleBindingMapper.xml | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 18 ++++++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/resources/mapper/PoleBindingMapper.xml b/dao/src/main/resources/mapper/PoleBindingMapper.xml
index 888d905..acab21a 100644
--- a/dao/src/main/resources/mapper/PoleBindingMapper.xml
+++ b/dao/src/main/resources/mapper/PoleBindingMapper.xml
@@ -24,7 +24,7 @@
SELECT t2.*
FROM `pole_binding` t1
LEFT JOIN pole t2 ON t1.pole_id = t2.id
- t1.device_code = #{Mac}
+ WHERE t1.device_code = #{Mac}
<where>
<if test="type != null">
AND t1.device_type = #{type}
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 f314146..ee55573 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
@@ -228,6 +228,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;
}
@@ -693,11 +707,11 @@
min = 0;
}
//璁＄畻鏃堕暱
- BigDecimal totalTime = BigDecimal.valueOf(hour*60+min);
+ BigDecimal totalTime = BigDecimal.valueOf(hour * 60 + min);
//璁＄畻鑺傝兘鐜� ( (1-v1.getBrightness()/100)*totalTime/3600 ) 淇濈暀涓や綅灏忔暟
BigDecimal energySaving = BigDecimal.valueOf((1 - v1.getBrightness() / 100) * totalTime.doubleValue() / 3600).setScale(2, BigDecimal.ROUND_HALF_UP);
- System.out.println(energySaving+"鑺傝兘鐜�");
+ System.out.println(energySaving + "鑺傝兘鐜�");
return energySaving;
}
--
Gitblit v1.9.3