修正bug
This commit is contained in:
parent
296d762529
commit
f9c9727fcf
|
|
@ -11,10 +11,10 @@ import java.time.DayOfWeek;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 假期计算器
|
* 假期计算器
|
||||||
|
|
@ -40,7 +40,7 @@ public abstract class HolidayCalculator {
|
||||||
/**
|
/**
|
||||||
* 工作时间列表
|
* 工作时间列表
|
||||||
*/
|
*/
|
||||||
private static final List<TimeRange> WORK_TIME_LIST = new ArrayList<>(10);
|
private static final List<TimeRange> WORK_TIME_LIST = new Vector<>(10);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否初始化
|
* 是否初始化
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,7 @@ public class LocationHolidayDataManager extends AbstractHolidayDataManager {
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
timestamp = System.currentTimeMillis();
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@ public class OnlineHolidayDataManager extends AbstractHolidayDataManager {
|
||||||
@Override
|
@Override
|
||||||
public List<Holiday> flushData() {
|
public List<Holiday> flushData() {
|
||||||
LocalDate now = LocalDate.now();
|
LocalDate now = LocalDate.now();
|
||||||
|
timestamp = System.currentTimeMillis();
|
||||||
List<Holiday> holiday1 = getDataFromApi(now.getYear());
|
List<Holiday> holiday1 = getDataFromApi(now.getYear());
|
||||||
List<Holiday> holiday2 = getDataFromApi(now.getYear() + 1);
|
List<Holiday> holiday2 = getDataFromApi(now.getYear() + 1);
|
||||||
List<Holiday> allList = new ArrayList<>(holiday1.size() + holiday2.size());
|
List<Holiday> allList = new ArrayList<>(holiday1.size() + holiday2.size());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue