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

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

Browse source 
Исправил ошибки.
This commit is contained in:
psemenkov 2023-04-24 17:52:20 +03:00
parent 9bfc038111
commit 70433b7f85
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java
View file

@ -24,27 +24,29 @@ public class PlannerAllTodayBuilder {
}
private PlannerAllTodayBuilder(){}
//пока для clearingCalendar нет сеттера append, если появится нужно поправить ClearingCalendarService.deleteFromPlannerAllTodayMap()
//из-за поля this.parent = Parent.Template.getKey();
public PlannerAllTodayBuilder append(PlannerTemplate plannerTemplate){
this.task = plannerTemplate.getTask();
this.taskTime = plannerTemplate.getTaskTime();
this.taskStatus = plannerTemplate.getTaskStatus();
this.companyId = plannerTemplate.getCompanyId();
this.securityId = plannerTemplate.getSecurityId();
this.parent = Parent.Planner.getKey();
this.parent = Parent.Template.getKey();
this.id = plannerTemplate.getId();
return this;
}
public PlannerAllTodayBuilder append(Planner plannerTemplate){
this.task = plannerTemplate.getTask();
this.taskTime = plannerTemplate.getTaskTime();
this.clearingDate = plannerTemplate.getClearingDate();
this.market = plannerTemplate.getMarket();
this.taskStatus = plannerTemplate.getTaskStatus();
this.companyId = plannerTemplate.getCompanyId();
this.securityId = plannerTemplate.getSecurityId();
public PlannerAllTodayBuilder append(Planner planner){
this.task = planner.getTask();
this.taskTime = planner.getTaskTime();
this.clearingDate = planner.getClearingDate();
this.market = planner.getMarket();
this.taskStatus = planner.getTaskStatus();
this.companyId = planner.getCompanyId();
this.securityId = planner.getSecurityId();
this.parent = Parent.Planner.getKey();
this.id = plannerTemplate.getId();
this.id = planner.getId();
return this;
}

8
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java
View file

@ -3,6 +3,7 @@ package ru.spcex.clearing.imdg.services;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
import ru.clearing.classes.statics.data.scheduler.Planner;
@ -27,7 +28,7 @@ public class PlannerAllTodayMaker {
private final IMap<Long, PlannerAllToday> plannerAllTodayMap;
@Autowired
public PlannerAllTodayMaker(HazelcastInstance hazelcastInstance) {
public PlannerAllTodayMaker(@Qualifier("hazelcastInstanceImdg") HazelcastInstance hazelcastInstance) {
this.hazelcastInstance = hazelcastInstance;
plannerMap = hazelcastInstance.getMap(Map_Planner);
clearingCalendarMap = hazelcastInstance.getMap(Map_ClearingCalendar);
@ -61,9 +62,8 @@ public class PlannerAllTodayMaker {
List<PlannerAllToday> res = new ArrayList<>();
if (needAddFromPlannerTemplate(currentDate, clearingCalendarMap.values())){
for (PlannerTemplate plannerTemplate : plannerTemplateMap.values()) {
res.add(PlannerAllTodayBuilder.builder().append(plannerTemplate).build());
}
plannerTemplateMap.values().stream().filter(plannerTemplate -> Status.Active.getKey().equals(plannerTemplate.getTaskStatus()))
.forEach(plannerTemplate -> res.add(PlannerAllTodayBuilder.builder().append(plannerTemplate).build()));
}
return res;
}