From 995a527d6e7d2d0cb141f6853b2b7a2a67b8a1c2 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 20 Nov 2020 18:00:22 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 72 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index 7332784..ad715cb 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -5,8 +5,10 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -16,7 +18,6 @@
import com.alibaba.druid.support.json.JSONUtils;
import com.moral.mapper.AlarmMapper;
import com.moral.service.AlarmService;
-import com.moral.service.SensorService;
@Service
@@ -26,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);
@@ -44,63 +45,58 @@
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);
List<Map<String, Object>> list = alarmMapper.getAlarmData(devices);
- List<Map<String, Object>> newList1 = list.stream().distinct().collect(Collectors.toList());
- for (Map<String, Object> map : newList1) {
+ 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);
}
}
Map<String, Object> hashMap = new HashMap<>();
- ArrayList<String> stateList1 = new ArrayList<>();
- ArrayList<String> stateList2 = new ArrayList<>();
- ArrayList<String> stateList3 = new ArrayList<>();
- for (Map<String, Object> map : newList1) {
+ Set<String> stateSet1 = new HashSet<>();
+ Set<String> stateSet2 = new HashSet<>();
+ Set<String> stateSet3 = new HashSet<>();
+ for (Map<String, Object> map : newList) {
if (map.get("1") != null) {
- stateList1.addAll((ArrayList<String>) map.get("1"));
- hashMap.put("1", stateList1);
+ stateSet1.addAll((ArrayList<String>) map.get("1"));
+ hashMap.put("1", stateSet1);
}
if (map.get("2") != null) {
- stateList2.addAll((ArrayList<String>) map.get("2"));
- hashMap.put("2", stateList2);
+ stateSet2.addAll((ArrayList<String>) map.get("2"));
+ hashMap.put("2", stateSet2);
}
if (map.get("3") != null) {
- stateList3.addAll((ArrayList<String>) map.get("3"));
- hashMap.put("3", stateList3);
+ stateSet3.addAll((ArrayList<String>) map.get("3"));
+ hashMap.put("3", stateSet3);
}
-
}
for (String key : hashMap.keySet()) {
- ArrayList<String> arrayList = (ArrayList<String>) hashMap.get(key);
- List<String> sensorsList = arrayList.stream().distinct().collect(Collectors.toList());
- hashMap.put(key, sensorsList);
+ 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);
}
-
- 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);
- ArrayList<String> stateList = (ArrayList<String>) hashMap.get(key);
- for (String state : stateList) {
- jsonMap.put(state,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