From f6263ece2df35b8fb9d3868a1464397b002bfb1e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 11 Sep 2020 13:25:56 +0800
Subject: [PATCH] 邮件发送依赖包更新
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index 475e587..ad715cb 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -27,7 +27,7 @@
private AlarmMapper alarmMapper;
@Override
- public void insertAlarmDaily() {
+ public int insertAlarmDaily() {
LocalDateTime time = LocalDateTime.now();
LocalDateTime endTime = time.truncatedTo(ChronoUnit.DAYS);
LocalDateTime startTime = endTime.minusDays(1);
@@ -45,6 +45,7 @@
devices.put("end", endTime);
devices.put("yearAndMonth", yearAndMonth);
List<String> macs = alarmMapper.getMacs(devices);
+ int count = 0;
for (String mac : macs) {
List<Map<String, Object>> resultList = new ArrayList<>();
devices.put("mac", mac);
@@ -52,12 +53,12 @@
List<Map<String, Object>> newList = list.stream().distinct().collect(Collectors.toList());
for (Map<String, Object> map : newList) {
for (String key : map.keySet()) {
- String[] strings = map.get(key).toString().replace("$.", "")
- .replace("[", "").replace("]", "")
- .replace("\"", "").replace(" ", "").split(",");
+ String[] strings = map.get(key).toString().replace("$.", "")
+ .replace("[", "").replace("]", "")
+ .replace("\"", "").replace(" ", "").split(",");
- List<String> sensors = new ArrayList<String>(Arrays.asList(strings));
- map.put(key, sensors);
+ List<String> sensors = new ArrayList<String>(Arrays.asList(strings));
+ map.put(key, sensors);
}
}
@@ -81,20 +82,21 @@
}
for (String key : hashMap.keySet()) {
- Map<String, Object> jsonMap = new HashMap<>();
- Map<String, Object> map = new HashMap<>();
- map.put("mac",mac);
- map.put("time",startTime);
- map.put("state", key);
- Set<String> sensors = (Set<String>) hashMap.get(key);
- for (String sensor : sensors) {
- jsonMap.put(sensor,1);
- }
- map.put("json",JSONUtils.toJSONString(jsonMap));
- resultList.add(map);
+ Map<String, Object> jsonMap = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
+ map.put("mac", mac);
+ map.put("time", startTime);
+ map.put("state", key);
+ Set<String> sensors = (Set<String>) hashMap.get(key);
+ for (String sensor : sensors) {
+ jsonMap.put(sensor, 1);
+ }
+ map.put("json", JSONUtils.toJSONString(jsonMap));
+ resultList.add(map);
}
- alarmMapper.insertAlarmDaily(resultList);
+ count = count + alarmMapper.insertAlarmDaily(resultList);
}
+ return count;
}
@Override
--
Gitblit v1.8.0