1
0

Compare commits

...

3 Commits

3 changed files with 36 additions and 31 deletions

View File

@@ -58,8 +58,10 @@ public class TaskController extends SimpleControllerSupport<Task, Void, TaskCont
} }
private TaskCost calculateCost(LocalDateTime start, LocalDateTime finish) { private TaskCost calculateCost(LocalDateTime start, LocalDateTime finish) {
if (ObjectUtil.isNull(start) || ObjectUtil.isNull(finish)) { if (ObjectUtil.isNull(start)) {
return new TaskCost(null, null); return new TaskCost(null, null);
} else if (ObjectUtil.isNull(finish)) {
finish = LocalDateTime.now();
} }
var duration = Duration.between(start, finish).toMillis(); var duration = Duration.between(start, finish).toMillis();
return new TaskCost( return new TaskCost(

View File

@@ -56,10 +56,12 @@ public class UpdateDailyTask extends TaskRunner {
var existsTradeDates = dailyRepository.findDistinctTradeDate(); var existsTradeDates = dailyRepository.findDistinctTradeDate();
var nowDate = LocalDate.now(); var nowDate = LocalDate.now();
var stocksMap = stockRepository.findAll().stream().collect(Collectors.toMap(Stock::getCode, stock -> stock)); var stocksMap = stockRepository.findAll().stream().collect(Collectors.toMap(Stock::getCode, stock -> stock));
tradeDates.parallelStream() var targetTradeDates = tradeDates.stream()
.filter(date -> date.isBefore(nowDate) || date.isEqual(nowDate)) .filter(date -> date.isBefore(nowDate) || date.isEqual(nowDate))
.filter(date -> !existsTradeDates.contains(date)) .filter(date -> !existsTradeDates.contains(date))
.forEach(tradeDate -> { .toList();
for (int index = 0, total = targetTradeDates.size(); index < total; index++) {
var tradeDate = targetTradeDates.get(index);
var factorResponse = tuShareService.factorList(tradeDate); var factorResponse = tuShareService.factorList(tradeDate);
var factorMap = new HashMap<String, Double>(); var factorMap = new HashMap<String, Double>();
for (List<String> item : factorResponse.data().items()) { for (List<String> item : factorResponse.data().items()) {
@@ -88,7 +90,8 @@ public class UpdateDailyTask extends TaskRunner {
dailyRepository.save(daily); dailyRepository.save(daily);
} }
} }
}); updater.update(index * 1.0 / total);
}
return null; return null;
} }

View File

@@ -28,7 +28,7 @@
</appender> </appender>
<logger name="com.zaxxer.hikari" level="ERROR"/> <logger name="com.zaxxer.hikari" level="ERROR"/>
<logger name="org.hibernate.SQL" level="DEBUG"/> <!--<logger name="org.hibernate.SQL" level="DEBUG"/>-->
<root level="INFO"> <root level="INFO">
<appender-ref ref="Console"/> <appender-ref ref="Console"/>