treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-921

Browse source
This commit is contained in:
ialbert 2025-12-18 11:21:37 +03:00
parent f5cab9ef6b
commit db71d1ebd3
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
View file

@ -1,5 +1,12 @@
package ru.spcex.clearing.scheduler.service;
import java.time.DayOfWeek;
import java.time.Instant;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
import java.util.function.Function;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.producer.Producer;
import org.slf4j.Logger;
@ -19,7 +26,9 @@ import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendar
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarUpdateRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
import static ru.spcex.clearing.scheduler.ISchedulerChecker.isWorkDayByTradingCalendar;
import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder;
import static ru.spcex.clearing.scheduler.config.PlannerQueueConfig.addToPlannerQueue;
import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.platform.enumeration.DayStatus;
import ru.spcex.platform.enumeration.Parent;
@ -28,17 +37,6 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.validation.IValidator;
import java.time.DayOfWeek;
import java.time.Instant;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
import java.util.function.Function;
import static ru.spcex.clearing.scheduler.ISchedulerChecker.isWorkDayByTradingCalendar;
import static ru.spcex.clearing.scheduler.config.PlannerQueueConfig.addToPlannerQueue;
@Service
public class ClearingCalendarService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass());
@ -140,8 +138,16 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
log.debug("CommonDeleteRequest received id = {}", req.getId());
ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());
LocalDate deletedDate = clearingCalendar != null ? clearingCalendar.getClearingDate() : null;
clearingCalendarMap.delete(clearingCalendar);
deleteFromPlannerAllTodayMap();
if (deletedDate != null && deletedDate.equals(LocalDate.now())) {
log.debug("deleted clearing calendar id={}; clearingDate=today; ", clearingCalendar.getId());
deleteFromPlannerAllTodayMap();
} else {
log.debug("Skip deleteFromPlannerAllTodayMap(): deletedDate={}, today={}", deletedDate, LocalDate.now());
}
return null;
}