详情查询、详情列表查询

工具方法
抓取全量股票数据入库
2024-05-31 18:11:23 +08:00 · 2024-05-31 17:49:52 +08:00 · 2024-05-30 18:27:49 +08:00 · 2024-05-30 11:10:30 +08:00
43 changed files with 998 additions and 1280 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
  # 构建
  - build
  - dockerize
-  - deploy
+  - webhook

 build:
  image: maven:3.6.3-openjdk-8
@@ -60,20 +60,16 @@ dockerize:
    - docker push juyoutech/india_stock_market:latest
    - docker push juyoutech/india_stock_market:$CI_PIPELINE_ID
    - docker push juyoutech/india_stock_market:$CI_COMMIT_BRANCH
-deploy-dev:
-  stage: deploy
+webhook:
+  stage: webhook
  only:
    - develop
  script:
-    - echo "Deploying application..."
+    - echo ">>>>>>Start Deploy<<<<<<"
    - ls
    - apt-get update
    - apt-get install -y curl
-    - |
-      curl -X POST \
-           -H "Content-Type: application/json" \
-           -d '{"namespace":"yddev", "deployment_name":"india-stock-market"}' \
-           https://updater-yddev.moneytj.com/restart-deployment
-    - echo "Application successfully deployed."
+    - curl --max-time 30 http://149.88.86.7:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh
+    - echo ">>>>>>Start Deploy Finish<<<<<<"


--- a/pom.xml
+++ b/pom.xml
@@ -185,12 +185,6 @@
 			<version>30.1-jre</version>
 		</dependency>

-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.13</version>
-		</dependency>
-
 	</dependencies>
 	
 	<build>
