Merge remote-tracking branch 'origin/master'

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

@@ -412,12 +412,23 @@ public class SceneEvaluateServiceImpl implements SceneEvaluateService {
     public List<SceneEvaluateHeatMapVO> heatMap(HeatMapBO bo) {
         String crossId = bo.getCrossId();
         Date startDate = bo.getStartDate();
-        Date endDate = bo.getEndDate();
-        endDate = DateUtil.offsetDay(endDate, 1); // 包含最后一天
-        int startStamp = (int) (startDate.getTime() / 1000); // 10位时间戳
-        int endStamp = (int) (endDate.getTime() / 1000);
+        String hourMinute = bo.getHourMinute();
         Integer status = bo.getStatus();
 
+        String[] parts = hourMinute.split(":");
+        int hour = Integer.parseInt(parts[0]);
+        int minute = Integer.parseInt(parts[1]);
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        calendar.set(Calendar.HOUR_OF_DAY, hour);
+        calendar.set(Calendar.MINUTE, minute);
+
+        int startStamp = (int)calendar.getTimeInMillis() / 1000;
+        calendar.add(Calendar.MINUTE, 5);
+        int endStamp = (int)calendar.getTimeInMillis() / 1000;
+
+
         List<SceneEvaluateHeatMapVO> res = new ArrayList<>();
         List<CrossDataHistPO> crossDataHistPOList = crossDataHistMapper.selectByCrossIdAndStartEnd(
                 crossId, startStamp, endStamp);

wj-databus/src/main/java/net/wanji/databus/bo/HeatMapBO.java

@@ -21,4 +21,7 @@ public class HeatMapBO {
 
     @ApiModelProperty(value = "路口状态 0正常 1 失衡  2 拥堵 3 溢出")
     private Integer status;
+
+    @ApiModelProperty(value = "小时分钟 格式 08:00")
+    private String hourMinute;
 }