Commit 51143610 authored by Tong Li's avatar Tong Li

遗传算法-初始话日历

parent 9d0bbffd
...@@ -534,7 +534,10 @@ public class RoutingDataService { ...@@ -534,7 +534,10 @@ public class RoutingDataService {
machine.setHolidays(Holidays1); machine.setHolidays(Holidays1);
List<MaintenanceWindow> maintenanceWindows=new ArrayList<>(); List<MaintenanceWindow> maintenanceWindows=new ArrayList<>();
if(machine.getName().contains("铲车"))
{
int i=1+2;
}
List<EquipMaintainTask> EquipMaintainTasks1 = EquipMaintainTasks.stream() List<EquipMaintainTask> EquipMaintainTasks1 = EquipMaintainTasks.stream()
.filter(t -> t.getEquipId().equals(resource.getReferenceId()) ) .filter(t -> t.getEquipId().equals(resource.getReferenceId()) )
.collect(Collectors.toList()); .collect(Collectors.toList());
......
...@@ -59,7 +59,10 @@ public class MachineSchedulerService { ...@@ -59,7 +59,10 @@ public class MachineSchedulerService {
LocalDate endDate = currentTime.plusDays(60).toLocalDate(); LocalDate endDate = currentTime.plusDays(60).toLocalDate();
List<TimeSegment> allSegments = new ArrayList<>(); List<TimeSegment> allSegments = new ArrayList<>();
if(machine.getName().contains("铲车"))
{
int i=1+2;
}
while (!currentDate.isAfter(endDate)) { while (!currentDate.isAfter(endDate)) {
// 检查是否在假期内 // 检查是否在假期内
boolean isHolidayPeriod = isHoliday(machine,currentDate); boolean isHolidayPeriod = isHoliday(machine,currentDate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment