update

Add api for optional stock

See merge request india/india_market_java!44

pom.xml

@@ -185,6 +185,12 @@
 			<version>30.1-jre</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.13</version>
+		</dependency>
+
 	</dependencies>
 	
 	<build>

src/main/java/cn/stock/market/dto/query/StockChartDto.java

@@ -0,0 +1,48 @@
+package cn.stock.market.dto.query;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class StockChartDto {
+    private Long timestamp;
+    private double open;
+    private double high;
+    private double low;
+    private double close;
+    private double volume;
+
+    public StockChartDto(Long date, double open, double high, double low, double close, double volume) {
+        this.timestamp = date;
+        this.open = open;
+        this.high = high;
+        this.low = low;
+        this.close = close;
+        this.volume = volume;
+    }
+
+    public double getVolume() {
+        return volume;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public double getOpen() {
+        return open;
+    }
+
+    public double getHigh() {
+        return high;
+    }
+
+    public double getLow() {
+        return low;
+    }
+
+    public double getClose() {
+        return close;
+    }
+}

src/main/java/cn/stock/market/web/MoneyApiController.java

@@ -9,12 +9,14 @@ import cn.stock.market.domain.basic.repository.OptionalStockRepository;
 import cn.stock.market.dto.OptionalStockResponse;
 import cn.stock.market.dto.StockHistoryRequest;
 import cn.stock.market.dto.StockHistoryResponse;
+import cn.stock.market.dto.query.StockChartDto;
 import cn.stock.market.infrastructure.db.po.QMoneyStockPO;
 import cn.stock.market.utils.HttpRequest;
 import cn.stock.market.utils.NseIndiaRequest;
 import cn.stock.market.utils.ServerResponse;
 import cn.stock.market.web.annotations.EncryptFilter;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -28,6 +30,12 @@ import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -47,6 +55,10 @@ import org.springframework.web.util.UriUtils;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -706,26 +718,26 @@ public class MoneyApiController {
         Long to = null;
         Long from = null;
         int countback = 5;
-        if (StringUtils.equals("H", resolution)) {
-            to = (long) (System.currentTimeMillis() / 1000);
-            from = to - (60 * 60);
-            countback = 60;
-            request.setResolution("1");
-        } else if (StringUtils.equals("D", resolution)) {
-            to = (long) (System.currentTimeMillis() / 1000);
-            from = to - (24 * 60 * 60);
-            countback = 390;
-            request.setResolution("1");
+        if(StringUtils.equals("H",resolution)){
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (10 * 60 * 60 );
+            countback = 328;
+            request.setResolution("60");
+        }else if(StringUtils.equals("D",resolution)){
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (2 * 30 * 24 * 60 * 60 );
+            countback = 730;
+            request.setResolution("1D");
         } else if (StringUtils.equals("W", resolution)) {
             to = (long) (System.currentTimeMillis() / 1000);
             from = to - (7 * 24 * 60 * 60);
-            countback = 471;
-            request.setResolution("5");
+            countback = 730;
+            request.setResolution("1W");
         } else if (StringUtils.equals("M", resolution)) {
-            to = (long) (System.currentTimeMillis() / 1000);
-            from = to - (35 * 24 * 60 * 60);
-            countback = 328;
-            request.setResolution("30");
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (15 * 30 * 24 * 60 * 60);
+            countback = 730;
+            request.setResolution("1D");
         }
 
         request.setFrom(from);
@@ -740,7 +752,81 @@ public class MoneyApiController {
 
         while (response == null && retryCount < maxRetries) {
             try {
-                response = restTemplate.getForObject(apiUrl, StockHistoryResponse.class);
+                if (StringUtils.equals("M", resolution)) {
+                    CloseableHttpClient client = HttpClients.createDefault();
+                    HttpGet req = new HttpGet(apiUrl);
+                    HttpResponse resp = client.execute(req);
+                    String jsonResponse = EntityUtils.toString(resp.getEntity(), "UTF-8");
+                    ObjectMapper mapper = new ObjectMapper();
+                    JsonNode rootNode = mapper.readTree(jsonResponse);
+
+                    JsonNode timeNode = rootNode.get("t");
+                    JsonNode lowNode = rootNode.get("l");
+                    JsonNode highNode = rootNode.get("h");
+                    JsonNode openNode = rootNode.get("o");
+                    JsonNode closeNode = rootNode.get("c");
+                    JsonNode volumeNote = rootNode.get("v");
+
+                    List<StockChartDto> stocks = new ArrayList<>();
+                    for (int i = 0; i < timeNode.size(); i++) {
+                        long timestamp = timeNode.get(i).asLong();
+                        double closePrice = closeNode.get(i).asDouble();
+                        double openPrice = openNode.get(i).asDouble();
+                        double volume = volumeNote.get(i).asDouble();
+                        double low = lowNode.get(i).asDouble();
+                        double high = highNode.get(i).asDouble();
+
+                        stocks.add(new StockChartDto(timestamp, openPrice, high, low, closePrice, volume));
+                    }
+
+                    Map<String, List<StockChartDto>> groupedByMonth = stocks.stream()
+                            .collect(Collectors.groupingBy(
+                                    sp -> Instant.ofEpochSecond(sp.getTimestamp())
+                                            .atZone(ZoneId.systemDefault())
+                                            .toLocalDate()
+                                            .format(DateTimeFormatter.ofPattern("yyyy-MM")),
+                                    LinkedHashMap::new,
+                                    Collectors.toList()
+                            ));
+
+                    List<Long> timestamps = new ArrayList<>();
+                    List<Double> opens = new ArrayList<>();
+                    List<Double> closes = new ArrayList<>();
+                    List<Double> highs = new ArrayList<>();
+                    List<Double> lows = new ArrayList<>();
+                    List<Long> volumes = new ArrayList<>();
+
+                    response = new StockHistoryResponse();
+                    groupedByMonth.forEach((month, prices) -> {
+                        double open = prices.get(0).getOpen();
+                        double close = prices.get(prices.size() - 1).getClose();
+                        double high = prices.stream().mapToDouble(StockChartDto::getHigh).max().orElse(0);
+                        double low = prices.stream().mapToDouble(StockChartDto::getLow).min().orElse(0);
+                        double volume = prices.stream().mapToDouble(StockChartDto::getVolume).sum();
+
+                        long timestamp = YearMonth.parse(month, DateTimeFormatter.ofPattern("yyyy-MM")).atDay(1).atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli() / 1000;
+                        timestamps.add(timestamp);
+                        opens.add(open);
+                        closes.add(close);
+                        highs.add(high);
+                        lows.add(low);
+                        volumes.add((long) volume);
+
+                        System.out.println("Month: " + month);
+                        System.out.println("Open: " + open + ", Close: " + close + ", High: " + high + ", Low: " + low);
+                    });
+
+                    response.setS("ok");
+                    response.setT(timestamps);
+                    response.setL(lows);
+                    response.setH(highs);
+                    response.setO(opens);
+                    response.setC(closes);
+                    response.setV(volumes);
+
+                } else {
+                    response = restTemplate.getForObject(apiUrl, StockHistoryResponse.class);
+                }
             } catch (RestClientException e) {
                 // Log the exception or perform any other error handling
                 log.error("Error while making API request. Retrying... (Retry count: {})", retryCount + 1);
@@ -753,11 +839,15 @@ public class MoneyApiController {
                 } catch (InterruptedException ex) {
                     Thread.currentThread().interrupt();
                 }
+            } catch (ClientProtocolException e) {
+                throw new RuntimeException(e);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
         }
 
         if (response != null && !response.getS().equals("error")) {
-            setResponse(response, resolution);
+//            setResponse(response, resolution);
             // API request successful, return the response
             return ResponseEntity.ok(response);
         } else {