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

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

@@ -1724,7 +1724,7 @@ public class TrendServiceImpl implements TrendService {
                                     hotspotCrossVO.setDetailList(dirDetails);
                                     Date currentDate = new Date(entry.getKey() * 1000L);
                                     hotspotCrossVO.setTimeStamp(currentDate);
-                                    hotspotCrossVO.setHourMinute(DateUtil.format(currentDate, DateStyle.MM_DD_HH_MM.getValue()));
+                                    hotspotCrossVO.setHourMinute(DateUtil.format(currentDate, DateStyle.HH_MM.getValue()));
                                     hotspotCrossVO.setCrossId(abnormalCrossListVO.getId());
                                     hotspotCrossVOS.add(hotspotCrossVO);
                                 }
@@ -1754,12 +1754,12 @@ public class TrendServiceImpl implements TrendService {
             if (!CollectionUtils.isEmpty(turnDataHistPOList)) {
                 Map<Integer, List<CrossTurnDataHistPO>> collect = turnDataHistPOList.stream().collect(Collectors.groupingBy(CrossTurnDataHistPO::getBatchTime));
                 for (Map.Entry<Integer, List<CrossTurnDataHistPO>> entry : collect.entrySet()) {
-                    HotspotCrossTurnVO hotspotCrossTurnVO = new HotspotCrossTurnVO();
                     Integer timeStamp = entry.getKey();
                     List<CrossTurnDataHistPO> value = entry.getValue();
                     if (!CollectionUtils.isEmpty(value)) {
                         Map<Integer, List<CrossTurnDataHistPO>> dirMap = value.stream().collect(Collectors.groupingBy(CrossTurnDataHistPO::getInDir));
                         for (Map.Entry<Integer, List<CrossTurnDataHistPO>> dirEntry : dirMap.entrySet()) {
+                            HotspotCrossTurnVO hotspotCrossTurnVO = new HotspotCrossTurnVO();
                             Integer dir = dirEntry.getKey();
                             List<CrossTurnDataHistPO> list = dirEntry.getValue();
                             List<HotspotCrossTurnVO.TurnDetail> turnDetails = new ArrayList<>();
@@ -1772,9 +1772,9 @@ public class TrendServiceImpl implements TrendService {
                             }
                             hotspotCrossTurnVO.setCrossId(crossId);
                             hotspotCrossTurnVO.setDir(dir);
-                            Date currentDate = 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.setHourMinute(DateUtil.format(currentDate, DateStyle.HH_MM.getValue()));
                             hotspotCrossTurnVO.setTurnList(turnDetails);
                             results.add(hotspotCrossTurnVO);
                         }