Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/EventServiceImpl.java

@@ -129,7 +129,7 @@ public class EventServiceImpl implements EventService {
 			groupByType.forEach((type, valList2) -> {
 				EventInfoSimplePo tmp = null;
 				for (EventInfoSimplePo po : valList2) {
-					po.setDate(DateUtil.formatDate(po.getStartTime(), "M/d"));
+					po.setDate(net.wanji.common.utils.tool.DateUtil.formatDate(po.getStartTime(), "M/d"));
 					//合并时间重叠事件
 					if (tmp != null) {
 						Date agoStartTime = tmp.getStartTime();

signal-optimize-service/src/main/resources/mapper/GreenwaveHistMapper.xml

@@ -58,8 +58,9 @@
         DATE_FORMAT( start_time, '%Y-%m-%d %H:%i:00' ) start_time,
         round(AVG(speed),2) speed,
         round(AVG(delay_time)) delay_time,
-        round(AVG(stop_times)) stop_times,
-        round(AVG(trval_time)) trval_time
+        round(AVG(stop_times),2) stop_times,
+        round(AVG(trval_time)) trval_time,
+        round(AVG(if(queue_length=-1,null,queue_length))) queue_length
         FROM
         t_greenwave_hist
         where 1=1