From f0bd124afb1b814bdbb6eafa6daaf5c0d5f54be6 Mon Sep 17 00:00:00 2001 From: Achilles Date: Sat, 6 Jan 2024 12:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stock/market/web/MoneyApiController.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/cn/stock/market/web/MoneyApiController.java b/src/main/java/cn/stock/market/web/MoneyApiController.java index 31abf28..d1ec100 100644 --- a/src/main/java/cn/stock/market/web/MoneyApiController.java +++ b/src/main/java/cn/stock/market/web/MoneyApiController.java @@ -285,8 +285,6 @@ public class MoneyApiController { if (company_a != null) { String stockUrl = company_a.attr("href"); String stockName = company_a.text(); - log.info(stockName); - log.info(stockUrl); dto.setStockName(stockName); dto.setStockUrl(stockUrl); } @@ -477,15 +475,12 @@ public class MoneyApiController { moneyStockSuggestDTOS = bseGainer(); } if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){ - moneyStockSuggestDTOS.stream().forEach(f-> - f.getStockUrl().replaceAll("(? selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockUrl).collect(Collectors.toList()); + List selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(selfUlrList)){ - List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfUrl.in(selfUlrList)); + List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList)); if(CollectionUtils.isNotEmpty(all)){ - moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getSelfUrl().equals(f.getStockUrl()))) - .forEach(f->f.setScId(all.stream().filter(s->s.getSelfUrl().equals(f.getStockUrl())).findFirst().orElse(null).getMoneyScId())); + moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName()))) + .forEach(f->f.setScId(all.stream().filter(s->s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId())); } } } @@ -510,15 +505,13 @@ public class MoneyApiController { }else if(StringUtils.equals(stockType,"bse")){ moneyStockSuggestDTOS = bseTopLoser(); } - if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){ - moneyStockSuggestDTOS.stream().forEach(f-> - f.getStockUrl().replaceAll("(? selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockUrl).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){ + List selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(selfUlrList)){ - List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfUrl.in(selfUlrList)); + List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList)); if(CollectionUtils.isNotEmpty(all)){ - moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getSelfUrl().equals(f.getStockUrl()))) - .forEach(f->f.setScId(all.stream().filter(s->s.getSelfUrl().equals(f.getStockUrl())).findFirst().orElse(null).getMoneyScId())); + moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName()))) + .forEach(f->f.setScId(all.stream().filter(s->s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId())); } } } @@ -546,15 +539,13 @@ public class MoneyApiController { }else if(StringUtils.equals(stockType,"bse")){ moneyStockSuggestDTOS = bseActives(); } - if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){ - moneyStockSuggestDTOS.stream().forEach(f-> - f.getStockUrl().replaceAll("(? selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockUrl).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){ + List selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(selfUlrList)){ - List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfUrl.in(selfUlrList)); + List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList)); if(CollectionUtils.isNotEmpty(all)){ - moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getSelfUrl().equals(f.getStockUrl()))) - .forEach(f->f.setScId(all.stream().filter(s->s.getSelfUrl().equals(f.getStockUrl())).findFirst().orElse(null).getMoneyScId())); + moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName()))) + .forEach(f->f.setScId(all.stream().filter(s->s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId())); } } } @@ -563,6 +554,17 @@ public class MoneyApiController { } + private static String extractLastSegment(String url) { + if (url == null) { + return null; + } + int lastSlashIndex = url.lastIndexOf('/'); + if (lastSlashIndex != -1 && lastSlashIndex < url.length() - 1) { + return url.substring(lastSlashIndex + 1); + } + return url; // 如果没有斜杠，或者斜杠位于字符串的末尾，则返回原始字符串 + } + public static void main(String[] args) { nseGainer();