|
|
@@ -756,10 +756,12 @@ public class FhzgSvgBreakersServiceImpl implements FhzgSvgBreakersService {
|
|
|
periodSwitchSeResult = s.getPeriodSwitchSeResult();
|
|
|
} else {
|
|
|
try {
|
|
|
+ LocalDateTime floorNow =LocalDateTime.parse(dto.getTime(), TIME_FORMATTER);
|
|
|
+ LocalDateTime sTime = floorNow.minusMinutes(30);
|
|
|
periodSwitchSeResult = iStateEstimationApiClient.queryByFeederSave(StateEstimationRequest.builder()
|
|
|
.psrIds(Collections.singletonList(dto.getLinePsrId()))
|
|
|
.containerCode(Collections.singletonList(CommonConstant.SWITCH))
|
|
|
- .startTime(dto.getTime())
|
|
|
+ .startTime(sTime.format(TIME_FORMATTER))
|
|
|
.endTime(dto.getTime())
|
|
|
.isAuto(Boolean.FALSE)
|
|
|
.build()).getData().getPeriodSwitchSeResult();
|
|
|
@@ -995,6 +997,8 @@ public class FhzgSvgBreakersServiceImpl implements FhzgSvgBreakersService {
|
|
|
if (groupFeederIds.isEmpty()) {
|
|
|
groupFeederIds = Collections.singletonList(feederId);
|
|
|
}
|
|
|
+ LocalDateTime floorNow =LocalDateTime.parse(dto.getTime(), TIME_FORMATTER);
|
|
|
+ LocalDateTime sTime = floorNow.minusMinutes(30);
|
|
|
for (String feeder : groupFeederIds) {
|
|
|
s = JSON.parseObject(JSON.toJSONString(redisTemplate.opsForValue().get(feeder + dto.getTime() + "zg")), StateEstimation.class);
|
|
|
if (s != null) {
|
|
|
@@ -1004,7 +1008,7 @@ public class FhzgSvgBreakersServiceImpl implements FhzgSvgBreakersService {
|
|
|
ss = iStateEstimationApiClient.queryByFeederSave(StateEstimationRequest.builder()
|
|
|
.psrIds(Collections.singletonList(dto.getLinePsrId()))
|
|
|
.containerCode(Collections.singletonList(CommonConstant.SWITCH))
|
|
|
- .startTime(dto.getTime())
|
|
|
+ .startTime(sTime.format(TIME_FORMATTER))
|
|
|
.endTime(dto.getTime())
|
|
|
.isAuto(Boolean.FALSE)
|
|
|
.build()).getData().getPeriodSwitchSeResult();
|