Commit 77e23be0 authored by wang yecheng's avatar wang yecheng

追加干线跟路口的问题时长

parent 87419fef
...@@ -176,10 +176,12 @@ public class AnalysisProblemCrossDayServiceImpl extends ServiceImpl<AnalysisProb ...@@ -176,10 +176,12 @@ public class AnalysisProblemCrossDayServiceImpl extends ServiceImpl<AnalysisProb
} }
value.stream().sorted(Comparator.comparing(AnalysisProblemCrossDay::getDt)).collect(Collectors.toList()); value.stream().sorted(Comparator.comparing(AnalysisProblemCrossDay::getDt)).collect(Collectors.toList());
List<Integer> numberlist = value.stream().map(AnalysisProblemCrossDay::getEventNumber).collect(Collectors.toList()); List<Integer> numberlist = value.stream().map(AnalysisProblemCrossDay::getEventNumber).collect(Collectors.toList());
List<Integer> durationList = value.stream().map(item->item.getEventTotalTime()!=null?item.getEventTotalTime():0).collect(Collectors.toList());
Map<String, Object> maplist = new HashMap<>(); Map<String, Object> maplist = new HashMap<>();
maplist.put("eventType", key); maplist.put("eventType", key);
maplist.put("eventLabel", typeName); maplist.put("eventLabel", typeName);
maplist.put("list", numberlist); maplist.put("list", numberlist);
maplist.put("durationList",durationList);
allList.add(maplist); allList.add(maplist);
} }
......
...@@ -164,10 +164,12 @@ import java.util.stream.Collectors; ...@@ -164,10 +164,12 @@ import java.util.stream.Collectors;
List<Integer> numberList = sortedSet.stream() List<Integer> numberList = sortedSet.stream()
.map(timePoint -> existingDataPoints.getOrDefault(timePoint, 0)) .map(timePoint -> existingDataPoints.getOrDefault(timePoint, 0))
.collect(Collectors.toList()); .collect(Collectors.toList());
List<Integer> durationList = value.stream().map(item->item.getEventTotalTime()!=null?item.getEventTotalTime():0).collect(Collectors.toList());
Map<String,Object>mapList=new HashMap<>(); Map<String,Object>mapList=new HashMap<>();
mapList.put("eventType",key); mapList.put("eventType",key);
mapList.put("eventLabel",typeName); mapList.put("eventLabel",typeName);
mapList.put("list",numberList); mapList.put("list",numberList);
mapList.put("durationList",durationList);
allList.add(mapList); allList.add(mapList);
} }
......
...@@ -323,6 +323,7 @@ ...@@ -323,6 +323,7 @@
SELECT SELECT
dt, dt,
sum( event_number ) AS event_number, sum( event_number ) AS event_number,
sum(event_total_time) AS event_total_time,
t1.event_type, t1.event_type,
t2.label AS typeName t2.label AS typeName
FROM t_analysis_problem_cross_day t1 FROM t_analysis_problem_cross_day t1
......
...@@ -258,6 +258,7 @@ ...@@ -258,6 +258,7 @@
SELECT SELECT
dt, dt,
sum( event_number ) AS event_number, sum( event_number ) AS event_number,
sum(event_total_time) As event_total_time,
t1.event_type, t1.event_type,
t2.label AS typeName t2.label AS typeName
FROM t_analysis_problem_green_day t1 FROM t_analysis_problem_green_day t1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment