From f50b6b55198465c50b97d2e38027ea2a10e2bac6 Mon Sep 17 00:00:00 2001 From: gs Date: Thu, 20 Jun 2024 16:54:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/stock/market/web/StockApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index 1eeaa04..9764571 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -177,7 +177,7 @@ public class StockApiController { String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2); String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_")); String imgUrl = n.substring(n.indexOf("img loading=\"lazy\" src=") + 24, n.indexOf("?")); - String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9); + String time = n.substring(n.indexOf("Updated On : ") + 36, n.indexOf("IST") - 9); SiteNews siteNews = new SiteNews(); siteNews.setAddTime(new Date()); From d491bef7359858b9056ae8679b9eab2699b8aa1e Mon Sep 17 00:00:00 2001 From: gs Date: Tue, 25 Jun 2024 17:45:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/stock/market/web/BTodayStockController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/cn/stock/market/web/BTodayStockController.java b/src/main/java/cn/stock/market/web/BTodayStockController.java index 1692773..34066cb 100644 --- a/src/main/java/cn/stock/market/web/BTodayStockController.java +++ b/src/main/java/cn/stock/market/web/BTodayStockController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; +import java.text.DecimalFormat; import java.util.List; import java.util.Map; @@ -159,6 +160,17 @@ public class BTodayStockController { String forObject = restTemplate.getForObject(apiUrl, String.class); JSONObject jsonObject = JSON.parseObject(forObject); + String price = jsonObject.getString("price"); + if (price != null) { + try { + double priceValue = Double.parseDouble(price); + DecimalFormat df = new DecimalFormat("0.00"); + jsonObject.put("price", df.format(priceValue)); + } catch (NumberFormatException e) { + // Handle the case where price is not a valid double + e.printStackTrace(); + } + } jsonObject.put("id",btodayStock.getId()); return jsonObject; } From 2f8657157856112823af96683d7069dddca9e730 Mon Sep 17 00:00:00 2001 From: gs Date: Tue, 25 Jun 2024 18:00:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/stock/market/web/BTodayStockController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/stock/market/web/BTodayStockController.java b/src/main/java/cn/stock/market/web/BTodayStockController.java index 34066cb..457a391 100644 --- a/src/main/java/cn/stock/market/web/BTodayStockController.java +++ b/src/main/java/cn/stock/market/web/BTodayStockController.java @@ -160,12 +160,14 @@ public class BTodayStockController { String forObject = restTemplate.getForObject(apiUrl, String.class); JSONObject jsonObject = JSON.parseObject(forObject); - String price = jsonObject.getString("price"); - if (price != null) { + JSONArray arryData = jsonObject.getJSONArray("data"); + if (arryData != null&&arryData.size()>0) { try { + JSONObject jsonObject1 = arryData.getJSONObject(0); + String price = jsonObject1.getString("price"); double priceValue = Double.parseDouble(price); DecimalFormat df = new DecimalFormat("0.00"); - jsonObject.put("price", df.format(priceValue)); + jsonObject1.put("price", df.format(priceValue)); } catch (NumberFormatException e) { // Handle the case where price is not a valid double e.printStackTrace(); From bae941828eb6985284297269cb393e6fdcbf6344 Mon Sep 17 00:00:00 2001 From: Achilles Date: Fri, 28 Jun 2024 16:59:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=92=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/stock/market/web/MoneyApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/web/MoneyApiController.java b/src/main/java/cn/stock/market/web/MoneyApiController.java index 8356f93..4f1be40 100644 --- a/src/main/java/cn/stock/market/web/MoneyApiController.java +++ b/src/main/java/cn/stock/market/web/MoneyApiController.java @@ -191,7 +191,7 @@ public class MoneyApiController { if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null ) { JSONObject data = JSONObject.parseObject(responseEntity.getBody()).getJSONObject("data"); if(data!=null){ - json1.put("company",data.getString("company")); + json1.put("company",data.getString("SC_FULLNM")); json1.put("pricepercentchange",data.getString("pricepercentchange")); json1.put("stockType",stockType); json1.put("pricechange",data.getString("pricechange"));