Add api for optional stock

Add alternate source

See merge request india/india_market_java!43

src/main/generated/cn/stock/market/infrastructure/db/po/QOptionalStockPO.java

@@ -0,0 +1,41 @@
+package cn.stock.market.infrastructure.db.po;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QOptionalStockPO is a Querydsl query type for OptionalStockPO
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QOptionalStockPO extends EntityPathBase<OptionalStockPO> {
+
+    private static final long serialVersionUID = 1161631810L;
+
+    public static final QOptionalStockPO optionalStockPO = new QOptionalStockPO("optionalStockPO");
+
+    public final StringPath company = createString("company");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath symbol = createString("symbol");
+
+    public QOptionalStockPO(String variable) {
+        super(OptionalStockPO.class, forVariable(variable));
+    }
+
+    public QOptionalStockPO(Path<? extends OptionalStockPO> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QOptionalStockPO(PathMetadata metadata) {
+        super(OptionalStockPO.class, metadata);
+    }
+
+}
+

src/main/java/cn/stock/market/domain/basic/convert/OptionalStockConvert.java

@@ -0,0 +1,16 @@
+package cn.stock.market.domain.basic.convert;
+
+import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.OptionalStock;
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+@Component
+@Lazy
+public class OptionalStockConvert extends SimpleEntityPOConvert<OptionalStock, OptionalStockPO> {
+    public static OptionalStockConvert of() {
+        return SpringUtils.getBean(OptionalStockConvert.class);
+    }
+}

src/main/java/cn/stock/market/domain/basic/entity/OptionalStock.java

@@ -0,0 +1,16 @@
+package cn.stock.market.domain.basic.entity;
+
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+        callSuper = false
+)
+public class OptionalStock extends OptionalStockPO {
+}

src/main/java/cn/stock/market/domain/basic/repository/OptionalStockRepository.java

@@ -0,0 +1,32 @@
+package cn.stock.market.domain.basic.repository;
+
+import cn.qutaojing.common.domain.convert.IEntityPOConvert;
+import cn.qutaojing.common.domain.respostory.SimplePoConvertEntityRepository;
+import cn.stock.market.domain.basic.convert.OptionalStockConvert;
+import cn.stock.market.domain.basic.entity.OptionalStock;
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import cn.stock.market.infrastructure.db.repo.OptionalStockRepo;
+import com.rp.spring.jpa.GenericJpaRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor(
+        onConstructor = @__(@Autowired)
+)
+public class OptionalStockRepository extends SimplePoConvertEntityRepository<OptionalStock, OptionalStockPO, Integer> {
+    final OptionalStockRepo repo;
+
+    final OptionalStockConvert convert;
+
+    @Override
+    public GenericJpaRepository<OptionalStockPO, Integer> repo() {
+        return repo;
+    }
+
+    @Override
+    public IEntityPOConvert<OptionalStock, OptionalStockPO> convert() {
+        return convert;
+    }
+}

src/main/java/cn/stock/market/dto/OptionalStockResponse.java

@@ -0,0 +1,18 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+@Data
+public class OptionalStockResponse {
+    private String message;
+    private Integer code;
+    private DataResponse data = new DataResponse();
+
+    @Data
+    public static class DataResponse {
+        private String symbol;
+        private String company;
+        private Double pricecurrent;
+        private Float pricepercentchange;
+    }
+}

src/main/java/cn/stock/market/infrastructure/db/po/MoneyStockPO.java

@@ -60,6 +60,10 @@ public class MoneyStockPO {
    * NSE India的id */
   String nseIndiaId;
 
+  /**
+   * NSE India Chart的id */
+  String nseIndiaChartId;
+
   /**
    * 自有self_url */
   String selfUrl;

src/main/java/cn/stock/market/infrastructure/db/po/OptionalStockPO.java

@@ -0,0 +1,35 @@
+package cn.stock.market.infrastructure.db.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@SuperBuilder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(
+        name = "optional_stock"
+)
+public class OptionalStockPO {
+    @Id
+    @GeneratedValue(
+            strategy = javax.persistence.GenerationType.IDENTITY
+    )
+    Integer id;
+
+    String symbol;
+
+    String company;
+}

src/main/java/cn/stock/market/infrastructure/db/repo/OptionalStockRepo.java

@@ -0,0 +1,7 @@
+package cn.stock.market.infrastructure.db.repo;
+
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import com.rp.spring.jpa.GenericJpaRepository;
+
+public interface OptionalStockRepo extends GenericJpaRepository<OptionalStockPO, Integer> {
+}

src/main/java/cn/stock/market/utils/NseIndiaRequest.java

@@ -2,18 +2,21 @@ package cn.stock.market.utils;
 
 import cn.stock.market.dto.StockHistoryRequest;
 import cn.stock.market.dto.StockHistoryResponse;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import okhttp3.*;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class NseIndiaRequest {
     private static final String NSE_INDIA_URL = "https://www.nseindia.com";
+    private static final String NSE_INDIA_CHART_URL = "https://charting.nseindia.com";
     private static final OkHttpClient client;
+    private static final ObjectMapper objectMapper = new ObjectMapper();
 
     static {
         client = new OkHttpClient.Builder()
@@ -47,8 +50,8 @@ public class NseIndiaRequest {
         return request;
     }
 
-    private static void initCookie() {
-        Request request = createRequest(NSE_INDIA_URL);
+    private static void initCookie(String url) {
+        Request request = createRequest(url);
         try (Response response = client.newCall(request).execute()) {
             if (!response.isSuccessful()) {
                 throw new IOException("Failed to fetch initial cookies");
@@ -58,8 +61,35 @@ public class NseIndiaRequest {
         }
     }
 
+    private static Integer getCode(String symbol) {
+        Request request = createRequest(NSE_INDIA_CHART_URL + "//Charts/GetEQMasters").newBuilder()
+                .addHeader("referer", NSE_INDIA_CHART_URL)
+                .addHeader("origin", NSE_INDIA_CHART_URL)
+                .build();
+
+        try (Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Failed to get EQ code");
+            }
+
+            String result = response.body().string();
+
+            String regex = "(\\d+)\\|" + symbol + "\\|.*";
+            Pattern pattern = Pattern.compile(regex);
+            Matcher matcher = pattern.matcher(result);
+
+            if (matcher.find()) {
+                return Integer.valueOf(matcher.group(1));
+            }
+            throw new IOException("No data found");
+
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to get EQ code", e);
+        }
+    }
+
     public static JSONObject stockByJYSFromHttp(String stockType, String symbol, String nseIndiaId) {
-        initCookie();
+        initCookie(NSE_INDIA_URL);
 
         String url = NSE_INDIA_URL + "/api/quote-equity?symbol=" + nseIndiaId;
         Request request = createRequest(url).newBuilder()
@@ -96,18 +126,44 @@ public class NseIndiaRequest {
         }
     }
 
-    public static StockHistoryResponse stockKLineFromHttp(StockHistoryRequest stockHistoryRequest) {
-        initCookie();
+    public static StockHistoryResponse stockKLineFromHttp(StockHistoryRequest stockHistoryRequest, String resolution) {
+        initCookie(NSE_INDIA_CHART_URL);
 
-        SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy");
-        String fromDate = sdf.format(new Date(stockHistoryRequest.getFrom() * 1000));
-        String toDate = sdf.format(new Date(stockHistoryRequest.getTo() * 1000));
+        Integer code = getCode(stockHistoryRequest.getSymbol());
 
-        String url = String.format("%s/api/historical/cm/equity?symbol=%s&from=%s&to=%s", NSE_INDIA_URL, stockHistoryRequest.getSymbol(), fromDate, toDate);
+        int interval = 1;
+        if (StringUtils.equals("H", resolution)) {
+            resolution = "I";
+            interval = 60;
+        }
 
-        Request request = createRequest(url).newBuilder()
-                .addHeader("referer", NSE_INDIA_URL)
-                .addHeader("origin", NSE_INDIA_URL)
+        Map<String, Object> body = new HashMap<>();
+        body.put("chartPeriod", resolution);
+        body.put("chartStart", 0);
+        body.put("exch", "N");
+        body.put("fromDate", 0);
+        body.put("instrType", "C");
+        body.put("scripCode", code);
+        body.put("timeInterval", interval);
+        body.put("toDate", stockHistoryRequest.getTo() + 18000);
+        body.put("ulToken", code);
+
+        String payload;
+        try {
+            payload = objectMapper.writeValueAsString(body);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to serialize body", e);
+        }
+
+        RequestBody requestBody = RequestBody.create(
+                MediaType.get("application/json; charset=utf-8"),
+                payload
+        );
+
+        Request request = createRequest(NSE_INDIA_CHART_URL + "//Charts/symbolhistoricaldata/").newBuilder()
+                .addHeader("referer", NSE_INDIA_CHART_URL)
+                .addHeader("origin", NSE_INDIA_CHART_URL)
+                .post(requestBody)
                 .build();
 
         try (Response response = client.newCall(request).execute()) {
@@ -115,52 +171,7 @@ public class NseIndiaRequest {
                 throw new IOException("Request failed with code: " + response.code());
             }
 
-            JSONObject jsonData = JSONObject.parseObject(response.body().string());
-            JSONArray data =jsonData.getJSONArray("data");
-
-            StockHistoryResponse result = new StockHistoryResponse();
-            List<Long> tList = new ArrayList<>();
-            List<Double> oList = new ArrayList<>();
-            List<Double> hList = new ArrayList<>();
-            List<Double> lList = new ArrayList<>();
-            List<Double> cList = new ArrayList<>();
-            List<Long> vList = new ArrayList<>();
-
-            for (int i = 0; i < data.size(); i++) {
-                Long t, v;
-                Double o, h, l, c;
-
-                try {
-                    JSONObject jsonObject = data.getJSONObject(i);
-
-                    String timestampStr = jsonObject.getString("TIMESTAMP");
-                    Instant instant = Instant.parse(timestampStr);
-                    t = instant.toEpochMilli() / 1000;
-
-                    o = jsonObject.getDouble("CH_OPENING_PRICE");
-                    c = jsonObject.getDouble("CH_CLOSING_PRICE");
-                    h = jsonObject.getDouble("CH_TRADE_HIGH_PRICE");
-                    l = jsonObject.getDouble("CH_TRADE_LOW_PRICE");
-                    v = jsonObject.getLong("CH_TOT_TRADED_VAL");
-
-                } catch (Exception e) {
-                    continue;
-                }
-
-                tList.add(t);
-                oList.add(o);
-                hList.add(h);
-                lList.add(l);
-                cList.add(c);
-                vList.add(v);
-            }
-
-            result.setT(tList);
-            result.setO(oList);
-            result.setH(hList);
-            result.setL(lList);
-            result.setC(cList);
-            result.setV(vList);
+            StockHistoryResponse result = objectMapper.readValue(response.body().string(), StockHistoryResponse.class);
 
             return result;
         } catch (IOException e) {

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

@@ -3,14 +3,19 @@ package cn.stock.market.web;
 import cn.hutool.core.date.DateUtil;
 import cn.stock.market.MoneyStockSuggestDTO;
 import cn.stock.market.domain.basic.entity.MoneyStock;
+import cn.stock.market.domain.basic.entity.OptionalStock;
 import cn.stock.market.domain.basic.repository.MoneyStockRepository;
+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.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.ObjectMapper;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Lists;
@@ -36,8 +41,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.util.UriUtils;
 
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -58,7 +67,14 @@ public class MoneyApiController {
     @Autowired
     private MoneyStockRepository moneyStockRepository;
 
+    @Autowired
+    private OptionalStockRepository optionalStockRepository;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
     private static final String EXTERNAL_API_URL = "https://priceapi.moneycontrol.com/techCharts/indianMarket/stock/history";
+    private static final String OPTIONAL_STOCK_MONEYCONTROL_URL = "https://priceapi.moneycontrol.com/pricefeed/notapplicable/inidicesindia/";
 
     @ApiOperation(value = "股票详情信息", httpMethod = "GET")
     @ApiImplicitParams({
@@ -740,27 +756,25 @@ public class MoneyApiController {
             }
         }
 
-        if (response != null) {
+        if (response != null && !response.getS().equals("error")) {
             setResponse(response, resolution);
             // API request successful, return the response
             return ResponseEntity.ok(response);
         } else {
-            if (!StringUtils.equals("H", resolution)) {
-                try {
-                    MoneyStock moneyStock = moneyStockRepository.findOne((QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
-                                    .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
-                                    .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
-                            .orElse(null);
+            try {
+                MoneyStock moneyStock = moneyStockRepository.findOne((QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
+                                .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
+                                .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
+                        .orElse(null);
 
-                    if (moneyStock != null && moneyStock.getNseIndiaId() != null && !moneyStock.getNseIndiaId().isEmpty()) {
-                        request.setSymbol(moneyStock.getNseIndiaId());
-                        response = NseIndiaRequest.stockKLineFromHttp(request);
-                        return ResponseEntity.ok(response);
-                    }
-                } catch (Exception e) {
-                    log.error("Failed to get data from nseindia.", e.getMessage());
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+                if (moneyStock != null && moneyStock.getNseIndiaChartId() != null && !moneyStock.getNseIndiaChartId().isEmpty()) {
+                    request.setSymbol(moneyStock.getNseIndiaChartId());
+                    response = NseIndiaRequest.stockKLineFromHttp(request, resolution);
+                    return ResponseEntity.ok(response);
                 }
+            } catch (Exception e) {
+                log.error("Failed to get data from nseindia.", e.getMessage());
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
             }
 
             // All retries failed, return an error response
@@ -770,6 +784,33 @@ public class MoneyApiController {
         // 返回响应
     }
 
+    @GetMapping({"/market/api/market/stock/optional", "/api/market/stock/optional"})
+    @ResponseBody
+    @EncryptFilter(decryptRequest = false)
+    public ResponseEntity<List<Object>> getOptionalStock() {
+        List<OptionalStock> optionalStocks = optionalStockRepository.findAll();
+        List<Object> data = optionalStocks.stream().map(stock -> {
+            try {
+                String responseStr = HttpRequest.doGrabGet(OPTIONAL_STOCK_MONEYCONTROL_URL + URLEncoder.encode(stock.getSymbol(), "UTF-8"));
+                OptionalStockResponse response = objectMapper.readValue(responseStr, OptionalStockResponse.class);
+                if (response != null && response.getCode().equals(200)) {
+                    return response.getData();
+                }
+            }
+            catch (Exception e) {
+                log.error("Failed to get optional stock from moneycontrol for " + stock.getSymbol(), e);
+            }
+
+            OptionalStockResponse response = new OptionalStockResponse();
+            response.getData().setSymbol(stock.getSymbol());
+            response.getData().setSymbol(stock.getCompany());
+
+            return response.getData();
+        }).collect(Collectors.toList());
+
+        return ResponseEntity.ok(data);
+    }
+
     private void setResponse(StockHistoryResponse response, String resolution) {
         if (!"ok".equals(response.getS())) {
             return;