모의투자 로직 변경
This commit is contained in:
@@ -51,22 +51,27 @@ public class DashboardService {
|
||||
: watchlistRepo.findByDeviceIdOrderByDisplayOrderAsc(deviceId).size();
|
||||
out.put("watchlistCount", watchlistCount);
|
||||
|
||||
int liveCheckMarkets = (int) liveSettingsRepo.findAllByIsLiveCheckTrue().stream()
|
||||
.filter(s -> deviceId.equals(s.getDeviceId()) || (userId != null && userId.equals(s.getUserId())))
|
||||
.count();
|
||||
int liveCheckMarkets = userId != null
|
||||
? (int) liveSettingsRepo.findAllByIsLiveCheckTrueAndUserIdIsNotNull().stream()
|
||||
.filter(s -> userId.equals(s.getUserId()))
|
||||
.count()
|
||||
: 0;
|
||||
out.put("liveCheckMarkets", liveCheckMarkets);
|
||||
|
||||
List<LiveStrategySettingsDto> active = liveStrategySettingsService.listActive(userId, deviceId);
|
||||
out.put("monitoredMarkets", active.size());
|
||||
|
||||
PaperSummaryDto paper = paperTradingService.getSummary(userId, deviceId, null);
|
||||
out.put("paper", paper);
|
||||
if (userId != null) {
|
||||
out.put("paper", paperTradingService.getSummary(userId, null));
|
||||
out.put("live", liveTradingService.getSummary(userId));
|
||||
} else {
|
||||
out.put("paper", PaperSummaryDto.builder().build());
|
||||
out.put("live", LiveSummaryDto.builder().build());
|
||||
}
|
||||
|
||||
LiveSummaryDto live = liveTradingService.getSummary(userId, deviceId);
|
||||
out.put("live", live);
|
||||
|
||||
List<TradeSignalDto> recentSignals = signalRepo
|
||||
.findByDeviceIdOrderByCreatedAtDesc(deviceId)
|
||||
List<TradeSignalDto> recentSignals = (userId != null
|
||||
? signalRepo.findByUserIdOrderByCreatedAtDesc(userId)
|
||||
: signalRepo.findByDeviceIdOrderByCreatedAtDesc(deviceId != null ? deviceId : ""))
|
||||
.stream().limit(8)
|
||||
.map(s -> TradeSignalDto.builder()
|
||||
.id(s.getId())
|
||||
|
||||
Reference in New Issue
Block a user