--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QOptionalStockPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QOptionalStockPO.java
@@ -1,41 +0,0 @@
-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);
-    }
-
-}
-
--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QStockIpoPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QStockIpoPO.java
@@ -38,7 +38,6 @@ public class QStockIpoPO extends EntityPathBase<StockIpoPO> {
    public final StringPath stockCode = createString("stockCode");

    public final StringPath stockName = createString("stockName");
-    public final StringPath exchangeType = createString("exchangeType");

    public final NumberPath<java.math.BigDecimal> stockPrice = createNumber("stockPrice", java.math.BigDecimal.class);

--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QTwelveStockPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QTwelveStockPO.java
@@ -0,0 +1,49 @@
+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;
+
+
+/**
+ * QTwelveStockPO is a Querydsl query type for TwelveStockPO
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QTwelveStockPO extends EntityPathBase<TwelveStockPO> {
+
+    private static final long serialVersionUID = -100071895L;
+
+    public static final QTwelveStockPO twelveStockPO = new QTwelveStockPO("twelveStockPO");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Integer> isLock = createNumber("isLock", Integer.class);
+
+    public final NumberPath<Integer> isShow = createNumber("isShow", Integer.class);
+
+    public final DateTimePath<java.util.Date> saveTime = createDateTime("saveTime", java.util.Date.class);
+
+    public final StringPath stockCode = createString("stockCode");
+
+    public final StringPath stockName = createString("stockName");
+
+    public final StringPath stockType = createString("stockType");
+
+    public QTwelveStockPO(String variable) {
+        super(TwelveStockPO.class, forVariable(variable));
+    }
+
+    public QTwelveStockPO(Path<? extends TwelveStockPO> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QTwelveStockPO(PathMetadata metadata) {
+        super(TwelveStockPO.class, metadata);
+    }
+
+}
+
--- a/src/main/java/cn/stock/market/application/assembler/TwelveStockAssembler.java
+++ b/src/main/java/cn/stock/market/application/assembler/TwelveStockAssembler.java
@@ -0,0 +1,35 @@
+package cn.stock.market.application.assembler;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.dto.TwelveStockDTO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockAssembler 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockAssembler {
+  public TwelveStockDTO toDTO(TwelveStock e) {
+    TwelveStockDTO dto = Beans.mapper(e, TwelveStockDTO.class);
+    if(dto == null) return dto;
+    fill(e, dto);
+    return  dto;
+  }
+
+  protected void fill(TwelveStock e, TwelveStockDTO dto) {
+    if(dto == null) return;
+    return;
+  }
+
+  public static TwelveStockAssembler of() {
+    return SpringUtils.getBean(TwelveStockAssembler.class);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/convert/OptionalStockConvert.java
+++ b/src/main/java/cn/stock/market/domain/basic/convert/OptionalStockConvert.java
@@ -1,16 +0,0 @@
-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);
-    }
-}
--- a/src/main/java/cn/stock/market/domain/basic/convert/TwelveStockConvert.java
+++ b/src/main/java/cn/stock/market/domain/basic/convert/TwelveStockConvert.java
@@ -0,0 +1,23 @@
+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.TwelveStock;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockConvert 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockConvert extends SimpleEntityPOConvert<TwelveStock, TwelveStockPO> {
+  public static TwelveStockConvert of() {
+    return SpringUtils.getBean(TwelveStockConvert.class);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/entity/OptionalStock.java
+++ b/src/main/java/cn/stock/market/domain/basic/entity/OptionalStock.java
@@ -1,16 +0,0 @@
-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 {
-}
--- a/src/main/java/cn/stock/market/domain/basic/entity/TwelveStock.java
+++ b/src/main/java/cn/stock/market/domain/basic/entity/TwelveStock.java
@@ -0,0 +1,28 @@
+package cn.stock.market.domain.basic.entity;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.stock.market.dto.command.TwelveStockCreateCommand;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStock 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStock extends TwelveStockPO {
+  public void update(TwelveStockCreateCommand cmd) {
+    Beans.copyProperties(cmd, this);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/factory/TwelveStockFactory.java
+++ b/src/main/java/cn/stock/market/domain/basic/factory/TwelveStockFactory.java
@@ -0,0 +1,28 @@
+package cn.stock.market.domain.basic.factory;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.dto.command.TwelveStockCreateCommand;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockFactory 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockFactory {
+  public static TwelveStockFactory of() {
+    return SpringUtils.getBean(TwelveStockFactory.class);
+  }
+
+  public TwelveStock from(TwelveStockCreateCommand cmd) {
+    TwelveStock e = TwelveStock.builder().build();
+    e.update(cmd);
+    return e;
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/repository/OptionalStockRepository.java
+++ b/src/main/java/cn/stock/market/domain/basic/repository/OptionalStockRepository.java
@@ -1,32 +0,0 @@
-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;
-    }
-}
--- a/src/main/java/cn/stock/market/domain/basic/repository/TwelveStockRepository.java
+++ b/src/main/java/cn/stock/market/domain/basic/repository/TwelveStockRepository.java
@@ -0,0 +1,46 @@
+package cn.stock.market.domain.basic.repository;
+
+import cn.qutaojing.common.domain.convert.IEntityPOConvert;
+import cn.qutaojing.common.domain.respostory.SimplePoConvertEntityRepository;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.convert.TwelveStockConvert;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import cn.stock.market.infrastructure.db.repo.TwelveStockRepo;
+import com.rp.spring.jpa.GenericJpaRepository;
+import java.lang.Integer;
+import java.lang.Override;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+/**
+ * TwelveStockRepository 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Repository
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class TwelveStockRepository extends SimplePoConvertEntityRepository<TwelveStock, TwelveStockPO, Integer> {
+  final TwelveStockRepo repo;
+
+  final TwelveStockConvert convert;
+
+  @Override
+  public GenericJpaRepository<TwelveStockPO, Integer> repo() {
+    return repo;
+  }
+
+  @Override
+  public IEntityPOConvert<TwelveStock, TwelveStockPO> convert() {
+    return convert;
+  }
+
+  public static TwelveStockRepository of() {
+    return SpringUtils.getBean(TwelveStockRepository.class);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java
+++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java
@@ -30,8 +30,6 @@ import org.apache.commons.lang3.StringUtils;
 import cn.stock.market.infrastructure.db.po.QStockPO;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpEntity;
@@ -249,25 +247,12 @@ public class StockService {
 		String result = "";
 		try {
 			// 使用Jsoup连接到网页
-//			Document doc = Jsoup.connect("https://www.business-standard.com/markets/news")
-//					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
-//					.header("Referer", "https://www.business-standard.com/")
-//					.header("Accept-Language", "en-US,en;q=0.9")
-//					.get();
-			String url = "https://www.business-standard.com/markets/news";
-			Document doc = Jsoup.connect(url)
-					.referrer("https://www.business-standard.com/")
+			Document doc = Jsoup.connect("https://www.business-standard.com/markets/news")
+					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
+					.header("Referer", "https://www.business-standard.com/")
 					.header("Accept-Language", "en-US,en;q=0.9")
-					.userAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1")
-					.timeout(5000) // timeout 5 seconds
 					.get();
-		//	result = doc.html().substring(doc.html().indexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">"),doc.html().lastIndexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">")+500);
-			Elements divElements = doc.select("div.listingstyle_cardlistlist__dfq57");
-			StringBuilder sb = new StringBuilder();
-			for (Element divElement : divElements) {
-				sb.append(divElement.outerHtml()).append("\n");
-			}
-			result = sb.toString();
+			result = doc.html().substring(doc.html().indexOf("<div class=\"shortvideoimg\" style=\"position:relative\">"),doc.html().lastIndexOf("<div class=\"shortvideoimg\" style=\"position:relative\">")+1200);
 		} catch (Exception e) {
 			return e.toString();
 		}
@@ -279,16 +264,10 @@ public class StockService {
 		List<String> list = new ArrayList<>();
 		try {
 			// 使用Jsoup连接到网页
-//			Document doc = Jsoup.connect(url)
-//					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
-//					.header("Referer", "https://www.business-standard.com/")
-//					.header("Accept-Language", "en-US,en;q=0.9")
-//					.get();
 			Document doc = Jsoup.connect(url)
-					.referrer("https://www.business-standard.com/")
+					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
+					.header("Referer", "https://www.business-standard.com/")
 					.header("Accept-Language", "en-US,en;q=0.9")
-					.userAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1")
-					.timeout(5000) // timeout 5 seconds
 					.get();
 			result = doc.html().substring(doc.html().indexOf("articleBody") + 14, doc.html().indexOf(",\"author\":") - 1);
 			list.add(result);
@@ -995,7 +974,7 @@ public class StockService {
 			String exchange = "bse";
 			IndiaIndexVo vo1 = new IndiaIndexVo();
 			String coCode = "20558";
-			JSONObject object = TodayApis.getStockDetail("in%3BSEN", coCode);
+			JSONObject object = TodayApis.getStockDetail(exchange, coCode);
 			IndiaStockVO market = objToVo(object);
 			market.setName("BSESENSEX指数");
 			vo1.setIndexVo(market);
@@ -1025,7 +1004,7 @@ public class StockService {
 			String exchange = "nse";
 			IndiaIndexVo vo1 = new IndiaIndexVo();
 			String coCode = "20559";
-			JSONObject object = TodayApis.getStockDetail("in%3BNSX", coCode);
+			JSONObject object = TodayApis.getStockDetail(exchange, coCode);
 			IndiaStockVO market = objToVo(object);
 			market.setName("NIFTY50指数");
 			vo1.setIndexVo(market);
@@ -1055,23 +1034,23 @@ public class StockService {
 	}
 	private IndiaStockVO objToVo(JSONObject object){
 		IndiaStockVO market = new IndiaStockVO();
-		if(object.containsKey("priceprevclose")){
-			market.setClose(object.getString("priceprevclose"));
+		if(object.containsKey("prev_close")){
+			market.setClose(object.getString("prev_close"));
 		}
-		if(object.containsKey("pricecurrent")){
-			market.setNowPrice(object.getString("pricecurrent"));
+		if(object.containsKey("price")){
+			market.setNowPrice(object.getString("price"));
 		}
-		if(object.containsKey("pricepercentchange")){
-			market.setRate(object.getString("pricepercentchange"));
+		if(object.containsKey("perchg")){
+			market.setRate(object.getString("perchg"));
 		}
-		if(object.containsKey("HIGH")){
-			market.setHigh(object.getString("HIGH"));
+		if(object.containsKey("high_price")){
+			market.setHigh(object.getString("high_price"));
 		}
-		if(object.containsKey("LOW")){
-			market.setLow(object.getString("LOW"));
+		if(object.containsKey("low_price")){
+			market.setLow(object.getString("low_price"));
 		}
-		if(object.containsKey("OPEN")){
-			market.setOpen(object.getString("OPEN"));
+		if(object.containsKey("open_price")){
+			market.setOpen(object.getString("open_price"));
 		}
 		return market;
 //		stockListVO.setName(jsonObject.getString("companyname"));
--- a/src/main/java/cn/stock/market/domain/basic/service/TwelveStockService.java
+++ b/src/main/java/cn/stock/market/domain/basic/service/TwelveStockService.java
@@ -0,0 +1,33 @@
+package cn.stock.market.domain.basic.service;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.factory.TwelveStockFactory;
+import cn.stock.market.domain.basic.repository.TwelveStockRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * TwelveStockService 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Service
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class TwelveStockService {
+  final TwelveStockRepository repository;
+
+  final TwelveStockFactory factory;
+
+  public TwelveStockRepository repository() {
+    return repository;
+  }
+
+  public static TwelveStockService of() {
+    return SpringUtils.getBean(TwelveStockService.class);
+  }
+}
--- a/src/main/java/cn/stock/market/dto/OptionalStockResponse.java
+++ b/src/main/java/cn/stock/market/dto/OptionalStockResponse.java
@@ -1,18 +0,0 @@
-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;
-    }
-}
--- a/src/main/java/cn/stock/market/dto/TwelveStockDTO.java
+++ b/src/main/java/cn/stock/market/dto/TwelveStockDTO.java
@@ -0,0 +1,23 @@
+package cn.stock.market.dto;
+
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockDTO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStockDTO extends TwelveStockPO {
+}
--- a/src/main/java/cn/stock/market/dto/TwelveStockData.java
+++ b/src/main/java/cn/stock/market/dto/TwelveStockData.java
@@ -0,0 +1,22 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+@Data
+public class TwelveStockData {
+	
+    private String symbol;
+    
+    private String name;
+    
+    private String currency;
+    
+    private String exchange;
+    
+    private String mic_code;
+    
+    private String country;
+    
+    private String type;
+}
+
--- a/src/main/java/cn/stock/market/dto/TwelveStockInfo.java
+++ b/src/main/java/cn/stock/market/dto/TwelveStockInfo.java
@@ -0,0 +1,61 @@
+package cn.stock.market.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+/**
+ * TwelveStockInfo类用于存储股票信息。
+ * 该类包含了股票的基本信息和交易数据。
+ */
+@ApiModel("TwelveStockInfo")
+public class TwelveStockInfo {
+    @ApiModelProperty("股票代码")
+    private String stockCode;
+
+    @ApiModelProperty("交易代码")
+    private String symbol;
+
+    @ApiModelProperty("股票名称")
+    private String stockName;
+
+    @ApiModelProperty("股票类型")
+    private String stockType;
+
+    @ApiModelProperty("当前价格")
+    private String lastPrice;
+
+    @ApiModelProperty("变动百分比")
+    private String perchg;
+    @ApiModelProperty("变动值")
+    private String change;
+
+    @ApiModelProperty("开盘价格")
+    private String openPrice;
+
+    @ApiModelProperty("昨日收盘价格")
+    private String previousPrice;
+
+    @ApiModelProperty("成交量")
+    private String volume;
+
+    @ApiModelProperty("最高价格")
+    private String highPrice;
+
+    @ApiModelProperty("最低价格")
+    private String lowPrice;
+
+    @ApiModelProperty("52周最高价格")
+    private String week52HighPrice;
+
+    @ApiModelProperty("52周最低价格")
+    private String week52LowPrice;
+
+    @ApiModelProperty("股票当前的交易状态: 1-表示退市Closed, 2-Opening Auction, 3-Continuous Trading, 15-Intra-day Close (scheduled)")
+    private String status;
+
+    @ApiModelProperty("股票id")
+    private Integer id;
+}
+
--- a/src/main/java/cn/stock/market/dto/command/TwelveStockCreateCommand.java
+++ b/src/main/java/cn/stock/market/dto/command/TwelveStockCreateCommand.java
@@ -0,0 +1,48 @@
+package cn.stock.market.dto.command;
+
+import java.lang.Integer;
+import java.lang.String;
+import java.util.Date;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockCreateCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+public class TwelveStockCreateCommand {
+  /**
+   * 主键 */
+  Integer id;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+}
--- a/src/main/java/cn/stock/market/dto/command/TwelveStockModifyCommand.java
+++ b/src/main/java/cn/stock/market/dto/command/TwelveStockModifyCommand.java
@@ -0,0 +1,24 @@
+package cn.stock.market.dto.command;
+
+import java.lang.Integer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockModifyCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStockModifyCommand extends TwelveStockCreateCommand {
+  Integer id;
+}
--- a/src/main/java/cn/stock/market/dto/query/StockChartDto.java
+++ b/src/main/java/cn/stock/market/dto/query/StockChartDto.java
@@ -1,48 +0,0 @@
-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;
-    }
-}
--- a/src/main/java/cn/stock/market/infrastructure/api/TodayApis.java
+++ b/src/main/java/cn/stock/market/infrastructure/api/TodayApis.java
@@ -187,17 +187,18 @@ public class TodayApis {

    //获取详情
    public static JSONObject getStockDetail(String exchange,String coCode){
-        String url = String.format("https://priceapi.moneycontrol.com/pricefeed/notapplicable/inidicesindia/%s",exchange);
+        String url = String.format("https://marketapi.intoday.in/widget/stockdetail/pullview?co_code=%s&exchange=%s",coCode,exchange);
        String str = get(url);
        JSONObject object = JSON.parseObject(str);
        boolean bool = false;
-        if(object.containsKey("code")){
-            bool = object.getInteger("code") == 200;
+        if(object.containsKey("success")){
+            bool = object.getBoolean("success");
        }
        if(!bool){
            return new JSONObject();
        }
-        JSONObject entity = JSON.parseObject(object.getString("data"));
+        JSONArray jsonArray = JSON.parseArray(object.getString("data"));
+        JSONObject entity = JSON.parseObject(jsonArray.get(0).toString());
        return entity;

    }
--- a/src/main/java/cn/stock/market/infrastructure/db/po/MoneyStockPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/MoneyStockPO.java
@@ -56,14 +56,6 @@ public class MoneyStockPO {
   * 展示表示 */
  String selfDispId;

-  /**
-   * NSE India的id */
-  String nseIndiaId;
-
-  /**
-   * NSE India Chart的id */
-  String nseIndiaChartId;
-
  /**
   * 自有self_url */
  String selfUrl;
@@ -83,6 +75,4 @@ public class MoneyStockPO {
  /**
   * 是否展示  0是  1否 */
  Integer isShow;
-
-  Boolean useFromBseindia = false;
 }
--- a/src/main/java/cn/stock/market/infrastructure/db/po/OptionalStockPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/OptionalStockPO.java
@@ -1,35 +0,0 @@
-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;
-}
--- a/src/main/java/cn/stock/market/infrastructure/db/po/StockIpoPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/StockIpoPO.java
@@ -79,8 +79,6 @@ public class StockIpoPO {
   * 申请总额 */
  String apply;

-  String exchangeType;
-
  /**
   * 市盈率 */
  BigDecimal peRatio;
--- a/src/main/java/cn/stock/market/infrastructure/db/po/TwelveStockPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/TwelveStockPO.java
@@ -0,0 +1,66 @@
+package cn.stock.market.infrastructure.db.po;
+
+import java.lang.Integer;
+import java.lang.String;
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+/**
+ * TwelveStockPO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@SuperBuilder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(
+    name = "twelve_stock"
+)
+public class TwelveStockPO {
+  /**
+   * 主键 */
+  @Id
+  @GeneratedValue(
+      strategy = javax.persistence.GenerationType.IDENTITY
+  )
+  Integer id;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+}
--- a/src/main/java/cn/stock/market/infrastructure/db/repo/OptionalStockRepo.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/repo/OptionalStockRepo.java
@@ -1,7 +0,0 @@
-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> {
-}
--- a/src/main/java/cn/stock/market/infrastructure/db/repo/TwelveStockRepo.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/repo/TwelveStockRepo.java
@@ -0,0 +1,15 @@
+package cn.stock.market.infrastructure.db.repo;
+
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import com.rp.spring.jpa.GenericJpaRepository;
+import java.lang.Integer;
+
+/**
+ * TwelveStockRepo 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+public interface TwelveStockRepo extends GenericJpaRepository<TwelveStockPO, Integer> {
+}
--- a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
@@ -7,7 +7,6 @@ import cn.stock.market.domain.basic.repository.StockRepository;
 import cn.stock.market.domain.basic.service.StockService;
 import cn.stock.market.infrastructure.api.investing.InvestingInvokerApis;
 import cn.stock.market.infrastructure.db.po.QSiteNewsPO;
-import cn.stock.market.utils.DateTimeUtil;
 import cn.stock.market.utils.Utils;
 import com.ag.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
@@ -26,8 +25,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;

@Slf4j
@Component
@@ -121,16 +118,8 @@ public class InvestingTask {
            newsList.forEach( n -> {
                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 imgUrl = extractImgSrc(n);
-//                String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
-                // Extract the date and time using regex
-                Pattern pattern = Pattern.compile("Updated On :<!-- --> <!-- -->(.*?)<!-- -->");
-                Matcher matcher = pattern.matcher(n);
-                String time = "";
-                if (matcher.find()) {
-                    time = DateTimeUtil.formatDateTimeFor24H(matcher.group(1).trim(),"dd MMM yyyy | hh:mm a");
-                }
+                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);

                SiteNews siteNews = new SiteNews();
                siteNews.setAddTime(new Date());
@@ -151,22 +140,4 @@ public class InvestingTask {
        }

    }
-
-    public static String extractImgSrc(String htmlData) {
-        String searchString = "<noscript>";
-        int startPos = htmlData.indexOf(searchString);
-
-        if (startPos != -1) {
-            String startTag = "src=";
-            startPos = htmlData.indexOf(startTag, startPos) + startTag.length() + 1;
-
-            int endPos = htmlData.indexOf("?", startPos);
-
-            if (endPos != -1) {
-                return htmlData.substring(startPos, endPos);
-            }
-        }
-
-        return null;
-    }
 }
--- a/src/main/java/cn/stock/market/infrastructure/job/Scraper.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/Scraper.java
@@ -1,20 +1,14 @@
 package cn.stock.market.infrastructure.job;

 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import cn.stock.market.domain.basic.entity.BtodayStock;
-import cn.stock.market.domain.basic.entity.MoneyStock;
 import cn.stock.market.domain.basic.entity.StockIpo;
 import cn.stock.market.domain.basic.repository.BtodayStockRepository;
-import cn.stock.market.domain.basic.repository.MoneyStockRepository;
 import cn.stock.market.domain.basic.repository.StockIpoRepository;
 import cn.stock.market.dto.StockIpoDTO;
-import cn.stock.market.infrastructure.db.po.QMoneyStockPO;
 import cn.stock.market.infrastructure.db.po.QStockIpoPO;
 import cn.stock.market.infrastructure.db.po.StockIpoPO;
 import cn.stock.market.infrastructure.db.repo.BtodayStockRepo;
-import com.alibaba.druid.sql.visitor.functions.Now;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -37,11 +31,14 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -57,10 +54,6 @@ public class Scraper {
    private StockIpoRepository stockIpoRepository;

    private final ExecutorService executorService = Executors.newFixedThreadPool(5);
-    @Autowired
-    private MoneyStockRepository moneyStockRepository;
-
-    private boolean times = false;


    @Scheduled(cron = "0 0 1 */2 * ?")
@@ -111,7 +104,6 @@ public class Scraper {


    @Scheduled(cron = "0 0 18 * * ?")
-//    @PostConstruct
    @RequestMapping("/testScraperGetMoneyControllerNewIPO")
    public  void getMoneyControllerNewIPOSchedule() {
        log.info("定时任务执行获取新股ipo的方法开始执行");
@@ -171,28 +163,7 @@ public class Scraper {
                        stockIpo.setCreateDate(new Date());
                        stockIpo.setUpdateDate(new Date());
                        stockIpo.setSourceType("3");
-
-                        if (stockIpo.getStockCode() == null || stockIpo.getStockName() == null){
-                            continue;
-                        }
-
-                        List<String> exchanges = getIpoExchange(stockIpo.getStockName(), stockIpo.getStockCode());
-
-                        for (String exchange : exchanges) {
-                            StockIpo ipo = new StockIpo();
-                            ipo.setStockCode(stockIpo.getStockCode());
-                            ipo.setStockName(stockIpo.getStockName());
-                            ipo.setStockPrice(stockIpo.getStockPrice());
-                            ipo.setSubscriptionDate(stockIpo.getSubscriptionDate());
-                            ipo.setListingDate(stockIpo.getListingDate());
-                            ipo.setTotalNumber(stockIpo.getTotalNumber());
-                            ipo.setApply(stockIpo.getApply());
-                            ipo.setCreateDate(stockIpo.getCreateDate());
-                            ipo.setUpdateDate(stockIpo.getUpdateDate());
-                            ipo.setExchangeType(exchange);
-
-                            listStockIpoList.add(ipo);
-                        }
+                        listStockIpoList.add(stockIpo);
                    }

                    for (int i = 0; i < upcomingData.size(); i++) {
@@ -215,37 +186,11 @@ public class Scraper {
                        stockIpo.setCreateDate(new Date());
                        stockIpo.setUpdateDate(new Date());
                        stockIpo.setSourceType("3");
-
-                        if (stockIpo.getStockCode() == null || stockIpo.getStockName() == null){
-                            continue;
-                        }
-
-                        List<String> exchanges = getIpoExchange(stockIpo.getStockName(), stockIpo.getStockCode());
-
-                        for (String exchange : exchanges) {
-                            StockIpo ipo = new StockIpo();
-                            ipo.setStockCode(stockIpo.getStockCode());
-                            ipo.setStockName(stockIpo.getStockName());
-                            ipo.setStockPrice(stockIpo.getStockPrice());
-                            ipo.setSubscriptionDate(stockIpo.getSubscriptionDate());
-                            ipo.setListingDate(stockIpo.getListingDate());
-                            ipo.setTotalNumber(stockIpo.getTotalNumber());
-                            ipo.setApply(stockIpo.getApply());
-                            ipo.setCreateDate(stockIpo.getCreateDate());
-                            ipo.setUpdateDate(stockIpo.getUpdateDate());
-                            ipo.setExchangeType(exchange);
-
-                            listStockIpoList.add(ipo);
-                        }
+                        listStockIpoList.add(stockIpo);
                    }

                  //  stockIpoRepository.saveAll(listStockIpoList);

-                    if (!listStockIpoList.isEmpty())
-                    {
-                        listStockIpoList = listStockIpoList.stream().filter(a -> StringUtils.isNotBlank(a.getStockName())).collect(Collectors.toList());
-                    }
-
                    List<String> scIdList = Lists.transform(listStockIpoList, StockIpo::getStockCode);
                    if(CollectionUtil.isNotEmpty(scIdList)){
                        List<StockIpo> existStockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.stockCode.in(scIdList));
@@ -260,7 +205,6 @@ public class Scraper {
                        //保存全部的新股
                        if(CollectionUtil.isNotEmpty(listStockIpoList)){
                            stockIpoRepository.saveAll(listStockIpoList);
-
                            log.info("定时任务执行获取新股ipo的方法开始结束,保存了数据:{}", JSON.toJSONString(listStockIpoList));
                        }else {
                            log.info("定时任务执行获取新股ipo的方法开始结束,没有数据");
@@ -281,36 +225,6 @@ public class Scraper {

    }

-    @Scheduled(cron = "0 0 19 * * ?")
-    @PostConstruct
-    @RequestMapping("/addMoneyStock")
-    public  void addMoneyStock() {
-        log.info("定时任务执行获取新股ipo的方法开始执行");
-
-        List<StockIpo> stockIpoList;
-
-        if(!times){
-            stockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.listingDate.isNotNull()
-                    .and(QStockIpoPO.stockIpoPO.listingDate.loe(DateTime.now()))
-                    .and(QStockIpoPO.stockIpoPO.exchangeType.isNotNull())
-                    .and(QStockIpoPO.stockIpoPO.exchangeType.isNotEmpty())
-            ); // first time run
-
-            times = true;
-        }
-        else {
-            stockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.listingDate.isNotNull()
-                    .and(QStockIpoPO.stockIpoPO.listingDate.loe(DateTime.now())
-                            .and(QStockIpoPO.stockIpoPO.listingDate.goe(DateUtil.offsetDay(DateTime.now(), -3))))
-                    .and(QStockIpoPO.stockIpoPO.exchangeType.isNotNull())
-                    .and(QStockIpoPO.stockIpoPO.exchangeType.isNotEmpty())
-            ); // from second run
-        }
-
-        List<MoneyStock> moneyStockList = convertToMoneyStock(stockIpoList);
-        moneyStockRepository.saveAll(moneyStockList);
-    }
-

    private static Timestamp convertStringToTimestamp(String dateString) {
        // 实现将字符串转换为 Timestamp 的逻辑
@@ -322,6 +236,12 @@ public class Scraper {
        }
    }

+
+
+
+
+
+
    private void processSubMap(Map<String, String> sefUrlList) {
        for (Map.Entry<String, String> entry : sefUrlList.entrySet()) {
            String companyName = entry.getKey();
@@ -458,134 +378,4 @@ public class Scraper {
        log.info("Getting web detail URL: " + url + "...");
        return Jsoup.connect(url).ignoreContentType(true).execute().body();
    }
-
-    public List<String> getIpoExchange(String stockName, String stockCode) {
-        List<String> exchanges = new ArrayList<>();
-        String url = "https://www.moneycontrol.com/ipo/{stockName}-{stockCode}-ipodetail";
-        url = url.replace("{stockName}", stockName.toLowerCase().replace(" ", "-")).replace("{stockCode}", stockCode.toLowerCase());
-
-        org.apache.http.client.HttpClient client = HttpClients.createDefault();
-        HttpGet request = new HttpGet(url);
-        try {
-            org.apache.http.HttpResponse response = client.execute(request);
-
-            if (response.getStatusLine().getStatusCode() == 200) {
-                String responseBody = EntityUtils.toString(response.getEntity());
-                Document doc = Jsoup.parse(responseBody);
-
-                Element scriptTag = doc.selectFirst("script#__NEXT_DATA__");
-
-                if (scriptTag != null) {
-                    String jsonDataStr = scriptTag.html();
-
-                    com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(jsonDataStr);
-                    log.info("获取到新股的json信息:" + jsonObject.toJSONString());
-
-                    com.alibaba.fastjson.JSONObject pageProps = jsonObject.getJSONObject("props").getJSONObject("pageProps");
-                    com.alibaba.fastjson.JSONObject overview = pageProps.getJSONObject("ipoDetails").getJSONObject("ipoDetails").getJSONObject("overview");
-
-                    String exchangeStr = overview.getString("listing_on");
-
-                    if (exchangeStr != null && !exchangeStr.isEmpty() && !exchangeStr.equals("null")) {
-                        exchanges.addAll(new ArrayList<>(Arrays.asList(exchangeStr.split(","))));
-                    }
-                }
-            }
-        }
-        catch (Exception e) {
-            log.info(e.getMessage());
-        }
-
-        if (exchanges.isEmpty()) {
-            exchanges.add("");
-        }
-
-        return exchanges;
-    }
-
-    public List<MoneyStock> convertToMoneyStock(List<StockIpo> stockIpoList) {
-        // Lấy danh sách tất cả stockCode và exchangeType từ stockIpoList
-        Set<String> stockCodes = stockIpoList.stream().map(StockIpo::getStockCode).collect(Collectors.toSet());
-        Set<String> exchangeTypes = stockIpoList.stream().map(StockIpo::getExchangeType).collect(Collectors.toSet());
-
-        // Lấy tất cả các MoneyStock tồn tại trong database với stockCode và exchangeType trong stockIpoList
-        List<MoneyStock> existingMoneyStocks = moneyStockRepository.findAll(
-                QMoneyStockPO.moneyStockPO.moneyScId.in(stockCodes)
-                        .and(QMoneyStockPO.moneyStockPO.stockType.in(exchangeTypes))
-        );
-
-        // Lưu các stockCode và exchangeType đã tồn tại
-        Set<String> existingKeys = existingMoneyStocks.stream()
-                .map(ms -> ms.getMoneyScId() + ms.getStockType())
-                .collect(Collectors.toSet());
-
-        // Chỉ giữ những StockIpo chưa tồn tại
-        return stockIpoList.stream()
-                .filter(stockIpo -> !existingKeys.contains(stockIpo.getStockCode() + stockIpo.getExchangeType()))
-                .map(this::convert)
-                .collect(Collectors.toList());
-    }
-
-//    public List<MoneyStock> convertToMoneyStock(List<StockIpo> stockIpoList) {
-//        return stockIpoList.stream()
-//                .filter(stockIpo -> !moneyStockRepository.exists(
-//                        QMoneyStockPO.moneyStockPO.stockType.eq(stockIpo.getExchangeType())
-//                                .and(QMoneyStockPO.moneyStockPO.moneyScId.eq(stockIpo.getStockCode()))
-//                )) // Chỉ giữ những StockIpo chưa tồn tại
-//                .map(this::convert)
-//                .collect(Collectors.toList());
-//    }
-
-    private MoneyStock convert(StockIpo stockIpo) {
-        MoneyStock moneyStock = new MoneyStock();
-
-        moneyStock.setStockName(stockIpo.getStockName());
-        moneyStock.setMoneyScId(stockIpo.getStockCode());
-        moneyStock.setSelfDispId(stockIpo.getStockCode());
-        moneyStock.setStockType(stockIpo.getExchangeType());
-        moneyStock.setSaveTime(DateTime.now());
-        moneyStock.setNseIndiaId(getNSEId(stockIpo));
-
-        return moneyStock;
-    }
-
-    private String getNSEId(StockIpo stockIpo){
-        String url = "https://priceapi.moneycontrol.com/pricefeed/" + stockIpo.getExchangeType().toLowerCase() + "/equitycash/" + stockIpo.getStockCode();
-        // 创建 HttpClient 实例
-        HttpClient client = HttpClients.createDefault();
-        // 创建 HttpGet 请求
-        HttpGet request = new HttpGet(url);
-        try {
-            // 执行请求
-            HttpResponse response = client.execute(request);
-
-            // 检查请求是否成功
-            if (response.getStatusLine().getStatusCode() == 200) {
-                // 获取响应体
-                String responseBody = EntityUtils.toString(response.getEntity());
-
-                if (responseBody != null) {
-                    // 获取 JSON 数据
-
-                    // 将 JSON 字符串解析为 Java JSONObject
-                    JSONObject jsonObject = JSONObject.parseObject(responseBody);
-                    log.info("获取到新股的json信息:" + jsonObject.toJSONString());
-
-                    JSONObject jsonData = jsonObject.getJSONObject("data");
-
-                    if(stockIpo.getExchangeType().equals("NSE")){
-                        return jsonData.getString("NSEID");
-                    }
-                    else if(stockIpo.getExchangeType().equals("BSE")){
-                        return jsonData.getString("BSEID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            log.info(e.getMessage());
-        }
-
-        return "";
-    }
 }
--- a/src/main/java/cn/stock/market/infrastructure/job/TwelvedataTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/TwelvedataTask.java
@@ -0,0 +1,105 @@
+package cn.stock.market.infrastructure.job;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Lists;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.domain.basic.service.TwelveStockService;
+import cn.stock.market.dto.TwelveStockData;
+import cn.stock.market.utils.HttpRequest;
+import cn.stock.market.web.config.Config;
+
+@Slf4j
+@Component
+@RestController
+public class TwelvedataTask {
+	
+    @Autowired
+    private TwelveStockService twelveStockService;
+	
+    @GetMapping("/task/syncStockData")
+    @Scheduled(cron = "0 0 18 * * ?")
+    public void syncStockData() {
+        log.info("每天18点定时同步Twelvedata股票数据开始");
+        Stopwatch stopwatch = Stopwatch.createStarted();
+        // 获取股票symbol列表
+        List<TwelveStockData> stockList = getStockList();
+        // 查询出数据库中所有股票
+        List<TwelveStock> allStocks = twelveStockService.repository().findAll();
+        List<String> savedSymbols = allStocks.stream().map(p-> p.getStockCode() + "#" + p.getStockType()).distinct().collect(Collectors.toList());
+        // 去除数据库中已经存在的股票
+        // 使用Iterator安全地移除元素
+        if(stockList!=null && stockList.size()>0) {
+	        Iterator<TwelveStockData> iterator = stockList.iterator();
+	        while (iterator.hasNext()) {
+	        	TwelveStockData stockData = iterator.next();
+	            if (savedSymbols.contains(stockData.getSymbol() + "#" + stockData.getExchange())) { // 根据条件移除元素
+	                iterator.remove();
+	            }
+	        }
+        }
+        //剩余数据入库
+        List<TwelveStock> addList = Lists.newArrayList();
+        if(stockList!=null && stockList.size()>0) {
+        	for(TwelveStockData stockData:stockList) {
+        		addList.add(cover(stockData));
+        	}
+        	twelveStockService.repository().saveAll(addList);
+        }
+        log.info("syncStockData执行, 受影响数{}, 耗时:{}毫秒", addList.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+    }
+    
+    private TwelveStock cover(TwelveStockData data) {
+  	  TwelveStock stock = new TwelveStock();
+  	  stock.setStockCode(data.getSymbol());
+  	  stock.setStockName(data.getName());
+  	  stock.setStockType(data.getExchange());
+  	  stock.setSaveTime(new Date());
+  	  return stock;
+    }
+    
+    private List<TwelveStockData> getStockList() {
+        try {
+        	String source = "docs";
+        	String country = "India";
+        	List<TwelveStockData> list = Lists.newArrayList();
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/stocks?source=%s&country=%s&apikey=%s",source,country,config.getTwelveApikey());
+			String result = HttpRequest.doTwelveGet(url);
+			log.info("getStockList：获取 {} {} 的股票全量列表结束，耗时: {} ms ",source,country,(System.currentTimeMillis()-start));
+			JSONObject jsonObject = JSONObject.parseObject(result);
+			if (jsonObject != null && !jsonObject.isEmpty()) {
+				JSONArray jsonArray = jsonObject.getJSONArray("data");
+				if(jsonArray!=null && jsonArray.size()>0) {
+			        for (int i = 0; i < jsonArray.size(); i++) {
+			            JSONObject item = jsonArray.getJSONObject(i);
+			            TwelveStockData stock = JSONObject.toJavaObject(item, TwelveStockData.class);
+			            list.add(stock);
+			        }
+				}
+			}
+			return list;
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			 log.error("getStockList同步twelvedata股票数据异常,Exception:{}", e);
+		}
+        return null;
+    }
+}
--- a/src/main/java/cn/stock/market/utils/DateTimeUtil.java
+++ b/src/main/java/cn/stock/market/utils/DateTimeUtil.java
@@ -5,8 +5,6 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Calendar;
-import java.util.Locale;
-
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -188,25 +186,6 @@ public class DateTimeUtil {
    }


-    public static String formatDateTimeFor24H(String inputDateTime,String inputFormatStr){
-        String outputDateTime = "";
-        // 1. 解析日期时间
-        SimpleDateFormat inputFormat = new SimpleDateFormat(inputFormatStr, Locale.ENGLISH);
-        Date date = null;
-        try {
-            date = inputFormat.parse(inputDateTime);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if (date != null) {
-            // 2. 转换为24小时制
-            SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-             outputDateTime = outputFormat.format(date);
-        }
-        return outputDateTime;
-    }
-
    public static void main(String[] args) {
        parseToDateByMinute(10);
    }
--- a/src/main/java/cn/stock/market/utils/HttpRequest.java
+++ b/src/main/java/cn/stock/market/utils/HttpRequest.java
@@ -2,6 +2,7 @@ package cn.stock.market.utils;


 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
@@ -142,6 +143,52 @@ public class HttpRequest {
        return text;
    }

+    public static String doTwelveGet(String url) throws Exception{
+    	int maxRetries = 3;
+        for (int retry = 1; retry <= maxRetries; retry++) {    	
+	    	BufferedReader reader = null;
+	    	StringBuilder response = new StringBuilder();
+	    	try {
+		        URL obj = new URL(url);
+		        HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+		        con.setRequestMethod("GET");
+		        con.setRequestProperty("Accept", "application/json");
+		        con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+		        //模拟postman请求，否则返回403
+		        con.setRequestProperty("User-Agent", "PostmanRuntime/7.26.8");
+		        
+		        int responseCode = con.getResponseCode();
+		        if (responseCode == HttpURLConnection.HTTP_OK) {
+		        	reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
+		            String inputLine;
+		            while ((inputLine = reader.readLine()) != null) {
+		                response.append(inputLine);
+		            }
+		            reader.close();
+		            return response.toString();
+		        } else {
+		            log.error("HTTP request failed with response code: " + responseCode);
+		        }
+	    	}catch(Exception e) {
+	    		log.error("请求twelvedata数据url:{},exception:{} ", url,e);
+	    	}finally {
+	    		 if (reader != null) {
+	                 reader.close();
+	             }
+	    	}
+            // 如果不是最后一次重试，则等待一段时间再进行下一次重试
+            if (retry < maxRetries) {
+                try {
+                    // 1秒钟
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
+        return null;
+    }
+    

    public static void main(String[] args) {
        String url = "";
--- a/src/main/java/cn/stock/market/utils/NseIndiaRequest.java
+++ b/src/main/java/cn/stock/market/utils/NseIndiaRequest.java
@@ -1,181 +0,0 @@
-package cn.stock.market.utils;
-
-import cn.stock.market.dto.StockHistoryRequest;
-import cn.stock.market.dto.StockHistoryResponse;
-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.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()
-                .cookieJar(new CookieJar() {
-                    private final Map<String, List<Cookie>> cookieStore = new HashMap<>();
-
-                    @Override
-                    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
-                        cookieStore.put(url.host(), cookies);
-                    }
-
-                    @Override
-                    public List<Cookie> loadForRequest(HttpUrl url) {
-                        List<Cookie> cookies = cookieStore.get(url.host());
-                        return cookies != null ? cookies : new ArrayList<Cookie>();
-                    }
-                })
-                .build();
-    }
-
-    private static Request createRequest(String url) {
-        Request request = new Request.Builder()
-                .url(url)
-                .header("accept", "application/json, text/plain, */*")
-                .header("accept-language", "en-US,en;q=0.9")
-                .header("cache-control", "no-cache")
-                .header("pragma", "no-cache")
-                .header("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36")
-                .build();
-
-        return request;
-    }
-
-    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");
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to initialize cookies", e);
-        }
-    }
-
-    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(NSE_INDIA_URL);
-
-        String url = NSE_INDIA_URL + "/api/quote-equity?symbol=" + nseIndiaId;
-        Request request = createRequest(url).newBuilder()
-                .addHeader("referer", NSE_INDIA_URL)
-                .addHeader("origin", NSE_INDIA_URL)
-                .build();
-        try (Response response = client.newCall(request).execute()) {
-            if (!response.isSuccessful()) {
-                throw new IOException("Request failed with code: " + response.code());
-            }
-
-            JSONObject jsonData = JSONObject.parseObject(response.body().string());
-            JSONObject data =jsonData.getJSONObject("priceInfo");
-            JSONObject json = new JSONObject();
-
-            json.put("pricepercentchange",data.getString("pChange"));
-            json.put("stockType",stockType);
-            json.put("pricechange",data.getString("change"));
-            json.put("pricecurrent",data.getString("lastPrice"));
-            json.put("priceprevclose",data.getString("previousClose"));
-            json.put("PREVDATE","");
-            json.put("VOL",jsonData.getJSONObject("preOpenMarket").getString("totalTradedVolume"));
-            json.put("dataSourceType","3");
-            json.put("symbol",symbol);
-            json.put("BSEID",symbol);
-            json.put("NSEID",symbol);
-            json.put("LTH",data.getString("upperCP"));
-            json.put("LTL",data.getString("lowerCP"));
-            json.put("OPN",data.getString("open"));
-
-            return json;
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to fetch data", e);
-        }
-    }
-
-    public static StockHistoryResponse stockKLineFromHttp(StockHistoryRequest stockHistoryRequest, String resolution) {
-        initCookie(NSE_INDIA_CHART_URL);
-
-        Integer code = getCode(stockHistoryRequest.getSymbol());
-
-        int interval = 1;
-        if (StringUtils.equals("H", resolution)) {
-            resolution = "I";
-            interval = 60;
-        }
-
-        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()) {
-            if (!response.isSuccessful()) {
-                throw new IOException("Request failed with code: " + response.code());
-            }
-
-            StockHistoryResponse result = objectMapper.readValue(response.body().string(), StockHistoryResponse.class);
-
-            return result;
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to fetch data", e);
-        }
-    }
-}
--- a/src/main/java/cn/stock/market/web/BTodayStockController.java
+++ b/src/main/java/cn/stock/market/web/BTodayStockController.java
@@ -22,7 +22,6 @@ 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;

@@ -160,19 +159,6 @@ public class BTodayStockController {

        String forObject = restTemplate.getForObject(apiUrl, String.class);
        JSONObject jsonObject = JSON.parseObject(forObject);
-        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");
-                jsonObject1.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;
    }
--- a/src/main/java/cn/stock/market/web/MoneyApiController.java
+++ b/src/main/java/cn/stock/market/web/MoneyApiController.java
@@ -3,25 +3,17 @@ 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.*;
-import cn.stock.market.dto.query.StockChartDto;
+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.RequestCacheUtils;
 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;
 import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -31,38 +23,26 @@ 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;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 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.math.BigDecimal;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.YearMonth;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;

 /**
@@ -81,20 +61,15 @@ 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")
+
+
+    @ApiOperation(value = "股票详情信息",httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
-            @ApiImplicitParam(name = "symbol", value = "scId值"),
-            @ApiImplicitParam(name = "id", value = "id值"),
+            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
+            @ApiImplicitParam(name="symbol",value = "scId值"),
+            @ApiImplicitParam(name="id",value = "id值"),
    })
    @ApiResponses(value = {
            @ApiResponse(code = 200, message = "" +
@@ -193,114 +168,53 @@ public class MoneyApiController {
                    "priceprevclose: 前一交易日的收盘价\n" +
                    "30DayAvg: 过去30天的平均", response = JSONObject.class),
    })
-    @GetMapping({"/market/api/market/money/getStockDetail", "/api/market/money/getStockDetail"})
+    @GetMapping({"/market/api/market/money/getStockDetail","/api/market/money/getStockDetail"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)
-    public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol) {
+
+    public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol ) {
+        String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s",stockType,symbol);
        MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType)
-                        .and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
-                        .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
-                        .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
+                .and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
+                .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
+                .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
                .orElse(null);
     /*   if(moneyStock==null){
            return ServerResponse.createByErrorMsg("没有找到该股票");
        }*/
        // 设置重试次数
-        if ("ANI".equals(symbol)) {
-            JSONObject json1 = new JSONObject();
-            json1.put("company", "Archit Nuwood Industries Ltd");
-            json1.put("pricepercentchange", "Archit Nuwood Industries Ltd");
-            json1.put("stockType", stockType);
-            json1.put("pricecurrent", "386");
-            json1.put("dataSourceType", "3");
-            json1.put("symbol", "ANI");
-            json1.put("BSEID", "ANI");
-            json1.put("NSEID", "ANI");
-            return ServerResponse.createBySuccess(json1);
-        }
-
-        String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", stockType.toLowerCase(), symbol);
        int maxRetries = 3;
-        if (moneyStock.getUseFromBseindia()) {
-            String bseUrl = "https://api.bseindia.com/BseIndiaAPI/api/getScripHeaderData/w?Debtflag=&scripcode=" + moneyStock.getNseIndiaId() + "&seriesid=";
-            HttpHeaders headers = new HttpHeaders();
-            headers.add("accept", "application/json, text/plain, */*");
-            headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8");
-            headers.add("origin", "https://www.bseindia.com");
-            headers.add("referer", "https://www.bseindia.com/");
-            headers.add("sec-ch-ua", "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"");
-            headers.add("sec-ch-ua-mobile", "?0");
-            headers.add("sec-ch-ua-platform", "\"Windows\"");
-            headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36");
-
-            HttpEntity<String> entity = new HttpEntity<>(headers);
-
-            try {
-                ResponseEntity<String> responseEntity = restTemplate.exchange(bseUrl, HttpMethod.GET, entity, String.class);
-                if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null) {
-                    JSONObject bseData = JSONObject.parseObject(responseEntity.getBody());
-                    JSONObject json1 = new JSONObject();
-                    json1.put("company", bseData.getJSONObject("Cmpname").getString("FullN"));
-                    json1.put("pricepercentchange", bseData.getJSONObject("CurrRate").getString("PcChg"));
-                    json1.put("stockType", stockType);
-                    json1.put("pricechange", bseData.getJSONObject("CurrRate").getString("Chg"));
-                    json1.put("pricecurrent", bseData.getJSONObject("CurrRate").getString("LTP"));
-                    json1.put("priceprevclose", bseData.getJSONObject("Header").getString("PrevClose"));
-                    json1.put("PREVDATE", "");
-
-                    json1.put("dataSourceType", "3");
-                    json1.put("symbol", symbol);
-                    json1.put("BSEID", moneyStock.getNseIndiaId());
-                    json1.put("NSEID", moneyStock.getNseIndiaId());
-                    json1.put("LTH", bseData.getJSONObject("Header").getString("High"));
-                    json1.put("LTL", bseData.getJSONObject("Header").getString("Low"));
-                    json1.put("OPN", bseData.getJSONObject("Header").getString("Open"));
-
-
-                    if (moneyStock != null) {
-                        json1.put("id", moneyStock.getId());
-                    }
-
-                    json1.put("VOL", this.getVolume(moneyStock.getNseIndiaId()));
-                    return ServerResponse.createBySuccess(json1);
-                }
-            } catch (Exception e) {
-                System.err.println("Error fetching data from BSE India: " + e.getMessage());
-            }
-        }
-
        for (int retry = 1; retry <= maxRetries; retry++) {
            try {
                ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.GET, null, String.class);
                JSONObject json1 = new JSONObject();
-                if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null) {
+                if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null ) {
                    JSONObject data = JSONObject.parseObject(responseEntity.getBody()).getJSONObject("data");
-                    if (data != null) {
-                        json1.put("company", data.getString("SC_FULLNM"));
-                        json1.put("pricepercentchange", data.getString("pricepercentchange"));
-                        json1.put("stockType", stockType);
-                        json1.put("pricechange", data.getString("pricechange"));
-                        json1.put("pricecurrent", data.getString("pricecurrent"));
-                        json1.put("priceprevclose", data.getString("priceprevclose"));
-                        json1.put("PREVDATE", data.getString("PREVDATE"));
-                        json1.put("VOL", data.getString("VOL"));
-                        json1.put("dataSourceType", "3");
-                        json1.put("symbol", data.getString("symbol"));
-                        json1.put("BSEID", data.getString("BSEID"));
-                        json1.put("NSEID", data.getString("NSEID"));
-                        json1.put("LTH", data.getString("HP"));
-                        json1.put("LTL", data.getString("LP"));
-                        json1.put("OPN", data.getString("OPN"));
-                        if (null != moneyStock) {
-                            json1.put("id", moneyStock.getId());
+                    if(data!=null){
+                        json1.put("company",data.getString("company"));
+                        json1.put("pricepercentchange",data.getString("pricepercentchange"));
+                        json1.put("stockType",stockType);
+                        json1.put("pricechange",data.getString("pricechange"));
+                        json1.put("pricecurrent",data.getString("pricecurrent"));
+                        json1.put("priceprevclose",data.getString("priceprevclose"));
+                        json1.put("PREVDATE",data.getString("PREVDATE"));
+                        json1.put("VOL",data.getString("VOL"));
+                        json1.put("dataSourceType","3");
+                        json1.put("symbol",data.getString("symbol"));
+                        json1.put("BSEID",data.getString("BSEID"));
+                        json1.put("NSEID",data.getString("NSEID"));
+                        json1.put("LTH",data.getString("HP"));
+                        json1.put("LTL",data.getString("LP"));
+                        json1.put("OPN",data.getString("OPN"));
+                        if(null!=moneyStock){
+                            json1.put("id",moneyStock.getId());
                        }
-                        if (StringUtils.equals(data.getString("pricecurrent"), "0.00")
-                                && (!StringUtils.equals(data.getString("priceprevclose"), "0.00"))) {
-                            json1.put("pricecurrent", data.getString("priceprevclose"));
+                        if(StringUtils.equals(data.getString("pricecurrent"),"0.00")
+                          && (!StringUtils.equals(data.getString("priceprevclose"),"0.00"))){
+                            json1.put("pricecurrent",data.getString("priceprevclose"));
                        }
                    }
-                    if (json1.size() > 0)
-                        return ServerResponse.createBySuccess(json1);
+                    return ServerResponse.createBySuccess(json1);
                }
            } catch (Exception e) {
            }
@@ -314,82 +228,20 @@ public class MoneyApiController {
                }
            }
        }
-        if (moneyStock != null && moneyStock.getNseIndiaId() != null && !moneyStock.getNseIndiaId().isEmpty()) {
-            try {
-                // Get data from nseindia
-                JSONObject json = NseIndiaRequest.stockByJYSFromHttp(stockType, symbol, moneyStock.getNseIndiaId());
-                json.put("id", moneyStock.getId());
-                json.put("company",moneyStock.getStockName());
-                return ServerResponse.createBySuccess(json);
-
-            } catch (Exception e) {
-                return null;
-            }
-        }
        return null;
    }

-    private String getVolume(String scripcode) {
-        String url = "https://api.bseindia.com/BseIndiaAPI/api/StockTrading/w?flag=&quotetype=EQ&scripcode=" + scripcode;
-        RestTemplate restTemplate = new RestTemplate();

-        HttpHeaders headers = new HttpHeaders();
-        headers.add("accept", "application/json, text/plain, */*");
-        headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8");
-        headers.add("origin", "https://www.bseindia.com");
-        headers.add("referer", "https://www.bseindia.com/");
-        headers.add("sec-ch-ua", "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"");
-        headers.add("sec-ch-ua-mobile", "?0");
-        headers.add("sec-ch-ua-platform", "\"Windows\"");
-        headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36");

-        HttpEntity<String> entity = new HttpEntity<>(headers);
-
-        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
-        BigDecimal volume = BigDecimal.ZERO;
-
-        if (response.getStatusCode().value() == 200 && response.getBody() != null) {
-            JSONObject volumeData = JSONObject.parseObject(response.getBody());
-            if (volumeData.getString("TTQ") != null) {
-                volume = new BigDecimal(volumeData.getString("TTQ"));
-            }
-        }
-        return volume.toString();
-    }
-
-    private String getChartData(String scripcode, String resolution) {
-        String url = "https://charting.bseindia.com/charting/RestDataProvider.svc/getDat?exch=B&type=b&mode=bseL&fromdate=01-01-1991-01%3A01%3A00-AM&scode=" + scripcode;
-        if (resolution.equals("H")) {
-            url = "https://charting.bseindia.com/charting/RestDataProvider.svc/getDatI?exch=B&type=b&mode=bseL&fromdate=01-01-1991-01%3A01%3A00-AM&scode=" + scripcode;
-        }
-        RestTemplate restTemplate = new RestTemplate();
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("accept", "application/json, text/plain, */*");
-        headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8");
-        headers.add("origin", "https://www.bseindia.com");
-        headers.add("referer", "https://www.bseindia.com/");
-        headers.add("sec-ch-ua", "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"");
-        headers.add("sec-ch-ua-mobile", "?0");
-        headers.add("sec-ch-ua-platform", "\"Windows\"");
-        headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36");
-
-        HttpEntity<String> entity = new HttpEntity<>(headers);
-
-        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
-
-        return response.getBody();
-    }
-
-    private static List<MoneyStockSuggestDTO> nseActives() {
+    private static   List<MoneyStockSuggestDTO>  nseActives() {
        List<MoneyStockSuggestDTO> list = new ArrayList<>();
        String url = "https://www.moneycontrol.com/stocks/marketstats/nse-mostactive-stocks/nifty-50-9/";
        try {
            Document doc = Jsoup.connect(url).get();
            int size = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr").size();
-            for (int i = 1; i <= size; i++) {
+            for (int i =1;i<=size;i++){
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td.PR > span > a").first();
+                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child("+i+") > td.PR > span > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
@@ -397,7 +249,7 @@ public class MoneyApiController {
                    dto.setStockUrl(stockUrl);
                }

-                String highPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(2)").first());
+                String highPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child("+i+") > td:nth-child(2)").first());
                dto.setHighPrice(highPrice);

                String lowPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div >  div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(3)").first());
@@ -422,7 +274,7 @@ public class MoneyApiController {
        return list;
    }

-    private static List<MoneyStockSuggestDTO> bseActives() {
+    private static  List<MoneyStockSuggestDTO> bseActives() {
        List<MoneyStockSuggestDTO> list = new ArrayList<>();

        String url = "https://www.moneycontrol.com/stocks/marketstats/bsemact1/index.php";
@@ -430,9 +282,9 @@ public class MoneyApiController {
            Document doc = Jsoup.connect(url).get();
            int size = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr").size();
            System.err.println(size);
-            for (int i = 1; i <= size; i++) {
+            for (int i =1;i<=size;i++){
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td.PR > span > a").first();
+                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child("+i+") > td.PR > span > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
@@ -461,19 +313,19 @@ public class MoneyApiController {
            }

        } catch (IOException e) {
-            log.error("occur Exception", e);
+            log.error("occur Exception",e);
        }
        return list;
    }

-    private static List<MoneyStockSuggestDTO> bseGainer() {
+    private static  List<MoneyStockSuggestDTO> bseGainer() {
        String url = "https://www.moneycontrol.com/stocks/marketstats/bse-gainer/sensex_4/";
        List<MoneyStockSuggestDTO> list = Lists.newArrayList();
        try {
            Document doc = Jsoup.connect(url).get();
            int size = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr").size();
-            for (int i = 1; i <= size; i++) {
-                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td.PR > span > a").first();
+            for (int i =1;i<=size;i++){
+                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child("+i+") > td.PR > span > a").first();
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
@@ -517,9 +369,9 @@ public class MoneyApiController {
        try {
            Document doc = Jsoup.connect(url).get();
            int size = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr").size();
-            for (int i = 1; i <= size; i++) {
+            for (int i =1;i<=size;i++){
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td.PR > span > h3 > a").first();
+                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child("+i+") > td.PR > span > h3 > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
@@ -554,20 +406,20 @@ public class MoneyApiController {
        return list;
    }

-    private static List<MoneyStockSuggestDTO> nseTopLoser() {
+    private static  List<MoneyStockSuggestDTO>  nseTopLoser() {
        String url = "https://www.moneycontrol.com/stocks/marketstats/nseloser/index.php";
        List<MoneyStockSuggestDTO> list = Lists.newArrayList();

        try {
            Document doc = Jsoup.connect(url).get();
            int size = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr").size();
-            for (int i = 1; i <= size; i++) {
+            for (int i =1;i<=size;i++){
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td.PR > span > h3 > a").first();
+                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child("+i+") > td.PR > span > h3 > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
-                    dto.setStockUrl(stockUrl);
+                   dto.setStockUrl(stockUrl);
                    dto.setStockName(stockName);
                }

@@ -594,7 +446,7 @@ public class MoneyApiController {
        } catch (IOException e) {
            e.printStackTrace();
        }
-        return list;
+        return  list;
    }

    private static List<MoneyStockSuggestDTO> bseTopLoser() {
@@ -604,7 +456,7 @@ public class MoneyApiController {
        try {
            Document doc = Jsoup.connect(url).get();
            int size = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr").size();
-            for (int i = 1; i <= size; i++) {
+            for (int i =1;i<=size;i++){
                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td.PR > span > a").first();
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
                if (company_a != null) {
@@ -649,15 +501,17 @@ public class MoneyApiController {
    }


-    @ApiOperation(value = "股票推荐TopGainer", httpMethod = "GET")
+
+
+    @ApiOperation(value = "股票推荐TopGainer",httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
+            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
    })
    @ApiResponses(value = {
            @ApiResponse(code = 200, message = "" +
                    "股票推荐相关: top gainer", response = JSONObject.class),
    })
-    @GetMapping({"/market/api/market/money/getTopGainer", "/api/market/money/getTopGainer"})
+    @GetMapping({"/market/api/market/money/getTopGainer","/api/market/money/getTopGainer"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)

@@ -675,15 +529,15 @@ public class MoneyApiController {
            }
            Map<Object, Boolean> map = new HashMap<>();
            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
+                    .filter(f->StringUtils.isNotBlank(f.getStockName()))
                    .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
+            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
                List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(selfUlrList)) {
+                if(CollectionUtils.isNotEmpty(selfUlrList)){
                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if (CollectionUtils.isNotEmpty(all)) {
-                        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()));
+                    if(CollectionUtils.isNotEmpty(all)){
+                        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()));
                    }
                }
                gainerStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
@@ -694,47 +548,47 @@ public class MoneyApiController {
    }


-    @ApiOperation(value = "股票推荐TopLoser", httpMethod = "GET")
+    @ApiOperation(value = "股票推荐TopLoser",httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
+            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
    })
    @ApiResponses(value = {
            @ApiResponse(code = 200, message = "" +
                    "股票推荐相关: TopLoser", response = JSONObject.class),
    })
-    @GetMapping({"/market/api/market/money/getTopLoser", "/api/market/money/getTopLoser"})
+    @GetMapping({"/market/api/market/money/getTopLoser","/api/market/money/getTopLoser"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)

    public List<MoneyStockSuggestDTO> getTopLoser(@RequestParam String stockType) {
        List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
        moneyStockSuggestDTOS = loserStockSuggestCache.getIfPresent(stockType);
-        if (null == moneyStockSuggestDTOS) {
-            if (StringUtils.equals(stockType, "nse")) {
+        if(null==moneyStockSuggestDTOS){
+            if(StringUtils.equals(stockType,"nse")){
                moneyStockSuggestDTOS = nseTopLoser();
-            } else if (StringUtils.equals(stockType, "bse")) {
+            }else if(StringUtils.equals(stockType,"bse")){
                moneyStockSuggestDTOS = bseTopLoser();
            }
            Map<Object, Boolean> map = new HashMap<>();
            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
+                    .filter(f->StringUtils.isNotBlank(f.getStockName()))
                    .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
-                moneyStockSuggestDTOS.stream().forEach(f -> f.setDispId(extractLastSegment(f.getStockUrl())));
+            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
+                moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
                List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(selfUlrList)) {
+                if(CollectionUtils.isNotEmpty(selfUlrList)){
                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if (CollectionUtils.isNotEmpty(all)) {
-                        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()));
+                    if(CollectionUtils.isNotEmpty(all)){
+                        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()));
                    }
-                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(noScIdList)) {
+                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
+                    if(CollectionUtils.isNotEmpty(noScIdList)){
                        List<String> dispIdList = noScIdList.stream().map(MoneyStockSuggestDTO::getDispId).collect(Collectors.toList());
                        List<MoneyStock> all1 = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfDispId.in(dispIdList));
-                        if (CollectionUtils.isNotEmpty(all1)) {
-                            moneyStockSuggestDTOS.stream().filter(f -> all1.stream().anyMatch(s -> s.getSelfDispId().equals(f.getDispId())))
-                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
+                        if(CollectionUtils.isNotEmpty(all1)){
+                            moneyStockSuggestDTOS.stream().filter(f->all1.stream().anyMatch(s->s.getSelfDispId().equals(f.getDispId())))
+                                    .forEach(f->f.setScId(all.stream().filter(s->s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
                        }
                    }
                }
@@ -745,47 +599,49 @@ public class MoneyApiController {
    }


-    @ApiOperation(value = "股票推荐TopActive", httpMethod = "GET")
+
+
+    @ApiOperation(value = "股票推荐TopActive",httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
+            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
    })
    @ApiResponses(value = {
            @ApiResponse(code = 200, message = "" +
                    "股票推荐相关: top active", response = JSONObject.class),
    })
-    @GetMapping({"/market/api/market/money/getTopActives", "/api/market/money/getTopActives"})
+    @GetMapping({"/market/api/market/money/getTopActives","/api/market/money/getTopActives"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)

    public List<MoneyStockSuggestDTO> getTopActive(@RequestParam String stockType) {
        List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
        moneyStockSuggestDTOS = activesStockSuggestCache.getIfPresent(stockType);
-        if (moneyStockSuggestDTOS == null) {
-            if (StringUtils.equals(stockType, "nse")) {
+        if(moneyStockSuggestDTOS ==null){
+            if(StringUtils.equals(stockType,"nse")){
                moneyStockSuggestDTOS = nseActives();
-            } else if (StringUtils.equals(stockType, "bse")) {
+            }else if(StringUtils.equals(stockType,"bse")){
                moneyStockSuggestDTOS = bseActives();
            }
            Map<Object, Boolean> map = new HashMap<>();
            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
+                    .filter(f->StringUtils.isNotBlank(f.getStockName()))
                    .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
-                moneyStockSuggestDTOS.stream().forEach(f -> f.setDispId(extractLastSegment(f.getStockUrl())));
+            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
+                moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
                List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(selfUlrList)) {
+                if(CollectionUtils.isNotEmpty(selfUlrList)){
                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if (CollectionUtils.isNotEmpty(all)) {
-                        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()));
+                    if(CollectionUtils.isNotEmpty(all)){
+                        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()));
                    }
-                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(noScIdList)) {
+                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
+                    if(CollectionUtils.isNotEmpty(noScIdList)){
                        List<String> dispIdList = noScIdList.stream().map(MoneyStockSuggestDTO::getDispId).collect(Collectors.toList());
                        List<MoneyStock> all1 = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfDispId.in(dispIdList));
-                        if (CollectionUtils.isNotEmpty(all1)) {
-                            moneyStockSuggestDTOS.stream().filter(f -> all1.stream().anyMatch(s -> s.getSelfDispId().equals(f.getDispId())))
-                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
+                        if(CollectionUtils.isNotEmpty(all1)){
+                            moneyStockSuggestDTOS.stream().filter(f->all1.stream().anyMatch(s->s.getSelfDispId().equals(f.getDispId())))
+                                    .forEach(f->f.setScId(all.stream().filter(s->s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
                        }
                    }
                }
@@ -796,36 +652,10 @@ public class MoneyApiController {
        return moneyStockSuggestDTOS;
    }

-    private static void addToListDouble(List<Double> list, String value) {
-        String[] values = value.split(",");
-        for (String v : values) {
-            list.add(Double.parseDouble(v));
-        }
-    }
-
-    private static void addToList(List<Long> list, String value) {
-        String[] values = value.split(",");
-        for (String v : values) {
-            list.add(Math.round(Double.parseDouble(v)));
-        }
-    }
-
-    private static void addDatesToList(List<Long> list, String value) {
-        String[] dates = value.split(",");
-        SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss a", Locale.US);
-        for (String dateStr : dates) {
-            try {
-                Date date = sdf.parse(dateStr);
-                list.add(date.getTime());
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
-    }


-    @GetMapping({"/market/api/market/money/history/kLine", "/api/market/money/history/kLine"})
-    @ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源", response = StockHistoryResponse.class)
+    @GetMapping({"/market/api/market/money/history/kLine","/api/market/money/history/kLine"})
+    @ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源",response = StockHistoryResponse.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "symbol", value = "Stock symbol 对应的是NSEID 或者是BSEID", required = true, dataType = "String", paramType = "query"),
            @ApiImplicitParam(name = "resolution", value = "单位:60 1D 1W 1D 对应H,D,W,Y", required = true, dataType = "String", paramType = "query"),
@@ -835,73 +665,10 @@ public class MoneyApiController {
            @ApiImplicitParam(name = "currencyCode", value = "INR 不变", required = true, dataType = "String", paramType = "query")
    })
    @ResponseBody
-    @EncryptFilter(decryptRequest = false)
-    public ResponseEntity<StockHistoryResponse> getStockHistory(@RequestParam String symbol,
-                                                                @RequestParam String resolution
-    ) {
-        MoneyStock moneyStock1 = moneyStockRepository.findOne(
-                        QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol)
-                        .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
-                        .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
-                .orElse(null);
-
-        if (moneyStock1 != null) {
-
-            String json = this.getChartData(moneyStock1.getNseIndiaId(), resolution);
-
-            Gson gson = new Gson();
-
-            JsonObject outerJson = gson.fromJson(json, JsonObject.class);
-
-            String innerJsonString;
-
-            if (resolution.equals("H")) {
-                innerJsonString = outerJson.get("getDatIResult").getAsString();
-            } else {
-                innerJsonString = outerJson.get("getDatResult").getAsString();
-            }
-
-            JsonObject innerJson = gson.fromJson(innerJsonString, JsonObject.class);
-
-            JsonArray dataInputValues = innerJson.getAsJsonArray("DataInputValues");
-
-            List<Double> openList = new ArrayList<>();
-            List<Double> highList = new ArrayList<>();
-            List<Double> lowList = new ArrayList<>();
-            List<Double> closeList = new ArrayList<>();
-            List<Long> volumeList = new ArrayList<>();
-            List<Long> dateList = new ArrayList<>();
-
-            if (dataInputValues.size() > 0) {
-                JsonObject dataObject = dataInputValues.get(0).getAsJsonObject();
-
-                JsonArray openArray = dataObject.getAsJsonArray("OpenData");
-                JsonArray highArray = dataObject.getAsJsonArray("HighData");
-                JsonArray lowArray = dataObject.getAsJsonArray("LowData");
-                JsonArray closeArray = dataObject.getAsJsonArray("CloseData");
-                JsonArray volumeArray = dataObject.getAsJsonArray("VolumeData");
-                JsonArray dateArray = dataObject.getAsJsonArray("DateData");
-
-                openArray.forEach(o -> addToListDouble(openList, o.getAsJsonObject().get("Open").getAsString()));
-                highArray.forEach(h -> addToListDouble(highList, h.getAsJsonObject().get("High").getAsString()));
-                lowArray.forEach(l -> addToListDouble(lowList, l.getAsJsonObject().get("Low").getAsString()));
-                closeArray.forEach(c -> addToListDouble(closeList, c.getAsJsonObject().get("Close").getAsString()));
-                volumeArray.forEach(v -> addToList(volumeList, v.getAsJsonObject().get("Volume").getAsString()));
-                dateArray.forEach(d -> addDatesToList(dateList, d.getAsJsonObject().get("Date").getAsString()));
-
-                StockHistoryResponse response = new StockHistoryResponse();
-                response.setS("ok");
-                response.setT(dateList);
-                response.setO(openList);
-                response.setH(highList);
-                response.setL(lowList);
-                response.setC(closeList);
-                response.setV(volumeList);
-
-                return ResponseEntity.ok(response);
-            }
-        }
-
+   @EncryptFilter(decryptRequest = false)
+    public ResponseEntity<StockHistoryResponse> getStockHistory( @RequestParam String symbol,
+                                                                 @RequestParam String resolution
+                                                               ) {
        // 向外部API发起请求，并获取响应
        StockHistoryRequest request = new StockHistoryRequest();
        request.setSymbol(symbol);
@@ -910,24 +677,24 @@ public class MoneyApiController {
        int countback = 5;
        if(StringUtils.equals("H",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (10 * 60 * 60 );
-            countback = 328;
-            request.setResolution("60");
+            from = to - ( 60 * 60 );
+            countback = 60;
+            request.setResolution("1");
        }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 = 730;
-            request.setResolution("1W");
-        } else if (StringUtils.equals("M", resolution)) {
+            from = to - (24 * 60 * 60 );
+            countback = 390;
+            request.setResolution("1");
+        }else if(StringUtils.equals("W",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (15 * 30 * 24 * 60 * 60);
-            countback = 730;
-            request.setResolution("1D");
+            from = to - (7 * 24 * 60 * 60 );
+            countback = 471;
+            request.setResolution("5");
+        }else if(StringUtils.equals("M",resolution)){
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (35 * 24 * 60 * 60 );
+            countback = 328;
+            request.setResolution("30");
        }

        request.setFrom(from);
@@ -935,88 +702,14 @@ public class MoneyApiController {
        request.setCountback(countback);
        request.setCurrencyCode("INR");
        String apiUrl = buildApiUrl(request);
-        log.info("request url:" + apiUrl);
+        log.info("request url:"+apiUrl);
        StockHistoryResponse response = null;
        int maxRetries = 3;
        int retryCount = 0;

        while (response == null && retryCount < maxRetries) {
            try {
-                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);
-                }
+                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);
@@ -1029,34 +722,14 @@ 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);
+        if (response != null) {
+            setResponse(response,resolution);
            // API request successful, return the response
            return ResponseEntity.ok(response);
        } else {
-            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.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
            log.error("Failed to get a successful response after {} retries.", maxRetries);
            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
@@ -1064,41 +737,14 @@ 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())) {
+    private void setResponse(StockHistoryResponse response,String resolution){
+        if(!"ok".equals(response.getS())){
            return;
        }
-        if (Objects.isNull(response.getT())) {
+        if(Objects.isNull(response.getT())){
            return;
        }
-        if (StringUtils.equals("H", resolution) || StringUtils.equals("D", resolution)) {
+        if(StringUtils.equals("H",resolution) || StringUtils.equals("D",resolution)) {
            List<Long> t = new ArrayList<>();
            List<Double> o = new ArrayList<>();
            List<Double> h = new ArrayList<>();
@@ -1110,7 +756,7 @@ public class MoneyApiController {
            Date currentTime = new Date();
            //判断最后一条是不是当天的数据，如果不是，把最后一条的时间作为当天的时间
            long getTime = response.getT().get(response.getT().size() - 1) * 1000L;
-            if (!DateUtil.isSameDay(currentTime, new Date(getTime))) {
+            if(!DateUtil.isSameDay(currentTime, new Date(getTime))){
                currentTime = new Date(getTime);
            }
            int i = 0;
@@ -1136,14 +782,14 @@ public class MoneyApiController {
    }


+
+
    private String buildApiUrl(StockHistoryRequest request) {
        // 构建外部API的URL
        return String.format("%s?symbol=%s&resolution=%s&from=%d&to=%d&countback=%d&currencyCode=%s",
                EXTERNAL_API_URL, request.getSymbol(), request.getResolution(), request.getFrom(),
                request.getTo(), request.getCountback(), request.getCurrencyCode());
-    }
-
-    ;
+    };


    private static String extractLastSegment(String url) {
@@ -1168,7 +814,7 @@ public class MoneyApiController {
 ////        bseTopLoser();
        System.out.println(new Date());
        System.out.println(new Date(1713949200000L));
-        System.out.println(DateUtil.isSameDay(new Date(), new Date(1713949200000L)));
+        System.out.println(DateUtil.isSameDay(new Date(),new Date(1713949200000L)));
    }

    private Cache<String, List<MoneyStockSuggestDTO>> gainerStockSuggestCache = CacheBuilder.newBuilder()
--- a/src/main/java/cn/stock/market/web/StockApiController.java
+++ b/src/main/java/cn/stock/market/web/StockApiController.java
@@ -3,8 +3,6 @@ package cn.stock.market.web;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 import javax.servlet.http.HttpServletRequest;
@@ -14,7 +12,6 @@ import cn.qutaojing.common.jpa.ConditionBuilder;
 import cn.stock.market.domain.basic.entity.SiteNews;
 import cn.stock.market.domain.basic.repository.SiteNewsRepository;
 import cn.stock.market.infrastructure.db.po.QSiteNewsPO;
-import cn.stock.market.infrastructure.job.InvestingTask;
 import cn.stock.market.web.annotations.EncryptFilter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -172,22 +169,15 @@ public class StockApiController {

 	@RequestMapping({"test.do"})
 	@ResponseBody
-	public ServerResponse test(/*@RequestParam("url") String url, @RequestParam("pageNum") Integer pageNum*/) {
+	public ServerResponse test(@RequestParam("url") String url, @RequestParam("pageNum") Integer pageNum) {
 		String news = stockService.getNews();
 		List<String> newsList = Arrays.asList(news.split("<a href="));
 		newsList = newsList.subList(1, newsList.size());
 		newsList.forEach( n -> {
 			String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2);
 			String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_"));
-			String imgUrl = InvestingTask.extractImgSrc(n);
-//			String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
-			// Extract the date and time using regex
-			Pattern pattern = Pattern.compile("Updated On :<!-- --> <!-- -->(.*?)<!-- -->");
-			Matcher matcher = pattern.matcher(n);
-			String time = "";
-			if (matcher.find()) {
-				time = matcher.group(1).trim();
-			}
+			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);

 			SiteNews siteNews = new SiteNews();
 			siteNews.setAddTime(new Date());
@@ -248,7 +238,7 @@ public class StockApiController {
 	@ResponseBody
 	public ServerResponse getIndiaIndexByToday() {
 		String INDEX_CODE = "TODAY_INDEX";
-		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,6000, (string) -> {
+		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,60000, (string) -> {
 			return this.stockService.getIndexByBtoday();
 		});
 	}
--- a/src/main/java/cn/stock/market/web/TwelveApiController.java
+++ b/src/main/java/cn/stock/market/web/TwelveApiController.java
@@ -0,0 +1,137 @@
+package cn.stock.market.web;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.StringUtil;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.dto.StockHistoryResponse;
+import cn.stock.market.dto.TwelveStockInfo;
+import cn.stock.market.utils.HttpRequest;
+import cn.stock.market.utils.ServerResponse;
+import cn.stock.market.web.annotations.EncryptFilter;
+import cn.stock.market.web.config.Config;
+
+/**
+ * twelvedata数据源接口
+ * 
+ */
+@RestController
+@Api(value = "/TwelveApiController", tags = "twelvedata股票行情")
+@Slf4j
+@RequestMapping({"/api/market/twelvedata", "/api/hq/twelvedata"})
+public class TwelveApiController {
+    
+    @ApiOperation(value = "股票详情信息", httpMethod = "GET")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "stockCode",value = "股票对应代码",dataType ="String",required = true, paramType = "query"),
+    	@ApiImplicitParam(name = "stockType",value = "股票对应代码:BSE/NSE",dataType ="String",required = true, paramType = "query")
+    })
+    @GetMapping("/getStockDetail")
+    @EncryptFilter(decryptRequest = false)
+    public ServerResponse<?> getStockDetail(String stockCode,String stockType) {
+        try {
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/quote?symbol=%s&exchange=%s&apikey=%s",stockCode,stockType,config.getTwelveApikey());
+            String result = HttpRequest.doTwelveGet(url);
+            if(StringUtil.isNotEmpty(result)) {
+            	JSONObject data = JSONObject.parseObject(result);
+            	TwelveStockInfo info = mapJsonToTwelveStock(data);
+            	log.info("getStockDetail：获取 {}, {} 的股票详情结束，耗时: {} ms ",stockCode,stockType,(System.currentTimeMillis()-start));
+            	return ServerResponse.createBySuccess("操作成功", info);
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情参数：{},{}. Exception:{}" , stockCode,stockType, e);
+        }
+        return ServerResponse.createBySuccess("操作成功");
+    }
+
+    private TwelveStockInfo mapJsonToTwelveStock(JSONObject jsonObject) {
+    	TwelveStockInfo info = new TwelveStockInfo();
+        if (jsonObject != null && !jsonObject.isEmpty()) {
+        	info.setStockCode(jsonObject.getString("symbol"));
+        	info.setSymbol(jsonObject.getString("symbol"));
+        	info.setStockName(jsonObject.getString("name"));
+        	info.setStockType(jsonObject.getString("exchange"));
+        	info.setLastPrice(jsonObject.getString("close"));
+        	info.setPerchg(jsonObject.getString("percent_change"));
+        	info.setChange(jsonObject.getString("change"));
+        	info.setOpenPrice(jsonObject.getString("open"));
+        	info.setPreviousPrice(jsonObject.getString("previous_close"));
+        	info.setVolume(jsonObject.getString("volume"));
+        	info.setHighPrice(jsonObject.getString("high"));
+        	info.setLowPrice(jsonObject.getString("low"));
+        	JSONObject json = jsonObject.getJSONObject("fifty_two_week");
+        	if(json!=null && !json.isEmpty()) {
+	        	info.setWeek52HighPrice(json.getString("high"));
+	        	info.setWeek52LowPrice(json.getString("low"));
+        	}
+        }
+        return info;
+    }
+    
+    @ApiOperation(value = "股票详情列表", httpMethod = "GET")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "stockCodes",value = "股票对应代码, 多个时以英文逗号分隔",dataType ="String",required = true, paramType = "query"),
+    	@ApiImplicitParam(name = "stockType",value = "股票对应代码:BSE/NSE",dataType ="String",required = true, paramType = "query")
+    })
+    @GetMapping("/getStockDetailList")
+    @EncryptFilter(decryptRequest = false)
+    public ServerResponse<?> getStockDetailList(String stockCodes,String stockType) {
+        try {
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/quote?symbol=%s&exchange=%s&apikey=%s",stockCodes,stockType,config.getTwelveApikey());
+            String result = HttpRequest.doTwelveGet(url);
+            if(StringUtil.isNotEmpty(result)) {
+            	JSONObject data = JSONObject.parseObject(result);
+            	List<TwelveStockInfo> list = mapJsonToTwelveList(stockCodes,data);
+            	log.info("getStockDetailList：获取 {}, {} 的股票列表详情结束，耗时: {} ms ",stockCodes,stockType,(System.currentTimeMillis()-start));
+            	return ServerResponse.createBySuccess("操作成功", list);
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情参数：{},{}. Exception:{}" , stockCodes,stockType, e);
+        }
+        return ServerResponse.createBySuccess("操作成功");
+    }
+    
+    private List<TwelveStockInfo> mapJsonToTwelveList(String stockCodes,JSONObject jsonObject) {
+		if (jsonObject == null || jsonObject.isEmpty()) {
+			return new ArrayList<>();
+		}
+		List<TwelveStockInfo> list = new ArrayList<>();
+		String[] items = stockCodes.split(",");
+		if(items!=null && items.length>0) {
+			if(items.length == 1) {
+				TwelveStockInfo info = mapJsonToTwelveStock(jsonObject);
+				list.add(info);
+				return list;
+			}
+			for (String str : items) {
+				JSONObject json = jsonObject.getJSONObject(str);
+				TwelveStockInfo vo = mapJsonToTwelveStock(json);
+				list.add(vo);
+			}
+		}
+		return list;
+    }
+
+
+}
--- a/src/main/java/cn/stock/market/web/config/Config.java
+++ b/src/main/java/cn/stock/market/web/config/Config.java
@@ -39,4 +39,5 @@ public class Config {
 	String aliyunAccessKeyId;
 	String aliyunAccessKeySecret;
 	String aliyunAppCode;
+	String twelveApikey;
 }
--- a/src/main/resources/application-base-alpha.yml
+++ b/src/main/resources/application-base-alpha.yml
@@ -3,9 +3,9 @@ spring:
    show-sql: true
  # Redis配置
  redis:
-    host: 43.156.40.39
-    password: a5v8b86P4mVzFlUqJV
-    port: 30031
+    host: 43.132.212.180
+    password: ruTZ9J3gaDhknJ
+    port: 36379
    database: 1
    lettuce:
      pool:
@@ -17,9 +17,9 @@ spring:
  datasource:
    stock-market:
      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://43.156.40.39:30030/india_stock?useUnicode=true&characterEncoding=utf-8
+      url: jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8
      username: root
-      password: uNejHIFQGJOUtYTmE
+      password: 33BsUUcnXRYgwtIND
      maxActive: 500
      testWhileIdle: true
      validationQuery: SELECT 1
@@ -42,6 +42,7 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tJi2z8cegG8fTW7BSQu
 aliyunAccessKeySecret: fnCI9LUcqLuH7D6nkhvSHQMob1JSm8
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+twelveApikey: 4098a6fc2c3245a88c7da804f10223c2
 # 具体看类:CloudStorageConfig
 oss:
  type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云
--- a/src/main/resources/application-base-prod.yml
+++ b/src/main/resources/application-base-prod.yml
@@ -46,6 +46,7 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tCQRp7t158TVyoF2Yhe
 aliyunAccessKeySecret: glyzOno773Cv7HeWDliveu2H5gX486
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+twelveApikey: 4098a6fc2c3245a88c7da804f10223c2
 # 具体看类:CloudStorageConfig
 oss:
  type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云
--- a/src/test/java/rp/lee/jpa/JpaDDDGen.java
+++ b/src/test/java/rp/lee/jpa/JpaDDDGen.java
@@ -31,9 +31,9 @@ public class JpaDDDGen {
 	 */
 	public static DataSource getMySQLDataSource() {
 		MysqlDataSource mysqlDS = new MysqlDataSource();
-		mysqlDS.setURL("jdbc:mysql://43.132.212.180:33306/india_stock?useUnicode=true&characterEncoding=utf-8");
+		mysqlDS.setURL("jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8");
 		mysqlDS.setUser("root");
-		mysqlDS.setPassword("33BsUUcnXRYgwt");
+		mysqlDS.setPassword("33BsUUcnXRYgwtIND");
 		return mysqlDS;
 	}
 	
@@ -50,7 +50,7 @@ public class JpaDDDGen {
 		/**
 		 * cs_statistic - 要生成的数据库表
 		 */
-		Cons.tableNameToEntiyMapping.put("money_stock", null);
+		Cons.tableNameToEntiyMapping.put("twelve_stock", null);

 		ToolDDD.g(getMySQLDataSource().getConnection());
 	}
Author	SHA1	Message	Date
zhanghuilong	f565132607	详情查询、详情列表查询	2024-05-31 18:11:23 +08:00
zhanghuilong	67a3d6fd74	工具方法	2024-05-31 17:49:52 +08:00
zhanghuilong	c8b0bcd336	抓取全量股票数据入库	2024-05-30 18:27:49 +08:00
zhanghuilong	a12000f99e	twelve_stock实体	2024-05-30 11:10:30 +08:00