From 978f41e48ba2e1345d799017535fda1565b9dfff Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Jul 2020 10:13:14 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 55 ++++++++++++++++++-------------------------------------
1 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index 1710632..475e587 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
@@ -25,15 +26,11 @@
@Resource
private AlarmMapper alarmMapper;
- @Resource
- private SensorService sensorService;
-
@Override
public void insertAlarmDaily() {
LocalDateTime time = LocalDateTime.now();
LocalDateTime endTime = time.truncatedTo(ChronoUnit.DAYS);
LocalDateTime startTime = endTime.minusDays(1);
- List<String> sensorKeys = sensorService.getSensorKeys();
String year = startTime.getYear() + "";
String month = null;
int monthValue = startTime.getMonthValue();
@@ -44,73 +41,57 @@
}
String yearAndMonth = year + month;
Map<String, Object> devices = new HashMap<>();
- devices.put("sensorKeys", sensorKeys);
devices.put("start", startTime);
devices.put("end", endTime);
devices.put("yearAndMonth", yearAndMonth);
List<String> macs = alarmMapper.getMacs(devices);
- devices.put("macs", macs);
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()) {
- if (!"mac".equals(key)) {
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);
- }
+
}
}
-
Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("mac", mac);
- 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);
- }
-
- }
-
- for (String key : hashMap.keySet()) {
- if (!"mac".equals(key)) {
- ArrayList<String> arrayList = (ArrayList<String>) hashMap.get(key);
- List<String> sensorsList = arrayList.stream().distinct().collect(Collectors.toList());
- hashMap.put(key, sensorsList);
+ stateSet3.addAll((ArrayList<String>) map.get("3"));
+ hashMap.put("3", stateSet3);
}
}
for (String key : hashMap.keySet()) {
- if(!"mac".equals(key)){
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);
+ 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);
}
--
Gitblit v1.8.0