From 8143ce1b902f99d8333475aa06e3c08e5e4164cf Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Jun 2020 19:19:56 +0800
Subject: [PATCH] alarm_daily统计任务update
---
src/main/resources/mapper/AlarmMapper.xml | 21 ++++-
src/main/java/com/moral/mapper/AlarmMapper.java | 2
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 135 ++++++++++++---------------------
src/main/java/com/moral/service/AlarmService.java | 4
pom.xml | 14 +++
src/main/java/com/moral/task/AlarmTableInsertTask.java | 7 -
6 files changed, 87 insertions(+), 96 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0a6b46a..373e550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,20 @@
<artifactId>xxl-job-core</artifactId>
<version>2.1.2</version>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/junit/junit -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>dom4j</groupId>
diff --git a/src/main/java/com/moral/mapper/AlarmMapper.java b/src/main/java/com/moral/mapper/AlarmMapper.java
index 8b29596..de429fd 100644
--- a/src/main/java/com/moral/mapper/AlarmMapper.java
+++ b/src/main/java/com/moral/mapper/AlarmMapper.java
@@ -9,6 +9,8 @@
List<Map<String, Object>> getAlarmData(Map<String, Object> devices);
+ List<String> getMacs(Map<String, Object> devices);
+
int insertAlarmDaily(List<Map<String,Object>> list);
void createTable(@Param("yearAndMonth") String yearAndMonth);
diff --git a/src/main/java/com/moral/service/AlarmService.java b/src/main/java/com/moral/service/AlarmService.java
index 887b95e..f4c852b 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -5,9 +5,7 @@
public interface AlarmService {
- List<Map<String, Object>> getAlarmData();
-
- int insertAlarmDaily(List<Map<String,Object>> list);
+ void insertAlarmDaily();
void createTable(String yearAndMonth);
}
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index db9d8eb..1710632 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -3,8 +3,8 @@
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -16,7 +16,6 @@
import com.alibaba.druid.support.json.JSONUtils;
import com.moral.mapper.AlarmMapper;
import com.moral.service.AlarmService;
-import com.moral.service.DeviceService;
import com.moral.service.SensorService;
@@ -30,7 +29,7 @@
private SensorService sensorService;
@Override
- public List<Map<String, Object>> getAlarmData() {
+ public void insertAlarmDaily() {
LocalDateTime time = LocalDateTime.now();
LocalDateTime endTime = time.truncatedTo(ChronoUnit.DAYS);
LocalDateTime startTime = endTime.minusDays(1);
@@ -49,104 +48,72 @@
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) {
+ for (String key : map.keySet()) {
+ if (!"mac".equals(key)) {
+ String[] strings = map.get(key).toString().replace("$.", "")
+ .replace("[", "").replace("]", "")
+ .replace("\"", "").replace(" ", "").split(",");
- List<Map<String, Object>> list = alarmMapper.getAlarmData(devices);
- for (Map<String, Object> map : list) {
- ArrayList<String> list1 = new ArrayList<>();
- ArrayList<String> list2 = new ArrayList<>();
- ArrayList<String> list3 = new ArrayList<>();
- for (String key : map.keySet()) {
- if (!key.equals("mac")) {
- String value = map.get(key).toString().substring(1, 2);
- if (value.equals("1")) {
- list1.add(key);
- } else if (value.equals("2")) {
- list2.add(key);
- } else if (value.equals("3")) {
- list3.add(key);
+ List<String> sensors = new ArrayList<String>(Arrays.asList(strings));
+ map.put(key, sensors);
}
}
}
- map.put("1", list1);
- map.put("2", list2);
- map.put("3", list3);
- }
- for (Map<String, Object> map : list) {
- Iterator<String> iter = map.keySet().iterator();
- while (iter.hasNext()) {
- String next = iter.next();
- if (!(next.equals("mac")) && !(next.equals("1")) && !(next.equals("2")) && !(next.equals("3"))) {
- iter.remove();
+ 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) {
+ if (map.get("1") != null) {
+ stateList1.addAll((ArrayList<String>) map.get("1"));
+ hashMap.put("1", stateList1);
}
- }
- }
-
- for (int i = list.size() - 1; i >= 0; i--) {
- for (int j = i - 1; j >= 0; j--) {
- Map<String, Object> map1 = list.get(i);
- Map<String, Object> map2 = list.get(j);
- if (map1.get("mac").equals(map2.get("mac"))) {
- List<String> frontList1 = (ArrayList<String>) map1.get("1");
- List<String> frontList2 = (ArrayList<String>) map1.get("2");
- List<String> frontList3 = (ArrayList<String>) map1.get("3");
- List<String> backList1 = (ArrayList<String>) map2.get("1");
- List<String> backList2 = (ArrayList<String>) map2.get("2");
- List<String> backList3 = (ArrayList<String>) map2.get("3");
- backList1.addAll(frontList1);
- backList2.addAll(frontList2);
- backList3.addAll(frontList3);
- list.remove(map1);
- List<String> list1 = backList1.stream().distinct().collect(Collectors.toList());
- List<String> list2 = backList2.stream().distinct().collect(Collectors.toList());
- List<String> list3 = backList3.stream().distinct().collect(Collectors.toList());
- map2.put("1", list1);
- map2.put("2", list2);
- map2.put("3", list3);
- break;
+ if (map.get("2") != null) {
+ stateList2.addAll((ArrayList<String>) map.get("2"));
+ hashMap.put("2", stateList2);
}
- }
- }
+ if (map.get("3") != null) {
+ stateList3.addAll((ArrayList<String>) map.get("3"));
+ hashMap.put("3", stateList3);
+ }
- for (Map<String, Object> map : list) {
- List<String> list1 = (ArrayList<String>) map.get("1");
- List<String> list2 = (ArrayList<String>) map.get("2");
- List<String> list3 = (ArrayList<String>) map.get("3");
- if (list1.size() == 0) {
- map.remove("1");
}
- if (list2.size() == 0) {
- map.remove("2");
- }
- if (list3.size() == 0) {
- map.remove("3");
- }
- }
- List<Map<String, Object>> resultList = new ArrayList<>();
- for (Map<String, Object> map : list) {
- for (String key : map.keySet()) {
- Map<String, Object> jsonMap = new HashMap<>();
+ for (String key : hashMap.keySet()) {
if (!"mac".equals(key)) {
- Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("mac",map.get("mac"));
- hashMap.put("time",startTime);
- hashMap.put("state",key);
- ArrayList<String> stateList = (ArrayList<String>) map.get(key);
+ ArrayList<String> arrayList = (ArrayList<String>) hashMap.get(key);
+ List<String> sensorsList = arrayList.stream().distinct().collect(Collectors.toList());
+ hashMap.put(key, sensorsList);
+ }
+ }
+
+ 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);
}
- hashMap.put("json", JSONUtils.toJSONString(jsonMap));
- resultList.add(hashMap);
+ map.put("json",JSONUtils.toJSONString(jsonMap));
+ resultList.add(map);
}
}
+ alarmMapper.insertAlarmDaily(resultList);
}
- return resultList;
- }
-
- @Override
- public int insertAlarmDaily(List<Map<String, Object>> list) {
- return alarmMapper.insertAlarmDaily(list);
}
@Override
diff --git a/src/main/java/com/moral/task/AlarmTableInsertTask.java b/src/main/java/com/moral/task/AlarmTableInsertTask.java
index be063b8..b33f4c0 100644
--- a/src/main/java/com/moral/task/AlarmTableInsertTask.java
+++ b/src/main/java/com/moral/task/AlarmTableInsertTask.java
@@ -24,12 +24,9 @@
@XxlJob("alarmDaily")
public ReturnT insertAlarmDailyTable(String param) {
- List<Map<String, Object>> list = alarmService.getAlarmData();
- if (!CollectionUtils.isEmpty(list)) {
- alarmService.insertAlarmDaily(list);
+ alarmService.insertAlarmDaily();
return new ReturnT(200, "������������������");
- }
- return new ReturnT(500, "������������������");
+
}
@XxlJob("createAlarmSubTable")
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index 7a7c6b0..34705d9 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/src/main/resources/mapper/AlarmMapper.xml
@@ -3,15 +3,28 @@
<mapper namespace="com.moral.mapper.AlarmMapper">
<select id="getAlarmData" resultType="java.util.LinkedHashMap">
SELECT
- mac
- <foreach collection="sensorKeys" open="," separator="," item="sensorKey">
- json->'$.${sensorKey}[0]' AS '${sensorKey}'
- </foreach>
+ mac,
+ json_search ( json, 'all', '1' ) '1',
+ json_search ( json, 'all', '2' ) '2',
+ json_search ( json, 'all', '3' ) '3'
FROM
alarm_${yearAndMonth}
WHERE
time >= #{start}
AND time <![CDATA[<]]> #{end}
+ AND mac =#{mac}
+ </select>
+
+ <select id="getMacs" resultType="java.lang.String">
+ SELECT
+ mac
+ FROM
+ alarm_${yearAndMonth}
+ where
+ time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ GROUP BY
+ mac
</select>
<insert id="insertAlarmDaily">
--
Gitblit v1.8.0