diff --git a/src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java b/src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java index dd901e3..265190c 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java +++ b/src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java @@ -115,15 +115,15 @@ public class MoneyScraper { if (ulElement != null) { for (Element aElement : ulElement.select("a")) { String exchangeValue = aElement.text().trim(); - if ("BSE".equals(exchangeValue) || "NSE".equals(exchangeValue)) { + if ("BSE".equals(exchangeValue.toUpperCase()) || "NSE".equals(exchangeValue.toUpperCase())) { log.info(Thread.currentThread().getName() + ",the stock url: " + url + ", the exchange Value: " + exchangeValue); - MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toLowerCase(Locale.ROOT)) + MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toUpperCase(Locale.ROOT)) .detailUrl(String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", exchangeValue.toLowerCase(), companyCodeId)) .selfUrl(url) .selfDispId(extractDispId(url)) .moneyScId(companyCodeId).saveTime(new Date()).build(); - List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(name), QMoneyStockPO.moneyStockPO.stockType.eq(exchangeValue.toLowerCase(Locale.ROOT))); + List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(name), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(Locale.ROOT))); if (CollectionUtil.isEmpty(all)) { moneyStockRepository.save(build); } @@ -264,15 +264,15 @@ public class MoneyScraper { for (Element aElement : ulElement.select("a")) { String exchangeValue = aElement.text().trim(); - if ("BSE".equals(exchangeValue) || "NSE".equals(exchangeValue)) { + if ("BSE".equals(exchangeValue.toUpperCase(Locale.ROOT)) || "NSE".equals(exchangeValue.toUpperCase(Locale.ROOT))) { log.info(Thread.currentThread().getName()+",stockName: " + textContent + ", self_link: " + linkAttribute + ", the exchange Value: " + exchangeValue); - MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toLowerCase(Locale.ROOT)) + MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toUpperCase(Locale.ROOT)) .detailUrl(String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", exchangeValue.toLowerCase(), companyCodeId)) .selfUrl(linkAttribute) .selfDispId(extractDispId(linkAttribute)) .moneyScId(companyCodeId).saveTime(new Date()).build(); - List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(textContent), QMoneyStockPO.moneyStockPO.stockType.eq(exchangeValue.toLowerCase(Locale.ROOT))); + List all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(textContent), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(Locale.ROOT))); if(CollectionUtil.isEmpty(all)){ moneyStockRepository.save(build); } diff --git a/src/main/java/cn/stock/market/infrastructure/job/Scraper.java b/src/main/java/cn/stock/market/infrastructure/job/Scraper.java index de781c2..c2d80af 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/Scraper.java +++ b/src/main/java/cn/stock/market/infrastructure/job/Scraper.java @@ -565,7 +565,7 @@ public class Scraper { moneyStock.setStockName(stockIpo.getStockName()); moneyStock.setMoneyScId(stockIpo.getStockCode()); moneyStock.setSelfDispId(stockIpo.getStockCode()); - moneyStock.setStockType(stockIpo.getExchangeType()); + moneyStock.setStockType(stockIpo.getExchangeType().toUpperCase()); moneyStock.setSaveTime(DateTime.now()); moneyStock.setNseIndiaId(getNSEId(stockIpo)); @@ -596,10 +596,10 @@ public class Scraper { JSONObject jsonData = jsonObject.getJSONObject("data"); - if(stockIpo.getExchangeType().equals("NSE")){ + if(stockIpo.getExchangeType().toUpperCase(Locale.ROOT).equals("NSE")){ return jsonData.getString("NSEID"); } - else if(stockIpo.getExchangeType().equals("BSE")){ + else if(stockIpo.getExchangeType().toUpperCase(Locale.ROOT).equals("BSE")){ return jsonData.getString("BSEID"); } }