valhalla / fw-valhalla

Commit 61733fdb9f9ec8368d854130faeeada62552e8e1

Authored by 张志伟
2 parents 988aed10 358e4f17

Merge remote-tracking branch 'origin/test'

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
  View file @61733fd
... ... @@ -407,7 +407,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
407 407 if (SettingTypeEnum.FIRST_TRIGGER_TIME.getValue().equals(vo.getType())) {
408 408 if (Objects.nonNull(unitEnum) && value > 0) {
409 409 for (FollowClue clue : list) {
410   - LocalDateTime originTime = clue.getOriginTime();
  410 + LocalDateTime originTime = LocalDate.from(clue.getOriginTime()).atStartOfDay();
411 411 LocalDateTime newStartTime = calTime(originTime, unitEnum, value);
412 412 if (FollowTypeEnum.IR.equals(clue.getClueType())) {
413 413 newStartTime = calTime(originTime, unitEnum, value * -1);
... ... @@ -421,7 +421,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
421 421 if (SettingTypeEnum.FAIL_TIME.getValue().equals(vo.getType())) {
422 422 if (Objects.nonNull(unitEnum) && value > 0) {
423 423 for (FollowClue clue : list) {
424   - LocalDateTime originTime = clue.getOriginTime();
  424 + LocalDateTime originTime = LocalDate.from(clue.getOriginTime()).atStartOfDay();
425 425 LocalDateTime newEndTime = calTime(originTime, unitEnum, value);
426 426 if (LocalDate.now().isBefore(newEndTime.toLocalDate())) {
427 427 clue.setEndTime(newEndTime);
... ...