[update] 态势监测-时间格式优化

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

@@ -1722,7 +1722,9 @@ public class TrendServiceImpl implements TrendService {
                                         dirDetails.add(dirDetail);
                                     }
                                     hotspotCrossVO.setDetailList(dirDetails);
-                                    hotspotCrossVO.setTimeStamp(new Date(entry.getKey() * 1000L));
+                                    Date currentDate = new Date(entry.getKey() * 1000L);
+                                    hotspotCrossVO.setTimeStamp(currentDate);
+                                    hotspotCrossVO.setHourMinute(DateUtil.format(currentDate, DateStyle.MM_DD_HH_MM.getValue()));
                                     hotspotCrossVO.setCrossId(abnormalCrossListVO.getId());
                                     hotspotCrossVOS.add(hotspotCrossVO);
                                 }
@@ -1731,7 +1733,7 @@ public class TrendServiceImpl implements TrendService {
                     }
                 }
             }
-            return hotspotCrossVOS;
+            return hotspotCrossVOS.stream().sorted(Comparator.comparing(HotspotCrossVO::getTimeStamp)).collect(Collectors.toList());
         } catch (Exception e) {
             log.error("重点路口监测异常：", e);
             throw new Exception(e);
@@ -1770,7 +1772,9 @@ public class TrendServiceImpl implements TrendService {
                             }
                             hotspotCrossTurnVO.setCrossId(crossId);
                             hotspotCrossTurnVO.setDir(dir);
-                            hotspotCrossTurnVO.setTimeStamp(new Date(timeStamp  * 1000L));
+                            Date currentDate = new Date(timeStamp  * 1000L);
+                            hotspotCrossTurnVO.setTimeStamp(currentDate);
+                            hotspotCrossTurnVO.setHourMinute(DateUtil.format(currentDate, DateStyle.MM_DD_HH_MM.getValue()));
                             hotspotCrossTurnVO.setTurnList(turnDetails);
                             results.add(hotspotCrossTurnVO);
                         }
@@ -1781,7 +1785,7 @@ public class TrendServiceImpl implements TrendService {
             log.error("路口转向排队长度异常", e);
             throw new Exception(e);
         }
-        return results;
+        return results.stream().sorted(Comparator.comparing(HotspotCrossTurnVO::getTimeStamp)).collect(Collectors.toList());
     }
 
     @Override
@@ -1814,7 +1818,9 @@ public class TrendServiceImpl implements TrendService {
                         }
                         hotspotCrossLaneVO.setCrossId(crossId);
                         hotspotCrossLaneVO.setDir(dir);
-                        hotspotCrossLaneVO.setTimeStamp(new Date(timeStamp * 1000L));
+                        Date dateStamp = new Date(timeStamp * 1000L);
+                        hotspotCrossLaneVO.setTimeStamp(dateStamp);
+                        hotspotCrossLaneVO.setHourMinute(DateUtil.format(dateStamp, DateStyle.HH_MM.getValue()));
                         hotspotCrossLaneVO.setTurnList(laneDetails);
                         results.add(hotspotCrossLaneVO);
                     }
@@ -1824,7 +1830,7 @@ public class TrendServiceImpl implements TrendService {
             log.error("路口车道数据异常：", e);
             throw new Exception(e);
         }
-        return results;
+        return results.stream().sorted(Comparator.comparing(HotspotCrossLaneVO::getTimeStamp)).collect(Collectors.toList());
     }
 
     @Override

signal-optimize-service/src/main/java/net/wanji/opt/vo/HotspotCrossLaneVO.java

@@ -18,6 +18,7 @@ public class HotspotCrossLaneVO {
     private String crossId;
     private Integer dir;
     private Date timeStamp;
+    private String hourMinute;
     private List<HotspotCrossLaneVO.LaneDetail> turnList;
 
     @Data

signal-optimize-service/src/main/java/net/wanji/opt/vo/HotspotCrossTurnVO.java

@@ -17,6 +17,7 @@ import java.util.List;
 public class HotspotCrossTurnVO {
     private String crossId;
     private Date timeStamp;
+    private String hourMinute;
     private Integer dir;
     private List<HotspotCrossTurnVO.TurnDetail> turnList;
 

signal-optimize-service/src/main/java/net/wanji/opt/vo/HotspotCrossVO.java

@@ -17,6 +17,7 @@ import java.util.List;
 public class HotspotCrossVO {
     private String crossId;
     private Date timeStamp;
+    private String hourMinute;
     private List<DirDetail> detailList;
     @Data
     public static class DirDetail {