twelve_stock实例

# Conflicts:
#	src/main/java/cn/stock/market/utils/RefinitivUtil.java

.gitlab-ci.yml

@@ -1,13 +1,7 @@
 stages:
   # 构建
   - build
-  - dockerize
-  - deploy
-
-variables:  
-  company_name: juyoutech
-  project_name: germany_stock
-  service_name: market
+  - webhook
 
 build:
   image: maven:3.6.3-openjdk-8
@@ -15,7 +9,7 @@ build:
   only:
     - main
     - develop
-    - develop_red
+    - retifive
   before_script:
     - echo '<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -44,45 +38,17 @@ build:
     - mvn clean install -Dmaven.test.skip=true
     - ls
     - echo ">>>>>>Finish Building<<<<<<"
-dockerize:
-  stage: dockerize
-  tags:
-   - hk2
-  dependencies:
-    - build
+webhook:
+  stage: webhook
   only:
-    - main
     - develop
-    - develop_red
+    - retifive
   script:
-    - echo ">>>>>>Start Building Docker Image<<<<<<"
-    - pwd
-    - ls -lah
-    - echo $DOCKER_PASSWORD | docker login -u ${company_name} --password-stdin
-    - docker build -t ${company_name}/${project_name}_${service_name} .
-
-    - docker push ${company_name}/${project_name}_${service_name}
-
-    - docker tag ${company_name}/${project_name}_${service_name} ${company_name}/${project_name}_${service_name}:$CI_PIPELINE_ID
-    - docker push ${company_name}/${project_name}_${service_name}:$CI_PIPELINE_ID
-
-    - docker tag ${company_name}/${project_name}_${service_name} ${company_name}/${project_name}_${service_name}:$CI_COMMIT_BRANCH
-    - docker push ${company_name}/${project_name}_${service_name}:$CI_COMMIT_BRANCH
-
-    - echo ${company_name}/${project_name}_${service_name}:$CI_COMMIT_BRANCH
-
-deploy-dev:
-  stage: deploy
-  only:
-    - develop_red
-  script:
-    - echo "Deploying application..."
+    - echo ">>>>>>Start Deploy<<<<<<"
     - ls
-    - apk update
-    - apk add curl
-    - apk add curl openssh sshpass
-    - |
-      sshpass -p "$SSH_PASS" ssh -o StrictHostKeyChecking=no ubuntu@"$SSH_HOST" "./deploy_service.sh market $CI_PIPELINE_ID"
-    - echo "Application successfully deployed."
+    - apt-get update
+    - apt-get install -y curl
+    - 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=retifive/deploy-test.sh
+    - echo ">>>>>>Start Deploy Finish<<<<<<"
 
 

Dockerfile

@@ -1,17 +0,0 @@
-FROM openjdk:8
-
-RUN echo "deb http://archive.debian.org/debian/ stretch main contrib non-free" > /etc/apt/sources.list \
-    && echo "deb-src http://archive.debian.org/debian/ stretch main contrib non-free" >> /etc/apt/sources.list \
-    && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/10no-check-valid
-
-RUN apt-get update
-#RUN apt-get install -y iputils-ping dnsutils vim net-tools --allow-unauthenticated
-
-WORKDIR /app
-
-COPY target/india_market_java.jar /app/app.jar
-
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-
-CMD ["docker-entrypoint.sh"]

docker-entrypoint.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-export JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow \
-	-Dspring.redis.host=$REDIS_HOST \
-	-Dspring.redis.password=$REDIS_PASS \
-	-Dmarket.domain=$MARKET_HOST \
-	-Dspring.redis.port=$REDIS_PORT \
-	-Dspring.datasource.stock-market.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \
-	-Dspring.datasource.stock-market.username=$MYSQL_USER \
-	-Dspring.datasource.stock-market.password=$MYSQL_PASSWORD \
-	-Dspring.datasource.stock.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \
-	-Dspring.datasource.stock.username=$MYSQL_USER \
-	-Dspring.datasource.stock.password=$MYSQL_PASSWORD"
-
-
-echo 'param:'$@
-echo 'JAVA_OPTS:'$JAVA_OPTS
-
-java $JAVA_OPTS -jar /app/app.jar $@
-
-tail -f /dev/null

pom.xml

@@ -14,6 +14,7 @@
 		<maven.compile.source>1.8</maven.compile.source>
 		<maven.compile.target>1.8</maven.compile.target>
 		<maven.build.timestamp.format>MMdd-HHmm</maven.build.timestamp.format>
+		<rtsdk.version>3.6.5.0</rtsdk.version>
 	</properties>
 	<groupId>cn.stock</groupId>
 	<artifactId>market</artifactId>
@@ -42,6 +43,11 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-mongodb</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid-spring-boot-starter</artifactId>
@@ -77,11 +83,11 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!--<dependency>
+		<dependency>
 			<groupId>org.redisson</groupId>
 			<artifactId>redisson-spring-boot-starter</artifactId>
 			<version>3.13.3</version>
-		</dependency>-->
+		</dependency>
 
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
@@ -89,12 +95,6 @@
 			<version>4.1.0</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20240303</version>
-		</dependency>
-
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
@@ -191,10 +191,15 @@
 			<version>30.1-jre</version>
 		</dependency>
 
+		<!--<dependency>
+			<groupId>com.thomsonreuters.ema</groupId>
+			<artifactId>ema</artifactId>
+			<version>3.5.1.0</version>
+		</dependency>-->
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.13</version>
+			<groupId>com.refinitiv.ema</groupId>
+			<artifactId>ema</artifactId>
+			<version>${rtsdk.version}</version>
 		</dependency>
 
 	</dependencies>

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

@@ -29,10 +29,6 @@ public class QMoneyStockPO extends EntityPathBase<MoneyStockPO> {
 
     public final StringPath moneyScId = createString("moneyScId");
 
-    public final StringPath nseIndiaChartId = createString("nseIndiaChartId");
-
-    public final StringPath nseIndiaId = createString("nseIndiaId");
-
     public final DateTimePath<java.util.Date> saveTime = createDateTime("saveTime", java.util.Date.class);
 
     public final StringPath selfDispId = createString("selfDispId");
@@ -43,8 +39,6 @@ public class QMoneyStockPO extends EntityPathBase<MoneyStockPO> {
 
     public final StringPath stockType = createString("stockType");
 
-    public final BooleanPath useFromBseindia = createBoolean("useFromBseindia");
-
     public QMoneyStockPO(String variable) {
         super(MoneyStockPO.class, forVariable(variable));
     }

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);
-    }
-
-}
-

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

@@ -0,0 +1,51 @@
+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;
+
+
+/**
+ * QRetifiveStockPO is a Querydsl query type for RetifiveStockPO
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QRetifiveStockPO extends EntityPathBase<RetifiveStockPO> {
+
+    private static final long serialVersionUID = -280817720L;
+
+    public static final QRetifiveStockPO retifiveStockPO = new QRetifiveStockPO("retifiveStockPO");
+
+    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 final StringPath symbol = createString("symbol");
+
+    public QRetifiveStockPO(String variable) {
+        super(RetifiveStockPO.class, forVariable(variable));
+    }
+
+    public QRetifiveStockPO(Path<? extends RetifiveStockPO> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QRetifiveStockPO(PathMetadata metadata) {
+        super(RetifiveStockPO.class, metadata);
+    }
+
+}
+

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

@@ -23,8 +23,6 @@ public class QStockIpoPO extends EntityPathBase<StockIpoPO> {
 
     public final DateTimePath<java.util.Date> createDate = createDateTime("createDate", java.util.Date.class);
 
-    public final StringPath exchangeType = createString("exchangeType");
-
     public final NumberPath<Integer> id = createNumber("id", Integer.class);
 
     public final NumberPath<Integer> isList = createNumber("isList", Integer.class);

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

@@ -1,43 +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;
-
-
-/**
- * QStockTempPO is a Querydsl query type for StockTempPO
- */
-@Generated("com.querydsl.codegen.EntitySerializer")
-public class QStockTempPO extends EntityPathBase<StockTempPO> {
-
-    private static final long serialVersionUID = 1973569078L;
-
-    public static final QStockTempPO stockTempPO = new QStockTempPO("stockTempPO");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath stockGid = createString("stockGid");
-
-    public final StringPath stockLogo = createString("stockLogo");
-
-    public final StringPath stockType = createString("stockType");
-
-    public QStockTempPO(String variable) {
-        super(StockTempPO.class, forVariable(variable));
-    }
-
-    public QStockTempPO(Path<? extends StockTempPO> path) {
-        super(path.getType(), path.getMetadata());
-    }
-
-    public QStockTempPO(PathMetadata metadata) {
-        super(StockTempPO.class, metadata);
-    }
-
-}
-

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);
+    }
+
+}
+

src/main/java/cn/stock/market/StockMarketLaunch.java

@@ -20,12 +20,6 @@ import cn.stock.market.domain.basic.entity.SiteSetting;
 import cn.stock.market.domain.basic.repository.SiteSettingRepository;
 import lombok.extern.slf4j.Slf4j;
 
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Date;
-import java.util.TimeZone;
-
 @SpringBootApplication(exclude = { 
 		MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
 		RedisAutoConfiguration.class,
@@ -37,11 +31,6 @@ public class StockMarketLaunch implements CommandLineRunner {
 
 	public static void main(String[] args) {
 		HttpGlobalConfig.setTimeout(45000);
-		TimeZone.setDefault(TimeZone.getTimeZone("Europe/Madrid"));
-		log.info("JVM ZoneId: {}", ZoneId.systemDefault());
-		log.info("Sample: now={}, madrid={}",
-				new Date(),
-				ZonedDateTime.now(ZoneId.of("Europe/Madrid")));
 		SpringApplication.run(StockMarketLaunch.class, args);
 	}
 	

src/main/java/cn/stock/market/application/assembler/RetifiveStockAssembler.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.RetifiveStock;
+import cn.stock.market.dto.RetifiveStockDTO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * RetifiveStockAssembler 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Component
+@Lazy
+public class RetifiveStockAssembler {
+  public RetifiveStockDTO toDTO(RetifiveStock e) {
+    RetifiveStockDTO dto = Beans.mapper(e, RetifiveStockDTO.class);
+    if(dto == null) return dto;
+    fill(e, dto);
+    return  dto;
+  }
+
+  protected void fill(RetifiveStock e, RetifiveStockDTO dto) {
+    if(dto == null) return;
+    return;
+  }
+
+  public static RetifiveStockAssembler of() {
+    return SpringUtils.getBean(RetifiveStockAssembler.class);
+  }
+}

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);
+  }
+}

src/main/java/cn/stock/market/constant/InChangeDataTypeEnum.java

@@ -0,0 +1,13 @@
+package cn.stock.market.constant;
+
+
+/**
+ * @author Administrator
+ */
+
+public enum InChangeDataTypeEnum {
+	/**
+     * InChangeDataTypeEnum
+	 */
+	DEL, ADD, WAS, NOW;
+}

src/main/java/cn/stock/market/constant/InChangeType.java

@@ -0,0 +1,46 @@
+package cn.stock.market.constant;
+
+
+/**
+ * @author Administrator
+ */
+
+public enum InChangeType {
+	/**
+	 * InChangeType
+	 */
+	ALL(1, "所有数据"),
+	TODAY(2, "今日数据"),
+	;
+
+	int code;
+	String remark;
+	InChangeType(int code, String remark) {
+		this.code = code;
+		this.remark = remark;
+	}
+
+	public int code() {
+		return code;
+	}
+
+	public String remark() {
+		return remark;
+	}
+
+	public static String remark(int code) {
+		InChangeType of = of(code);
+		return of == null ? "" : of.remark;
+ 	}
+	
+	public static InChangeType of(int code) {
+		InChangeType[] values = InChangeType.values();
+		for (InChangeType e : values) {
+			if (e.code == code) {
+				return e;
+			}
+		}
+
+		return null;
+	}
+}

src/main/java/cn/stock/market/constant/MonthEnum.java

@@ -0,0 +1,56 @@
+package cn.stock.market.constant;
+
+
+/**
+ * @author Administrator
+ */
+
+public enum MonthEnum {
+	/**
+     * MonthEnum
+	 */
+	JAN("JAN", "01"),
+	FEB("FEB", "02"),
+	MAR("MAR", "03"),
+	APR("APR", "04"),
+	MAY("MAY", "05"),
+	JUN("JUN", "06"),
+	JUL("JUL", "07"),
+	AUG("AUG", "08"),
+	SEP("SEP", "09"),
+	OCT("OCT", "10"),
+	NOV("NOV", "11"),
+	DEC("DEC", "12"),
+	;
+
+	String code;
+	String remark;
+	MonthEnum(String code, String remark) {
+		this.code = code;
+		this.remark = remark;
+	}
+
+	public String code() {
+		return code;
+	}
+
+	public String remark() {
+		return remark;
+	}
+
+	public static String remark(String code) {
+		MonthEnum of = of(code);
+		return of == null ? "" : of.remark;
+ 	}
+	
+	public static MonthEnum of(String code) {
+		MonthEnum[] values = MonthEnum.values();
+		for (MonthEnum e : values) {
+			if (e.code.equalsIgnoreCase(code)) {
+				return e;
+			}
+		}
+
+		return null;
+	}
+}

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);
-    }
-}

src/main/java/cn/stock/market/domain/basic/convert/RetifiveStockConvert.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.RetifiveStock;
+import cn.stock.market.infrastructure.db.po.RetifiveStockPO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * RetifiveStockConvert 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Component
+@Lazy
+public class RetifiveStockConvert extends SimpleEntityPOConvert<RetifiveStock, RetifiveStockPO> {
+  public static RetifiveStockConvert of() {
+    return SpringUtils.getBean(RetifiveStockConvert.class);
+  }
+}

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

@@ -1,25 +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.Stock;
-import cn.stock.market.domain.basic.entity.StockTemp;
-import cn.stock.market.infrastructure.db.po.StockPO;
-import cn.stock.market.infrastructure.db.po.StockTempPO;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-/**
- * StockConvert 
- *
- * @author rplees 
- * @email rplees.i.ly@gmail.com 
- * @created 2023/06/17 
- */
-@Component
-@Lazy
-public class StockTempConvert extends SimpleEntityPOConvert<StockTemp, StockTempPO> {
-  public static StockTempConvert of() {
-    return SpringUtils.getBean(StockTempConvert.class);
-  }
-}

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);
+  }
+}

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 {
-}

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

@@ -0,0 +1,28 @@
+package cn.stock.market.domain.basic.entity;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.stock.market.dto.command.RetifiveStockCreateCommand;
+import cn.stock.market.infrastructure.db.po.RetifiveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * RetifiveStock 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class RetifiveStock extends RetifiveStockPO {
+  public void update(RetifiveStockCreateCommand cmd) {
+    Beans.copyProperties(cmd, this);
+  }
+}

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

@@ -1,20 +1,19 @@
 package cn.stock.market.domain.basic.entity;
 
 import cn.qutaojing.common.utils.Beans;
-import cn.stock.market.dto.command.StockCreateCommand;
-import cn.stock.market.infrastructure.db.po.StockPO;
-import cn.stock.market.infrastructure.db.po.StockTempPO;
+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;
 
 /**
- * Stock 
+ * TwelveStock 
  *
  * @author rplees 
  * @email rplees.i.ly@gmail.com 
- * @created 2023/06/17 
+ * @created 2024/05/30 
  */
 @Data
 @NoArgsConstructor
@@ -22,5 +21,8 @@ import lombok.experimental.SuperBuilder;
 @EqualsAndHashCode(
     callSuper = false
 )
-public class StockTemp extends StockTempPO {
+public class TwelveStock extends TwelveStockPO {
+  public void update(TwelveStockCreateCommand cmd) {
+    Beans.copyProperties(cmd, this);
+  }
 }

src/main/java/cn/stock/market/domain/basic/factory/RetifiveStockFactory.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.RetifiveStock;
+import cn.stock.market.dto.command.RetifiveStockCreateCommand;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * RetifiveStockFactory 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Component
+@Lazy
+public class RetifiveStockFactory {
+  public static RetifiveStockFactory of() {
+    return SpringUtils.getBean(RetifiveStockFactory.class);
+  }
+
+  public RetifiveStock from(RetifiveStockCreateCommand cmd) {
+    RetifiveStock e = RetifiveStock.builder().build();
+    e.update(cmd);
+    return e;
+  }
+}

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;
+  }
+}

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;
-    }
-}

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

@@ -0,0 +1,51 @@
+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.RetifiveStockConvert;
+import cn.stock.market.domain.basic.entity.RetifiveStock;
+import cn.stock.market.infrastructure.db.po.QRetifiveStockPO;
+import cn.stock.market.infrastructure.db.po.RetifiveStockPO;
+import cn.stock.market.infrastructure.db.repo.RetifiveStockRepo;
+import com.rp.spring.jpa.GenericJpaRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+/**
+ * RetifiveStockRepository 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Repository
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class RetifiveStockRepository extends SimplePoConvertEntityRepository<RetifiveStock, RetifiveStockPO, Integer> {
+  final RetifiveStockRepo repo;
+
+  final RetifiveStockConvert convert;
+
+  final QRetifiveStockPO p = QRetifiveStockPO.retifiveStockPO;
+
+  @Override
+  public GenericJpaRepository<RetifiveStockPO, Integer> repo() {
+    return repo;
+  }
+
+  @Override
+  public IEntityPOConvert<RetifiveStock, RetifiveStockPO> convert() {
+    return convert;
+  }
+
+  public static RetifiveStockRepository of() {
+    return SpringUtils.getBean(RetifiveStockRepository.class);
+  }
+
+  public RetifiveStock findBtStockByCoCode(String coCode) {
+    return findOneIfMutil(p.symbol.eq(coCode));
+  }
+}

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

@@ -54,11 +54,6 @@ public class StockRepository extends LocalCacheRepository<Stock, StockPO, Intege
 		
 		return map;
 	}
-
-	public Map<String, Stock> cacheGidMap() {
-		Map<String, Stock> map = cacheList().stream().collect(Collectors.toMap(Stock::getStockGid, val -> val, (u, v) -> u));
-		return map;
-	}
 	
 	public Map<String, Stock> cacheNameMap() {
 		Map<String, Stock> map = cacheList()

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

@@ -1,63 +0,0 @@
-package cn.stock.market.domain.basic.repository;
-
-import cn.qutaojing.common.domain.convert.IEntityPOConvert;
-import cn.qutaojing.common.domain.respostory.LocalCacheBean;
-import cn.qutaojing.common.domain.respostory.LocalCacheRepository;
-import cn.qutaojing.common.jpa.ConditionBuilder;
-import cn.qutaojing.common.utils.SpringUtils;
-import cn.stock.market.domain.basic.convert.StockConvert;
-import cn.stock.market.domain.basic.convert.StockTempConvert;
-import cn.stock.market.domain.basic.entity.Stock;
-import cn.stock.market.domain.basic.entity.StockTemp;
-import cn.stock.market.infrastructure.db.po.QStockPO;
-import cn.stock.market.infrastructure.db.po.QStockTempPO;
-import cn.stock.market.infrastructure.db.po.StockPO;
-import cn.stock.market.infrastructure.db.po.StockTempPO;
-import cn.stock.market.infrastructure.db.repo.StockRepo;
-import cn.stock.market.infrastructure.db.repo.StockTempRepo;
-import com.google.common.cache.CacheBuilder;
-import com.rp.spring.jpa.GenericJpaRepository;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * StockRepository
- *
- * @author rplees
- * @email rplees.i.ly@gmail.com
- * @created 2023/06/17
- */
-@Repository
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
-public class StockTempRepository extends LocalCacheRepository<StockTemp, StockTempPO, Integer> {
-	final StockTempRepo repo;
-	final StockTempConvert convert;
-	final static QStockTempPO q = QStockTempPO.stockTempPO;
-
-	public List<StockTemp> findAllForCheck() {
-		return findAll();
-	}
-
-	@Override
-	public GenericJpaRepository<StockTempPO, Integer> repo() {
-		return repo;
-	}
-
-	@Override
-	public IEntityPOConvert<StockTemp, StockTempPO> convert() {
-		return convert;
-	}
-
-	public static StockTempRepository of() {
-		return SpringUtils.getBean(StockTempRepository.class);
-	}
-}

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);
+  }
+}

src/main/java/cn/stock/market/domain/basic/service/RetifiveStockService.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.RetifiveStockFactory;
+import cn.stock.market.domain.basic.repository.RetifiveStockRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * RetifiveStockService 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Service
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class RetifiveStockService {
+  final RetifiveStockRepository repository;
+
+  final RetifiveStockFactory factory;
+
+  public RetifiveStockRepository repository() {
+    return repository;
+  }
+
+  public static RetifiveStockService of() {
+    return SpringUtils.getBean(RetifiveStockService.class);
+  }
+}

src/main/java/cn/stock/market/domain/basic/service/StockService.java

@@ -1,21 +1,28 @@
 package cn.stock.market.domain.basic.service;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.math.BigDecimal;
+import java.net.URL;
+import java.net.URLConnection;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.X509TrustManager;
 import javax.persistence.EntityExistsException;
 import javax.servlet.http.HttpServletRequest;
+import javax.sound.midi.Soundbank;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.text.StrFormatter;
 import cn.stock.market.dto.model.*;
-import cn.stock.market.infrastructure.api.EttechchartsApis;
-import cn.stock.market.infrastructure.api.GrowwInApis;
-import cn.stock.market.infrastructure.api.HomeApiIndex;
 import cn.stock.market.infrastructure.api.TodayApis;
-import cn.stock.market.infrastructure.api.investing.*;
+import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
+import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
+import cn.stock.market.infrastructure.api.investing.InvestingApis;
+import cn.stock.market.infrastructure.api.investing.InvestingInvokerApis;
 import cn.stock.market.infrastructure.api.sina.vo.HotSearchVO;
 import cn.stock.market.utils.*;
 import com.ag.utils.CollectionUtils;
@@ -23,9 +30,18 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Stopwatch;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
 import okhttp3.Request.Builder;
 import org.apache.commons.lang3.StringUtils;
 import cn.stock.market.infrastructure.db.po.QStockPO;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.HttpClientUtils;
+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;
@@ -54,6 +70,11 @@ import cn.stock.market.infrastructure.api.sina.vo.MarketVO;
 import cn.stock.market.infrastructure.api.sina.vo.MarketVOResult;
 import cn.stock.market.infrastructure.api.sina.vo.k.MinDataVO;
 import cn.stock.market.infrastructure.api.sina.vo.k.echarts.EchartsDataVO;
+import cn.stock.market.utils.GetPyByChinese;
+import cn.stock.market.utils.HttpClientRequest;
+import cn.stock.market.utils.PropertiesUtil;
+import cn.stock.market.utils.ServerResponse;
+import cn.stock.market.utils.Utils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.client.RestTemplate;
@@ -247,112 +268,34 @@ 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)
-//					.userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36")
-//					.header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
-//					.header("Accept-Language", "en-US,en;q=0.5")
-//					.header("Connection", "keep-alive")
-//					.referrer("https://www.google.com")
-//					.ignoreHttpErrors(true)
-//					.timeout(10000)
-//					.get();
-			String doGetNews = HttpClientRequest.doGetNews(url);
-//			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 = extractNewsFromHtml(doGetNews);
+			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();
+			result = doc.html().substring(doc.html().indexOf("<div class=\"short-video-img\">"),doc.html().lastIndexOf("<div class=\"short-video-img\">")+500);
 		} catch (Exception e) {
 			return e.toString();
 		}
 		return result;
 	}
 
-	private String extractNewsFromHtml(String rawHtml) {
-		Document doc = Jsoup.parse(rawHtml);
-
-		// Optional: extract raw block around <div class="listingstyle_shortvideoimg__0TWuX shortvideoimg">
-		int start = rawHtml.indexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">");
-		int end = rawHtml.lastIndexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">") + 500;
-		String result = (start != -1 && end > start) ? rawHtml.substring(start, end) : "";
-
-		// Extract article list using CSS selector
-		Elements divElements = doc.select("div.listingstyle_cardlistlist__dfq57");
-		StringBuilder sb = new StringBuilder();
-		for (Element divElement : divElements) {
-			sb.append(divElement.outerHtml()).append("\n");
-		}
-
-		// If you only want the div content:
-		result = sb.toString();
-		return result;
-	}
-
 	public List<String> getNewsInfo(String url) {
-//		String result = "";
-//		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("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);
-//			list.add(doc.html().substring(doc.html().indexOf("og:title") + 19, doc.html().indexOf("<meta property=\"og:url") - 5));
-//		} catch (Exception e) {
-//			list.add(e.toString());
-//			return list;
-//		}
-//		return list;
 		String result = "";
 		List<String> list = new ArrayList<>();
 		try {
-			// Step 1: Get raw HTML via HttpClient
-			String rawHtml = HttpClientRequest.doGetNews(url);
-
-			// Step 2: Parse HTML with Jsoup
-			Document doc = Jsoup.parse(rawHtml);
-
-			// Step 3: Extract content manually (like original)
-			int startIdx = rawHtml.indexOf("articleBody") + 14;
-			int endIdx = rawHtml.indexOf(",\"author\":") - 1;
-
-			if (startIdx > 0 && endIdx > startIdx) {
-				result = rawHtml.substring(startIdx, endIdx);
-			} else {
-				result = "[articleBody not found]";
-			}
+			// 使用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();
+			result = doc.html().substring(doc.html().indexOf("articleBody") + 14, doc.html().indexOf(",\"author\":") - 1);
 			list.add(result);
-
-			// Step 4: Extract og:title
-			int titleStart = rawHtml.indexOf("og:title") + 19;
-			int titleEnd = rawHtml.indexOf("<meta property=\"og:url") - 5;
-
-			if (titleStart > 0 && titleEnd > titleStart) {
-				list.add(rawHtml.substring(titleStart, titleEnd));
-			} else {
-				list.add("[title not found]");
-			}
-
+			list.add(doc.html().substring(doc.html().indexOf("og:title") + 19, doc.html().indexOf("<meta property=\"og:url") - 5));
 		} catch (Exception e) {
-			list.add("[Error] " + e.getMessage());
+			list.add(e.toString());
+			return list;
 		}
 		return list;
 	}
@@ -1046,67 +989,69 @@ public class StockService {
 		return ServerResponse.createBySuccess(indexVoList);
 	}
 
-	public ServerResponse getIndexByBtoday() throws Exception {
-		List<StockIndex> list = HomeApiIndex.fetchStockIndices();
-
-		List<IndiaIndexNewVo> indexVoList = new ArrayList<>();
-
-		for (StockIndex stockIndex : list) {
-			IndiaIndexNewVo vo1 = new IndiaIndexNewVo();
-			IndiaStockVO market = new IndiaStockVO();
-			market.setClose(String.valueOf(stockIndex.getClose()));
-			market.setHigh(String.valueOf(stockIndex.getHigh()));
-			market.setLow(String.valueOf(stockIndex.getLow()));
-			market.setName(stockIndex.getName());
-			market.setNowPrice(String.valueOf(stockIndex.getClose()));
-			market.setOpen(String.valueOf(stockIndex.getOpen()));
-			market.setRate(String.valueOf(stockIndex.getPercentChange()));
+	public ServerResponse getIndexByBtoday(){
+		List<IndiaIndexVo> indexVoList = new ArrayList<>();
+		try {
+			String exchange = "bse";
+			IndiaIndexVo vo1 = new IndiaIndexVo();
+			String coCode = "20558";
+			JSONObject object = TodayApis.getStockDetail(exchange, coCode);
+			IndiaStockVO market = objToVo(object);
+			market.setName("BSESENSEX指数");
 			vo1.setIndexVo(market);
 
-			// 只获取最近交易日的K线数据，智能跳过周末，优化性能和网络传输
-			List<ChartCandle> kLines = HomeApiIndex.fetchTodayAndYesterdayChartData(stockIndex.getId());
-			vo1.setKLine(kLines);
+			//获取k线图  1D 当天的数据
+			String format = "S";
+			String durationType = "D";
+			String duration = "1";
+			List kine = TodayApis.getStockKline(exchange,coCode,format,durationType,duration);
+			vo1.setKLine(kine);
 			indexVoList.add(vo1);
-			List<String> order = Arrays.asList(
-					"IBEX 35 Index",
-					"DAX Index",
-					"Dow Jones Industrial Average",
-					"S&P 500 Index"
-
-			);
-
-
-			Map<String, Integer> orderMap = new HashMap<>();
-			for (int i = 0; i < order.size(); i++) {
-				orderMap.put(order.get(i), i);
-			}
-
-			indexVoList.sort(Comparator.comparingInt(o -> orderMap.getOrDefault(o.getIndexVo().getName(), Integer.MAX_VALUE)));
+		}catch (Exception e){
+			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
 		}
 
+		try {
+			String exchange = "nse";
+			IndiaIndexVo vo1 = new IndiaIndexVo();
+			String coCode = "20559";
+			JSONObject object = TodayApis.getStockDetail(exchange, coCode);
+			IndiaStockVO market = objToVo(object);
+			market.setName("NIFTY50指数");
+			vo1.setIndexVo(market);
+
+			//获取k线图  1D 当天的数据
+			String format = "S";
+			String durationType = "D";
+			String duration = "1";
+			List kine = TodayApis.getStockKline(exchange,coCode,format,durationType,duration);
+			vo1.setKLine(kine);
+			indexVoList.add(vo1);
+		}catch (Exception e){
+			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
+		}
 		return ServerResponse.createBySuccess(indexVoList);
 
 	}
-
 	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"));
@@ -1124,48 +1069,4 @@ public class StockService {
 
 	}
 
-	public ServerResponse getEttechcharts(){
-		List<IndiaIndexVo> indexVoList = new ArrayList<>();
-		try {
-			//获取详情
-			String indexid = "2365";
-			String exchange = "47";
-			String keyName = "sensex";
-			IndiaIndexVo vo1 = new IndiaIndexVo();
-			JSONObject object = EttechchartsApis.getStockDetail(indexid, exchange,keyName);
-			IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
-			market.setName("BSESENSEX指数");
-			vo1.setIndexVo(market);
-
-			//获取k线图  1min 当天的数据 分钟
-			String scripcode = "SENSEX";
-			List kine = EttechchartsApis.getStockKline(scripcode,exchange);
-			vo1.setKLine(kine);
-			indexVoList.add(vo1);
-		}catch (Exception e){
-			log.info("获取BSESENSEX指数数据异常，异常信息{}。。。。",e.getMessage());
-		}
-		try {
-			//获取详情
-			String indexid = "2369";
-			String exchangeid = "50";
-			String keyName = "nifty";
-			IndiaIndexVo vo1 = new IndiaIndexVo();
-			JSONObject object = EttechchartsApis.getStockDetail(indexid, exchangeid,keyName);
-			IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
-			market.setName("NIFTY50指数");
-			vo1.setIndexVo(market);
-
-			//获取k线图  1min 当天的数据 分钟
-			String scripcode = "NSE+Index";
-			List kine = EttechchartsApis.getStockKline(scripcode,exchangeid);
-			vo1.setKLine(kine);
-			indexVoList.add(vo1);
-		}catch (Exception e){
-			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
-		}
-		return ServerResponse.createBySuccess(indexVoList);
-	}
-
-
 }

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);
+  }
+}

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;
-    }
-}

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

@@ -1,10 +0,0 @@
-package cn.stock.market.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class RawStockApiResponse {
-    private List<StockDataDto> data;
-}

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

@@ -0,0 +1,23 @@
+package cn.stock.market.dto;
+
+import cn.stock.market.infrastructure.db.po.RetifiveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * RetifiveStockDTO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class RetifiveStockDTO extends RetifiveStockPO {
+}

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

@@ -0,0 +1,17 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RetifiveStockHistoryResponse {
+    private String s;
+    private List<Long> t;
+    private List<Double> o;
+    private List<Double> h;
+    private List<Double> l;
+    private List<Double> c;
+    private List<Double> v;
+
+}

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

@@ -0,0 +1,67 @@
+package cn.stock.market.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author gs
+ * @date 2024/4/9 10:53
+ */
+@Data
+@Builder
+/**
+ * RetifiveStockInfo类用于存储股票信息。
+ * 该类包含了股票的基本信息和交易数据。
+ */
+@ApiModel("RefinitivStockInfo")
+public class RetifiveStockInfo {
+    @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;
+}
+

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

@@ -1,13 +0,0 @@
-package cn.stock.market.dto;
-
-import lombok.Data;
-
-@Data
-public class StockDataDto {
-    private long time;
-    private double open;
-    private double close;
-    private double max;
-    private double min;
-    private long volume;
-}

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

@@ -1,31 +0,0 @@
-package cn.stock.market.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class StockQuoteData {
-    private String id;
-    private String symbol;
-    private String name;
-    private String exchange;
-    private String mic_code;
-    private String datetime;
-    private long timestamp;
-    private double open;
-    private double high;
-    private double low;
-    private double close;
-    private long volume;
-    private double previous_close;
-    private double change;
-    private double percent_change;
-    private double average_volume;
-    @JsonProperty("is_market_open")
-    private boolean market_open;
-    private Long market_cap;
-    private Object fifty_two_week;
-    private int icon;
-}

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

@@ -1,13 +0,0 @@
-package cn.stock.market.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class StockQuoteResponse {
-    private List<StockQuoteData> data;
-    private boolean success;
-    private String message;
-    private int status;
-}

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

@@ -1,13 +0,0 @@
-package cn.stock.market.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class TradingViewData {
-    private String s; // symbol
-    private List<Object> d; // data array
-} 

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

@@ -1,13 +0,0 @@
-package cn.stock.market.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class TradingViewResponse {
-    private int totalCount;
-    private List<TradingViewData> data;
-} 

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 {
+}

src/main/java/cn/stock/market/dto/command/RetifiveStockCreateCommand.java

@@ -0,0 +1,52 @@
+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;
+
+/**
+ * RetifiveStockCreateCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+public class RetifiveStockCreateCommand {
+  /**
+   * 主键 */
+  Integer id;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * symbol,查询Rics的id用 */
+  String symbol;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+}

src/main/java/cn/stock/market/dto/command/RetifiveStockModifyCommand.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;
+
+/**
+ * RetifiveStockModifyCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class RetifiveStockModifyCommand extends RetifiveStockCreateCommand {
+  Integer id;
+}

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;
+}

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;
+}

src/main/java/cn/stock/market/dto/model/ChartCandle.java

@@ -1,11 +0,0 @@
-package cn.stock.market.dto.model;
-
-import lombok.Data;
-
-@Data
-public class ChartCandle {
-    private String upd_date;
-    private Double price;
-
-    // Getters & Setters (hoặc @Data nếu dùng Lombok)
-}

src/main/java/cn/stock/market/dto/model/StockIndex.java

@@ -1,31 +0,0 @@
-package cn.stock.market.dto.model;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class StockIndex {
-    private String id;
-    private String symbol;
-    private String name;
-    private String exchange;
-    private String micCode;
-    private String datetime;
-    private long timestamp;
-    private Double open;
-    private Double high;
-    private Double low;
-    private Double close;
-    private Long volume;
-    private Double previousClose;
-    private Double change;
-    private Double percentChange;
-    private Long averageVolume;
-    private Boolean isMarketOpen;
-    private Long marketCap;
-    private String fiftyTwoWeek;
-    private Integer icon;
-
-    // Getters & setters (hoặc dùng @Data nếu có Lombok)
-}

src/main/java/cn/stock/market/dto/model/Symbol.java

@@ -1,28 +0,0 @@
-package cn.stock.market.dto.model;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class Symbol {
-    private String symbol;
-    private String description;
-    private String stockGid;
-    private String type;
-    private String exchange;
-    private String currencyCode;
-    private String currencyLogoid;
-    private String logoid;
-    private String providerId;
-    private String sourceLogoid;
-    private String sourceId;
-    private String country;
-    private boolean isPrimaryListing;
-    private List<String> typespecs;
-
-    // Getters and setters
-    // Bạn có thể dùng Lombok nếu muốn ngắn gọn hơn
-    // Hoặc generate getter/setter trong IDE
-
-}

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;
-    }
-}

src/main/java/cn/stock/market/infrastructure/api/GrowwInApis.java

@@ -1,233 +0,0 @@
-package cn.stock.market.infrastructure.api;
-
-import cn.stock.market.dto.TodayStockDTO;
-import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
-import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-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 java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 数据来源网站：<a href="https://groww.in/indices/nifty">...</a>, <a href="https://groww.in/indices/sp-bse-sensex">...</a>
- *
- * @auther jnerh
- */
-public class GrowwInApis {
-
-    public static final String INDEX_DETAIL_URL = "https://groww.in/v1/api/stocks_data/v1/accord_points/exchange/%s/segment/CASH/latest_indices_ohlc/%s";
-    public static final String INDEX_KLINE_URL = "https://groww.in/v1/api/charting_service/v2/chart/delayed/exchange/%s/segment/CASH/%s/daily?intervalInMinutes=%s&minimal=true";
-
-
-    public static void requestSenSexData(List<IndiaIndexVo> indexVoList) {
-        IndiaIndexVo vo1 = new IndiaIndexVo();
-        JSONObject object = GrowwInApis.getSenSexDetail();
-        IndiaStockVO market = GrowwInApis.objToVo(object);
-        market.setName("BSESENSEX指数");
-        vo1.setIndexVo(market);
-
-        List kine = GrowwInApis.getSenSexKline();
-        vo1.setKLine(kine);
-        indexVoList.add(vo1);
-    }
-    public static void requestNifty50Data(List<IndiaIndexVo> indexVoList) {
-        IndiaIndexVo vo1 = new IndiaIndexVo();
-        JSONObject object = GrowwInApis.getNifty50Detail();
-        IndiaStockVO market = GrowwInApis.objToVo(object);
-        market.setName("NIFTY50指数");
-        vo1.setIndexVo(market);
-
-        List kine = GrowwInApis.getNifty50Kline();
-        vo1.setKLine(kine);
-        indexVoList.add(vo1);
-    }
-
-    /**
-     * 获取Nifty50指数详情
-     */
-    public static JSONObject getIndexDetail(String exchange, String type) {
-        String url = String.format(INDEX_DETAIL_URL, exchange, type);
-        String str = get(url);
-        return JSON.parseObject(str);
-    }
-
-    /**
-     * 获取k线图
-     */
-    public static List getIndexKline(String exchange, String type, String intervalInMinutes) {
-        String url = String.format(INDEX_KLINE_URL, exchange, type, intervalInMinutes);
-        String str = get(url);
-        JSONObject object = JSON.parseObject(str);
-        return getList(object.getString("candles"));
-    }
-
-
-    /**
-     * 获取Nifty50指数详情
-     */
-    public static JSONObject getSenSexDetail() {
-        return getIndexDetail("BSE", "1");
-    }
-
-    /**
-     * 获取k线图
-     */
-    public static List getSenSexKline() {
-        return getIndexKline("BSE", "1", "1");
-    }
-
-    /**
-     * 获取Nifty50指数详情
-     */
-    public static JSONObject getNifty50Detail() {
-        return getIndexDetail("NSE", "NIFTY");
-    }
-
-    /**
-     * 获取k线图
-     */
-    public static List getNifty50Kline() {
-        return getIndexKline("NSE", "NIFTY", "5");
-    }
-
-    static String get(String url) {
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
-        String result = "";
-
-        try {
-            httpClient = HttpClients.createDefault();
-            HttpGet httpGet = new HttpGet(url);
-            httpGet.setHeader("Referer", "https://groww.in/indices/nifty");
-            httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0");
-            httpGet.setHeader("X-App-Id", "growwWeb");
-            httpGet.setHeader("X-Device-Id", "fd4815a2-49e4-570a-931a-0316d4d8a52d");
-            httpGet.setHeader("X-Device-Type", "desktop");
-            httpGet.setHeader("X-Platform", "web");
-            RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
-            httpGet.setConfig(requestConfig);
-            response = httpClient.execute(httpGet);
-            HttpEntity entity = response.getEntity();
-            result = EntityUtils.toString(entity);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-
-            if (null != response) {
-                try {
-                    response.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (null != httpClient) {
-                try {
-                    httpClient.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return result;
-    }
-
-    public static IndiaStockVO objToVo(JSONObject object) {
-        IndiaStockVO market = new IndiaStockVO();
-        if (object.containsKey("close")) {
-            market.setClose(object.getString("close"));
-        }
-        if (object.containsKey("value")) {
-            market.setNowPrice(object.getString("value"));
-        }
-        if (object.containsKey("dayChangePerc")) {
-            market.setRate(object.getString("dayChangePerc"));
-        }
-        if (object.containsKey("high")) {
-            market.setHigh(object.getString("high"));
-        }
-        if (object.containsKey("low")) {
-            market.setLow(object.getString("low"));
-        }
-        if (object.containsKey("open")) {
-            market.setOpen(object.getString("open"));
-        }
-
-        return market;
-    }
-
-    private static List getList(String json) {
-        List<JSONObject> dataObject = new ArrayList<>();
-        JSONArray jsonArray = JSON.parseArray(json);
-        for (Object obj : jsonArray) {
-            JSONObject entity = new JSONObject();
-            JSONArray jsonArray1 = JSON.parseArray(obj.toString());
-            entity.put("upd_date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(JSON.parseArray(obj.toString()).getLong(0) * 1000)).replace(" ", "T"));
-            entity.put("price", jsonArray1.getBigDecimal(1));
-            dataObject.add(entity);
-        }
-        return dataObject;
-    }
-
-    private static TodayStockDTO todayStockDTO(JSONObject jsonObject) {
-        TodayStockDTO dto = new TodayStockDTO();
-        if (jsonObject.containsKey("exchange")) {
-            dto.setStockType(jsonObject.getString("exchange"));
-        } else {
-            dto.setStockType("");
-        }
-        if (jsonObject.containsKey("lname")) {
-            dto.setStockName(jsonObject.getString("lname"));
-        } else {
-            dto.setStockName("");
-        }
-        if (jsonObject.containsKey("high_price")) {
-            dto.setHighPrice(jsonObject.getString("highPrice"));
-        } else {
-            dto.setHighPrice("0.00");
-        }
-        if (jsonObject.containsKey("low_price")) {
-            dto.setLowPrice(jsonObject.getString("low_price"));
-        } else {
-            dto.setLowPrice("0.00");
-        }
-        if (jsonObject.containsKey("price")) {
-            dto.setLastPrice(jsonObject.getString("price"));
-        } else {
-            dto.setLastPrice("0.00");
-        }
-        if (jsonObject.containsKey("close_price")) {
-            dto.setPrevClosePrice(jsonObject.getString("close_price"));
-        } else {
-            dto.setPrevClosePrice("0.00");
-        }
-        if (jsonObject.containsKey("netchg")) {
-            dto.setChange(jsonObject.getString("netchg"));
-        } else {
-            dto.setChange("0.00");
-        }
-        if (jsonObject.containsKey("perchg")) {
-            dto.setChangePercent(jsonObject.getString("perchg"));
-        } else {
-            dto.setChangePercent("0.00");
-        }
-        return dto;
-
-    }
-
-    public static void main(String[] args) {
-        System.out.println(getNifty50Detail());
-        System.out.println(getNifty50Kline());
-    }
-}

src/main/java/cn/stock/market/infrastructure/api/HomeApiIndex.java

@@ -1,228 +0,0 @@
-package cn.stock.market.infrastructure.api;
-import cn.qutaojing.common.utils.SpringUtils;
-import cn.stock.market.dto.model.ChartCandle;
-import cn.stock.market.dto.model.StockIndex;
-import cn.stock.market.web.config.Config;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.time.DayOfWeek;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class HomeApiIndex {
-    private static final OkHttpClient client = new OkHttpClient();
-    static Config config = SpringUtils.getBean(Config.class);
-    private static final String API_URL = config.getStockUrlPrefix() +  "/api/ger-market/stocks/query-list?symbols=IBC:BME,DAX,^DJI:NASDAQ,^SPX:NASDAQ";
-    private static final String BASE_URL = config.getStockUrlPrefix() + "/api/ger-market/chart";
-
-    public static List<StockIndex> fetchStockIndices() throws Exception {
-        List<StockIndex> result = new ArrayList<>();
-
-        Request request = new Request.Builder()
-                .url(API_URL)
-                .addHeader("User-Agent", "Mozilla/5.0")
-                .addHeader("Accept", "application/json")
-                .build();
-
-        Response response = client.newCall(request).execute();
-
-        if (!response.isSuccessful()) {
-            throw new RuntimeException("HTTP error code: " + response.code());
-        }
-
-        String body = response.body().string();
-        JSONObject json = new JSONObject(body);
-        JSONArray data = json.getJSONArray("data");
-
-        for (int i = 0; i < data.length(); i++) {
-            JSONObject obj = data.getJSONObject(i);
-            StockIndex index = new StockIndex();
-
-            index.setId(obj.optString("id"));
-            index.setSymbol(obj.optString("symbol"));
-            if (index.getSymbol().equals("DAX")) {
-                index.setName("DAX Index");
-            }else if (index.getSymbol().equals("MDAX")) {
-                index.setName("MDAX Index");
-            }else if (index.getSymbol().equals("IBC:BME")) {
-                index.setName("IBEX 35 Index");
-            } else if (index.getSymbol().equals("SDXP")) {
-                index.setName("SDAX Index");
-            }else {
-                index.setName(obj.optString("name"));
-            }
-            index.setExchange(obj.optString("exchange"));
-            index.setMicCode(obj.optString("mic_code"));
-            index.setDatetime(obj.optString("datetime"));
-            index.setTimestamp(obj.optLong("timestamp"));
-            index.setOpen(getDoubleOrNull(obj, "open"));
-            index.setHigh(getDoubleOrNull(obj, "high"));
-            index.setLow(getDoubleOrNull(obj, "low"));
-            index.setClose(getDoubleOrNull(obj, "close"));
-            index.setVolume(getLongOrNull(obj, "volume"));
-            index.setPreviousClose(getDoubleOrNull(obj, "previous_close"));
-            index.setChange(getDoubleOrNull(obj, "change"));
-            index.setPercentChange(getDoubleOrNull(obj, "percent_change"));
-            index.setAverageVolume(getLongOrNull(obj, "average_volume"));
-            index.setIsMarketOpen(obj.optBoolean("is_market_open"));
-            index.setMarketCap(getLongOrNull(obj, "market_cap"));
-            index.setFiftyTwoWeek(obj.optString("fifty_two_week", null));
-            index.setIcon(obj.optInt("icon", 0));
-
-            result.add(index);
-        }
-
-        return result;
-    }
-
-    /**
-     * 获取图表数据（原方法，保持向后兼容）
-     */
-    public static List<ChartCandle> fetchChartData(String symbol, int amount) throws Exception {
-        return fetchChartDataWithDateFilter(symbol, amount, false);
-    }
-
-    /**
-     * 获取最近的交易日K线数据（支持跨周末）
-     * @param symbol 股票代码
-     * @return 最近交易日的K线数据
-     */
-    public static List<ChartCandle> fetchTodayAndYesterdayChartData(String symbol) throws Exception {
-        return fetchChartDataWithDateFilter(symbol, 168, true); // 获取7天数据，确保包含交易日
-    }
-
-    /**
-     * 获取图表数据，支持日期过滤
-     * @param symbol 股票代码
-     * @param amount 数据量
-     * @param filterRecentDays 是否只返回最近交易日的数据
-     */
-    private static List<ChartCandle> fetchChartDataWithDateFilter(String symbol, int amount, boolean filterRecentDays) throws Exception {
-        List<ChartCandle> result = new ArrayList<>();
-
-        String url = BASE_URL + "?symbol=" + symbol + "&interval=H&amount=" + amount;
-
-        Request request = new Request.Builder()
-                .url(url)
-                .addHeader("User-Agent", "Mozilla/5.0")
-                .addHeader("Accept", "application/json")
-                .build();
-
-        Response response = client.newCall(request).execute();
-
-        if (!response.isSuccessful()) {
-            throw new RuntimeException("HTTP error code: " + response.code());
-        }
-
-        String body = response.body().string();
-        JSONObject json = new JSONObject(body);
-        JSONArray data = json.getJSONArray("data");
-
-        if (filterRecentDays) {
-            // 获取最近的交易日期
-            Set<LocalDate> recentTradingDays = getRecentTradingDays();
-            
-            for (int i = 0; i < data.length(); i++) {
-                JSONObject obj = data.getJSONObject(i);
-                
-                long ts = obj.optLong("time");
-                ZonedDateTime zonedDateTime = Instant.ofEpochSecond(ts).atZone(ZoneId.of("Europe/Berlin"));
-                LocalDate dataDate = zonedDateTime.toLocalDate();
-                
-                // 只保留最近交易日的数据
-                if (recentTradingDays.contains(dataDate)) {
-                    ChartCandle candle = new ChartCandle();
-                    String formattedTime = convertToGermanTime(ts);
-                    candle.setUpd_date(formattedTime);
-                    candle.setPrice(getDoubleOrNull(obj, "close"));
-                    result.add(candle);
-                }
-            }
-        } else {
-            // 不过滤，返回所有数据
-            for (int i = 0; i < data.length(); i++) {
-                JSONObject obj = data.getJSONObject(i);
-                
-                long ts = obj.optLong("time");
-                String formattedTime = convertToGermanTime(ts);
-                
-                ChartCandle candle = new ChartCandle();
-                candle.setUpd_date(formattedTime);
-                candle.setPrice(getDoubleOrNull(obj, "close"));
-                result.add(candle);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 获取最近的交易日期（排除周末）
-     * @return 最近两个交易日的日期集合
-     */
-    public static Set<LocalDate> getRecentTradingDays() {
-        Set<LocalDate> tradingDays = new HashSet<>();
-        ZoneId germanyZone = ZoneId.of("Europe/Berlin");
-        LocalDate current = LocalDate.now(germanyZone);
-        
-        int foundDays = 0;
-        int daysBack = 0;
-        
-        // 向前查找最近的两个交易日
-        while (foundDays < 2 && daysBack < 10) { // 最多向前查找10天
-            LocalDate checkDate = current.minusDays(daysBack);
-            
-            // 排除周末（周六=6, 周日=7）
-            if (checkDate.getDayOfWeek() != DayOfWeek.SATURDAY && 
-                checkDate.getDayOfWeek() != DayOfWeek.SUNDAY) {
-                tradingDays.add(checkDate);
-                foundDays++;
-            }
-            daysBack++;
-        }
-        
-        return tradingDays;
-    }
-
-//    public static List<JSONObject> convertToJsonList(List<ChartCandle> candles) {
-//        List<JSONObject> result = new ArrayList<>();
-//
-//        for (ChartCandle c : candles) {
-//            JSONObject obj = new JSONObject();
-//            String formattedTime = convertToGermanTime(c.getTime());
-//            obj.put("upd_date", formattedTime);
-//            obj.put("price", c.getClose());
-//            result.add(obj);
-//        }
-//
-//        return result;
-//    }
-
-    public static String convertToGermanTime(long epochSeconds) {
-        ZoneId germanyZone = ZoneId.of("Europe/Berlin");
-        Instant instant = Instant.ofEpochSecond(epochSeconds);
-        ZonedDateTime zonedDateTime = instant.atZone(germanyZone);
-        DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
-        return formatter.format(zonedDateTime);
-    }
-
-    // Helper to safely parse nullable numbers
-    private static Double getDoubleOrNull(JSONObject obj, String key) {
-        return obj.isNull(key) ? null : obj.optDouble(key);
-    }
-
-    private static Long getLongOrNull(JSONObject obj, String key) {
-        return obj.isNull(key) ? null : obj.optLong(key);
-    }
-}

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;
 
     }

src/main/java/cn/stock/market/infrastructure/api/investing/IndiaIndexNewVo.java

@@ -1,18 +0,0 @@
-package cn.stock.market.infrastructure.api.investing;
-
-import cn.stock.market.dto.model.ChartCandle;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(value = "指数信息")
-public class IndiaIndexNewVo {
-    @ApiModelProperty(value = "指数详情")
-    private IndiaStockVO indexVo;
-    @ApiModelProperty(value = "指数k线")
-    private List<ChartCandle> kLine;
-}

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;
 }

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;
-}

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

@@ -0,0 +1,80 @@
+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;
+
+/**
+ * RetifiveStockPO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+@SuperBuilder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(
+    name = "retifive_stock"
+)
+public class RetifiveStockPO {
+  /**
+   * 主键 */
+  @Id
+  @GeneratedValue(
+      strategy = javax.persistence.GenerationType.IDENTITY
+  )
+  Integer id;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * symbol,查询Rics的id用 */
+  String symbol;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 更新时间：退市或有修改时会进行更新
+   */
+  Date updateTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+
+  /**
+   * 是否退市：0-否，1-是
+   */
+  Integer isDelisted;
+}

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

@@ -8,7 +8,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -76,7 +75,6 @@ public class SiteNewsPO {
   /**
    * 显示时间 */
   @ApiModelProperty("显示时间")
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Europe/Madrid")
   Date showTime;
 
   /**

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

@@ -61,11 +61,11 @@ public class StockIpoPO {
 
   /**
    * 是否显示【1 显示，2 不显示】 */
-  Integer isShow = 1;
+  Integer isShow;
 
   /**
    * 是否上市【1 未上市，2 已上市】 */
-  Integer isList = 1;
+  Integer isList;
 
   Date createDate;
 
@@ -79,8 +79,6 @@ public class StockIpoPO {
    * 申请总额 */
   String apply;
 
-  String exchangeType;
-
   /**
    * 市盈率 */
   BigDecimal peRatio;

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

@@ -1,39 +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.*;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * StockPO
- *
- * @author rplees
- * @email rplees.i.ly@gmail.com
- * @created 2023/06/17
- */
-@SuperBuilder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@Table(name = "stockTemp")
-public class StockTempPO {
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	Integer id;
-
-	String stockType;
-
-	String stockGid;
-
-	String stockLogo;
-}

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;
+}

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> {
-}

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

@@ -0,0 +1,15 @@
+package cn.stock.market.infrastructure.db.repo;
+
+import cn.stock.market.infrastructure.db.po.RetifiveStockPO;
+import com.rp.spring.jpa.GenericJpaRepository;
+import java.lang.Integer;
+
+/**
+ * RetifiveStockRepo 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/04/10 
+ */
+public interface RetifiveStockRepo extends GenericJpaRepository<RetifiveStockPO, Integer> {
+}

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

@@ -1,15 +0,0 @@
-package cn.stock.market.infrastructure.db.repo;
-
-import cn.stock.market.infrastructure.db.po.StockPO;
-import cn.stock.market.infrastructure.db.po.StockTempPO;
-import com.rp.spring.jpa.GenericJpaRepository;
-
-/**
- * StockRepo 
- *
- * @author rplees 
- * @email rplees.i.ly@gmail.com 
- * @created 2023/06/17 
- */
-public interface StockTempRepo extends GenericJpaRepository<StockTempPO, Integer> {
-}

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> {
+}

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;
@@ -16,45 +15,25 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
-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.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+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
-@RestController
-@RequestMapping("/api/market/investing")
 public class InvestingTask {
 
     @Autowired
     StockService stockService;
     @Autowired
     SiteNewsRepository newsRepository;
-    @Autowired
-    RestTemplate restTemplate;
 
 //    @Scheduled(cron = "0 0 6 * * ?")
     public void syncIndiaData(){
@@ -128,7 +107,7 @@ public class InvestingTask {
     }
 
     /*新闻接口*/
-//    @Scheduled(cron = "0 0 0/3 * * ?")
+    @Scheduled(cron = "0 0 0/3 * * ?")
     public void saveStockNews() {
         log.info("英文股票新闻数据同步开始");
         try {
@@ -139,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());
@@ -169,251 +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;
-    }
-
-    /*德国新闻接口*/
-//    @Scheduled(cron = "0 0 0/3 * * ?")
-    public void saveGerNews() {
-        log.info("德国股票新闻数据同步开始");
-        int savedCount = 0;
-        int totalCount = 0;
-        try {
-            // API URL for getting news list
-            String newsListUrl = "https://api.boerse-frankfurt.de/v1/data/category_news?newsType=ALL&lang=de&offset=0&limit=50";
-            
-            // Headers for the API request
-            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,ug;q=0.7,fr;q=0.6");
-            headers.add("origin", "https://www.boerse-frankfurt.de");
-            headers.add("priority", "u=1, i");
-            headers.add("referer", "https://www.boerse-frankfurt.de/");
-            headers.add("user-agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36");
-
-            HttpEntity<String> entity = new HttpEntity<>(headers);
-            
-            // Get news list
-            ResponseEntity<String> response = restTemplate.exchange(
-                newsListUrl, 
-                HttpMethod.GET, 
-                entity, 
-                String.class
-            );
-
-            if (response.getStatusCode().value() == 200 && response.getBody() != null) {
-                JSONObject newsListResponse = JSON.parseObject(response.getBody());
-                JSONArray newsData = newsListResponse.getJSONArray("data");
-                
-                if (newsData != null && newsData.size() > 0) {
-                    totalCount = newsData.size();
-                    log.info("Found {} German news items to process", totalCount);
-                    
-                    for (int i = 0; i < newsData.size(); i++) {
-                        try {
-                            JSONObject newsItem = newsData.getJSONObject(i);
-                            String newsId = newsItem.getString("id");
-                            String headline = newsItem.getString("headline");
-                            String time = newsItem.getString("time");
-                            String source = newsItem.getString("source");
-                            String teaserText = newsItem.getString("teaserText");
-                            String teaserImageUrl = newsItem.getString("teaserImageUrl");
-                            
-                            // Check if news already exists
-                            List<SiteNews> existingNews = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(newsId));
-                            if (existingNews.size() == 0) {
-                                // Get news detail
-                                String newsDetailUrl = "https://api.boerse-frankfurt.de/v1/data/news?id=" + newsId + "&lang=de";
-                                HttpEntity<String> detailEntity = new HttpEntity<>(headers);
-                                
-                                ResponseEntity<String> detailResponse = restTemplate.exchange(
-                                    newsDetailUrl, 
-                                    HttpMethod.GET, 
-                                    detailEntity, 
-                                    String.class
-                                );
-                                
-                                if (detailResponse.getStatusCode().value() == 200 && detailResponse.getBody() != null) {
-                                    JSONObject newsDetail = JSON.parseObject(detailResponse.getBody());
-                                    String body = newsDetail.getString("body");
-                                    
-                                    // Create SiteNews entity
-                                    SiteNews siteNews = new SiteNews();
-                                    siteNews.setAddTime(new Date());
-                                    siteNews.setSourceId(newsId);
-                                    siteNews.setTitle(headline);
-                                    siteNews.setSourceName(source);
-                                    siteNews.setDescription(teaserText != null ? teaserText : "");
-                                    siteNews.setImgurl(teaserImageUrl);
-                                    siteNews.setContent(body != null ? body : "");
-                                    siteNews.setStatus(1);
-                                    siteNews.setType(1); // Set as financial news type
-                                    siteNews.setViews(0);
-                                    
-                                    // Parse and set show time
-                                    if (time != null && !time.isEmpty()) {
-                                        try {
-                                            // Parse ISO 8601 format: "2025-06-19T08:37:58+02:00"
-                                            // Remove timezone offset and convert to standard format
-                                            String timeStr = time.replace("+02:00", "").replace("T", " ");
-                                            siteNews.setShowTime(DateTimeUtil.strToDate(timeStr, "yyyy-MM-dd HH:mm:ss"));
-                                        } catch (Exception e) {
-                                            log.warn("Failed to parse time for news {}: {}", newsId, time);
-                                            siteNews.setShowTime(new Date());
-                                        }
-                                    } else {
-                                        siteNews.setShowTime(new Date());
-                                    }
-                                    
-                                    try {
-                                        newsRepository.save(siteNews);
-                                        savedCount++;
-                                        log.info("Saved German news [{}/{}]: {}", savedCount, totalCount, headline);
-                                    } catch (Exception e) {
-                                        log.warn("Failed to save German news {}: {}", newsId, e.getMessage());
-                                    }
-                                } else {
-                                    log.warn("Failed to get news detail for {}: HTTP {}", newsId, detailResponse.getStatusCode());
-                                }
-                            } else {
-                                log.debug("News {} already exists, skipping", newsId);
-                            }
-                        } catch (Exception e) {
-                            log.warn("Error processing news item {}: {}", i, e.getMessage());
-                        }
-                    }
-                } else {
-                    log.warn("No news data found in API response");
-                }
-            } else {
-                log.error("Failed to get news list: HTTP {}", response.getStatusCode());
-            }
-            log.info("德国股票新闻数据同步完成，处理了 {} 条新闻，保存了 {} 条新闻", totalCount, savedCount);
-        } catch (Exception e) {
-            log.error("德国新闻数据同步异常，异常信息: {}", e.getMessage(), e);
-        }
-    }
-
-    @Scheduled(cron = "0 0 0/3 * * ?")
-//    @PostConstruct
-    public void getCincoDiasNews() {
-        String baseUrl = "https://cincodias.elpais.com";
-
-        try {
-            List<SiteNews> results = new ArrayList<>();
-            String listUrl = baseUrl + "/ultimas-noticias/";
-            Document doc = Jsoup.connect(listUrl)
-                    .userAgent("Mozilla/5.0")
-                    .get();
-
-            Elements articles = doc.select("article.c");
-
-            for (Element article : articles) {
-                // Title and Link
-                Element aTag = article.selectFirst("h2.c_t a");
-                String title = aTag != null ? aTag.text().trim() : null;
-                String link = aTag != null ? aTag.absUrl("href") : null;
-
-                // Author
-                Element authorTag = article.selectFirst("a.c_a_a");
-                String author = authorTag != null ? authorTag.text().trim() : null;
-
-                Element figure = article.selectFirst("figure.c_m a img");
-
-                String imageUrl = null;
-                if (figure != null) {
-                    imageUrl = figure.attr("src");
-                }
-                // Date
-                Date publishedDate = null;
-                try {
-                    Element timeTag = article.selectFirst("time");
-                    if (timeTag != null) {
-                        String datetimeAttr = timeTag.attr("datetime");
-                        DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-                        ZonedDateTime zonedDateTime = ZonedDateTime.parse(datetimeAttr, formatter);
-                        publishedDate = Date.from(zonedDateTime.toInstant());
-                    }
-                } catch (Exception e) {
-                    log.warn("Failed to parse published date for article: {}", link);
-                }
-
-                // Summary
-                String summary = article.selectFirst("p.c_d") != null ? article.selectFirst("p.c_d").text() : null;
-
-                // Optional: Get full content from article detail page
-                String htmlContent = "";
-                if (link != null) {
-                    try {
-                        Document detailDoc = Jsoup.connect(link)
-                                .userAgent("Mozilla/5.0")
-                                .get();
-
-                        // ✅ Extract article main content
-                        Element body = detailDoc.selectFirst("div.a_c.clearfix[data-dtm-region=articulo_cuerpo]");
-                        if (body != null) {
-                            htmlContent = body.html();
-                        }
-
-                    } catch (Exception e) {
-                        log.warn("Error fetching detail page: {}", link);
-                        e.printStackTrace();
-                    }
-                }
-
-                // Build SiteNews object
-                SiteNews siteNews = new SiteNews();
-                siteNews.setAddTime(new Date());
-                siteNews.setSourceId(link);
-                siteNews.setTitle(title);
-                siteNews.setSourceName("CINCO_DIAS");
-                siteNews.setDescription(summary != null ? summary : title);
-                siteNews.setImgurl(imageUrl);
-                siteNews.setContent(htmlContent);
-                siteNews.setStatus(1);
-                siteNews.setType(1);
-                siteNews.setViews(0);
-                siteNews.setShowTime(publishedDate);
-
-                try {
-                    newsRepository.save(siteNews);
-                    log.info("Saved Spanish news: {}", title);
-                } catch (Exception e) {
-                    log.warn("Failed to save Spanish news {}: {}", link, e.getMessage());
-                }
-            }
-
-        } catch (Exception e) {
-            log.error("Error fetching Spanish news: {}", e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Test method to manually trigger German news sync
-     * This can be called via REST API or scheduled task
-     */
-    @GetMapping("/test-ger-news")
-    public String testSaveGerNews() {
-        log.info("Testing German news sync...");
-        saveGerNews();
-        log.info("German news sync test completed");
-        return "German news sync test completed. Check logs for details.";
-    }
 }

src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java

@@ -115,15 +115,15 @@ public class MoneyScraper {
                 if (ulElement != null) {
                     for (Element aElement : ulElement.select("a")) {
                         String exchangeValue = aElement.text().trim();
-                        if ("BSE".equals(exchangeValue.toUpperCase()) || "NSE".equals(exchangeValue.toUpperCase())) {
+                        if ("BSE".equals(exchangeValue) || "NSE".equals(exchangeValue)) {
                             log.info(Thread.currentThread().getName() + ",the stock url: " + url +
                                     ", the exchange Value: " + exchangeValue);
-                            MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toUpperCase(Locale.ROOT))
+                            MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toLowerCase(Locale.ROOT))
                                     .detailUrl(String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", exchangeValue.toLowerCase(), companyCodeId))
                                     .selfUrl(url)
                                     .selfDispId(extractDispId(url))
                                     .moneyScId(companyCodeId).saveTime(new Date()).build();
-                            List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(name), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(Locale.ROOT)));
+                            List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(name), QMoneyStockPO.moneyStockPO.stockType.eq(exchangeValue.toLowerCase(Locale.ROOT)));
                             if (CollectionUtil.isEmpty(all)) {
                                 moneyStockRepository.save(build);
                             }
@@ -264,15 +264,15 @@ public class MoneyScraper {
                             for (Element aElement : ulElement.select("a")) {
                                 String exchangeValue = aElement.text().trim();
 
-                                if ("BSE".equals(exchangeValue.toUpperCase(Locale.ROOT)) || "NSE".equals(exchangeValue.toUpperCase(Locale.ROOT))) {
+                                if ("BSE".equals(exchangeValue) || "NSE".equals(exchangeValue)) {
                                     log.info(Thread.currentThread().getName()+",stockName: " + textContent + ", self_link: " + linkAttribute +
                                             ", the exchange Value: " + exchangeValue);
-                                    MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toUpperCase(Locale.ROOT))
+                                    MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toLowerCase(Locale.ROOT))
                                             .detailUrl(String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", exchangeValue.toLowerCase(), companyCodeId))
                                             .selfUrl(linkAttribute)
                                             .selfDispId(extractDispId(linkAttribute))
                                             .moneyScId(companyCodeId).saveTime(new Date()).build();
-                                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(textContent), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(Locale.ROOT)));
+                                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(textContent), QMoneyStockPO.moneyStockPO.stockType.eq(exchangeValue.toLowerCase(Locale.ROOT)));
                                     if(CollectionUtil.isEmpty(all)){
                                         moneyStockRepository.save(build);
                                     }

src/main/java/cn/stock/market/infrastructure/job/RealTimeTask.java

@@ -16,7 +16,7 @@ public class RealTimeTask {
 
     /*每天9点定时删除股票k线数据*/
     @Transactional
-//    @Scheduled(cron = "0 00 9 * * MON-FRI")
+    @Scheduled(cron = "0 00 9 * * MON-FRI")
     public void deleteStockCode() {
         log.info("每天9点定时删除股票k线数据");
         repo.deleteStockCode();
@@ -24,7 +24,7 @@ public class RealTimeTask {
 
     /*每天0点定时删除期货k线数据*/
     @Transactional
-//    @Scheduled(cron = "0 00 0 * * MON-FRI")
+    @Scheduled(cron = "0 00 0 * * MON-FRI")
     public void deleteStockFuturesCode() {
         log.info("每天0点定时删除期货k线数据");
         repo.deleteStockFuturesCode();

src/main/java/cn/stock/market/infrastructure/job/RefinitivTask.java

@@ -0,0 +1,136 @@
+package cn.stock.market.infrastructure.job;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.stock.market.constant.InChangeDataTypeEnum;
+import cn.stock.market.constant.InChangeType;
+import cn.stock.market.domain.basic.entity.RetifiveStock;
+import cn.stock.market.domain.basic.service.RetifiveStockService;
+import cn.stock.market.lesg.InChangeEntity;
+import cn.stock.market.lesg.RefinitivConsumer;
+import com.google.common.base.Stopwatch;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@RestController
+public class RefinitivTask {
+    @Autowired
+    private RefinitivConsumer refinitivConsumer;
+    @Autowired
+    private RetifiveStockService retifiveStockService;
+
+    @GetMapping("/task/syncStockData")
+    @Scheduled(cron = "0 0 18 * * ?")
+    @Transactional(rollbackFor = Exception.class)
+    public void syncStockData() {
+        log.info("每天18点定时同步Refinitiv股票数据开始");
+        Stopwatch stopwatch = Stopwatch.createStarted();
+        // 获取股票symbol列表
+        List<String> symbolList = refinitivConsumer.getSymbolList();
+        // 查询出数据库中所有股票
+        List<RetifiveStock> allRetifiveStocks = retifiveStockService.repository().findAll();
+        List<String> savedSymbols = allRetifiveStocks.stream().map(RetifiveStock::getSymbol).collect(Collectors.toList());
+        // 去除数据库中已经存在的股票
+        symbolList.removeAll(savedSymbols);
+        if (CollUtil.isEmpty(symbolList)) {
+            log.error("定时同步Refinitiv股票数据获取symbol为空");
+            return;
+        }
+
+        try {
+            List<RetifiveStock> stockList = refinitivConsumer.getRefinitivStockList(String.join(",", symbolList));
+            retifiveStockService.repository().saveAll(stockList);
+            log.info("每天18点定时同步Refinitiv股票数据结束, 当前股票总数 {}， 新增数{}, 耗时:{}毫秒",
+                    allRetifiveStocks.size(), symbolList.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+        } catch (Exception e) {
+            log.error("每天18点定时同步Refinitiv股票数据异常, 错误：", e);
+        }
+    }
+
+    @GetMapping("/task/syncInChange")
+    @Scheduled(cron = "0 10 0 * * ?")
+    @Transactional(rollbackFor = Exception.class)
+    public void syncInChange() {
+        log.info("每天6点定时同步Refinitiv股票数据IN/CHANGE开始");
+        InChangeType inChangeType = InChangeType.TODAY;
+        Stopwatch stopwatch = Stopwatch.createStarted();
+        // 获取股票symbol列表
+        Map<InChangeDataTypeEnum, List<InChangeEntity>> inChangeSymbolList = refinitivConsumer.getInChangeSymbolList(inChangeType);
+        // 过滤出要删除的数据
+        List<InChangeEntity> delList = inChangeSymbolList.get(InChangeDataTypeEnum.DEL);
+        List<String> delSymbols = delList.stream().map(InChangeEntity::getRic).collect(Collectors.toList());
+
+//        List<InChangeEntity> addList = inChangeSymbolList.get(InChangeDataTypeEnum.ADD);
+//        List<String> addSymbols = addList.stream().map(InChangeEntity::getRic).collect(Collectors.toList());
+        // 过滤出要更新的数据
+        List<InChangeEntity> updateList = inChangeSymbolList.get(InChangeDataTypeEnum.WAS);
+        List<String> wasSymbols = new ArrayList<>();
+        for (int i = 0; i < updateList.size(); i++) {
+            if (i % 2 == 0) {
+                wasSymbols.add(updateList.get(i).getRic());
+            }
+        }
+
+        // 查询出数据库中所有股票
+        List<RetifiveStock> allRetifiveStocks = retifiveStockService.repository().findAll();
+        List<String> savedSymbols = allRetifiveStocks.stream().map(RetifiveStock::getSymbol).collect(Collectors.toList());
+        //  取交集过滤出需要删除的股票
+        delSymbols.retainAll(savedSymbols);
+//        addSymbols.removeAll(savedSymbols);
+        //  取交集过滤出需要更新的股票
+        wasSymbols.retainAll(savedSymbols);
+
+        try {
+            // 执行删除操作
+            List<RetifiveStock> delStocks = allRetifiveStocks.stream()
+                    .filter(item -> delSymbols.contains(item.getSymbol()))
+                    .filter(item -> item.getIsDelisted() == 0)
+                    .collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(delStocks)) {
+                for (RetifiveStock delStock : delStocks) {
+                    // 将股票设为退市状态
+                    delStock.setIsDelisted(1);
+                    delStock.setUpdateTime(new Date());
+                }
+                retifiveStockService.repository().saveAll(delStocks);
+            }
+            log.info("每天6点定时同步Refinitiv股票数据IN/CHANGE结束, 受影响删除数{}, 耗时:{}毫秒", delStocks.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+
+            // 当类型为今日数据时才更新
+            List<RetifiveStock> updateStocks = allRetifiveStocks.stream()
+                    .filter(item -> wasSymbols.contains(item.getSymbol()))
+                    .collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(updateStocks)) {
+                // 执行更新操作
+                for (RetifiveStock updateStock : updateStocks) {
+                    // 定位到原来的股票数据
+                    InChangeEntity wasEntity = updateList.stream().filter(item -> item.getRic().equals(updateStock.getSymbol())).collect(Collectors.toList()).get(0);
+                    // 定位到要更新的股票数据
+                    InChangeEntity nowEntity = updateList.get(updateList.indexOf(wasEntity) + 1);
+                    // 进行更新赋值
+                    updateStock.setStockName(nowEntity.getDescription());
+                    updateStock.setStockCode(nowEntity.getCodeTicker());
+                    updateStock.setSymbol(nowEntity.getRic());
+                    updateStock.setUpdateTime(new Date());
+                }
+                retifiveStockService.repository().saveAll(updateStocks);
+            }
+            log.info("每天6点定时同步Refinitiv股票数据IN/CHANGE结束, 受影响更新数{}, 耗时:{}毫秒", updateStocks.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+        } catch (Exception e) {
+            log.error("每天6点定时同步Refinitiv股票数据IN/CHANGE异常, 错误：", e);
+        }
+    }
+}

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,13 +54,9 @@ 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 * ?")
+    @Scheduled(cron = "0 0 1 */2 * ?")
     @RequestMapping("/testScraperGetBusinessToday")
     public  void schedule() {
         String BASE_URL = "https://akm-img-a-in.tosshub.com/businesstoday/resource/market-widgets/prod/company-master-23-01-2023.json";
@@ -110,227 +103,126 @@ public class Scraper {
 
 
 
-//    @Scheduled(cron = "0 0 18 * * ?")
-//    @PostConstruct
+    @Scheduled(cron = "0 0 18 * * ?")
     @RequestMapping("/testScraperGetMoneyControllerNewIPO")
     public  void getMoneyControllerNewIPOSchedule() {
         log.info("定时任务执行获取新股ipo的方法开始执行");
         // 目标 URL
-        List<String> urls = Arrays.asList("https://www.moneycontrol.com/ipo/upcoming-ipos/", "https://www.moneycontrol.com/ipo/open-ipos/");
+        String url = "https://www.moneycontrol.com/ipo/open-upcoming-ipos";
         // 创建 HttpClient 实例
         HttpClient client = HttpClients.createDefault();
         // 创建 HttpGet 请求
-        for (String url : urls) {
-            HttpGet request = new HttpGet(url);
-            try {
-                // 执行请求
-                HttpResponse response = client.execute(request);
+        HttpGet request = new HttpGet(url);
+        try {
+            // 执行请求
+            HttpResponse response = client.execute(request);
 
-                // 检查请求是否成功
-                if (response.getStatusLine().getStatusCode() == 200) {
-                    // 获取响应体
-                    String responseBody = EntityUtils.toString(response.getEntity());
+            // 检查请求是否成功
+            if (response.getStatusLine().getStatusCode() == 200) {
+                // 获取响应体
+                String responseBody = EntityUtils.toString(response.getEntity());
 
-                    // 使用 Jsoup 解析 HTML
-                    Document doc = Jsoup.parse(responseBody);
+                // 使用 Jsoup 解析 HTML
+                Document doc = Jsoup.parse(responseBody);
 
-                    // 找到包含 JSON 数据的 <script> 标签
-                    Element scriptTag = doc.selectFirst("script#__NEXT_DATA__");
+                // 找到包含 JSON 数据的 <script> 标签
+                Element scriptTag = doc.selectFirst("script#__NEXT_DATA__");
 
-                    if (scriptTag != null) {
-                        // 获取 JSON 数据
-                        String jsonDataStr = scriptTag.html();
+                if (scriptTag != null) {
+                    // 获取 JSON 数据
+                    String jsonDataStr = scriptTag.html();
 
-                        // 将 JSON 字符串解析为 Java JSONObject
-                        JSONObject jsonObject = JSONObject.parseObject(jsonDataStr);
-                        log.info("获取到新股的json信息:"+jsonObject.toJSONString());
+                    // 将 JSON 字符串解析为 Java JSONObject
+                    JSONObject jsonObject = JSONObject.parseObject(jsonDataStr);
+                    log.info("获取到新股的json信息:"+jsonObject.toJSONString());
 
+                    JSONObject pageProps = jsonObject.getJSONObject("props").getJSONObject("pageProps");
+                    JSONObject ipoTableData = pageProps.getJSONObject("ipoTableData");
 
-
-                        JSONObject pageProps = jsonObject.getJSONObject("props").getJSONObject("pageProps");
-                        JSONObject ipoTableData = pageProps.getJSONObject("ipoTableData");
-
-
-
-                        // 解析 openData 和 upcomingData
-                        JSONArray openData = ipoTableData.getJSONArray("openData");
-//                    if (openData.isEmpty()){
-//                        openData = ipoTableData.getJSONArray("openUpcomingData");
-//                    }
-                        JSONArray upcomingData = ipoTableData.getJSONArray("upcomingData");
-                        List<StockIpo> listStockIpoList = new ArrayList<>();
-                        for (int i = 0; i < openData.size(); i++) {
-                            JSONObject entry = openData.getJSONObject(i);
-                            StockIpo stockIpo = new StockIpo();
-                            stockIpo.setStockCode(entry.getString("sc_id"));
-                            stockIpo.setStockName(entry.getString("company_name"));
-                            stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
-                            stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
-                            stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
-                            Integer totalNumber = 0;
-                            if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
-                                BigDecimal issueSize = new BigDecimal(entry.getLong("issue_size"));
-                                BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
-                                totalNumber = totalNumberBigDecimal.intValue();
-                            }
-                            stockIpo.setTotalNumber(totalNumber);
-                            stockIpo.setApply(entry.getString("total_subs"));
-                            stockIpo.setCreateDate(new Date());
-                            stockIpo.setUpdateDate(new Date());
-                            stockIpo.setSourceType("3");
-
-                            if (stockIpo.getStockCode() == null || stockIpo.getStockName() == null){
-                                continue;
-                            }
-                            String codeDetail = entry.getString("url").substring(entry.getString("url").lastIndexOf('/') + 1);;
-                            List<String> exchanges = getIpoExchange(stockIpo.getStockName(), codeDetail);
-
-                            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);
-                                ipo.setSourceType("3");
-                                listStockIpoList.add(ipo);
-                            }
+                    // 解析 openData 和 upcomingData
+                    JSONArray openData = ipoTableData.getJSONArray("openData");
+                    JSONArray upcomingData = ipoTableData.getJSONArray("upcomingData");
+                    List<StockIpo> listStockIpoList = new ArrayList<>();
+                    for (int i = 0; i < openData.size(); i++) {
+                        JSONObject entry = openData.getJSONObject(i);
+                        StockIpo stockIpo = new StockIpo();
+                        stockIpo.setStockCode(entry.getString("sc_id"));
+                        stockIpo.setStockName(entry.getString("company_name"));
+                        stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
+                        stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
+                        stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
+                        Integer totalNumber = 0;
+                        if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
+                            Integer issue_size = entry.getInteger("issue_size");
+                            BigDecimal issueSize = new BigDecimal(issue_size);
+                            BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
+                            totalNumber = totalNumberBigDecimal.intValue();
                         }
-
-                        for (int i = 0; i < upcomingData.size(); i++) {
-                            JSONObject entry = upcomingData.getJSONObject(i);
-                            StockIpo stockIpo = new StockIpo();
-                            stockIpo.setStockCode(entry.getString("sc_id"));
-                            stockIpo.setStockName(entry.getString("company_name"));
-                            stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
-                            stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
-                            stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
-                            Integer totalNumber = 0;
-                            if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
-                                Integer issue_size = entry.getInteger("issue_size");
-                                BigDecimal issueSize = new BigDecimal(issue_size);
-                                BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
-                                totalNumber = totalNumberBigDecimal.intValue();
-                            }
-                            stockIpo.setTotalNumber(totalNumber);
-                            stockIpo.setApply(entry.getString("total_subs"));
-                            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);
-                                ipo.setSourceType("3");
-                                listStockIpoList.add(ipo);
-                            }
-                        }
-
-                        //  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));
-                            List<String> existingStockScIds = existStockIpoList.stream()
-                                    .map(StockIpo::getStockCode)
-                                    .collect(Collectors.toList());
-
-                            for (StockIpo stockIpo : listStockIpoList) {
-                                StockIpo existIpo = existStockIpoList.stream().filter(a -> a.getStockCode().equals(stockIpo.getStockCode()) && (a.getExchangeType() == null || a.getExchangeType().isEmpty() || a.getExchangeType().toLowerCase().trim().equals(stockIpo.getExchangeType().toLowerCase().trim()))).findFirst().orElse(null);
-                                if (existIpo != null) {
-                                    if (existIpo.getExchangeType() == null || existIpo.getExchangeType().isEmpty()){
-                                        existIpo.setExchangeType(stockIpo.getExchangeType());
-                                    }
-                                    stockIpo.setId(existIpo.getId());
-                                    if (existIpo.getStockPrice() != null){
-                                        stockIpo.setStockPrice(existIpo.getStockPrice());
-                                        stockIpo.setApply(existIpo.getApply());
-                                    }
-                                }
-                            }
-//                        listStockIpoList = listStockIpoList.stream()
-//                                .filter(stockIpos -> !existingStockScIds.contains(stockIpos.getStockCode())).filter(stockIpo -> StringUtils.isNotBlank(stockIpo.getStockName()))
-//                                .collect(Collectors.toList());
-
-                            //保存全部的新股
-                            if(CollectionUtil.isNotEmpty(listStockIpoList)){
-                                stockIpoRepository.saveAll(listStockIpoList);
-
-                                log.info("定时任务执行获取新股ipo的方法开始结束,保存了数据:{}", JSON.toJSONString(listStockIpoList));
-                            }else {
-                                log.info("定时任务执行获取新股ipo的方法开始结束,没有数据");
-                            }
-                        }
-
-
-                        // 输出整个 JSON 数据
-                    } else {
-                        log.info("未找到包含 JSON 数据的 <script> 标签");
+                        stockIpo.setTotalNumber(totalNumber);
+                        stockIpo.setApply(entry.getString("total_subs"));
+                        stockIpo.setCreateDate(new Date());
+                        stockIpo.setUpdateDate(new Date());
+                        stockIpo.setSourceType("3");
+                        listStockIpoList.add(stockIpo);
                     }
+
+                    for (int i = 0; i < upcomingData.size(); i++) {
+                        JSONObject entry = upcomingData.getJSONObject(i);
+                        StockIpo stockIpo = new StockIpo();
+                        stockIpo.setStockCode(entry.getString("sc_id"));
+                        stockIpo.setStockName(entry.getString("company_name"));
+                        stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
+                        stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
+                        stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
+                        Integer totalNumber = 0;
+                        if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
+                            Integer issue_size = entry.getInteger("issue_size");
+                            BigDecimal issueSize = new BigDecimal(issue_size);
+                            BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
+                            totalNumber = totalNumberBigDecimal.intValue();
+                        }
+                        stockIpo.setTotalNumber(totalNumber);
+                        stockIpo.setApply(entry.getString("total_subs"));
+                        stockIpo.setCreateDate(new Date());
+                        stockIpo.setUpdateDate(new Date());
+                        stockIpo.setSourceType("3");
+                        listStockIpoList.add(stockIpo);
+                    }
+
+                  //  stockIpoRepository.saveAll(listStockIpoList);
+
+                    List<String> scIdList = Lists.transform(listStockIpoList, StockIpo::getStockCode);
+                    if(CollectionUtil.isNotEmpty(scIdList)){
+                        List<StockIpo> existStockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.stockCode.in(scIdList));
+                        List<String> existingStockScIds = existStockIpoList.stream()
+                                .map(StockIpo::getStockCode)
+                                .collect(Collectors.toList());
+
+                        listStockIpoList = listStockIpoList.stream()
+                                .filter(stockIpos -> !existingStockScIds.contains(stockIpos.getStockCode())).filter(stockIpo -> StringUtils.isNotBlank(stockIpo.getStockName()))
+                                .collect(Collectors.toList());
+
+                        //保存全部的新股
+                        if(CollectionUtil.isNotEmpty(listStockIpoList)){
+                            stockIpoRepository.saveAll(listStockIpoList);
+                            log.info("定时任务执行获取新股ipo的方法开始结束,保存了数据:{}", JSON.toJSONString(listStockIpoList));
+                        }else {
+                            log.info("定时任务执行获取新股ipo的方法开始结束,没有数据");
+                        }
+                    }
+
+
+                    // 输出整个 JSON 数据
                 } else {
-                    log.info("HTTP请求失败，状态码：" + response.getStatusLine().getStatusCode());
+                    log.info("未找到包含 JSON 数据的 <script> 标签");
                 }
-            } catch (IOException e) {
-                log.error("获取新股接口发生异常",e);
+            } else {
+                log.info("HTTP请求失败，状态码：" + response.getStatusLine().getStatusCode());
             }
+        } catch (IOException e) {
+            log.error("获取新股接口发生异常",e);
         }
 
-
-    }
-
-//    @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);
     }
 
 
@@ -344,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();
@@ -480,135 +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());
-        Set<String> exchangeTypes = stockIpoList.stream().map(stockIpo -> stockIpo.getExchangeType().toUpperCase()).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.upper().in(exchangeTypes))
-        );
-
-        // Lưu các stockCode và exchangeType đã tồn tại
-        Set<String> existingKeys = existingMoneyStocks.stream()
-                .map(ms -> ms.getMoneyScId() + ms.getStockType().toUpperCase())
-                .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().toUpperCase()))
-                .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().toUpperCase());
-        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().toUpperCase(Locale.ROOT).equals("NSE")){
-                        return jsonData.getString("NSEID");
-                    }
-                    else if(stockIpo.getExchangeType().toUpperCase(Locale.ROOT).equals("BSE")){
-                        return jsonData.getString("BSEID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            log.info(e.getMessage());
-        }
-
-        return "";
-    }
 }

src/main/java/cn/stock/market/infrastructure/job/StockNewTask.java

@@ -1,186 +0,0 @@
-package cn.stock.market.infrastructure.job;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import cn.stock.market.domain.basic.entity.Stock;
-import cn.stock.market.domain.basic.entity.StockTemp;
-import cn.stock.market.domain.basic.repository.StockRepository;
-import cn.stock.market.domain.basic.repository.StockTempRepository;
-import cn.stock.market.dto.model.Symbol;
-import cn.stock.market.infrastructure.db.po.StockPO;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-@Component
-@Slf4j
-public class StockNewTask {
-	private static final OkHttpClient client = new OkHttpClient();
-	private static final String BASE_URL = "https://symbol-search.tradingview.com/symbol_search/v3/";
-	private static final String PARAMS  = "?start={start}&hl=1&country=DE&lang=en&search_type=stocks&domain=production&sort_by_country=US&promo=true&exchange={exchange}";
-
-	private static final String US_URL =
-			"https://financialmodelingprep.com/api/v3/stock-screener";
-	private static final String US_API_KEY = "57ZI1xeAsqHY7ag0FBuMkwQzt6TQ60dG";
-	@Autowired
-	StockRepository stockRepository;
-
-
-//    @PostConstruct
-//	@Scheduled(cron = "0 01 22 * * ?")
-	public void syncStock() throws Exception {
-		try {
-			int limit = 20000;
-			List<String> exchanges = Arrays.asList("BER", "DUS", "HAM", "HAN", "MUN", "SWB", "FWB", "XETR");
-			Map<String, Stock> stockGidMap = stockRepository.cacheGidMap();
-			for (String exchange : exchanges) {
-				List<Stock> newStocks = new ArrayList<>();
-				int start = 0;
-				int symbolsRemaining;
-				do {
-					int finalStart = start;
-					if (start > 0) {
-						finalStart = start + 1;
-					}
-					String url = BASE_URL + PARAMS.replace("{start}", String.valueOf(finalStart)).replace("{exchange}", exchange);
-					Request request = new Request.Builder()
-							.url(url)
-							.addHeader("Origin", "https://www.tradingview.com")
-							.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)")
-							.addHeader("Accept", "application/json, text/plain, */*")
-							.addHeader("Referer", "https://www.tradingview.com/")
-							.build();
-
-					Response response = client.newCall(request).execute();
-
-					if (!response.isSuccessful()) {
-						throw new RuntimeException("Unexpected response code: " + response.code());
-					}
-
-					String responseBody = response.body().string();
-					JSONObject json = new JSONObject(responseBody);
-					JSONArray symbols = json.getJSONArray("symbols");
-					symbolsRemaining = json.getInt("symbols_remaining");
-
-					for (int i = 0; i < symbols.length(); i++) {
-						JSONObject s = symbols.getJSONObject(i);
-						if (s.optString("type").equals("stock") && !stockGidMap.containsKey(s.optString("exchange") + ":" + s.getString("symbol"))) {
-							Stock stock = new Stock();
-							stock.setStockGid(s.optString("exchange") + ":" + s.getString("symbol"));
-							stock.setStockCode(stock.getStockGid());
-							stock.setStockSpell(s.optString("symbol"));
-							stock.setStockName(s.optString("description"));
-							stock.setStockSymbol(s.optString("symbol"));
-							stock.setStockType(s.optString("exchange"));
-							stock.setIsLock(0);
-							stock.setIsShow(0);
-							stock.setAddTime(new Date());
-							stock.setStockState(0);
-							stock.setStockPlate("https://s3-symbol-logo.tradingview.com/" + s.optString("source_logoid") + "--big.svg");
-							newStocks.add(stock);
-							stockGidMap.put(s.optString("exchange") + ":" + s.getString("symbol"), stock);
-						}
-					}
-					Thread.sleep(500);
-
-					start += symbols.length();
-					System.out.println("Fetched: " + symbols.length() + ", Remaining: " + symbolsRemaining);
-					try {
-						if (!newStocks.isEmpty()) {
-							stockRepository.saveAll(newStocks);
-						}
-					} catch (Exception e) {
-						log.error("Insert stock failed: {}", e.getMessage());
-					}
-
-					if (start >= limit) {
-						break;
-					}
-
-				} while (symbolsRemaining > 0);
-			}
-		}catch (Exception e) {
-			log.error("Insert stock failed: {}", e.getMessage());
-			e.printStackTrace();
-		}
-	}
-
-	@Scheduled(cron = "0 0 8 * * *")
-//    @PostConstruct
-	public void fetchListStock() {
-		try {
-			List<Stock> nasdaqStocks = fetchStocksByExchange("NASDAQ");
-			List<Stock> nyseStocks = fetchStocksByExchange("NYSE");
-
-			List<Stock> allActiveStocks = new ArrayList<>();
-			allActiveStocks.addAll(nasdaqStocks);
-			allActiveStocks.addAll(nyseStocks);
-
-			try {
-				if (!allActiveStocks.isEmpty()) {
-					stockRepository.saveAll(allActiveStocks);
-				}
-			} catch (Exception e) {
-				log.error("Insert stock failed: {}", e.getMessage());
-			}
-		} catch (Exception e) {
-			log.error("Error fetchListStock every day: {}", e.getMessage());
-		}
-	}
-
-	private static List<Stock> fetchStocksByExchange(String exchange) throws Exception {
-		List<Stock> result = new ArrayList<>();
-
-		String url = US_URL + "?exchange=" + exchange + "&apikey=" + US_API_KEY;
-
-		Request request = new Request.Builder()
-				.url(url)
-				.addHeader("accept", "application/json")
-				.addHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)")
-				.build();
-
-		Response response = client.newCall(request).execute();
-
-		if (!response.isSuccessful()) {
-			throw new RuntimeException("HTTP error code: " + response.code());
-		}
-
-		String body = response.body().string();
-		JSONArray array = new JSONArray(body);
-
-		for (int i = 0; i < array.length(); i++) {
-			JSONObject obj = array.getJSONObject(i);
-			if (!obj.optBoolean("isActivelyTrading", false) && obj.optBoolean("isEtf", false)) {
-				continue;
-			}
-
-			Stock stock = new Stock();
-
-			String stockCodeNew = obj.getString("symbol") + ":" + obj.getString("exchangeShortName");
-
-			stock.setStockName(obj.getString("companyName"));
-			stock.setStockCode(stockCodeNew);
-			stock.setStockSpell(obj.getString("symbol"));
-			stock.setStockType(obj.getString("exchangeShortName"));
-			stock.setStockGid(stockCodeNew);
-			stock.setStockSymbol(obj.getString("symbol"));
-
-			result.add(stock);
-		}
-
-		System.out.println("Fetched " + result.size() + " stocks for exchange: " + exchange);
-		return result;
-	}
-}

src/main/java/cn/stock/market/infrastructure/job/StockTask.java

@@ -112,7 +112,7 @@ public class StockTask {
     }
     
     /*同步股票列表*/
-//    @Scheduled(cron = "0 0 6 * * ?")
+    @Scheduled(cron = "0 0 6 * * ?")
     public void syncAFutureStockList() {
     	PageInfo<JSONObject> info = EastmoneyApi.ipoApplyDate(1, 300);
     	Map<String, Stock> stockMap = StockRepository.of().cacheCodeMap();
@@ -154,7 +154,7 @@ public class StockTask {
     }
     
     /*同步股票列表*/
-//    @Scheduled(cron = "0 0 6 * * ?")
+    @Scheduled(cron = "0 0 6 * * ?")
     public void syncAStockList() {
     	MdcUtil.setTraceIdIfAbsent();
     	Config config = SpringUtils.getBean(Config.class);

src/main/java/cn/stock/market/infrastructure/redis/SingleDistributedLockTemplate.java

@@ -1,87 +1,87 @@
-//package cn.stock.market.infrastructure.redis;
-//
-//import java.time.LocalDateTime;
-//import java.time.format.DateTimeFormatter;
-//import java.util.Map;
-//import java.util.Map.Entry;
-//import java.util.concurrent.TimeUnit;
-//
-//import org.redisson.api.RLock;
-//import org.redisson.api.RedissonClient;
-//
-//import com.google.common.base.Stopwatch;
-//import com.google.common.collect.Maps;
-//
-//import cn.qutaojing.common.aop.distributedlock.DistributedLockCallback;
-//import cn.qutaojing.common.aop.distributedlock.DistributedLockInfo;
-//import cn.qutaojing.common.aop.distributedlock.DistributedLockTemplate;
-//import lombok.extern.slf4j.Slf4j;
-//
-///**
-// * 
-// * title: SingleDistributedLockTemplate.java 
-// *
-// * @author xlfd
-// * @email xlfd@gmail.com
-// * @version 1.0  
-// * @created Sep 1, 2020 5:03:20 PM
-// */
-//@Slf4j
-//public class SingleDistributedLockTemplate implements DistributedLockTemplate {
-//	private RedissonClient redisson;
-//	DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
-//
-//    public SingleDistributedLockTemplate() {
-//    }
-//
-//    public SingleDistributedLockTemplate(RedissonClient redisson) {
-//        this.redisson = redisson;
-//    }
-//
-//    @Override
-//	public <T> T lock(DistributedLockCallback<T> callback, DistributedLockInfo... lockInfoList) throws Throwable {
-//		Stopwatch stopwatch = Stopwatch.createStarted();
-//		Map<RLock, DistributedLockInfo> lockMap = Maps.newConcurrentMap();
-//		
-//		for (DistributedLockInfo info : lockInfoList) {
-//			RLock lock = getLock(info.getLockName(), info.getFairLock());
-//			lockMap.put(lock, info);
-//		}
-//		
-//		try {
-//			for (Entry<RLock, DistributedLockInfo> entry : lockMap.entrySet()) {
-//				RLock lock = entry.getKey();
-//				DistributedLockInfo info = entry.getValue();
-//				log.info("{}-准备获取{}分布式锁:{}", dateTimeFormatter.format(LocalDateTime.now()), info.getMessage(), info.getLockName());
-//				lock.lock(info.getLeaseTime(), info.getTimeUnit());
-//				log.info("{}-{}分布式锁:{}获取成功, 耗时:{} ms", dateTimeFormatter.format(LocalDateTime.now()), info.getMessage(), info.getLockName(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
-//			}
-//
-//			return callback.process();
-//		} finally {
-//			for (Entry<RLock, DistributedLockInfo> entry : lockMap.entrySet()) {
-//				RLock lock = entry.getKey();
-//				DistributedLockInfo info = entry.getValue();
-//				if (lock != null && lock.isLocked() && lock.isHeldByCurrentThread()) {
-//					lock.unlock();
-//					log.info("{}-{}分布式锁:{}释放成功, 耗时:{} ms", dateTimeFormatter.format(LocalDateTime.now()), info.getMessage(), info.getLockName(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
-//				}
-//			}
-//
-//		}
-//	}
-//
-//    private RLock getLock(String lockName, boolean fairLock) {
-//        RLock lock;
-//        if (fairLock) {
-//            lock = redisson.getFairLock(lockName);
-//        } else {
-//            lock = redisson.getLock(lockName);
-//        }
-//        return lock;
-//    }
-//
-//    public void setRedisson(RedissonClient redisson) {
-//        this.redisson = redisson;
-//    }
-//}
+package cn.stock.market.infrastructure.redis;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Maps;
+
+import cn.qutaojing.common.aop.distributedlock.DistributedLockCallback;
+import cn.qutaojing.common.aop.distributedlock.DistributedLockInfo;
+import cn.qutaojing.common.aop.distributedlock.DistributedLockTemplate;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ *
+ * title: SingleDistributedLockTemplate.java
+ *
+ * @author xlfd
+ * @email xlfd@gmail.com
+ * @version 1.0
+ * @created Sep 1, 2020 5:03:20 PM
+ */
+@Slf4j
+public class SingleDistributedLockTemplate implements DistributedLockTemplate {
+	private RedissonClient redisson;
+	DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
+
+    public SingleDistributedLockTemplate() {
+    }
+
+    public SingleDistributedLockTemplate(RedissonClient redisson) {
+        this.redisson = redisson;
+    }
+
+    @Override
+	public <T> T lock(DistributedLockCallback<T> callback, DistributedLockInfo... lockInfoList) throws Throwable {
+		Stopwatch stopwatch = Stopwatch.createStarted();
+		Map<RLock, DistributedLockInfo> lockMap = Maps.newConcurrentMap();
+
+		for (DistributedLockInfo info : lockInfoList) {
+			RLock lock = getLock(info.getLockName(), info.getFairLock());
+			lockMap.put(lock, info);
+		}
+
+		try {
+			for (Entry<RLock, DistributedLockInfo> entry : lockMap.entrySet()) {
+				RLock lock = entry.getKey();
+				DistributedLockInfo info = entry.getValue();
+				log.info("{}-准备获取{}分布式锁:{}", dateTimeFormatter.format(LocalDateTime.now()), info.getMessage(), info.getLockName());
+				lock.lock(info.getLeaseTime(), info.getTimeUnit());
+				log.info("{}-{}分布式锁:{}获取成功, 耗时:{} ms", dateTimeFormatter.format(LocalDateTime.now()), info.getMessage(), info.getLockName(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+			}
+
+			return callback.process();
+		} finally {
+			for (Entry<RLock, DistributedLockInfo> entry : lockMap.entrySet()) {
+				RLock lock = entry.getKey();
+				DistributedLockInfo info = entry.getValue();
+				if (lock != null && lock.isLocked() && lock.isHeldByCurrentThread()) {
+					lock.unlock();
+					log.info("{}-{}分布式锁:{}释放成功, 耗时:{} ms", dateTimeFormatter.format(LocalDateTime.now()), info.getMessage(), info.getLockName(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+				}
+			}
+
+		}
+	}
+
+    private RLock getLock(String lockName, boolean fairLock) {
+        RLock lock;
+        if (fairLock) {
+            lock = redisson.getFairLock(lockName);
+        } else {
+            lock = redisson.getLock(lockName);
+        }
+        return lock;
+    }
+
+    public void setRedisson(RedissonClient redisson) {
+        this.redisson = redisson;
+    }
+}

src/main/java/cn/stock/market/infrastructure/redis/config/RedisConfig.java

@@ -1,70 +1,71 @@
-//package cn.stock.market.infrastructure.redis.config;
-//
-//import java.time.Duration;
-//
-//import org.redisson.api.RedissonClient;
-//import org.springframework.cache.CacheManager;
-//import org.springframework.cache.annotation.EnableCaching;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.data.redis.cache.RedisCacheConfiguration;
-//import org.springframework.data.redis.cache.RedisCacheManager;
-//import org.springframework.data.redis.connection.RedisConnectionFactory;
-//import org.springframework.data.redis.core.RedisTemplate;
-//import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-//import org.springframework.data.redis.serializer.RedisSerializationContext;
-//import org.springframework.data.redis.serializer.StringRedisSerializer;
-//
-//import cn.qutaojing.common.aop.distributedlock.DistributedLockTemplate;
-//import cn.stock.market.infrastructure.redis.SingleDistributedLockTemplate;
-//
-///**
-// * 
-// * @author xlfd
-// * @email xlfd@gmail.com
-// * @version 1.0  
-// * @created Jun 3, 2021 4:56:28 PM
-// */
-//@Configuration
-//@EnableCaching
-//public class RedisConfig {
-//
-//	@Bean
-//	public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-//		RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
-//		redisTemplate.setConnectionFactory(redisConnectionFactory);
-//		redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
-//		redisTemplate.setKeySerializer(new StringRedisSerializer());
-//		
-//		redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
-//		redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-//		
-//		return redisTemplate;
-//	}
-//
-//	@Bean
-//	public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
-//		// 配置序列化
-//		RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
-//		config.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()));
-//		config.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new Jackson2JsonRedisSerializer<>(Object.class)));
-//
-//		// 设置缓存的默认过期时间 ,30分钟
-//		config.entryTtl(Duration.ofMinutes(30));
-//		// 不缓存空值
-//		config.disableCachingNullValues();
-//		RedisCacheManager cacheManager = RedisCacheManager.builder(redisConnectionFactory).cacheDefaults(config)
-//				.build();
-//		return cacheManager;
-//	}
-//	
-//	/**
-//	 * 分布式锁实现 
-//	 * @param redissonClient
-//	 * @return
-//	 */
-//	@Bean
-//	public DistributedLockTemplate distributedLockTemplate(RedissonClient redissonClient) {
-//	    return new SingleDistributedLockTemplate(redissonClient);
-//	}
-//}
+package cn.stock.market.infrastructure.redis.config;
+
+import java.time.Duration;
+
+import org.redisson.api.RedissonClient;
+import org.redisson.api.RedissonClient;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import cn.qutaojing.common.aop.distributedlock.DistributedLockTemplate;
+import cn.stock.market.infrastructure.redis.SingleDistributedLockTemplate;
+
+/**
+ *
+ * @author xlfd
+ * @email xlfd@gmail.com
+ * @version 1.0
+ * @created Jun 3, 2021 4:56:28 PM
+ */
+@Configuration
+@EnableCaching
+public class RedisConfig {
+
+	@Bean
+	public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+		RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
+		redisTemplate.setConnectionFactory(redisConnectionFactory);
+		redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
+		redisTemplate.setKeySerializer(new StringRedisSerializer());
+
+		redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
+		redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+
+		return redisTemplate;
+	}
+
+	@Bean
+	public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
+		// 配置序列化
+		RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
+		config.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()));
+		config.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new Jackson2JsonRedisSerializer<>(Object.class)));
+
+		// 设置缓存的默认过期时间 ,30分钟
+		config.entryTtl(Duration.ofMinutes(30));
+		// 不缓存空值
+		config.disableCachingNullValues();
+		RedisCacheManager cacheManager = RedisCacheManager.builder(redisConnectionFactory).cacheDefaults(config)
+				.build();
+		return cacheManager;
+	}
+
+	/**
+	 * 分布式锁实现
+	 * @param redissonClient
+	 * @return
+	 */
+	@Bean
+	public DistributedLockTemplate distributedLockTemplate(RedissonClient redissonClient) {
+	    return new SingleDistributedLockTemplate(redissonClient);
+	}
+}

src/main/java/cn/stock/market/lesg/Batch.java

@@ -0,0 +1,75 @@
+package cn.stock.market.lesg;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * @author Administrator
+ */
+public class Batch	{
+	private static int id = 0;
+	
+	private int thisID = 0;
+	private long _startTimeStamp = 0, _endTimeStamp = 0;
+	private Map<String, InstrumentData> batchInstruments;
+	private CountDownLatch countDownLatch;
+	private long timeout = 0;
+
+	Batch(String[] rics, long timeout)	{
+		thisID = id++;
+		this.timeout = timeout;
+		batchInstruments = new HashMap<String, InstrumentData>(rics.length);
+		for(String ric : rics) {
+			batchInstruments.put(ric, new InstrumentData(ric));
+		}
+		
+		countDownLatch = new CountDownLatch(batchInstruments.size());
+	}
+
+
+	public String[] getAllRics()	{
+		return batchInstruments.keySet().toArray(new String[batchInstruments.size()]);
+	}
+
+	public InstrumentData getInstrument(String ric) throws Exception	 {
+		if(!batchInstruments.containsKey(ric)) {
+			throw new Exception("RIC not found in batch: " + ric);
+		}
+
+		return batchInstruments.get(ric);
+	}
+
+
+	public InstrumentData[] getAllInstruments()	 {
+		return batchInstruments.values().toArray(new InstrumentData[0]);
+	}
+
+	public void recordStartTime()	{
+		_startTimeStamp = System.currentTimeMillis();
+		_endTimeStamp  = 0;
+	}
+
+	public void recordEndTime()	{
+		_endTimeStamp = System.currentTimeMillis();
+	}
+
+	public boolean await() throws Exception {
+		return countDownLatch.await(timeout, TimeUnit.MILLISECONDS);
+	}
+
+	public void countDown() {
+		countDownLatch.countDown();
+	}
+	
+	public long batchFulfilmentTime()	{
+		return _endTimeStamp - _startTimeStamp;
+	}
+	
+	public int getBatchId()	{
+		return thisID;
+	}
+	
+}

src/main/java/cn/stock/market/lesg/InChangeEntity.java

@@ -0,0 +1,22 @@
+package cn.stock.market.lesg;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * InChangeEntity
+ *
+ * @author jnerh
+ * @since 2024/05/09 16:39
+ */
+@Data
+@Builder
+public class InChangeEntity {
+    private String date;
+    private String description;
+    private String typ;
+    private String ric;
+    private String isin;
+    private String codeTicker;
+    private String cls;
+}

src/main/java/cn/stock/market/lesg/InstrumentData.java

@@ -0,0 +1,34 @@
+package cn.stock.market.lesg;
+
+import com.refinitiv.ema.access.*;
+import lombok.Data;
+
+import java.util.HashMap;
+
+@Data
+public class InstrumentData {
+	
+	public String ric;
+	public String dataState = "";
+	public HashMap<String, String> dataMap = new HashMap<>();
+	
+	
+	public InstrumentData(String ric)	{
+		this.ric = ric;
+	}
+	
+	
+	public void setState(OmmState state)	{
+		dataState = state.dataStateAsString() + "|" +
+			state.statusCodeAsString() + "|" +
+			state.statusText() + "|" +
+			state.streamStateAsString();
+	}
+
+
+	public void decode(FieldList fieldList)	{
+		for(FieldEntry fieldEntry : fieldList)
+			dataMap.put(fieldEntry.name(), fieldEntry.load().toString());
+	}
+	
+}

src/main/java/cn/stock/market/lesg/RefinitivAppClient.java

@@ -0,0 +1,54 @@
+package cn.stock.market.lesg;
+
+import com.refinitiv.ema.access.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+class RefinitivAppClient implements OmmConsumerClient {
+
+	private static final Logger LOG = LoggerFactory.getLogger(RefinitivAppClient.class);
+
+	
+	public void onRefreshMsg(RefreshMsg refreshMsg, OmmConsumerEvent event)	{
+		try	{
+			Batch bRequest = (Batch) event.closure();
+			InstrumentData instr = bRequest.getInstrument(refreshMsg.name());
+			instr.setState(refreshMsg.state());
+			if(DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()) {
+				instr.decode(refreshMsg.payload().fieldList());
+			}
+			bRequest.countDown();
+		}
+		catch(Exception e)	{
+			LOG.error("Exception processing Refresh callback");
+			LOG.error("Message: ", refreshMsg);
+			LOG.error("Exception: ", e);
+		}
+	}
+
+
+	public void onStatusMsg(StatusMsg statusMsg, OmmConsumerEvent event) 	{
+		if(statusMsg.hasName())	{
+			try	{
+				Batch bRequest = (Batch) event.closure();
+				InstrumentData instr = bRequest.getInstrument(statusMsg.name());
+				instr.setState(statusMsg.state());
+				bRequest.countDown();
+			}
+			catch(Exception e)	{
+				LOG.error("Exception processing Status callback");
+				LOG.error("Message: ", statusMsg);
+				LOG.error("Exception: ", e);
+			}
+		}
+	}
+
+	public void onUpdateMsg(UpdateMsg updateMsg, OmmConsumerEvent event)	{}
+
+	public void onGenericMsg(GenericMsg genericMsg, OmmConsumerEvent consumerEvent) {}
+
+	public void onAckMsg(AckMsg ackMsg, OmmConsumerEvent consumerEvent) {}
+
+	public void onAllMsg(Msg msg, OmmConsumerEvent consumerEvent) {}
+}

src/main/java/cn/stock/market/lesg/RefinitivConsumer.java

@@ -0,0 +1,670 @@
+package cn.stock.market.lesg;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import cn.stock.market.constant.InChangeDataTypeEnum;
+import cn.stock.market.constant.InChangeType;
+import cn.stock.market.domain.basic.entity.RetifiveStock;
+import cn.stock.market.dto.RetifiveStockHistoryResponse;
+import cn.stock.market.dto.RetifiveStockInfo;
+import cn.stock.market.utils.RefinitivUtil;
+import com.ag.exception.SysTipsException;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import com.refinitiv.ema.access.*;
+import com.refinitiv.ema.rdm.EmaRdm;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * RefinitivConsumer
+ *
+ * @author jnerh
+ * @since 2024/04/29 10:37
+ */
+@Service
+@Slf4j
+public class RefinitivConsumer implements ApplicationRunner {
+
+    /**
+     * 股票的IN/CHANGE范围为 2-40
+     */
+    private static final int SYMBOL_CHANGE_MAX_SIZE = 40;
+
+    private static final String SYMBOL_CHANGE_PREFIX = "IN/CHANGE";
+
+    private static final String SYMBOL_LINK_PREFIX = "#EQ.BO";
+
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    private static String serviceName;
+    @Value("${refinitiv.market-data.service-name}")
+    public void setServiceName(String serviceName) {
+        RefinitivConsumer.serviceName = serviceName;
+    }
+
+    private static String username;
+    @Value("${refinitiv.market-data.username}")
+    public void setUsername(String username) {
+        RefinitivConsumer.username = username;
+    }
+
+    private static String password;
+    @Value("${refinitiv.market-data.password}")
+    public void setPassword(String password) {
+        RefinitivConsumer.password = password;
+    }
+
+    private static String clientId;
+    @Value("${refinitiv.market-data.clientId}")
+    public void setClientId(String clientId) {
+        RefinitivConsumer.clientId = clientId;
+    }
+
+    private static long timeout;
+    @Value("${refinitiv.market-data.batch-request-timeout}")
+    public void setTimeout(long timeout) {
+        RefinitivConsumer.timeout = timeout;
+    }
+
+
+    @Value("${refinitiv.token.username}")
+    private String tokenUsername;
+
+    @Value("${refinitiv.token.password}")
+    private String tokenPassword;
+
+    @Value("${refinitiv.token.appKey}")
+    private String appKey;
+    @Value("${refinitiv.token.url}")
+    private String tokenUrl;
+
+
+    private static OmmConsumer consumer = null;
+
+    public static final String TOP_ACTIVES_SYMBOL = ".AV.BO";
+    public static final String TOP_GAINERS_SYMBOL = ".PG.BO";
+    public static final String TOP_LOSERS_SYMBOL = ".PL.BO";
+
+    public static final String SCOPE = "trapi";
+    public static final String GRANT_TYPE = "password";
+
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        initialize();
+    }
+
+    private static void initialize() {
+        log.info("Initialize the consumer and connect to market data system....start");
+        OmmConsumerConfig config = EmaFactory.createOmmConsumerConfig();
+        config.username(username)
+                .password(password)
+                .clientId(clientId)
+                .consumerName("Consumer_4");
+        consumer = EmaFactory.createOmmConsumer(config);
+        log.info("Initialize the consumer and connect to market data system....end");
+    }
+    public static OmmConsumer getConsumer() {
+        if (consumer == null) {
+            synchronized (RefinitivConsumer.class) {
+                if (consumer == null) {
+                    initialize();
+                }
+            }
+        }
+        return consumer;
+    }
+
+
+    public InstrumentData[] getDataBySymbol(String symbol) throws Exception {
+        String[] items = symbol.split(",");
+        log.info("Quote request for: {}", java.util.Arrays.toString(items));
+        // create a batch request
+        Batch btc = new Batch(items, timeout);
+        // price it
+        this.synchronousRequest(btc);
+        // send json array response
+        return btc.getAllInstruments();
+    }
+
+    /**
+     * 获取股票详情
+     *
+     * @param symbol ric
+     * @return 结果
+     * @throws Exception e
+     */
+    public RetifiveStockInfo getDetail(String symbol) throws Exception {
+        InstrumentData[] result = getDataBySymbol(symbol);
+        InstrumentData instrumentData = result[0];
+        // 判断数据有效性
+        if (isInvalidResult(instrumentData)) {
+            return null;
+        }
+
+        return RefinitivUtil.decode(instrumentData);
+    }
+
+    /**
+     * 获取股票推荐TopActives
+     *
+     * @return 结果
+     * @throws Exception e
+     */
+    public List<RetifiveStockInfo> getTopActives() throws Exception {
+        return getTopStockList(TOP_ACTIVES_SYMBOL);
+    }
+
+    /**
+     * 获取股票推荐TopGainers
+     *
+     * @return 结果
+     * @throws Exception e
+     */
+    public List<RetifiveStockInfo> getTopGainers() throws Exception {
+        return getTopStockList(TOP_GAINERS_SYMBOL);
+    }
+
+    /**
+     * 获取股票推荐TopLosers
+     *
+     * @return 结果
+     * @throws Exception e
+     */
+    public List<RetifiveStockInfo> getTopLosers() throws Exception {
+        return getTopStockList(TOP_LOSERS_SYMBOL);
+    }
+
+    /**
+     * 获取多个股票详情
+     *
+     * @param symbol ric
+     * @return 结果
+     * @throws Exception e
+     */
+    public List<RetifiveStockInfo> getDetailList(String symbol) throws Exception {
+        return getStockList(symbol);
+    }
+
+    /**
+     * 获取多个股票详情
+     *
+     * @param symbol ric
+     * @return 结果
+     * @throws Exception e
+     */
+    public List<RetifiveStockInfo> getStockList(String symbol) throws Exception {
+        List<RetifiveStockInfo> list = new ArrayList<>();
+        InstrumentData[] result = getDataBySymbol(symbol);
+        for (InstrumentData instrumentData : result) {
+            if (!isInvalidResult(instrumentData)) {
+                RetifiveStockInfo retifiveStockInfo = RefinitivUtil.decode(instrumentData);
+                list.add(retifiveStockInfo);
+            }
+        }
+
+        return list;
+    }
+
+    /**
+     * 获取多个股票详情
+     *
+     * @param symbol ric
+     * @return 结果
+     * @throws Exception e
+     */
+    public List<RetifiveStock> getRefinitivStockList(String symbol) throws Exception {
+        List<RetifiveStock> list = new ArrayList<>();
+        InstrumentData[] result = getDataBySymbol(symbol);
+        for (InstrumentData instrumentData : result) {
+            if (!isInvalidResult(instrumentData)) {
+                RetifiveStock retifiveStock = RefinitivUtil.decodeRefinitivStock(instrumentData);
+                list.add(retifiveStock);
+            }
+        }
+
+        return list;
+    }
+
+    /**
+     * 获取所有股票的symbol
+     *
+     * @return 结果
+     */
+    public List<String> getSymbolList() {
+        List<String> symbols = new ArrayList<>();
+        int seq = 0;
+        String symbolLink = seq + SYMBOL_LINK_PREFIX;
+        String nextLink = null;
+        try {
+            InstrumentData[] dataBySymbol = this.getDataBySymbol(symbolLink);
+            nextLink = RefinitivUtil.decode(dataBySymbol[0].getDataMap(), symbols);
+            while (StringUtils.isNotBlank(nextLink) && !nextLink.contains("blank data")) {
+                dataBySymbol = this.getDataBySymbol(nextLink);
+                nextLink = RefinitivUtil.decode(dataBySymbol[0].getDataMap(), symbols);
+            }
+        } catch (Exception e) {
+            log.error("每天18点定时同步Refinitiv股票数据出错，数据未查出，nextLink = {}", nextLink, e);
+        }
+
+        return symbols;
+    }
+
+    /**
+     * 判断是否可以获取下一页数据
+     *
+     * 如果是要查今天的数据，需要先change2，
+     * 1 如果change2中包含今天的数据
+     * 	1）判断最后一条是否为今天的数据
+     * 		a）如果是今天的数据，需要再查change3，依次类推
+     * 		b) 如果不是则停止查询，直接取出所有的今天的数据
+     * 2 不包含今天的数据
+     * 	1) 判断最后一条是否为今天之后的数据
+     * 		a) 是，需要再查change3，依次类推
+     * 		b) 不是，则停止查询，今天没有需要的数据
+     *
+     * @param list InChange数据
+     * @return 结果
+     */
+    private boolean canGoNext(List<InChangeEntity> list) {
+        // 获取当天的数据
+        List<InChangeEntity> todayData = list.stream().filter(item -> item.getDate().equals(LocalDate.now().toString())).collect(Collectors.toList());
+        // 获取到最后一条数据
+        InChangeEntity lastEntity = list.get(list.size() - 1);
+        if (CollUtil.isNotEmpty(todayData)) {
+            // 如果list中包含今天的数据，则判断最后一条是否为今天的数据
+            return LocalDate.parse(lastEntity.getDate()).isEqual(LocalDate.now());
+        } else {
+            // 如果list中不包含今天的数据，则判断最后一条是否为今天之后的数据
+            return LocalDate.parse(lastEntity.getDate()).isAfter(LocalDate.now());
+        }
+    }
+
+    /**
+     * 获取要操作的股票
+     *
+     * @param inChangeType 类型
+     * @return 结果
+     */
+    public Map<InChangeDataTypeEnum, List<InChangeEntity>> getInChangeSymbolList(InChangeType inChangeType) {
+        List<InChangeEntity> allInChangeData = queryInChangeData(inChangeType);
+        return assembleDataMap(allInChangeData);
+    }
+
+    /**
+     * 获取IN/CHANGE数据
+     *
+     * @param inChangeType 类型
+     * @return 结果
+     */
+    private List<InChangeEntity> queryInChangeData(InChangeType inChangeType) {
+        List<InChangeEntity> allInChangeData = new ArrayList<>();
+        for (int i = 2; i <= SYMBOL_CHANGE_MAX_SIZE; i++) {
+            String symbol = SYMBOL_CHANGE_PREFIX + i;
+            try {
+                InstrumentData[] dataBySymbol = this.getDataBySymbol(symbol);
+                InstrumentData instrumentData = dataBySymbol[0];
+                if (isInvalidResult(instrumentData)) {
+                    continue;
+                }
+
+                List<InChangeEntity> list = RefinitivUtil.decodeInChangeData(instrumentData);
+                allInChangeData.addAll(list);
+
+                if (inChangeType == InChangeType.TODAY) {
+                    if (!canGoNext(list)) {
+                        break;
+                    }
+                }
+            } catch (Exception e) {
+                log.error("每天18点定时同步Refinitiv股票数据IN/CHANGE出错，symbol = {}", symbol, e);
+            }
+        }
+
+        if (inChangeType == InChangeType.TODAY) {
+            // 过滤出今天的数据
+            return allInChangeData.stream().filter(item -> LocalDate.parse(item.getDate()).isEqual(LocalDate.now())).collect(Collectors.toList());
+        } else {
+            // 过滤出不晚于今天的数据
+            return allInChangeData.stream().filter(item -> !LocalDate.parse(item.getDate()).isAfter(LocalDate.now())).collect(Collectors.toList());
+        }
+    }
+
+    /**
+     * 组装要操作的数据
+     *
+     * @param allInChangeData 要操作的数据
+     * @return 结果
+     */
+    private Map<InChangeDataTypeEnum, List<InChangeEntity>> assembleDataMap(List<InChangeEntity> allInChangeData) {
+        Map<InChangeDataTypeEnum, List<InChangeEntity>> map = new HashMap<>(100);
+        List<InChangeEntity> delList = new ArrayList<>();
+//        List<InChangeEntity> addList = new ArrayList<>();
+        List<InChangeEntity> updateList = new ArrayList<>();
+        for (int i = 0; i < allInChangeData.size(); i++) {
+            InChangeEntity inChange = allInChangeData.get(i);
+            if (InChangeDataTypeEnum.DEL.name().equals(inChange.getTyp())) {
+                delList.add(inChange);
+            }
+//            if (InChangeDataTypeEnum.ADD.name().equals(inChange.getTyp())) {
+//                addList.add(inChange);
+//            }
+            if (InChangeDataTypeEnum.WAS.name().equals(inChange.getTyp()) && i < allInChangeData.size() - 1) {
+                updateList.addAll(Lists.newArrayList(allInChangeData.get(i + 1), inChange));
+            }
+        }
+
+        Collections.reverse(updateList);
+        map.put(InChangeDataTypeEnum.DEL, delList);
+//        map.put(InChangeDataTypeEnum.ADD, addList);
+        map.put(InChangeDataTypeEnum.WAS, updateList);
+        return map;
+    }
+
+
+    /**
+     * 获取多个推荐股票详情
+     *
+     * @param symbol ric
+     * @return 结果
+     * @throws Exception e
+     */
+    public List<RetifiveStockInfo> getTopStockList(String symbol) throws Exception {
+        List<RetifiveStockInfo> list = new ArrayList<>();
+        InstrumentData[] result = getDataBySymbol(symbol);
+        if (result.length == 0 || isInvalidResult(result[0])) {
+            return list;
+        }
+
+        List<String> topSymbols = RefinitivUtil.decodeTopData(result[0]);
+        if (CollUtil.isEmpty(topSymbols)) {
+            return list;
+        }
+        return getStockList(String.join(",", topSymbols));
+    }
+
+    /**
+     * 校验数据有效性
+     *
+     * @param instrumentData 数据
+     * @return 结果
+     */
+    private boolean isInvalidResult(InstrumentData instrumentData) {
+        String dataState = instrumentData.getDataState();
+        return CollUtil.isEmpty(instrumentData.getDataMap()) ||
+                StrUtil.containsAny(dataState, "Suspect", "NotFound", "**The record could not be found", "CLOSED");
+    }
+
+    public void synchronousRequest(Batch bRequest) throws Exception {
+        ElementList eList = EmaFactory.createElementList();
+        OmmArray array = EmaFactory.createOmmArray();
+        for (String instr : bRequest.getAllRics()) {
+            array.add(EmaFactory.createOmmArrayEntry().ascii(instr));
+        }
+        eList.add(EmaFactory.createElementEntry().array(EmaRdm.ENAME_BATCH_ITEM_LIST, array));
+        try {
+            getConsumer().registerClient(EmaFactory.createReqMsg().serviceName(serviceName).payload(eList).interestAfterRefresh(false), new RefinitivAppClient(), bRequest);
+        } catch (NullPointerException e) {
+            initialize();
+            getConsumer().registerClient(EmaFactory.createReqMsg().serviceName(serviceName).payload(eList).interestAfterRefresh(false), new RefinitivAppClient(), bRequest);
+        }
+
+        // wait for batch to be fulfilled
+        bRequest.await();
+    }
+
+
+    public void disconnect() {
+        if (consumer != null) {
+            consumer.uninitialize();
+        }
+    }
+
+    @SneakyThrows
+    public RetifiveStockHistoryResponse getKLink(String symbol, String resolution,String starttime, String endtime){
+        RetifiveStockHistoryResponse result = new RetifiveStockHistoryResponse();
+        String token = getToken();
+        if(StringUtils.isBlank(token)){
+            throw new SysTipsException("token为空");
+        }
+        JSONObject data = JSONObject.parseObject(token);
+        token = data.getString("access_token");
+        String baseURLToday = "https://api.refinitiv.com/data/historical-pricing/v1/views/intraday-summaries/";
+        String baseURLHistory = "https://api.refinitiv.com/data/historical-pricing/v1/views/interday-summaries/";
+        int countback = 5;
+        String interval = null;
+        String resourceEndpoint = null;
+        Date start = new SimpleDateFormat("yyyy-MM-dd").parse(starttime);
+        Date end = new SimpleDateFormat("yyyy-MM-dd").parse(endtime);
+        long duration = end.getTime() - start.getTime();
+        long minutes = TimeUnit.MILLISECONDS.toMinutes(duration);
+        String fields = null;
+        Integer flag = 0;
+        if(StringUtils.equals("1m",resolution)){
+
+            countback = (int)minutes;
+            interval = "PT1M";
+            resourceEndpoint = baseURLToday + symbol;
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,TRDPRC_1,NUM_MOVES";
+        }else
+        if(StringUtils.equals("5m",resolution)){
+            countback = (int) (minutes/5);
+            interval = "PT5M";
+            resourceEndpoint = baseURLToday + symbol;
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,TRDPRC_1,NUM_MOVES";
+        }else
+        if(StringUtils.equals("10m",resolution)){
+            countback = (int) (minutes/10);
+            interval = "PT10M";
+            resourceEndpoint = baseURLToday + symbol;
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,TRDPRC_1,NUM_MOVES";
+        }else
+        if(StringUtils.equals("30m",resolution)){
+            countback = (int) (minutes/30);
+            interval = "PT30M";
+            resourceEndpoint = baseURLToday + symbol;
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,TRDPRC_1,NUM_MOVES";
+        }else
+        if(StringUtils.equals("H",resolution)){
+            countback = (int) (minutes/60);
+            interval = "PT1H";
+            resourceEndpoint = baseURLToday + symbol;
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,TRDPRC_1,NUM_MOVES";
+        }else if(StringUtils.equals("D",resolution)){
+
+            countback = (int)(minutes/24/60);
+            interval ="P1D";
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,OFF_CLOSE,NUM_MOVES";
+            flag = 1;
+            resourceEndpoint = baseURLHistory + symbol;
+        }else if(StringUtils.equals("W",resolution)){
+
+            countback = (int)(minutes/7/24/60);
+            interval ="P1W";
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,OFF_CLOSE,NUM_MOVES";
+            flag = 2;
+            resourceEndpoint = baseURLHistory + symbol;
+        }else if(StringUtils.equals("M",resolution)){
+
+            countback = (int)(minutes/30/24/60);
+            interval ="P1M";
+            fields = "DATE,HIGH_1,LOW_1,OPEN_PRC,OFF_CLOSE,NUM_MOVES";
+            flag = 2;
+            resourceEndpoint = baseURLHistory + symbol;
+        }
+
+        DateTimeFormatter formatterIso = DateTimeFormatter.ISO_INSTANT;
+        String startStr = start.toInstant().atZone(ZoneId.of("UTC")).format(formatterIso);
+        String endStr = end.toInstant().atZone(ZoneId.of("UTC")).format(formatterIso);
+        HttpResponse response = HttpUtil.createGet(resourceEndpoint)
+                .form("eventTypes","trade,quote")
+                .form("start",startStr)
+                .form("end",endStr)
+                .form("count",countback)
+                .form("interval",interval)
+                .form("fields",fields)
+                .header("Authorization","Bearer " + token)
+                .execute();
+        if(response.getStatus() != 200){
+            log.error("获取股票k线信息失败,code:"+response.getStatus());
+            return result;
+        }
+        JSONArray jsonArray = JSONArray.parseArray(response.body());
+        JSONArray dateArray = JSONObject.parseObject(jsonArray.get(0).toString()).getJSONArray("data");
+        List<Long> t = new ArrayList<>(); //时间
+        List<Double> o = new ArrayList<>(); //开盘价
+        List<Double> h = new ArrayList<>(); // 最高价
+        List<Double> l = new ArrayList<>();//最低价
+        List<Double> c = new ArrayList<>();//当前价
+        List<Double> v = new ArrayList<>();//交易量
+        for(int i = 0; i < dateArray.size(); i++){
+            JSONArray date = dateArray.getJSONArray(i);
+            if(date.get(1) == null){
+                continue;
+            }
+            if(StringUtils.equals("D",resolution) || StringUtils.equals("W",resolution) || StringUtils.equals("M",resolution)){
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+                Date d = formatter.parse(date.get(0).toString());
+                t.add(d.getTime() / 1000);
+            }else {
+                Instant instant = Instant.parse(date.get(0).toString());
+                long timestampMillis = instant.getEpochSecond();
+                t.add(timestampMillis);
+            }
+            if(flag == 0) {
+                o.add(Double.valueOf(date.get(3).toString()));
+                h.add(Double.valueOf(date.get(1).toString()));
+                l.add(Double.valueOf(date.get(2).toString()));
+                c.add(Double.valueOf(date.get(4).toString()));
+                v.add(date.get(5) == null?0:Double.valueOf(date.get(5).toString()));
+            }
+            if(flag == 1){
+                o.add(Double.valueOf(date.get(4).toString()));
+                h.add(Double.valueOf(date.get(2).toString()));
+                l.add(Double.valueOf(date.get(3).toString()));
+                c.add(Double.valueOf(date.get(1).toString()));
+                v.add(date.get(5) == null?0:Double.valueOf(date.get(5).toString()));
+            }
+            if(flag == 2){
+                o.add(Double.valueOf(date.get(1).toString()));
+                h.add(Double.valueOf(date.get(4).toString()));
+                l.add(Double.valueOf(date.get(2).toString()));
+                c.add(Double.valueOf(date.get(5).toString()));
+                v.add(date.get(3) == null?0:Double.valueOf(date.get(3).toString()));
+            }
+
+
+        }
+        result.setT(t);
+        result.setO(o);
+        result.setH(h);
+        result.setL(l);
+        result.setC(c);
+        result.setV(v);
+        result.setS("ok");
+        return result;
+    }
+
+    public String getToken(){
+        String toekn = null;
+        if(ObjectUtil.isNotNull(redisTemplate.opsForValue().get("token"))){
+             toekn = redisTemplate.opsForValue().get("token").toString();
+        }
+
+        if(StringUtils.isNotBlank(toekn)){
+            JSONObject data = JSONObject.parseObject(toekn);
+            if(Long.valueOf(data.get("expiry_tm").toString()) > System.currentTimeMillis()){
+                return toekn;
+            }
+            toekn = requestNewToken(data.get("refresh_token").toString());
+            return toekn;
+        }
+        toekn = requestNewToken("");
+        return toekn;
+    }
+
+    public String requestNewToken(String refreshToken){
+
+        if(StringUtils.isNotBlank(refreshToken)){
+            HttpResponse response = HttpUtil.createPost(tokenUrl)
+                    .form("refresh_token",refreshToken)
+                    .form("grant_type","refresh_token")
+                    .header("Content-Type", "application/x-www-form-urlencoded")
+                    .basicAuth(appKey,"")
+                    .execute();
+            if(response.getStatus() != 200){
+                return getNewToken();
+            }
+            JSONObject data = JSONObject.parseObject(response.body());
+            data.put("expiry_tm",System.currentTimeMillis() + (Long.valueOf(data.get("expires_in").toString())-10));
+            String toekn = data.toString();
+            redisTemplate.opsForValue().set("token",toekn);
+            redisTemplate.expire("token",1, TimeUnit.DAYS);
+            return toekn;
+        }
+//        HttpResponse response = HttpUtil.createPost(tokenUrl)
+//                .form("username",tokenUsername)
+//                .form("password",tokenPassword)
+//                .form("grant_type","password")
+//                .form("scope",SCOPE)
+//                .form("takeExclusiveSignOnControl","true")
+//                .header("Content-Type", "application/x-www-form-urlencoded")
+//                .basicAuth(appKey,"")
+//                .execute();
+//        if(response.getStatus() != 200){
+//            throw new SysTipsException("获取token失败");
+//        }
+//        JSONObject data = JSONObject.parseObject(response.body());
+//        data.put("expiry_tm",System.currentTimeMillis() + (Long.valueOf(data.get("expires_in").toString())-10));
+//        String toekn = data.toString();
+//        redisTemplate.opsForValue().set("token",toekn);
+//        redisTemplate.expire("token",1, TimeUnit.DAYS);
+        return getNewToken();
+    }
+
+    public String getNewToken(){
+        HttpResponse response = HttpUtil.createPost(tokenUrl)
+                .form("username",tokenUsername)
+                .form("password",tokenPassword)
+                .form("grant_type","password")
+                .form("scope",SCOPE)
+                .form("takeExclusiveSignOnControl","true")
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .basicAuth(appKey,"")
+                .execute();
+        if(response.getStatus() != 200){
+            log.error("获取toekn失败,code:"+response.getStatus());
+            return null;
+        }
+        JSONObject data = JSONObject.parseObject(response.body());
+        data.put("expiry_tm",System.currentTimeMillis() + (Long.valueOf(data.get("expires_in").toString())-10));
+        String toekn = data.toString();
+        redisTemplate.opsForValue().set("token",toekn);
+        redisTemplate.expire("token",1, TimeUnit.DAYS);
+        return toekn;
+    }
+}

src/main/java/cn/stock/market/listener/AppClient.java

@@ -0,0 +1,141 @@
+/*
+package cn.stock.market.listener;
+
+import com.thomsonreuters.ema.access.AckMsg;
+import com.thomsonreuters.ema.access.ElementList;
+import com.thomsonreuters.ema.access.EmaFactory;
+import com.thomsonreuters.ema.access.GenericMsg;
+import com.thomsonreuters.ema.access.Msg;
+import com.thomsonreuters.ema.access.OmmArray;
+import com.thomsonreuters.ema.access.OmmConsumer;
+import com.thomsonreuters.ema.access.OmmConsumerClient;
+import com.thomsonreuters.ema.access.OmmConsumerConfig;
+import com.thomsonreuters.ema.access.OmmConsumerEvent;
+import com.thomsonreuters.ema.access.Payload;
+import com.thomsonreuters.ema.access.RefreshMsg;
+import com.thomsonreuters.ema.access.ReqMsg;
+import com.thomsonreuters.ema.access.StatusMsg;
+import com.thomsonreuters.ema.access.UpdateMsg;
+import com.thomsonreuters.ema.rdm.EmaRdm;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Service
+@Slf4j
+public class AppClient implements OmmConsumerClient {
+
+    private CompletableFuture<RefreshMsg> messageFuture = new CompletableFuture<>();
+    private OmmConsumer consumer;
+
+    private CompletableFuture<List<RefreshMsg>> messagesFuture = new CompletableFuture<>();
+    private ConcurrentHashMap<String, RefreshMsg> messages = new ConcurrentHashMap<>();
+    private AtomicInteger expectedItemCount = new AtomicInteger(0); // 使用AtomicInteger确保线程安全
+
+
+    public CompletableFuture<List<RefreshMsg>> getMessagesFuture() {
+        return messagesFuture;
+    }
+
+    public void resetMessagesFuture() {
+        this.messagesFuture = new CompletableFuture<>(); // 重置CompletableFuture
+    }
+
+
+
+    @Autowired
+    public AppClient(OmmConsumer consumer) {
+        this.consumer = consumer;
+    }
+
+    // 根据itemName进行订阅的方法
+    public void subscribe(String itemName) {
+        resetMessageFuture(); // 重置Future以便新的请求
+        this.expectedItemCount =  new AtomicInteger(1); // 设置预期的消息数量
+        ReqMsg reqMsg = EmaFactory.createReqMsg().serviceName("ELEKTRON_DD").name(itemName);
+        consumer.registerClient(reqMsg, this);
+    }
+
+
+    public CompletableFuture<RefreshMsg> getMessageFuture() {
+        return messageFuture;
+    }
+
+    public void resetMessageFuture() {
+        this.messageFuture = new CompletableFuture<>();
+    }
+
+    @Override
+    public void onRefreshMsg(RefreshMsg refreshMsg, OmmConsumerEvent event) {
+       // log.error("监听的消息:"+refreshMsg.toString());
+        if(expectedItemCount.get()==1){
+            messageFuture.complete(refreshMsg);
+        }
+        if(expectedItemCount.get()>1){
+          */
+/*  System.out.println("监听的消息:"+refreshMsg.streamId()+","+refreshMsg.name()+
+                    ",是否完成:"+refreshMsg.complete());*//*
+
+            RefreshMsg msg = EmaFactory.createRefreshMsg(refreshMsg);
+            messages.put(refreshMsg.name()+"", msg);  // 假设每个refreshMsg都有一个uniqueIdentifier方法
+            if (messages.size() == expectedItemCount.get()) {  // 使用get()获取当前值
+                List<RefreshMsg> resultList = new ArrayList<>(messages.values());
+                messagesFuture.complete(resultList);
+            }
+        }
+
+    }
+
+    public void subscribeList(List<String> itemNames) {
+        resetMessagesFutures();  // 重置Future以便新的请求
+        this.expectedItemCount =  new AtomicInteger(itemNames.size()); // 设置预期的消息数量
+        ElementList batch = EmaFactory.createElementList();
+        OmmArray array = EmaFactory.createOmmArray();
+
+        if (!itemNames.isEmpty()) {
+            itemNames.forEach(itemName -> array.add(EmaFactory.createOmmArrayEntry().ascii(itemName)));
+            batch.add(EmaFactory.createElementEntry().array(EmaRdm.ENAME_BATCH_ITEM_LIST, array));
+            consumer.registerClient(EmaFactory.createReqMsg().serviceName("ELEKTRON_DD").payload(batch), this);
+        }
+    }
+
+    private void resetMessagesFutures() {
+        this.messages.clear(); // 清理之前的消息记录
+        this.messagesFuture = new CompletableFuture<>();
+        this.expectedItemCount = new AtomicInteger(0);
+    }
+
+    @Override
+    public void onUpdateMsg(UpdateMsg updateMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onStatusMsg(StatusMsg statusMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onGenericMsg(GenericMsg genericMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onAckMsg(AckMsg ackMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onAllMsg(Msg msg, OmmConsumerEvent consumerEvent) {
+    }
+    // 其他消息处理...
+}
+*/

src/main/java/cn/stock/market/listener/ConcurrentAppClient.java

@@ -0,0 +1,79 @@
+/*
+package cn.stock.market.listener;
+
+import com.thomsonreuters.ema.access.AckMsg;
+import com.thomsonreuters.ema.access.EmaFactory;
+import com.thomsonreuters.ema.access.GenericMsg;
+import com.thomsonreuters.ema.access.Msg;
+import com.thomsonreuters.ema.access.OmmConsumer;
+import com.thomsonreuters.ema.access.OmmConsumerClient;
+import com.thomsonreuters.ema.access.OmmConsumerEvent;
+import com.thomsonreuters.ema.access.RefreshMsg;
+import com.thomsonreuters.ema.access.ReqMsg;
+import com.thomsonreuters.ema.access.StatusMsg;
+import com.thomsonreuters.ema.access.UpdateMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+
+*/
+/**
+ * @author gs
+ * @date 2024/4/8 22:01
+ *//*
+
+@Service
+public class ConcurrentAppClient implements OmmConsumerClient {
+    private final ConcurrentHashMap<String, CompletableFuture<RefreshMsg>> futures = new ConcurrentHashMap<>();
+    private OmmConsumer consumer;
+
+    @Autowired
+    public ConcurrentAppClient(OmmConsumer consumer) {
+        this.consumer = consumer;
+    }
+
+    public CompletableFuture<RefreshMsg> subscribe(String itemName) {
+        CompletableFuture<RefreshMsg> future = new CompletableFuture<>();
+        futures.put(itemName, future);
+        ReqMsg reqMsg = EmaFactory.createReqMsg().serviceName("ELEKTRON_DD").name(itemName);
+        consumer.registerClient(reqMsg, this);
+        return future;
+    }
+
+    @Override
+    public void onRefreshMsg(RefreshMsg refreshMsg, OmmConsumerEvent event) {
+        String itemName = refreshMsg.name();
+        CompletableFuture<RefreshMsg> future = futures.remove(itemName);
+        if (future != null) {
+            future.complete(refreshMsg);
+        }
+    }
+
+    @Override
+    public void onUpdateMsg(UpdateMsg updateMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onStatusMsg(StatusMsg statusMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onGenericMsg(GenericMsg genericMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onAckMsg(AckMsg ackMsg, OmmConsumerEvent consumerEvent) {
+
+    }
+
+    @Override
+    public void onAllMsg(Msg msg, OmmConsumerEvent consumerEvent) {
+
+    }
+}
+*/

src/main/java/cn/stock/market/listener/EmaConfig.xml

@@ -0,0 +1,898 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmaConfig>
+
+<!-- ConsumerGroup provides set of detailed configurations to be used by named consumers -->
+<!-- Application specifies which configuration to use by setting OmmConsumerConfig::consumerName() -->
+<ConsumerGroup>
+	<!-- DefaultConsumer parameter defines which consumer configuration is used by OmmConsumer -->
+	<!-- if application does not specify it through OmmConsumerConfig::consumerName() -->
+	<!-- first consumer on the ConsumerList is a DefaultConsumer if this parameter is not specified	-->
+	<DefaultConsumer value="Consumer_1"/>
+	<ConsumerList>
+		<Consumer>
+			<!-- Name is mandatory	-->
+			<Name value="Consumer_1"/>
+			<!-- Channel is optional: defaulted to "RSSL_SOCKET + localhost + 14002" -->
+			<!-- Channel or ChannelSet may be specified -->
+			<Channel value="Channel_1"/>
+			<!-- Dictionary is optional: defaulted to "ChannelDictionary" -->
+			<Dictionary value="Dictionary_1"/>
+			<XmlTraceToStdout value="0"/>
+		</Consumer>
+		<Consumer>
+			<Name value="Consumer_2"/>
+			<!-- ChannelSet specifies an ordered list of Channels to which OmmConsumer will attempt to -->
+			<!-- connect, one at a time, if the previous one fails to connect -->
+			<ChannelSet value="Channel_1, Channel_2"/>
+			<Dictionary value="Dictionary_2"/>
+			<XmlTraceToStdout value="0"/>
+		</Consumer>
+		<Consumer>
+			<Name value="Consumer_3"/>
+			<!-- Channel set to "RSSL_ENCRYPTED" -->
+			<Channel value="Channel_3"/>
+			<!-- Dictionary is optional: defaulted to "ChannelDictionary" -->
+			<Dictionary value="Dictionary_1"/>
+			<XmlTraceToStdout value="0"/>
+		</Consumer>
+		<Consumer>
+			<Name value="Consumer_4"/>
+			<Channel value="Channel_4"/>
+			<Dictionary value="Dictionary_1"/>
+			<MaxDispatchCountApiThread value="6500"/>
+			<MaxDispatchCountUserThread value="6500"/>
+			<XmlTraceToStdout value="0"/>
+		</Consumer>
+		<Consumer>
+			<!-- Channel is specified to provide RSSL_WEBSOCKET connection options	-->
+			<Name value="Consumer_5"/>
+			<Channel value="Channel_5"/>
+			<Dictionary value="Dictionary_2"/>
+			<XmlTraceToStdout value="0"/>
+			<DefaultServiceID value="1"/>
+		</Consumer>
+		<Consumer>
+			<!-- Name is mandatory -->
+			<Name value="Consumer_6"/>
+			<Channel value="Channel_6"/>
+			<!-- Dictionary is optional: defaulted to "ChannelDictionary" -->
+			<Dictionary value="Dictionary_1"/>
+			<XmlTraceToStdout value="0"/>
+			<DefaultServiceID value="1"/>
+		</Consumer>
+		<!-- Consumer with enabled RTT feature -->
+		<Consumer>
+			<Name value="Consumer_7"/>
+			<Channel value="Channel_1"/>
+			<Dictionary value="Dictionary_2"/>
+			<XmlTraceToStdout value="0"/>
+			<DefaultServiceID value="1"/>
+			<EnableRtt value="1"/>
+		</Consumer>
+		<!-- Consumer for warm standby feature -->
+        <Consumer>
+            <Name value="Consumer_8"/>
+            <WarmStandbyChannelSet value="WarmStandbyChannel_1"/>
+            <Dictionary value="Dictionary_2"/>
+            <XmlTraceToStdout value="0"/>
+        </Consumer>    
+		<!-- Performance tools consumers -->
+		<Consumer>
+			<Name value="Perf_Consumer_1"/>
+			<Channel value="Perf_Channel_1"/>
+			<Dictionary value="Dictionary_1"/>
+			<MaxDispatchCountApiThread value="6500"/>
+			<MaxDispatchCountUserThread value="6500"/>
+		</Consumer>
+		<Consumer>
+			<Name value="Perf_Consumer_WSJSON_1"/>
+			<Channel value="Perf_Channel_WSJSON_1"/>
+			<Dictionary value="Dictionary_2"/>
+			<MaxDispatchCountApiThread value="6500"/>
+			<MaxDispatchCountUserThread value="6500"/>
+		</Consumer>
+		<Consumer>
+			<Name value="Perf_Consumer_WSRWF_1"/>
+			<Channel value="Perf_Channel_WSRWF_1"/>
+			<Dictionary value="Dictionary_1"/>
+			<MaxDispatchCountApiThread value="6500"/>
+			<MaxDispatchCountUserThread value="6500"/>
+		</Consumer>
+		<Consumer>
+			<Name value="Consumer_RRTViewer_SE"/>
+			<Channel value="Channel_RRTViewer_SE"/>
+			<Dictionary value="Dictionary_1"/>
+			<!-- 'XmlTraceToStdout == 1' is required for proper working of 'Debug' mode in RRTViewer -->
+			<!-- If XmlTraceToStdout set into '0', 'debug' mode will print only EMA logs. -->
+			<XmlTraceToStdout value="1"/>
+		</Consumer>
+		<Consumer>
+			<Name value="Consumer_RRTViewer_DE"/>
+			<Channel value="Channel_RRTViewer_DE"/>
+			<Dictionary value="Dictionary_1"/>
+			<!-- 'XmlTraceToStdout == 1' is required for proper working of 'Debug' mode in RRTViewer -->
+			<!-- If XmlTraceToStdout set into '0', 'debug' mode will print only EMA logs. -->
+			<XmlTraceToStdout value="1"/>
+		</Consumer>
+	</ConsumerList>
+</ConsumerGroup>
+
+<!-- NiProviderGroup provides set of detailed configurations to be used by named providers -->
+<!-- Application specifies which configuration to use by setting OmmNiProviderConfig::providerName() -->
+<NiProviderGroup>
+	<!-- DefaultNiProvider parameter defines which provider configuration is used by OmmProvider -->
+	<!-- if application does not specify it through OmmNiProviderConfig::providerName() -->
+	<!-- first provider on the NiProviderList is a DefaultNiProvider if this parameter is not specified -->
+	<DefaultNiProvider value="Provider_1"/>
+	<NiProviderList>
+		<!-- Regular providers -->
+		<NiProvider>
+			<!-- Name is mandatory	-->
+			<Name value="Provider_1"/>
+			<!-- Channel is optional: defaulted to "RSSL_SOCKET + localhost + 14003" -->
+			<Channel value="Channel_7"/>
+			<!-- Directory is optional. -->
+			<!-- the EMA provides hardcoded directory containing a single service named "NI_PUB".	-->
+			<!-- the EMA defaults the OmmNiProviderConfig::adminControlDirectory() to ApiControlEnum.-->
+			<!-- the applications may just use the hardcoded "NI_PUB" service to publish all the items.-->
+			<!-- if desired, a custom directory may be configured, named and used instead of the	-->
+			<!-- hardcoded one.	Please see examples in the DirectoryGroup.-->
+			<!-- the directory may also be specified using OmmNiProviderConfig::addAdminMsg(). -->
+			<!-- if desired the OmmNiProviderConfig::adminControlDirectory() to UserControlEnum -->
+			<!-- which allows applications to specify and control the directory. -->
+			<Directory value="Directory_1"/>
+			<XmlTraceToStdout value="0"/>
+		</NiProvider>
+		<NiProvider>
+			<Name value="Provider_2"/>
+			<Channel value="Channel_6"/>
+			<Directory value="Directory_2"/>
+			<XmlTraceToStdout value="0"/>
+		</NiProvider>
+		<NiProvider>
+			<Name value="Provider_3"/>
+			<Channel value="Channel_6"/>
+			<Directory value="Directory_3"/>
+		</NiProvider>
+		<NiProvider>
+			<Name value="Provider_4"/>
+			<Channel value="Channel_7"/>
+			<Directory value="Directory_1"/>
+			<XmlTraceToStdout value="0"/>
+		</NiProvider>
+		<!-- Performance tools niprovider -->
+		<NiProvider>
+			<Name value="Perf_NIProvider_1"/>
+			<Channel value="Perf_NIP_Channel_1"/>
+			<Directory value="Perf_Directory_1"/>
+			<XmlTraceToStdout value="0"/>
+			<ItemCountHint value="100000"/>
+			<MaxDispatchCountApiThread value="500"/>
+			<MaxDispatchCountUserThread value="500"/>
+		</NiProvider>
+	</NiProviderList>
+</NiProviderGroup>
+
+<!-- IProviderGroup provides set of detailed configurations to be used by named providers                -->
+<!-- Application specifies which configuration to use by setting OmmIProviderConfig::providerName()      -->
+<IProviderGroup>
+    <!-- DefaultIProvider parameter defines which provider configuration is used by OmmProvider          -->
+    <!-- if application does not specify it through OmmIProviderConfig::providerName()                   -->
+    <!-- first provider on the IProviderList is a default provider if this parameter is not specified    -->
+    <DefaultIProvider value="Provider_1"/>
+    <IProviderList>
+		<IProvider>
+			<!-- Name is mandatory                                                                       -->
+			<Name value="Provider_1"/>
+			<!-- Server is optional: defaulted to "RSSL_SOCKET + 14002"                                  -->
+			<Server value="Server_1"/>
+			<!-- Directory is optional: defaulted to AdminControl::UserControlEnum                       -->
+			<!-- source directory configuration to use if OmmIProviderConfig::adminModel()               -->
+			<!-- was set to ApiControlEnum                                                               -->
+			<!-- this configuration also decides which dictionaries will be loaded at startup            -->
+			<!-- this configuration may be overwritten by OmmIProviderConfig::addAdminMsg()              -->
+			<Directory value="Directory_2"/>
+			<ItemCountHint value="10000"/>
+			<ServiceCountHint value="10000" />
+			<DispatchTimeoutApiThread value="500" />
+			<MaxDispatchCountApiThread value="500" />
+			<MaxDispatchCountUserThread value="500" />
+			<PipePort value="9009" />
+			<RefreshFirstRequired value="1" />
+		</IProvider>
+		<IProvider>
+			<!-- Name is mandatory                                                           -->
+			<Name value="Provider_3"/>
+			<!-- Server is optional: now it specifies RSSL_WEBSOCKET connection options      -->
+			<Server value="Server_2"/>
+			<!-- Directory is optional: defaulted to AdminControl::UserControlEnum           -->
+			<!-- source directory configuration to use if OmmIProviderConfig::adminModel()   -->
+			<!-- was set to ApiControlEnum                                                   -->
+			<!-- this configuration also decides which dictionaries will be loaded at startup -->
+			<!-- this configuration may be overwritten by OmmIProviderConfig::addAdminMsg()  -->
+			<Directory value="Directory_2"/>
+			<ItemCountHint value="10000"/>
+			<ServiceCountHint value="10000" />
+			<DispatchTimeoutApiThread value="500" />
+			<MaxDispatchCountApiThread value="500" />
+			<MaxDispatchCountUserThread value="500" />
+			<PipePort value="9009" />
+			<RefreshFirstRequired value="1" />
+			<SendJsonConvError value="1" />
+		</IProvider>
+		<IProvider>
+			<!-- Name is mandatory   -->
+			<Name value="EncryptedProvider"/>
+			<!-- Server is optional: defaulted to "RSSL_SOCKET + 14002"  -->
+			<Server value="EncryptedServer"/>
+			<!-- Directory is optional: defaulted to AdminControl::UserControlEnum         -->
+			<!-- source directory configuration to use if OmmIProviderConfig::adminModel() -->
+			<!-- was set to ApiControlEnum                                                 -->
+			<!-- this configuration also decides which dictionaries will be loaded at startup  -->
+			<!-- this configuration may be overwritten by OmmIProviderConfig::addAdminMsg()    -->
+			<Directory value="Directory_2"/>
+			<ItemCountHint value="10000"/>
+			<ServiceCountHint value="10000" />
+			<DispatchTimeoutApiThread value="500" />
+			<MaxDispatchCountApiThread value="500" />
+			<MaxDispatchCountUserThread value="500" />
+			<PipePort value="9009" />
+			<RefreshFirstRequired value="1" />
+		</IProvider>
+		<!-- Performance tools provider -->
+		<IProvider>
+			<Name value="Perf_Provider_1"/>
+			<Server value="Perf_Server_1"/>
+			<Directory value="Directory_2"/>
+			<ItemCountHint value="100000"/>
+			<ServiceCountHint value="10000"/>
+			<DispatchTimeoutApiThread value="5000" />
+			<MaxDispatchCountApiThread value="10"/>
+			<MaxDispatchCountUserThread value="6500"/>
+			<RefreshFirstRequired value="1"/>
+			<XmlTraceToStdout value="0"/>
+		</IProvider>
+    </IProviderList>
+</IProviderGroup>
+
+<ChannelGroup>
+	<ChannelList>
+		<Channel>
+			<Name value="Channel_1"/>
+			<!-- ChannelType possible values are:	-->
+			<!-- ChannelType::RSSL_SOCKET    - TCP IP connection type		-->
+			<!-- ChannelType::RSSL_HTTP      - Http tunnel connection type	-->
+			<!-- ChannelType::RSSL_ENCRYPTED - Https tunnel connection type	-->
+			<ChannelType value="ChannelType::RSSL_SOCKET"/>
+			<!-- CompressionType is optional: defaulted to None	-->
+			<!-- possible values: None, ZLib, LZ4		        -->
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<!-- ConnectionPingTimeout is optional: defaulted to 30000	-->
+			<ConnectionPingTimeout value="30000"/>
+			<!-- TcpNodelay is optional: defaulted to 1 -->
+			<!-- possible values: 1 (tcp_nodelay option set), 0 (tcp_nodelay not set) -->
+			<TcpNodelay value="1"/>
+			<Host value="localhost"/>
+			<Port value="14002"/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_2"/>
+			<ChannelType value="ChannelType::RSSL_SOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<Host value="localhost"/>
+			<Port value="14002"/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_3"/>
+			<ChannelType value="ChannelType::RSSL_ENCRYPTED"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="1"/>
+			<Host value="localhost"/>
+			<Port value="14002"/>
+			<!-- ObjectName is optional: defaulted to "" -->
+			<ObjectName value=""/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_4"/>
+			<ChannelType value="ChannelType::RSSL_ENCRYPTED"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<!-- EMA discovers a host and a port from RDP service discovery for the specified location
+				 when both of them are not set and the session management is enable. -->
+			<Location value="us-east-1"/>
+			<EnableSessionManagement value="1"/>
+			<ObjectName value=""/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_5"/>
+			<ChannelType value="ChannelType::RSSL_ENCRYPTED"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<!-- EMA discovers a host and a port from RDP service discovery for the specified location
+			    when both of them are not set and the session management is enable. -->
+			<Location value="us-east-1"/>
+			<EnableSessionManagement value="1"/>
+			<EncryptedProtocolType value="EncryptedProtocolType::RSSL_WEBSOCKET"/>
+			<WsMaxMsgSize value="61440"/>
+			<WsProtocols value="tr_json2"/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_6"/>
+			<ChannelType value="ChannelType::RSSL_WEBSOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<Host value="localhost"/>
+			<Port value="15000"/>
+			<WsMaxMsgSize value="61440"/>
+			<WsProtocols value="rssl.json.v2, rssl.rwf, tr_json2"/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_7"/>
+			<ChannelType value="ChannelType::RSSL_SOCKET"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="1"/>
+			<Host value="localhost"/>
+			<Port value="14003"/>
+			<!-- ObjectName is optional: defaulted to "" -->
+			<ObjectName value=""/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_8"/>
+			<ChannelType value="ChannelType::RSSL_HTTP"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<Host value="localhost"/>
+			<Port value="14003"/>
+			<!-- ObjectName is optional: defaulted to ""												-->
+			<ObjectName value=""/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_9"/>
+			<ChannelType value="ChannelType::RSSL_ENCRYPTED"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<Host value="localhost"/>
+			<Port value="14003"/>
+			<!-- ObjectName is optional: defaulted to ""	-->
+			<ObjectName value=""/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_RRTViewer_SE"/>
+			<ChannelType value="ChannelType::RSSL_SOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="1"/>
+			<Host value="localhost"/>
+			<Port value="14002"/>
+		</Channel>
+		<Channel>
+			<Name value="Channel_RRTViewer_DE"/>
+			<ChannelType value="ChannelType::RSSL_ENCRYPTED"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<!-- EMA discovers a host and a port from RDP service discovery for the specified location
+				 when both of them are not set and the session management is enable. -->
+			<Location value="us-east-1"/>
+			<EnableSessionManagement value="1"/>
+			<ObjectName value=""/>
+		</Channel>
+
+		<!--Performance tools channels -->
+		<Channel>
+			<Name value="Perf_Channel_1"/>
+			<ChannelType value="ChannelType::RSSL_SOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<NumInputBuffers value="2048"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="1"/>
+			<Host value="localhost"/>
+			<Port value="14002"/>
+		</Channel>
+		<Channel>
+			<Name value="Perf_Channel_WSJSON_1"/>
+			<ChannelType value="ChannelType::RSSL_WEBSOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="50000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="0"/>
+			<DirectWrite value="1"/>
+			<Host value="localhost"/>
+			<Port value="14002"/>
+			<WsMaxMsgSize value="18432"/>
+			<WsProtocols value="rssl.json.v2"/>
+		</Channel>
+		<Channel>
+			<Name value="Perf_Channel_WSRWF_1"/>
+			<ChannelType value="ChannelType::RSSL_WEBSOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="0"/>
+			<DirectWrite value="1"/>
+			<Host value="localhost"/>
+			<Port value="14002"/>
+			<WsProtocols value="rssl.rwf"/>
+		</Channel>
+		<Channel>
+			<Name value="Perf_NIP_Channel_1"/>
+			<ChannelType value="ChannelType::RSSL_SOCKET"/>
+			<GuaranteedOutputBuffers value="100000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="0"/>
+			<DirectWrite value="1"/>
+			<Host value="localhost"/>
+			<Port value="14003"/>
+			<InterfaceName value=""/>
+			<HighWaterMark value="6144"/>
+			<NumInputBuffers value="10000"/>
+			<SysRecvBufSize value="65535"/>
+			<SysSendBufSize value="65535"/>
+		</Channel>
+	</ChannelList>
+</ChannelGroup>
+
+<ServerGroup>
+    <ServerList>
+		<Server>
+			<Name value="Server_1"/>
+			<ServerType value="ServerType::RSSL_SOCKET"/>
+			<!-- CompressionType is optional: defaulted to None -->
+			<!-- possible values: None, ZLib, LZ4 -->
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<!-- ConnectionPingTimeout is optional: defaulted to 30000 -->
+			<ConnectionPingTimeout value="30000"/>
+			<!-- TcpNodelay is optional: defaulted to 1 -->
+			<!-- possible values: 1 (tcp_nodelay option set), 0 (tcp_nodelay not set) -->
+			<TcpNodelay value="1"/>
+			<Port value="14002"/>
+		</Server>
+		<Server>
+			<Name value="Server_2"/>
+			<!-- For WS connection server could use also RSSL_SOCKET type -->
+			<ServerType value="ServerType::RSSL_WEBSOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="1"/>
+			<Port value="15000"/>
+			<!-- There are optional and used for applying WS connection -->
+			<MaxFragmentSize value="6144"/>
+			<WsProtocols value="rssl.json.v2, rssl.rwf, tr_json2"/>
+		</Server>
+		<Server>
+			<Name value="EncryptedServer"/>
+			<ServerType value="ServerType::RSSL_ENCRYPTED"/>
+			<!-- CompressionType is optional: defaulted to None -->
+			<!-- possible values: None, ZLib, LZ4 -->
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<!-- ConnectionPingTimeout is optional: defaulted to 30000 -->
+			<ConnectionPingTimeout value="30000"/>
+			<!-- TcpNodelay is optional: defaulted to 1 -->
+			<!-- possible values: 1 (tcp_nodelay option set), 0 (tcp_nodelay not set) -->
+			<TcpNodelay value="1"/>
+			<Port value="14002"/>
+		</Server>
+		<!--Performance tools server -->
+		<Server>
+			<Name value="Perf_Server_1"/>
+			<ServerType value="ServerType::RSSL_SOCKET"/>
+			<CompressionType value="CompressionType::None"/>
+			<GuaranteedOutputBuffers value="5000"/>
+			<ConnectionPingTimeout value="30000"/>
+			<TcpNodelay value="0"/>
+			<Port value="14002"/>
+			<HighWaterMark value="0"/>
+			<InterfaceName value=""/>
+			<DirectWrite value="1" />
+			<MaxFragmentSize value="6144"/>
+			<NumInputBuffers value="10000"/>
+			<SysRecvBufSize value="65535"/>
+			<SysSendBufSize value="65535"/>
+		</Server>
+    </ServerList>
+</ServerGroup>
+
+<WarmStandbyServerInfoGroup>
+    <WarmStandbyServerInfoList>
+        <WarmStandbyServerInfo>
+            <Name value="Server_Info_1"/>
+            <Channel value="Channel_1"/>
+            <PerServiceNameSet value=""/>
+        </WarmStandbyServerInfo>
+        <WarmStandbyServerInfo>
+            <Name value="Server_Info_2"/>
+            <Channel value="Channel_7"/>
+            <PerServiceNameSet value=""/>
+        </WarmStandbyServerInfo>
+    </WarmStandbyServerInfoList>
+</WarmStandbyServerInfoGroup>
+
+<WarmStandbyGroup>
+    <WarmStandbyList>
+        <WarmStandbyChannel>
+            <Name value="WarmStandbyChannel_1"/>
+            <StartingActiveServer value="Server_Info_1"/>
+            <StandbyServerSet value="Server_Info_2"/>
+            <WarmStandbyMode value="WarmStandbyMode::LOGIN_BASED"/>
+        </WarmStandbyChannel>
+    </WarmStandbyList>
+</WarmStandbyGroup>
+
+<!-- source directory refresh configuration used by provider -->
+<DirectoryGroup>
+	<!-- DefaultDirectory specifies Directory used as default if providers do not specify Directory name -->
+	<DefaultDirectory value="Directory_1"/>
+	<DirectoryList>
+		<!-- providers refer to the Directory by name	-->
+		<!-- Directory is a set of Services (one or more) on which a provider will provide item data	-->
+		<Directory>
+			<Name value="Directory_1"/>
+			<Service>
+				<Name value="TEST_NI_PUB"/>
+				<InfoFilter>
+					<!-- optional value; if not specified EMA will assign it -->
+					<ServiceId value="11"/>
+					<!-- optional value	-->
+					<Vendor value="company name"/>
+					<!-- possible values: 0 - means consolidation service, 1 - means original provider	-->
+					<IsSource value="0"/>
+					<!-- an array of market domains supported by this service	-->
+					<!-- domains defined in the RDM Usage Guide may be refered by name -->
+					<!-- names of the RDM defined domains are listed in the EmaRdm.h file -->
+					<!-- e.g. MMT_MARKET_PRICE, MMT_MARKET_BY_ORDER 	-->
+					<!-- note that the capabilities may be specified with names and or numbers -->
+					<Capabilities>
+						<CapabilitiesEntry value="MMT_MARKET_PRICE"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_ORDER"/>
+					</Capabilities>
+					<!-- list of dictionary names specified in the DictionaryGroup	-->
+					<!-- EMA will populate the Service::InfoFilter::DictionariesProvided element -->
+					<!-- with the respective <>ItemName values -->
+					<DictionariesProvided>
+						<DictionariesProvidedEntry value="Dictionary_3"/>
+					</DictionariesProvided>
+
+					<!-- list of dictionary names specified in the DictionaryGroup	-->
+					<!-- EMA will populate the Service::InfoFilter::DictionariesUsed element -->
+					<!-- with the respective <>ItemName values	-->
+					<DictionariesUsed>
+						<DictionariesUsedEntry value="Dictionary_3"/>
+					</DictionariesUsed>
+					<!-- list of QoS values supported by this service	-->
+					<!-- possible values are listed in the OmmQos.h file of the EMA	-->
+					<QoS>
+						<QoSEntry>
+							<Timeliness value="Timeliness::RealTime"/>
+							<Rate value="Rate::TickByTick"/>
+						</QoSEntry>
+						<QoSEntry>
+							<Timeliness value="Timeliness::InexactDelayed"/>
+							<Rate value="Rate::JustInTimeConflated"/>
+						</QoSEntry>
+					</QoS>
+					<!-- 0 means does not support, 1 - means supports QoS range -->
+					<SupportsQoSRange value="0"/>
+					<!-- name of item list	-->
+					<ItemList value="#.itemlist"/>
+					<!-- 0 means does not accept, 1 - means accepts consumer status	-->
+					<AcceptingConsumerStatus value="0"/>
+					<!-- 0 means does not support, 1 - means supports out of band snapshots -->
+					<SupportsOutOfBandSnapshots value="0"/>
+				</InfoFilter>
+				<!-- StateFilter is optional	-->
+				<!-- EMA will default the values as follows: -->
+				<!-- for interactive provider		-->
+				<!--	- ServiceState is "up" and AcceptingRequests is "Yes"	-->
+				<!-- for non interactive provider	-->
+				<!--	- ServiceState is "up" and AcceptingRequests is "No"	-->
+				<StateFilter>
+					<!-- 0 means service is down, 1 - means service is up (default; 1) -->
+					<ServiceState value="1"/>
+					<!-- 0 means service does not accept, 1 - means service accepts (default; 1) -->
+					<AcceptingRequests value="1"/>
+					<!-- optional; specifies status change to apply to all items provided by this service -->
+					<!-- possible values are listed in the OmmState.h file of the EMA -->
+					<Status>
+						<!-- possible values are: Open, Close, CloseRecover -->
+						<StreamState value="StreamState::Open"/>
+						<!-- possibe values are: NoChange, Ok, Suspect	-->
+						<DataState value="DataState::Ok"/>
+						<!-- possible values are: None, DacsDown, etc	-->
+						<StatusCode value="StatusCode::None"/>
+						<!-- a text field	-->
+						<StatusText value=""/>
+					</Status>
+				</StateFilter>
+			</Service>
+			<Service>
+				<Name value="NI_PUB"/>
+				<InfoFilter>
+					<DictionariesProvided>
+						<DictionariesProvidedEntry value="Dictionary_3"/>
+					</DictionariesProvided>
+					<DictionariesUsed>
+						<DictionariesUsedEntry value="Dictionary_3"/>
+					</DictionariesUsed>
+					<Vendor value="company name"/>
+					<IsSource value="0"/>
+					<Capabilities>
+						<CapabilitiesEntry value="6"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_ORDER"/>
+					</Capabilities>
+					<QoS>
+						<QoSEntry>
+							<Timeliness value="Timeliness::RealTime"/>
+							<Rate value="Rate::TickByTick"/>
+						</QoSEntry>
+					</QoS>
+					<SupportsQoSRange value="0"/>
+					<ItemList value="#.itemlist"/>
+					<AcceptingConsumerStatus value="0"/>
+					<SupportsOutOfBandSnapshots value="0"/>
+				</InfoFilter>
+				<StateFilter>
+					<ServiceState value="1"/>
+					<AcceptingRequests value="1"/>
+					<Status>
+						<StreamState value="StreamState::Open"/>
+						<DataState value="DataState::Ok"/>
+						<StatusCode value="StatusCode::None"/>
+						<StatusText value=""/>
+					</Status>
+				</StateFilter>
+			</Service>
+		</Directory>
+		<Directory>
+			<Name value="Directory_2"/>
+			<Service>
+				<Name value="DIRECT_FEED"/>
+				<InfoFilter>
+					<ServiceId value="1"/>
+					<DictionariesProvided>
+						<DictionariesProvidedEntry value="Dictionary_3"/>
+					</DictionariesProvided>
+
+					<DictionariesUsed>
+						<DictionariesUsedEntry value="Dictionary_3"/>
+					</DictionariesUsed>
+					<Vendor value="company name"/>
+					<IsSource value="0"/>
+					<Capabilities>
+						<CapabilitiesEntry value="6"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_ORDER"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_PRICE"/>
+						<CapabilitiesEntry value="MMT_DICTIONARY"/>
+						<CapabilitiesEntry value="200"/>
+					</Capabilities>
+					<QoS>
+						<QoSEntry>
+							<Timeliness value="Timeliness::RealTime"/>
+							<Rate value="Rate::TickByTick"/>
+						</QoSEntry>
+						<QoSEntry>
+							<Timeliness value="100"/>
+							<Rate value="100"/>
+						</QoSEntry>
+					</QoS>
+					<SupportsQoSRange value="0"/>
+					<ItemList value="#.itemlist"/>
+					<AcceptingConsumerStatus value="0"/>
+					<SupportsOutOfBandSnapshots value="0"/>
+				</InfoFilter>
+				<StateFilter>
+					<ServiceState value="1"/>
+					<AcceptingRequests value="1"/>
+				</StateFilter>
+			</Service>
+		</Directory>
+		<Directory>
+			<Name value="Directory_3"/>
+			<Service>
+				<Name value="TEST_NI_PUB"/>
+				<InfoFilter>
+					<ServiceId value="11"/>
+					<Vendor value="company name"/>
+					<IsSource value="0"/>
+					<Capabilities>
+						<CapabilitiesEntry value="MMT_MARKET_PRICE"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_ORDER"/>
+					</Capabilities>
+					<DictionariesProvided>
+						<DictionariesProvidedEntry value="Dictionary_3"/>
+					</DictionariesProvided>
+					<DictionariesUsed>
+						<DictionariesUsedEntry value="Dictionary_3"/>
+					</DictionariesUsed>
+					<QoS>
+						<QoSEntry>
+							<Timeliness value="Timeliness::RealTime"/>
+							<Rate value="Rate::TickByTick"/>
+						</QoSEntry>
+						<QoSEntry>
+							<Timeliness value="Timeliness::InexactDelayed"/>
+							<Rate value="Rate::JustInTimeConflated"/>
+						</QoSEntry>
+					</QoS>
+					<SupportsQoSRange value="0"/>
+					<ItemList value="#.itemlist"/>
+					<AcceptingConsumerStatus value="0"/>
+					<SupportsOutOfBandSnapshots value="0"/>
+				</InfoFilter>
+				<StateFilter>
+					<ServiceState value="1"/>
+					<AcceptingRequests value="1"/>
+					<Status>
+						<StreamState value="StreamState::Open"/>
+						<DataState value="DataState::Ok"/>
+						<StatusCode value="StatusCode::None"/>
+						<StatusText value=""/>
+					</Status>
+				</StateFilter>
+			</Service>
+			<Service>
+				<Name value="NI_PUB"/>
+				<InfoFilter>
+					<DictionariesProvided>
+						<DictionariesProvidedEntry value="Dictionary_3"/>
+					</DictionariesProvided>
+					<DictionariesUsed>
+						<DictionariesUsedEntry value="Dictionary_3"/>
+					</DictionariesUsed>
+
+					<Vendor value="company name"/>
+					<IsSource value="0"/>
+					<Capabilities>
+						<CapabilitiesEntry value="6"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_ORDER"/>
+					</Capabilities>
+					<QoS>
+						<QoSEntry>
+							<Timeliness value="Timeliness::RealTime"/>
+							<Rate value="Rate::TickByTick"/>
+						</QoSEntry>
+					</QoS>
+					<SupportsQoSRange value="0"/>
+					<ItemList value="#.itemlist"/>
+					<AcceptingConsumerStatus value="0"/>
+					<SupportsOutOfBandSnapshots value="0"/>
+				</InfoFilter>
+				<StateFilter>
+					<ServiceState value="1"/>
+					<AcceptingRequests value="1"/>
+					<Status>
+						<StreamState value="StreamState::Open"/>
+						<DataState value="DataState::Ok"/>
+						<StatusCode value="StatusCode::None"/>
+						<StatusText value=""/>
+					</Status>
+				</StateFilter>
+			</Service>
+		</Directory>
+
+		<Directory>
+			<Name value="Directory_4"/>
+			<Service>
+				<Name value="DIRECT_FEED"/>
+				<InfoFilter>
+					<ServiceId value="1"/>
+					<DictionariesProvided>
+						<DictionariesProvidedEntry value="Dictionary_3"/>
+					</DictionariesProvided>
+					<DictionariesUsed>
+						<DictionariesUsedEntry value="Dictionary_3"/>
+					</DictionariesUsed>
+					<Vendor value="company name"/>
+					<IsSource value="0"/>
+					<Capabilities>
+						<CapabilitiesEntry value="6"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_ORDER"/>
+						<CapabilitiesEntry value="MMT_MARKET_BY_PRICE"/>
+						<CapabilitiesEntry value="MMT_DICTIONARY"/>
+						<CapabilitiesEntry value="200"/>
+					</Capabilities>
+					<QoS>
+						<QoSEntry>
+							<Timeliness value="Timeliness::RealTime"/>
+							<Rate value="Rate::TickByTick"/>
+						</QoSEntry>
+						<QoSEntry>
+							<Timeliness value="100"/>
+							<Rate value="100"/>
+						</QoSEntry>
+					</QoS>
+					<SupportsQoSRange value="0"/>
+					<ItemList value="#.itemlist"/>
+					<AcceptingConsumerStatus value="0"/>
+					<SupportsOutOfBandSnapshots value="0"/>
+				</InfoFilter>
+				<StateFilter>
+					<ServiceState value="1"/>
+					<AcceptingRequests value="1"/>
+				</StateFilter>
+			</Service>
+		</Directory>
+        <Directory>
+            <Name value="Perf_Directory_1"/>
+            <Service>
+                <Name value="NI_PUB"/>
+                <InfoFilter>
+                    <ServiceId value="1"/>
+                    <DictionariesProvided>
+                        <DictionariesProvidedEntry value="Dictionary_3"/>
+                    </DictionariesProvided>
+                    <DictionariesUsed>
+                        <DictionariesUsedEntry value="Dictionary_3"/>
+                    </DictionariesUsed>
+                    <Vendor value="RefinitivDevTestLab"/>
+                    <IsSource value="0"/>
+                    <Capabilities>
+                        <CapabilitiesEntry value="MMT_DICTIONARY"/>
+                        <CapabilitiesEntry value="MMT_MARKET_PRICE"/>
+                        <CapabilitiesEntry value="MMT_MARKET_BY_ORDER"/>
+                        <CapabilitiesEntry value="MMT_MARKET_BY_PRICE"/>
+                        <CapabilitiesEntry value="200"/>
+                    </Capabilities>
+                    <QoS>
+                        <QoSEntry>
+                            <Timeliness value="Timeliness::RealTime"/>
+                            <Rate value="Rate::TickByTick"/>
+                        </QoSEntry>
+                        <QoSEntry>
+                            <Timeliness value="100"/>
+                            <Rate value="100"/>
+                        </QoSEntry>
+                    </QoS>
+                    <SupportsQoSRange value="0"/>
+                    <ItemList value="#.itemlist"/>
+                    <AcceptingConsumerStatus value="0"/>
+                    <SupportsOutOfBandSnapshots value="0"/>
+                </InfoFilter>
+                <StateFilter>
+                    <ServiceState value="1"/>
+                    <AcceptingRequests value="1"/>
+                </StateFilter>
+            </Service>
+        </Directory>
+	</DirectoryList>
+</DirectoryGroup>
+<DictionaryGroup>
+	<DictionaryList>
+		<Dictionary>
+			<Name value="Dictionary_1"/>
+			<!-- dictionaryType is optional: defaulted to ChannelDictionary" -->
+			<!-- possible values: ChannelDictionary, FileDictionary -->
+			<!-- if dictionaryType is set to ChannelDictionary, file names are ignored -->
+			<DictionaryType value="DictionaryType::ChannelDictionary"/>
+		</Dictionary>
+		<Dictionary>
+			<Name value="Dictionary_2"/>
+			<DictionaryType value="DictionaryType::FileDictionary"/>
+			<!-- dictionary names are optional: defaulted to RDMFieldDictionary and enumtype.def -->
+			<RdmFieldDictionaryFileName value="./RDMFieldDictionary"/>
+			<EnumTypeDefFileName value="./enumtype.def"/>
+		</Dictionary>
+		<Dictionary>
+			<Name value="Dictionary_3"/>
+			<!-- providers always assume DictionaryType = DictionaryType::FileDictionary -->
+			<DictionaryType value="DictionaryType::FileDictionary"/>
+			<!-- dictionary file names are optional: defaulted to ./RDMFieldDictionary and ./enumtype.def -->
+			<RdmFieldDictionaryFileName value="./RDMFieldDictionary"/>
+			<EnumTypeDefFileName value="./enumtype.def"/>
+			<!-- <dictionary>ItemName represents the names shown in DictionariesProvided and DictionariesUsed
+				elements of the Directory InfoFilter -->
+			<!-- <dictionary>ItemName is optional; default values are "RWFFld" for the RdmFieldDictionary
+				and "RWFEnum" for the enumtype.def -->
+			<RdmFieldDictionaryItemName value="RWFFld"/>
+			<EnumTypeDefItemName value="RWFEnum"/>
+		</Dictionary>
+	</DictionaryList>
+</DictionaryGroup>
+</EmaConfig>

src/main/java/cn/stock/market/listener/MongoConfig.java

@@ -0,0 +1,25 @@
+package cn.stock.market.listener;
+
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.core.MongoTemplate;
+
+@Configuration
+public class MongoConfig {
+
+    @Bean
+    public MongoClient mongoClient() {
+        // 连接到MongoDB服务器（示例中使用默认的MongoDB端口）
+        // 请根据你的实际情况修改这里的连接字符串
+        return MongoClients.create("mongodb://root:123456@localhost:27017");
+    }
+
+    @Bean
+    public MongoTemplate mongoTemplate() {
+        // 创建并返回MongoTemplate的实例，需要提供MongoClient实例和数据库名
+        // 替换"yourDatabase"为你的数据库名
+        return new MongoTemplate(mongoClient(), "company");
+    }
+}

src/main/java/cn/stock/market/listener/MyAppRunner.java

@@ -0,0 +1,38 @@
+/*
+package cn.stock.market.listener;
+
+import com.thomsonreuters.ema.access.EmaFactory;
+import com.thomsonreuters.ema.access.OmmConsumer;
+import com.thomsonreuters.ema.access.OmmConsumerConfig;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MyAppRunner implements ApplicationRunner {
+    static String userName = "GE-A-10288435-3-15856";
+    static String password = "8EyCWDQ%XITcGRM@RhKokxX05FZJe1";
+    static String clientId = "662b37b071144c9f8f2507d93037a019a010ae0e";
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        // 在这里写入您的初始化代码
+        System.out.println("应用已启动，执行初始化代码...");
+
+        // The "Consumer_4" uses EncryptedProtocolType::RSSL_SOCKET while the "Consumer_5" uses EncryptedProtocolType::RSSL_WEBSOCKET predefined in EmaConfig.xml
+    }
+
+    @Bean
+    public OmmConsumer getOmmConsumer() {
+        OmmConsumer consumer = null;
+        OmmConsumerConfig config = EmaFactory.createOmmConsumerConfig();
+        config.username(userName);
+        config.password(password);
+        config.clientId(clientId);
+        consumer  = EmaFactory.createOmmConsumer(config.consumerName( "Consumer_4"));
+        return consumer;
+    }
+
+
+}
+*/

src/main/java/cn/stock/market/listener/StockInfoRefinitiv.java

@@ -0,0 +1,22 @@
+package cn.stock.market.listener;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+/**
+ * @author gs
+ * @date 2024/4/8 21:00
+ */
+@Document("stock_info")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StockInfoRefinitiv {
+    private String stockName;
+    private String stockCode;
+    private String stockType;
+    private String status;
+    private String commandStr;
+}

src/main/java/cn/stock/market/listener/SymbolRefinitiv.java

@@ -0,0 +1,19 @@
+package cn.stock.market.listener;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+/**
+ * @author gs
+ * @date 2024/4/8 17:20
+ */
+@Data
+@AllArgsConstructor
+@Document("symbol")
+public class SymbolRefinitiv {
+    private String symbol;
+    private String stockType;
+    private String commandStr;
+}

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;
@@ -187,26 +185,32 @@ public class DateTimeUtil {
         return cal.getTime();
     }
 
-
-    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;
+    /**
+     * 获取某个时间的凌晨时间
+     * @param time
+     * @param date
+     * @return
+     */
+    public static Date getDayOfMorning(Date time,Integer date){
+        Calendar lastDate = Calendar.getInstance();
+        lastDate.setTime(time);
+        lastDate.add(Calendar.DATE,date);
+        lastDate.set(Calendar.HOUR_OF_DAY,0);
+        lastDate.set(Calendar.MINUTE,0);
+        lastDate.set(Calendar.SECOND,0);
+        lastDate.set(Calendar.MILLISECOND,0);
+        return lastDate.getTime();
     }
 
+    //获取某个时间的前/后时间，以年为单位
+    public  static Date getDayOfYear(Date time,Integer date){
+        Calendar lastDate = Calendar.getInstance();
+        lastDate.setTime(time);
+        lastDate.add(Calendar.YEAR,date);
+        return lastDate.getTime();
+    }
+
+
     public static void main(String[] args) {
         parseToDateByMinute(10);
     }

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

@@ -212,109 +212,6 @@ public class HttpClientRequest {
         return result;
     }
 
-    public static String doEttechchartsGet(String url) {
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
-        String result = "";
-
-        try {
-            httpClient = HttpClients.createDefault();
-
-            HttpGet httpGet = new HttpGet(url);
-
-//            httpGet.setHeader(":authority","ettechcharts.indiatimes.com");
-//            httpGet.setHeader(":method","GET");
-//            httpGet.setHeader(":scheme","https");
-            httpGet.setHeader("accept","*/*");
-            httpGet.setHeader("accept-encoding","gzip, deflate, br");
-            httpGet.setHeader("accept-language","zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6");
-            httpGet.setHeader("user-agent","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36");
-            httpGet.setHeader("Referer", "https://economictimes.indiatimes.com/");
-
-
-            RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
-
-            httpGet.setConfig(requestConfig);
-
-            response = httpClient.execute(httpGet);
-
-            HttpEntity entity = response.getEntity();
-
-            result = EntityUtils.toString(entity);
-        } catch (ClientProtocolException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-
-            if (null != response) {
-                try {
-                    response.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (null != httpClient) {
-                try {
-                    httpClient.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return result;
-    }
-
-    public static String doGetNews(String url) {
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
-        String result = "";
-
-        try {
-            httpClient = HttpClients.createDefault();
-
-            HttpGet httpGet = new HttpGet(url);
-
-            // Spoof real browser headers
-            httpGet.setHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7");
-            httpGet.setHeader("Accept-Language", "en-US,en;q=0.9,vi;q=0.8,ug;q=0.7,fr;q=0.6");
-            httpGet.setHeader("User-Agent", "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");
-            httpGet.setHeader("Priority", "u=0, i");
-            httpGet.setHeader("Sec-Fetch-Dest", "document");
-            httpGet.setHeader("Sec-Fetch-Mode", "navigate");
-            httpGet.setHeader("Sec-Fetch-Site", "none");
-            httpGet.setHeader("Sec-Fetch-User", "?1");
-            httpGet.setHeader("Upgrade-Insecure-Requests", "1");
-
-            // Set cookies exactly like in curl
-            httpGet.setHeader("Cookie", "userUid=1747102033185-d570fba9-62fd-40be-93ca-ed08b4de57d4; _sid=MTc0NzEwMjAzMzE4Ni4ycTU%3D; _scor_uid=135c13065ff84620b5318b489af93e87; _gcl_au=1.1.249135292.1747102036; _ga=GA1.1.1031614211.1747102037; WZRK_G=28895afb56ff48dda59fe8de0af746bf; FCNEC=%5B%5B%22AKsRol8sHYeSYz_FYPkInYXN3P4ZDPfVKbsRfILfDuOMLhDtkTuoCJP5MlvT9gIbOe7IlDfY8ZeHszhwdVtAoKF1gWv0pLAq5EqpLpse8CEm_ZNv-bUSs6zEyqpOkeKWFI_Ei6VfNAvnZAO8PcXdF8_ncsaO902X7g%3D%3D%22%5D%5D; _ga_KRGL1M61LX=GS2.1.s1747105135$o2$g0$t1747105135$j60$l0$h0");
-
-            RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(10000)
-                    .setSocketTimeout(15000)
-                    .setConnectionRequestTimeout(10000)
-                    .build();
-            httpGet.setConfig(requestConfig);
-
-            response = httpClient.execute(httpGet);
-            HttpEntity entity = response.getEntity();
-
-            if (entity != null) {
-                result = EntityUtils.toString(entity);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (response != null) response.close();
-                if (httpClient != null) httpClient.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return result;
-    }
-
     public static void main(String[] args) {
         String url = "https://marketapi.intoday.in/widget/topgainer/view?exchange=nse";
         String str = doGet(url);

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);
-        }
-    }
-}

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

@@ -0,0 +1,317 @@
+package cn.stock.market.utils;
+
+import cn.hutool.core.util.StrUtil;
+import cn.stock.market.constant.MonthEnum;
+import cn.stock.market.domain.basic.entity.RetifiveStock;
+import cn.stock.market.dto.RetifiveStockInfo;
+import cn.stock.market.lesg.InChangeEntity;
+import cn.stock.market.lesg.InstrumentData;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.ReflectionUtils;
+
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * RefinitivUtil
+ * Refinitiv数据解析工具
+ *
+ * @author jnerh
+ * @since 2024/04/11 10:20
+ */
+@Slf4j
+public class RefinitivUtil {
+
+    public static final String BLANK_DATA = "(blank data)";
+    public static final List<String> STOCK_CODE_FIELDS = Lists.newArrayList("EXCHCODE", "PROV_SYMB", "MNEMONIC", "SRC_SYMB");
+
+    public static final String BSE_SYMBOL_SUFFIX = ".BO";
+
+    private static RetifiveStockInfo handleData(RetifiveStockInfo retifiveStockInfo) {
+        Field[] fields = retifiveStockInfo.getClass().getDeclaredFields();
+        Arrays.stream(fields).forEach(field -> {
+            ReflectionUtils.makeAccessible(field);
+            try {
+                Object obj = field.get(retifiveStockInfo);
+                if (obj instanceof String) {
+                    String objStr = (String) obj;
+                    field.set(retifiveStockInfo, objStr.replace(BLANK_DATA, ""));
+                }
+            } catch (IllegalAccessException e) {
+                log.error("Refinitiv数据源处理数据出错，", e);
+            }
+        });
+
+        // 未开盘时，将当前价设为昨日收盘价
+        try {
+            Field statusField = retifiveStockInfo.getClass().getDeclaredField("status");
+            ReflectionUtils.makeAccessible(statusField);
+            Object obj = statusField.get(retifiveStockInfo);
+            if (obj instanceof String) {
+                String objStr = (String) obj;
+                if (StringUtils.equals(objStr, "1")) {
+                    Field lastPriceField = retifiveStockInfo.getClass().getDeclaredField("lastPrice");
+                    Field previousPriceField = retifiveStockInfo.getClass().getDeclaredField("previousPrice");
+                    ReflectionUtils.makeAccessible(previousPriceField);
+                    ReflectionUtils.makeAccessible(lastPriceField);
+                    lastPriceField.set(retifiveStockInfo, previousPriceField.get(retifiveStockInfo));
+                }
+            }
+        } catch (Exception e) {
+            log.error("Refinitiv数据源获取status出错，", e);
+        }
+        return retifiveStockInfo;
+    }
+
+
+    public static RetifiveStockInfo decode(InstrumentData data) {
+        Map<String, String> dataMap = data.getDataMap();
+        RetifiveStockInfo stockInfo = RetifiveStockInfo.builder().symbol(data.getRic()).build();
+        dataMap.forEach((k, v) -> {
+            if (k.equals("DSPLY_NAME")) {
+                stockInfo.setStockName(v);
+            }
+            if (StrUtil.isBlank(stockInfo.getStockCode()) && StrUtil.isNotBlank(parseStockCode(k, v))) {
+                stockInfo.setStockCode(v);
+            }
+            if (k.equals("INST_PHASE")) {
+                stockInfo.setStatus(v);
+            }
+            if (k.equals("OPEN_PRC")) {
+                stockInfo.setOpenPrice(v);
+            }
+            if (k.equals("HST_CLOSE")) {
+                stockInfo.setPreviousPrice(v);
+            }
+            if (k.equals("52WK_HIGH")) {
+                stockInfo.setWeek52HighPrice(v);
+            }
+            if (k.equals("52WK_LOW")) {
+                stockInfo.setWeek52LowPrice(v);
+            }
+            if (k.equals("PCTCHNG")) {
+                stockInfo.setPerchg(v);
+            }
+            if (k.equals("NETCHNG_1")) {
+                stockInfo.setChange(v);
+            }
+            if (k.equals("HIGH_1")) {
+                stockInfo.setHighPrice(v);
+            }
+            if (k.equals("LOW_1")) {
+                stockInfo.setLowPrice(v);
+            }
+            if (k.equals("IRGVOL")) {
+                stockInfo.setVolume(v);
+            }
+            if (k.equals("TRDPRC_1")) {
+                stockInfo.setLastPrice(v);
+            }
+            if (k.equals("RDN_EXCHID")) {
+                String stockType = v;
+                if (StrUtil.equals(stockType, "145")) {
+                    //孟买国家交易所
+                    stockType = "bse";
+                } else if (StrUtil.equals(stockType, "147")) {
+                    //印度国家交易所
+                    stockType = "nse";
+                }
+                stockInfo.setStockType(stockType);
+            }
+        });
+
+        return handleData(stockInfo);
+    }
+
+    /**
+     * 解析股票代码
+     *
+     * @param k 字段名
+     * @param v 字段值
+     * @return 股票代码
+     */
+    private static String parseStockCode(String k, String v) {
+        if (isValidStockCode(k, v)) {
+            return v;
+        }
+
+        return null;
+    }
+
+    /**
+     * 判断是否为股票代码
+     *
+     * @param k 字段名
+     * @param v 字段值
+     * @return 是否为股票代码
+     */
+    public static boolean isValidStockCode(String k, String v) {
+        return STOCK_CODE_FIELDS.contains(k) && !StrUtil.contains(v, "blank data");
+    }
+
+
+    /**
+     * 解析为RetifiveStock
+     *
+     * @param data 查出的数据
+     * @return 结果
+     */
+    public static RetifiveStock decodeRefinitivStock(InstrumentData data) {
+        Map<String, String> dataMap = data.getDataMap();
+        RetifiveStock stock= RetifiveStock.builder().symbol(data.getRic()).saveTime(new Date()).build();
+        dataMap.forEach((k, v) -> {
+            if (k.equals("DSPLY_NAME")) {
+                stock.setStockName(v);
+            }
+            if (StrUtil.isBlank(stock.getStockCode()) && StrUtil.isNotBlank(parseStockCode(k, v))) {
+                stock.setStockCode(v);
+            }
+            if (k.equals("RDN_EXCHID")) {
+                String stockType = v;
+                if (StrUtil.equals(stockType, "145")) {
+                    //孟买国家交易所
+                    stockType = "bse";
+                } else if (StrUtil.equals(stockType, "147")) {
+                    //印度国家交易所
+                    stockType = "nse";
+                }
+                stock.setStockType(stockType);
+            }
+        });
+
+        return stock;
+    }
+
+    public static List<String> decodeTopData(InstrumentData instrumentData) {
+        List<String> list = new ArrayList<>(100);
+        instrumentData.getDataMap().forEach((k, v) -> {
+            if (k.startsWith("BR_LINK")) {
+                if (!v.contains("blank data")) {
+                    list.add(k);
+                }
+            }
+        });
+
+        List<String> stringList = list.stream().sorted(topComparator()).collect(Collectors.toList());
+
+        List<String> result = new ArrayList<>();
+        for (String key : stringList) {
+            result.add(instrumentData.getDataMap().get(key));
+        }
+        return result;
+    }
+
+    public static List<InChangeEntity> decodeInChangeData(InstrumentData instrumentData) {
+        List<String> list = new ArrayList<>(100);
+        instrumentData.getDataMap().forEach((k, v) -> {
+            if (StrUtil.contains(k, "ROW80_") && !StrUtil.containsAny(v, "IN/CHANGE")) {
+                list.add(k);
+            }
+        });
+
+        List<String> inChangeSymbolList = list.stream().sorted(inChangeComparator()).collect(Collectors.toList());
+        List<String> result = new ArrayList<>();
+        for (String key : inChangeSymbolList) {
+            result.add(instrumentData.getDataMap().get(key));
+        }
+
+        String flagStr = result.remove(0);
+        int dateBeginIdx = 0;
+        int dateEndIdx = flagStr.indexOf("DESCRIPTION") - 1;
+        int descriptionBeginIdx = flagStr.indexOf("DESCRIPTION");
+        int descriptionEndIdx = flagStr.indexOf("TYP") - 1;
+        int typBeginIdx = flagStr.indexOf("TYP");
+        int typEndIdx = flagStr.indexOf("RIC") - 1;
+        int ricBeginIdx = flagStr.indexOf("RIC");
+        int ricEndIdx = flagStr.indexOf("ISIN") - 1;
+        int isinBeginIdx = flagStr.indexOf("ISIN");
+        int isinEndIdx = flagStr.indexOf("CODE") - 1;
+        int codeBeginIdx = flagStr.indexOf("CODE");
+        int codeEndIdx = flagStr.indexOf("CLS") - 1;
+        int clsBeginIdx = flagStr.indexOf("CLS");
+        List<InChangeEntity> inChangeEntityList = new ArrayList<>();
+        for (String data : result) {
+            String date = data.substring(dateBeginIdx, dateEndIdx).trim();
+            String description = data.substring(descriptionBeginIdx, descriptionEndIdx).trim();
+            String typ = data.substring(typBeginIdx, typEndIdx).trim();
+            String ric = parseInChangeRic(data.substring(ricBeginIdx, ricEndIdx).trim());
+            if (!ric.endsWith(BSE_SYMBOL_SUFFIX)) {
+                // 暂无相关权限处理非孟买国家交易所的股票
+                continue;
+            }
+
+            String isin = data.substring(isinBeginIdx, isinEndIdx).trim();
+            String codeTicker = data.substring(codeBeginIdx, codeEndIdx).trim();
+            String cls = data.substring(clsBeginIdx).trim();
+            InChangeEntity inChangeEntity = InChangeEntity.builder()
+                    .date(parseInChangeDate(date))
+                    .description(description)
+                    .typ(typ)
+                    .ric(ric)
+                    .isin(isin)
+                    .codeTicker(codeTicker)
+                    .cls(cls)
+                    .build();
+            inChangeEntityList.add(inChangeEntity);
+        }
+
+        return inChangeEntityList;
+    }
+
+    private static String parseInChangeDate(String date) {
+        String day = date.substring(0, 2);
+        String month = date.substring(2, 5);
+        String year = date.substring(5);
+        return String.format("20%s-%s-%s", year, Objects.requireNonNull(MonthEnum.of(month)).remark(), day);
+    }
+
+    private static String parseInChangeRic(String ric) {
+        return StrUtil.replace(ric, "<", "")
+                .replace(">", "");
+    }
+
+    private static Comparator<String> topComparator() {
+        String flag = "BR_LINK";
+        return (s1, s2) -> {
+            String seqStr1 = s1.substring(flag.indexOf(s1) + flag.length() + 1);
+            String seqStr2 = s2.substring(flag.indexOf(s2) + flag.length() + 1);
+            int seq1 = Integer.parseInt(seqStr1);
+            int seq2 = Integer.parseInt(seqStr2);
+            return seq1 - seq2;
+        };
+    }
+
+    private static Comparator<String> inChangeComparator() {
+        String flag = "ROW80_";
+        return (s1, s2) -> {
+            String seqStr1 = s1.substring(flag.indexOf(s1) + flag.length() + 1);
+            String seqStr2 = s2.substring(flag.indexOf(s2) + flag.length() + 1);
+            int seq1 = Integer.parseInt(seqStr1);
+            int seq2 = Integer.parseInt(seqStr2);
+            return seq1 - seq2;
+        };
+    }
+
+
+    public static String decode(Map<String, String> dataMap, List<String> symbols) {
+        String nextLink = null;
+        if (dataMap.get("NEXT_LR") == null) {
+            return nextLink;
+        }
+
+        for (Map.Entry<String, String> entry : dataMap.entrySet()) {
+            if (entry.getKey().startsWith("LINK_") && !entry.getValue().contains("blank data")) {
+                symbols.add(entry.getValue());
+            }
+
+            if (entry.getKey().startsWith("NEXT_LR")) {
+                nextLink = entry.getValue();
+            }
+        }
+
+        return nextLink;
+    }
+}

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

@@ -65,50 +65,6 @@ public class RequestCacheUtils {
 		
 		return response;
 	}
-
-	/**
-	 * 根据时间创建缓存
-	 * @param key	key
-	 * @param duration 时间(毫秒)
-	 * @return
-	 */
-	public static Cache<String, ServerResponse<?>> cacheByMilliseconds(String key,long duration) {
-		if(! map.containsKey(key)) {
-			log.info("创建缓存: {}", key);
-			Cache<String, ServerResponse<?>> cache = CacheBuilder.newBuilder()
-					.maximumSize(1000)
-					.expireAfterWrite(duration,TimeUnit.MILLISECONDS)
-					.weakValues()
-					.recordStats()
-					.build(
-//						new CacheLoader<String, Object>() {
-//						@Override
-//						public Object load(String key) throws Exception {
-//							return func.apply(key);
-//						}
-//					 }
-					);
-			map.put(key, cache);
-		}
-
-		return map.get(key);
-	}
-
-	@SneakyThrows
-	public static <T> ServerResponse<T> cache(String module, String key,long duration, Function<String, ServerResponse<?>> func) {
-		Cache<String, ServerResponse<?>> cache = cacheByMilliseconds(module,duration);
-		AtomicBoolean bool = new AtomicBoolean(true);
-		ServerResponse<T> response = (ServerResponse<T>) cache.get(key, () -> {
-			bool.set(false);
-			return func.apply(key);
-		});
-
-		if(bool.get()) {
-			log.info("命中缓存 module: {}, key: {}, 时间戳: {}", module, key, System.currentTimeMillis());
-		}
-
-		return response;
-	}
 	
 	public static void main(String[] args) throws InterruptedException {
 		ServerResponse<Object> response = null;

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

@@ -20,7 +20,7 @@ import cn.stock.market.domain.basic.service.SiteArticleService;
 import cn.stock.market.utils.ServerResponse;
 
 @Controller
-@RequestMapping({"/market/api/market/art/","/market/api/market/art/","/api/market/art/", "/api/hq/art/"})
+@RequestMapping({"/api/market/art/", "/api/hq/art/"})
 @Api(tags = "公告信息")
 public class ArticleApiController extends BaseController {
 

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;
 
@@ -36,7 +35,7 @@ public class BTodayStockController {
     @Autowired
     private BtodayStockService btodayStockService;
 
-    @GetMapping({"/market/api/bToday/kLine","/api/bToday/kLine"})
+    @GetMapping("/api/bToday/kLine")
     @ApiOperation(value = "股票详情K线图",httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name="exchange",value = "BSE或者NSE"),
@@ -141,7 +140,7 @@ public class BTodayStockController {
                     "fromredis: 标志是否来自 Redis 缓存，false 表示不是", response = JSONObject.class),
 
     })
-    @GetMapping({"/market/api/bToday/stockDetail","/api/bToday/stockDetail"})
+    @GetMapping("/api/bToday/stockDetail")
     @EncryptFilter(decryptRequest = false)
     public com.alibaba.fastjson.JSONObject getPriceChartCompanyPullView(
             @RequestParam(value = "exchange") String exchange,
@@ -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;
     }

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

@@ -25,7 +25,7 @@ import springfox.documentation.annotations.ApiIgnore;
  * @created Dec 4, 2018 10:22:44 PM
  */
 @RestController
-@RequestMapping({"/market/api/hq/","/api/hq/"})
+@RequestMapping("/api/hq/")
 @ApiIgnore
 public class InfoController {
 	@Value("${spring.application.name}")
@@ -40,7 +40,6 @@ public class InfoController {
 	public Map<String, Object> test(@RequestParam(required = false) String key) {
 		Map<String, Object> map = Maps.newHashMap();
 		map.put("stockMarketDbUrl", stockMarketDbUrl);
-		map.put("stockMarketDbUrl1", stockMarketDbUrl);
 		if(StringUtils.isNotBlank(key)) {
 			map.put("key", PropertiesUtil.getProperty(key));
 		}

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

@@ -0,0 +1,720 @@
+/*
+package cn.stock.market.web;
+
+import cn.stock.market.domain.basic.entity.RetifiveStock;
+import cn.stock.market.domain.basic.service.RetifiveStockService;
+import cn.stock.market.dto.RetifiveStockInfo;
+import cn.stock.market.infrastructure.db.po.QRetifiveStockPO;
+import cn.stock.market.listener.AppClient;
+import cn.stock.market.listener.ConcurrentAppClient;
+import cn.stock.market.listener.StockInfoRefinitiv;
+import cn.stock.market.listener.SymbolRefinitiv;
+import cn.stock.market.utils.ServerResponse;
+import com.google.common.collect.Lists;
+import com.querydsl.core.types.Predicate;
+import com.thomsonreuters.ema.access.DataType;
+import com.thomsonreuters.ema.access.FieldEntry;
+import com.thomsonreuters.ema.access.FieldList;
+import com.thomsonreuters.ema.access.RefreshMsg;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@RestController
+@Slf4j
+@RequestMapping("/retifive/**")
+public class MessageRetifiveController {
+
+    @Autowired
+    private AppClient appClient;
+
+    @Autowired
+    private ConcurrentAppClient concurrentAppClient;
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Autowired
+    private RetifiveStockService retifiveStockService;
+
+    @GetMapping("/message")
+    public ServerResponse<?> getMessage(@RequestParam String itemName) {
+        RefreshMsg refreshMsg = null;
+        try {
+            appClient.subscribe(itemName); // 根据itemName订阅
+            // 等待消息
+             refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+            return ServerResponse.createBySuccess("操作成功",refreshMsg.toString());
+        } catch (Exception e) {
+            return ServerResponse.createByError();
+        } finally {
+            // 可能需要重置或清理资源
+            appClient.resetMessageFuture();
+        }
+    }
+
+    @GetMapping("/getStockSymbolList")
+    public ServerResponse<?> getStockList() {
+        RefreshMsg refreshMsg = null;
+        List<String> itemNameList = generateItemNames();
+        String nextLink = "";
+        for (String itemName : itemNameList) {
+            try {
+                appClient.subscribe(itemName); // 根据itemName订阅
+                // 等待消息
+                refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+                System.out.println(refreshMsg.name());
+                if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                    nextLink  = decode1(refreshMsg.payload().fieldList(),refreshMsg.name());
+                    while (StringUtils.isNotBlank(nextLink)&&!nextLink.contains("blank data")){
+                        appClient.subscribe(nextLink); // 根据itemName订阅
+                        // 等待消息
+                        refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+                        nextLink = decode1(refreshMsg.payload().fieldList(),refreshMsg.name());
+                    }
+                }
+            } catch (Exception e) {
+                log.error("获取列表异常link:"+nextLink,e);
+                return ServerResponse.createByError();
+            } finally {
+                // 可能需要重置或清理资源
+                appClient.resetMessageFuture();
+            }
+        }
+        return ServerResponse.createBySuccess("操作成功");
+    }
+
+
+   */
+/* @GetMapping("/getStockInfoList")
+    @Deprecated
+    public ServerResponse<?> getStockInfoList() {
+        ExecutorService executorService = Executors.newFixedThreadPool(5); // 创建一个固定大小的线程池
+        List<SymbolRefinitiv> collect = mongoTemplate.query(SymbolRefinitiv.class).stream().collect(Collectors.toList());
+        List<StockInfoRefinitiv> collect2 = mongoTemplate.query(StockInfoRefinitiv.class).stream().collect(Collectors.toList());
+
+        List<SymbolRefinitiv> difference = collect.stream()
+                .filter(symbol -> collect2.stream()
+                        .noneMatch(stockInfo -> stockInfo.getCommandStr().equals(symbol.getSymbol())))
+                .collect(Collectors.toList());
+
+        List<String> itemNameList = difference.stream().map(SymbolRefinitiv::getSymbol).collect(Collectors.toList());
+
+        // 计算每个线程应处理的元素数量
+        int size = itemNameList.size();
+        int chunkSize = size / 5; // 假设列表可以均匀分配
+        for (int i = 0; i < 5; i++) {
+            int start = i * chunkSize;
+            int end = (i == 4) ? size : (start + chunkSize); // 最后一个线程可能需要处理更多的元素
+            List<String> sublist = itemNameList.subList(start, end);
+            // 将子列表的处理提交给线程池
+            executorService.submit(() -> {
+                for (String itemName : sublist) {
+                    try {
+                        CompletableFuture<RefreshMsg> future = concurrentAppClient.subscribe(itemName);
+                        RefreshMsg refreshMsg = future.get(10, TimeUnit.SECONDS);
+                        if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                          //  List<FieldEntry> safeList = Collections.synchronizedList(new ArrayList<>(refreshMsg.payload().fieldList()));
+                            decode2(refreshMsg.payload().fieldList(),refreshMsg.name());
+                        }
+                    } catch (Exception e) {
+                        log.error("获取列表异常link:"+itemName,e);
+                    }
+                }
+            });
+        }
+
+        executorService.shutdown();
+        try {
+            if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                executorService.shutdownNow();
+            }
+        } catch (InterruptedException ie) {
+            executorService.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+
+        return ServerResponse.createBySuccess("操作成功");
+    }*//*
+
+
+
+    @GetMapping("/testStockInfoList2")
+    public ServerResponse<?> getStockInfoList2() {
+        List<String> collect = mongoTemplate.query(SymbolRefinitiv.class).stream().map(SymbolRefinitiv::getSymbol).collect(Collectors.toList());
+        // 计算每个线程应处理的元素数量
+                for (String itemName : collect) {
+                    try {
+                        appClient.subscribe(itemName); // 根据itemName订阅
+                        // 等待消息
+                        RefreshMsg refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+                        if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                            //  List<FieldEntry> safeList = Collections.synchronizedList(new ArrayList<>(refreshMsg.payload().fieldList()));
+                            decode2(refreshMsg.payload().fieldList(),refreshMsg.name());
+                        }
+                    } catch (Exception e) {
+                        log.error("获取列表异常link:"+itemName,e);
+                    } finally {
+                        // 可能需要重置或清理资源
+                        appClient.resetMessageFuture();
+                    }
+        }
+
+        return ServerResponse.createBySuccess("操作成功");
+    }
+
+    @GetMapping("/getStockDetail")
+    public ServerResponse<?> getStockInfoList2(String itemName) {
+
+        // 计算每个线程应处理的元素数量
+            try {
+                appClient.subscribe(itemName); // 根据itemName订阅
+                // 等待消息
+                RefreshMsg refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+                if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                    RetifiveStockInfo retifiveStockInfo = decode3(refreshMsg.payload().fieldList(), refreshMsg.name());
+                    //获取股票id
+                    RetifiveStock stock = retifiveStockService.repository().findBtStockByCoCode(itemName);
+                    if(stock != null){
+                        retifiveStockInfo.setId(stock.getId());
+                    }
+                    return ServerResponse.createBySuccess("操作成功",retifiveStockInfo);
+                }
+            } catch (Exception e) {
+                log.error("获取股票详情link:"+itemName,e);
+            } finally {
+                // 可能需要重置或清理资源
+                appClient.resetMessageFuture();
+            }
+
+        return ServerResponse.createBySuccess("操作成功");
+    }
+
+
+    @GetMapping("/getStockDetailList")
+    public ServerResponse<?> getStockDetailList(String itemName) {
+
+        // 计算每个线程应处理的元素数量
+        String[] itemNames = itemName.split(",");
+        List<RetifiveStockInfo> list = Lists.newArrayList();
+        for (String name : itemNames) {
+            try {
+                appClient.subscribe(name); // 根据itemName订阅
+                // 等待消息
+                RefreshMsg refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+                if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                    RetifiveStockInfo retifiveStockInfo = decode3(refreshMsg.payload().fieldList(), refreshMsg.name());
+                    list.add(retifiveStockInfo);
+                }
+            } catch (Exception e) {
+                log.error("获取股票详情link:"+name,e);
+            } finally {
+                // 可能需要重置或清理资源
+                appClient.resetMessageFuture();
+            }
+        }
+        return ServerResponse.createBySuccess("操作成功",list);
+
+    }
+
+
+
+    @GetMapping("/getBSETopActivesList")
+    public ServerResponse<?> getGainerList(String itemName) {
+        // 计算每个线程应处理的元素数量
+       String name = ".AV.BO";
+        List<RetifiveStockInfo> list = Lists.newArrayList();
+        try {
+            appClient.subscribe(name); // 根据itemName订阅
+            // 等待消息
+            RefreshMsg refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+            if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                List<String> strings = decode4(refreshMsg.payload().fieldList());
+                if(strings.size()>0){
+                    appClient.subscribeList(strings); // 根据itemName订阅
+                    // 等待消息
+                    List<RefreshMsg> refreshMsgs = appClient.getMessagesFuture().get(10, TimeUnit.SECONDS);
+                    for (RefreshMsg msg : refreshMsgs) {
+                        list.add(decode3(msg.payload().fieldList(),msg.name()));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情link:"+name,e);
+        } finally {
+            // 可能需要重置或清理资源
+            appClient.resetMessageFuture();
+        }
+        return ServerResponse.createBySuccess("操作成功",list);
+    }
+
+    @GetMapping("/getBSETopGainerList")
+    public ServerResponse<?> getBSETopGainerList() {
+
+        // 计算每个线程应处理的元素数量
+        String name = ".PG.BO";
+        List<RetifiveStockInfo> list = Lists.newArrayList();
+        try {
+            appClient.subscribe(name); // 根据itemName订阅
+            // 等待消息
+            RefreshMsg refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+            if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                List<String> strings = decode4(refreshMsg.payload().fieldList());
+                appClient.subscribeList(strings); // 根据itemName订阅
+                // 等待消息
+                List<RefreshMsg> refreshMsgs = appClient.getMessagesFuture().get(10, TimeUnit.SECONDS);
+                for (RefreshMsg msg : refreshMsgs) {
+                    list.add(decode3(msg.payload().fieldList(),msg.name()));
+                }
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情link:"+name,e);
+        } finally {
+            // 可能需要重置或清理资源
+            appClient.resetMessageFuture();
+        }
+        return ServerResponse.createBySuccess("操作成功",list);
+    }
+
+
+
+    @GetMapping("/getBSETopLoserList")
+    public ServerResponse<?> getBSETopLoserList() {
+
+        // 计算每个线程应处理的元素数量
+        String name = ".PL.BO";
+        List<RetifiveStockInfo> list = Lists.newArrayList();
+        try {
+            appClient.subscribe(name); // 根据itemName订阅
+            // 等待消息
+            RefreshMsg refreshMsg = appClient.getMessageFuture().get(10, TimeUnit.SECONDS);// 设置超时时间，例如10秒
+            if (DataType.DataTypes.FIELD_LIST == refreshMsg.payload().dataType()){
+                List<String> strings = decode4(refreshMsg.payload().fieldList());
+                    appClient.subscribeList(strings); // 根据itemName订阅
+                    // 等待消息
+                List<RefreshMsg> refreshMsgs = appClient.getMessagesFuture().get(10, TimeUnit.SECONDS);
+                for (RefreshMsg msg : refreshMsgs) {
+                    list.add(decode3(msg.payload().fieldList(),msg.name()));
+                }
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情link:"+name,e);
+        } finally {
+            // 可能需要重置或清理资源
+            appClient.resetMessageFuture();
+        }
+        return ServerResponse.createBySuccess("操作成功",list);
+    }
+
+
+
+    private List<String>  decode4(FieldList fieldList) {
+        List<String> list = Lists.newArrayList();
+        String nextLink = "";
+        for (FieldEntry fieldEntry : fieldList){
+          //  System.err.println("Fid: " + fieldEntry.fieldId() + " Name = " + fieldEntry.name() + " DataType: " + DataType.asString(fieldEntry.load().dataType()) + " Value: "+ fieldEntry.load().toString());
+            if(fieldEntry.name().startsWith("BR_LINK")){
+                nextLink = fieldEntry.load().toString();
+                if(!nextLink.contains("blank data")){
+                    list.add(nextLink);
+                }
+            }
+        }
+        return list;
+    }
+
+
+   */
+/* void decode(FieldList fieldList)
+    {
+        for (FieldEntry fieldEntry : fieldList)
+        {
+            System.out.print("Fid: " + fieldEntry.fieldId() + " Name = " + fieldEntry.name() + " DataType: " + DataType.asString(fieldEntry.load().dataType()) + " Value: ");
+
+            if (Data.DataCode.BLANK == fieldEntry.code())
+                System.out.println(" blank");
+            else
+                switch (fieldEntry.loadType())
+                {
+                    case DataType.DataTypes.REAL :
+                        System.out.println(fieldEntry.real().asDouble());
+                        break;
+                    case DataType.DataTypes.DATE :
+                        System.out.println(fieldEntry.date().day() + " / " + fieldEntry.date().month() + " / " + fieldEntry.date().year());
+                        break;
+                    case DataType.DataTypes.TIME :
+                        System.out.println(fieldEntry.time().hour() + " / " + fieldEntry.time().minute() + " / " + fieldEntry.time().second() + fieldEntry.time().millisecond());
+                        break;
+                    case DataType.DataTypes.INT :
+                        System.out.println(fieldEntry.intValue());
+                        break;
+                    case DataType.DataTypes.UINT :
+                        System.out.println(fieldEntry.uintValue());
+                        break;
+                    case DataType.DataTypes.ASCII :
+                        System.out.println(fieldEntry.ascii());
+                        break;
+                    case DataType.DataTypes.ENUM :
+                        System.out.println(fieldEntry.hasEnumDisplay() ? fieldEntry.enumDisplay() : fieldEntry.enumValue());
+                        break;
+                    case DataType.DataTypes.RMTES :
+                        System.out.println(fieldEntry.rmtes());
+                        break;
+                    case DataType.DataTypes.ERROR :
+                        System.out.println("(" + fieldEntry.error().errorCodeAsString() + ")");
+                        break;
+                    default :
+                        System.out.println();
+                        break;
+                }
+        }
+    }*//*
+
+
+    String  decode1(FieldList fieldList,String name)
+    {
+        Iterator<FieldEntry> iter = fieldList.iterator();
+        FieldEntry fieldEntry;
+        String nextLink = "";
+        while (iter.hasNext())
+        {
+            fieldEntry = iter.next();
+            //System.out.println("Fid: " + fieldEntry.fieldId() + " Name: " + fieldEntry.name() + " value: " + fieldEntry.load());
+            if(fieldEntry.name().startsWith("LINK_")){
+                if(fieldEntry.loadType() == DataType.DataTypes.ASCII){
+                    String symbol = fieldEntry.load().toString();
+                    if(!symbol.contains("blank data")){
+                        mongoTemplate.insert(new SymbolRefinitiv(symbol,"bse",name));
+                      */
+/*  RetifiveStock retifiveStockPO = new RetifiveStock();
+                        retifiveStockPO.setSymbol(name);
+                        retifiveStockPO.setStockType("bse");
+                        retifiveStockService.repository().save(retifiveStockPO);*//*
+
+                    }
+                }
+            }
+            if(fieldEntry.name().startsWith("NEXT_LR")){
+                nextLink = fieldEntry.load().toString();
+                if(nextLink.contains("blank data")){
+                    break;
+                }
+            }
+
+            if(fieldEntry.name().startsWith("NEXT_LR")){
+                nextLink = fieldEntry.load().toString();
+                if(nextLink.contains("blank data")){
+                    break;
+                }
+            }
+            String stockName = "";
+            if(fieldEntry.name().equals("DSPLY_NAME")){
+               if(fieldEntry.loadType() == DataType.DataTypes.RMTES) {
+                stockName = fieldEntry.load().toString();
+               }
+            }
+            String stockCode = "";
+            if(fieldEntry.name().equals("PROV_SYMB")){
+                if(fieldEntry.loadType() == DataType.DataTypes.RMTES) {
+                    stockCode = fieldEntry.load().toString();
+                }
+            }
+
+            String status = "";
+            if(fieldEntry.name().equals("TRD_STATUS")){
+                if(fieldEntry.loadType() == DataType.DataTypes.RMTES) {
+                    status = fieldEntry.load().toString();
+                }
+            }
+
+            StockInfoRefinitiv stockInfoRefinitiv = new StockInfoRefinitiv();
+            stockInfoRefinitiv.setStockName(stockName);
+            stockInfoRefinitiv.setStockCode(stockCode);
+            stockInfoRefinitiv.setStatus(status);
+            stockInfoRefinitiv.setStockType("bse");
+            stockInfoRefinitiv.setCommandStr(name);
+        }
+        return nextLink;
+    }
+
+     void  decode2(FieldList fieldList,String name)
+    {
+        Iterator<FieldEntry> iter = fieldList.iterator();
+        FieldEntry fieldEntry;
+        String stockName = "";
+        String stockCode = "";
+        String status = "";
+        String price = "";
+        String openPrice = "";
+        String previousPrice = "";
+        String percentChange = "";
+        String week52High ="";
+        String week52Low = "";
+        String high = "";
+        String low = "";
+        String volume = "";//实时交易数量
+        String stockType = "";
+        String changeValue = "";
+        while (iter.hasNext())
+        {
+            fieldEntry = iter.next();
+          //  System.out.println("Fid: " + fieldEntry.fieldId() + " Name: " + fieldEntry.name() +" Unit: "+DataType.asString(fieldEntry.loadType()) + " value: " + fieldEntry.load());
+            if(fieldEntry.name().equals("DSPLY_NAME")){
+                if(fieldEntry.loadType() == DataType.DataTypes.RMTES) {
+                    stockName = fieldEntry.load().toString();
+                }
+            }
+            if(fieldEntry.name().equals("PROV_SYMB")){
+                if(fieldEntry.loadType() == DataType.DataTypes.RMTES) {
+                    stockCode = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("INST_PHASE")){
+                if(fieldEntry.loadType() == DataType.DataTypes.ENUM) {
+                    status = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("OPEN_PRC")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    openPrice = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("HST_CLOSE")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    previousPrice = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("52WK_HIGH")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    week52High = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("52WK_LOW")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    week52Low = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("PCTCHNG")){ // NETCHNG_1
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    percentChange = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("NETCHNG_1")){ // NETCHNG_1
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    changeValue = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("HIGH_1")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    high = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("LOW_1")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    low = fieldEntry.load().toString();
+                }
+            }
+            if(fieldEntry.name().equals("IRGVOL")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    volume = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("TRDPRC_1")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    price = fieldEntry.load().toString();
+                }
+            }
+            if(fieldEntry.name().equals("RDN_EXCHID")){
+                if(fieldEntry.loadType() == DataType.DataTypes.ENUM) {
+                    stockType = fieldEntry.load().toString();
+                    if(StringUtils.equals(stockType,"145")){
+                        stockType = "bse";//孟买国家交易所
+                    }else if(StringUtils.equals(stockType,"147")){
+                        stockType = "nse";//印度国家交易所
+                    }
+                }
+            }
+        }
+
+        */
+/*StockInfoRefinitiv stockInfoRefinitiv = new StockInfoRefinitiv();
+        stockInfoRefinitiv.setStockName(stockName);
+        stockInfoRefinitiv.setStockCode(stockCode);
+        stockInfoRefinitiv.setStatus(status);
+        stockInfoRefinitiv.setStockType("bse");
+        stockInfoRefinitiv.setCommandStr(name);
+        mongoTemplate.insert(stockInfoRefinitiv);*//*
+
+
+ */
+/*       RetifiveStockInfo  retifiveStockInfo = RetifiveStockInfo.builder().stockCode(stockCode).stockName(stockName).symbol(name).status(status)
+                .openPrice(openPrice).currentPrice(price).highPrice(high).lowPrice(low).previousPrice(previousPrice).changePercent(percentChange)
+                .volume(volume).week52HighPrice(week52High).week52LowPrice(week52Low).stockType(stockType).changeValue(changeValue)
+                .build();*//*
+
+
+        RetifiveStock retifiveStock = RetifiveStock.builder().stockType(stockType).saveTime(new Date()).isLock(0).isShow(0)
+                .stockCode(stockCode).symbol(name).stockName(stockName).build();
+        List<RetifiveStock> all = retifiveStockService.repository().findAll(QRetifiveStockPO.retifiveStockPO.symbol.eq(name));
+        if(CollectionUtils.isEmpty(all)){
+            retifiveStockService.repository().save(retifiveStock);
+        }
+    }
+
+
+
+    RetifiveStockInfo decode3(FieldList fieldList, String name)
+    {
+        Iterator<FieldEntry> iter = fieldList.iterator();
+        FieldEntry fieldEntry;
+        String stockName = "";
+        String stockCode = "";
+        String status = "";
+        String price = "";
+        String openPrice = "";
+        String previousPrice = "";
+        String percentChange = "";
+        String week52High ="";
+        String week52Low = "";
+        String high = "";
+        String low = "";
+        String volume = "";//实时交易数量
+        String stockType = "";
+        String changeValue = "";
+        while (iter.hasNext())
+        {
+            fieldEntry = iter.next();
+          //  System.out.println("Fid: " + fieldEntry.fieldId() + " Name: " + fieldEntry.name() +" Unit: "+DataType.asString(fieldEntry.loadType()) + " value: " + fieldEntry.load());
+            if(fieldEntry.name().equals("DSPLY_NAME")){
+                if(fieldEntry.loadType() == DataType.DataTypes.RMTES) {
+                    stockName = fieldEntry.load().toString();
+                }
+            }
+            if(fieldEntry.name().equals("PROV_SYMB")){
+                if(fieldEntry.loadType() == DataType.DataTypes.RMTES) {
+                    stockCode = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("INST_PHASE")){
+                if(fieldEntry.loadType() == DataType.DataTypes.ENUM) {
+                    status = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("OPEN_PRC")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    openPrice = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("HST_CLOSE")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    previousPrice = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("52WK_HIGH")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    week52High = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("52WK_LOW")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    week52Low = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("PCTCHNG")){ // NETCHNG_1
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    percentChange = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("NETCHNG_1")){ // NETCHNG_1
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    changeValue = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("HIGH_1")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    high = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("LOW_1")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    low = fieldEntry.load().toString();
+                }
+            }
+            if(fieldEntry.name().equals("IRGVOL")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    volume = fieldEntry.load().toString();
+                }
+            }
+
+            if(fieldEntry.name().equals("TRDPRC_1")){
+                if(fieldEntry.loadType() == DataType.DataTypes.REAL) {
+                    price = fieldEntry.load().toString();
+                }
+            }
+            if(fieldEntry.name().equals("RDN_EXCHID")){
+                if(fieldEntry.loadType() == DataType.DataTypes.ENUM) {
+                    stockType = fieldEntry.load().toString();
+                    if(StringUtils.equals(stockType,"145")){
+                        stockType = "bse";//孟买国家交易所
+                    }else if(StringUtils.equals(stockType,"147")){
+                        stockType = "nse";//印度国家交易所
+                    }
+                }
+            }
+        }
+        RetifiveStockInfo  retifiveStockInfo = RetifiveStockInfo.builder().stockCode(stockCode).stockName(stockName).symbol(name).status(status)
+                .openPrice(openPrice).lastPrice(price).highPrice(high).lowPrice(low).previousPrice(previousPrice).perchg(percentChange)
+                .volume(volume).week52HighPrice(week52High).week52LowPrice(week52Low).stockType(stockType).change(changeValue)
+                .build();
+
+        return retifiveStockInfo;
+    }
+
+
+
+
+    private static List<String> generateItemNames() {
+            List<String> itemNames = new ArrayList<>();
+
+            // 从字母 'A' 到 'Z'
+            for (char letter = 'A'; letter <= 'Z'; letter++) {
+                String itemName = "0#" + letter + ".BO";
+                itemNames.add(itemName);
+            }
+
+            return itemNames;
+        }
+}
+*/

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

@@ -1,33 +1,18 @@
 package cn.stock.market.web;
 
-import cn.hutool.core.date.DateUtil;
-import cn.qutaojing.common.jpa.ConditionBuilder;
 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.entity.Stock;
 import cn.stock.market.domain.basic.repository.MoneyStockRepository;
-import cn.stock.market.domain.basic.repository.OptionalStockRepository;
-import cn.stock.market.domain.basic.repository.StockRepository;
-import cn.stock.market.domain.basic.service.StockService;
-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.infrastructure.db.po.QStockPO;
-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 cn.stock.market.web.service.MoneyApiService;
 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;
@@ -37,37 +22,24 @@ 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.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -87,26 +59,15 @@ public class MoneyApiController {
     @Autowired
     private MoneyStockRepository moneyStockRepository;
 
-    @Autowired
-    private OptionalStockRepository optionalStockRepository;
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @Autowired
-    private MoneyApiService moneyApiService;
-
     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/";
-    @Autowired
-    private StockRepository stockRepository;
 
 
-    @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 = "" +
@@ -205,80 +166,80 @@ public class MoneyApiController {
                     "priceprevclose: 前一交易日的收盘价\n" +
                     "30DayAvg: 过去30天的平均", response = JSONObject.class),
     })
-    @GetMapping({"/market/api/market/money/getStockDetail", "/api/market/money/getStockDetail"})
+    @GetMapping("/api/market/money/getStockDetail")
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
-    public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol) {
-        Stock stock = stockRepository.findStockByCode(symbol);
-        if (stock == null) {
-            return ServerResponse.createByErrorMsg("Stock is not exist!");
-        }
-        StockQuoteData data = moneyApiService.getSingleStockQuote(symbol);
-        data.setName(stock.getStockName());
-        return ServerResponse.createBySuccess(data);
-    }
 
-    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"));
+    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)))
+                .orElse(null);
+     /*   if(moneyStock==null){
+            return ServerResponse.createByErrorMsg("没有找到该股票");
+        }*/
+        // 设置重试次数
+        int maxRetries = 3;
+        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 ) {
+                    JSONObject data = JSONObject.parseObject(responseEntity.getBody()).getJSONObject("data");
+                    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"));
+                        }
+                    }
+                    return ServerResponse.createBySuccess(json1);
+                }
+            } catch (Exception e) {
+            }
+            // 如果不是最后一次重试，则等待一段时间再进行下一次重试
+            if (retry < maxRetries) {
+                try {
+                    // 1秒钟
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
             }
         }
-        return volume.toString();
+        return null;
     }
 
-    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();
@@ -286,7 +247,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());
@@ -311,7 +272,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";
@@ -319,9 +280,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();
@@ -350,19 +311,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");
@@ -406,9 +367,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();
@@ -443,20 +404,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);
                 }
 
@@ -483,7 +444,7 @@ public class MoneyApiController {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return list;
+        return  list;
     }
 
     private static List<MoneyStockSuggestDTO> bseTopLoser() {
@@ -493,7 +454,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) {
@@ -538,233 +499,234 @@ public class MoneyApiController {
     }
 
 
-    @ApiOperation(value = "股票推荐TopGainer", httpMethod = "GET")
+
+
+    @ApiOperation(value = "股票推荐TopGainer",httpMethod = "GET")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE或者germany"),
+            @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("/api/market/money/getTopGainer")
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
 
-    public List<MoneyStockSuggestDTO> getTopGainer(@RequestParam(required = false, defaultValue = "germany") String stockType) {
+    public List<MoneyStockSuggestDTO> getTopGainer(@RequestParam String stockType) {
         List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
         // 尝试从缓存中获取结果
-        // Use TradingView API for German stocks
-        List<StockQuoteData> stockQuoteDataList = moneyApiService.getTopGainersFromTradingView();
-        moneyStockSuggestDTOS = convertStockQuoteDataToMoneyStockSuggestDTO(stockQuoteDataList);
+        moneyStockSuggestDTOS = gainerStockSuggestCache.getIfPresent(stockType);
 
+        if (moneyStockSuggestDTOS == null) {
+            // 缓存未命中，执行业务查询
+            if (StringUtils.equals(stockType, "nse")) {
+                moneyStockSuggestDTOS = nseGainer();
+            } else if (StringUtils.equals(stockType, "bse")) {
+                moneyStockSuggestDTOS = bseGainer();
+            }
 
+            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
+                List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
+                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()));
+                    }
+                }
+                gainerStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
+            }
+            // 将结果放入缓存
+        }
         return moneyStockSuggestDTOS;
     }
 
-    private List<MoneyStockSuggestDTO> convertStockQuoteDataToMoneyStockSuggestDTO(List<StockQuoteData> stockQuoteDataList) {
-        List<MoneyStockSuggestDTO> result = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(stockQuoteDataList)) {
-            for (StockQuoteData stockQuoteData : stockQuoteDataList) {
-                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                dto.setStockName(stockQuoteData.getName());
-                dto.setStockType("XETRA");
-                dto.setLastPrice(String.valueOf(stockQuoteData.getClose()));
-                dto.setChange(String.valueOf(stockQuoteData.getChange()));
-                dto.setChangePercent(String.valueOf(stockQuoteData.getPercent_change()));
-                dto.setHighPrice(String.valueOf(stockQuoteData.getHigh()));
-                dto.setLowPrice(String.valueOf(stockQuoteData.getLow()));
-                dto.setPrevClosePrice(String.valueOf(stockQuoteData.getPrevious_close()));
-                dto.setScId(String.valueOf(stockQuoteData.getSymbol()));
-                dto.setDispId(String.valueOf(stockQuoteData.getSymbol()));
-                result.add(dto);
-            }
-        }
-        return result;
-    }
 
-    @ApiOperation(value = "股票推荐TopLoser", httpMethod = "GET")
+    @ApiOperation(value = "股票推荐TopLoser",httpMethod = "GET")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE或者germany"),
+            @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("/api/market/money/getTopLoser")
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
 
-    public List<MoneyStockSuggestDTO> getTopLoser(@RequestParam(required = false) String stockType) {
+    public List<MoneyStockSuggestDTO> getTopLoser(@RequestParam String stockType) {
         List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
-        List<StockQuoteData> stockQuoteDataList = moneyApiService.getTopLosersFromTradingView();
-        moneyStockSuggestDTOS = convertStockQuoteDataToMoneyStockSuggestDTO(stockQuoteDataList);
-
+        moneyStockSuggestDTOS = loserStockSuggestCache.getIfPresent(stockType);
+        if(null==moneyStockSuggestDTOS){
+            if(StringUtils.equals(stockType,"nse")){
+                moneyStockSuggestDTOS = nseTopLoser();
+            }else if(StringUtils.equals(stockType,"bse")){
+                moneyStockSuggestDTOS = bseTopLoser();
+            }
+            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
+            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)){
+                    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()));
+                    }
+                    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()));
+                        }
+                    }
+                }
+                loserStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
+            }
+        }
         return moneyStockSuggestDTOS;
     }
 
 
-    @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("/api/market/money/getTopActives")
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
 
-    public List<StockQuoteData> getTopActive(@RequestParam(value = "stockType", required = false) String stockType, @RequestParam(value = "type", required = false) String type) {
-        List<String> topActiveCode = Arrays.asList("AAPL:NASDAQ","MSFT:NASDAQ","GOOGL:NASDAQ","AMZN:NASDAQ","META:NASDAQ","TSLA:NASDAQ","NVDA:NASDAQ","BRK.B:NYSE","JPM:NYSE",
-                                                    "UNH:NYSE", "V:NYSE", "MA:NYSE","JNJ:NYSE","XOM:NYSE","PG:NYSE","HD:NYSE","LLY:NYSE","KO:NYSE", "PEP:NASDAQ", "NFLX:NASDAQ",
-                "SAP:XETR", "SIE:XETR", "DTE:XETR", "ALV:XETR", "BAS:XETR", "BMW:XETR", "VOW3:XETR", "ADS:XETR", "BAYN:XETR", "RWE:XETR",
-                "DBK:XETR", "MUV2:XETR", "FME:XETR", "FRE:XETR", "HEI:XETR", "HEN3:XETR", "LIN:XETR", "IFX:XETR", "CON:XETR", "ZAL:XETR",
-                "ITX:BME", "AIR:BME", "SAN:BME", "IBE:BME", "BBVA:BME", "XPBR:BME", "XPBRA:BME", "CABK:BME", "XAMXB:BME", "CCEP:BME",
-                "XVALO:BME", "AENA:BME", "FER:BME", "AMS:BME", "ELE:BME", "TEF:BME", "NTGY:BME", "XBBDC:BME", "CLNX:BME", "XNOR:BME"
-        );
-        QStockPO q = QStockPO.stockPO;
-        ConditionBuilder builder = ConditionBuilder.builder();
-        builder.and(q.stockCode.in(topActiveCode));
-        if(type != null && !type.trim().isEmpty()) {
-            if (type.equals("us")) {
-                builder.and(q.stockType.in("NASDAQ", "NYSE"));
-            } else if (type.equals("dg")) {
-                builder.and(q.stockType.in("XETR"));
-            } else if (type.equals("es")) {
-                builder.and(q.stockType.in("BME"));
+    public List<MoneyStockSuggestDTO> getTopActive(@RequestParam String stockType) {
+        List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
+        moneyStockSuggestDTOS = activesStockSuggestCache.getIfPresent(stockType);
+        if(moneyStockSuggestDTOS ==null){
+            if(StringUtils.equals(stockType,"nse")){
+                moneyStockSuggestDTOS = nseActives();
+            }else if(StringUtils.equals(stockType,"bse")){
+                moneyStockSuggestDTOS = bseActives();
+            }
+            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
+            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)){
+                    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()));
+                    }
+                    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()));
+                        }
+                    }
+                }
+                activesStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
             }
         }
-        List<Stock> stocks = stockRepository.findAll(builder.build());
-        List<StockQuoteData> stockQuoteDatas = moneyApiService.getStocksQuote(stocks);
-        for (StockQuoteData stockQuoteData : stockQuoteDatas) {
-            Stock name = stocks.stream().filter(e->e.getStockCode().equals(stockQuoteData.getSymbol())).findFirst().orElse(null);
-            if (name != null) {
-                stockQuoteData.setName(name.getStockName());
-            }
-        }
-        return stockQuoteDatas;
+
+        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) {
+    @GetMapping("/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"),
+            @ApiImplicitParam(name = "from", value = "Start timestamp", required = true, dataType = "long", paramType = "query"),
+            @ApiImplicitParam(name = "to", value = "End timestamp", required = true, dataType = "long", paramType = "query"),
+            @ApiImplicitParam(name = "countback", value = "开始时间和结束时间区间的计划展示的数量", required = true, dataType = "int", paramType = "query"),
+            @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
+                                                               ) {
+        // 向外部API发起请求，并获取响应
+        StockHistoryRequest request = new StockHistoryRequest();
+        request.setSymbol(symbol);
+        Long to = null;
+        Long from = null;
+        int countback = 5;
+        if(StringUtils.equals("H",resolution)){
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (1* 24 * 60 * 60 );
+            countback = 16;
+            request.setResolution("60");
+        }else if(StringUtils.equals("D",resolution)){
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (24 * 60 * 60 );
+            countback = 30;
+            request.setResolution("60");
+        }else if(StringUtils.equals("W",resolution)){
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (10 * 24 * 60 * 60 );
+            countback = 30;
+            request.setResolution("1D");
+        }else if(StringUtils.equals("M",resolution)){
+            to  = (long) (System.currentTimeMillis() / 1000);
+            from = to - (35 * 24 * 60 * 60 );
+            countback = 30;
+            request.setResolution("1D");
+        }
+
+        request.setFrom(from);
+        request.setTo(to);
+        request.setCountback(countback);
+        request.setCurrencyCode("INR");
+        String apiUrl = buildApiUrl(request);
+        log.info("request url:"+apiUrl);
+        StockHistoryResponse response = null;
+        int maxRetries = 3;
+        int retryCount = 0;
+
+        while (response == null && retryCount < maxRetries) {
             try {
-                Date date = sdf.parse(dateStr);
-                list.add(date.getTime() / 1000);
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
-    }
+                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);
 
-    private Long convertToTimestamp(String dateStr) {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss a", Locale.US);
-            Date date = sdf.parse(dateStr);
-            return date.getTime() / 1000;
-        } catch (ParseException e) {
-            e.printStackTrace();
-            return 0L;
-        }
-    }
-
-    @GetMapping({"/market/api/market/money/history/kLine", "/api/market/money/history/kLine"})
-    @ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源", response = StockHistoryResponse.class)
-    @ResponseBody
-    @EncryptFilter(decryptRequest = false)
-    public ResponseEntity<StockHistoryResponse> getStockChart(@RequestParam String symbol,
-                                                              @RequestParam String interval,
-                                                              @RequestParam(required = false) Integer amount
-    ) {
-        return ResponseEntity.ok(moneyApiService.getStockHistory(symbol, interval, amount));
-    }
-
-    @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();
+                // Increment the retry count
+                retryCount++;
+                // Add some delay before the next retry (you can adjust this as needed)
+                try {
+                    Thread.sleep(300); // 1 second delay
+                } catch (InterruptedException ex) {
+                    Thread.currentThread().interrupt();
                 }
             }
-            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);
+        if (response != null) {
+            // API request successful, return the response
+            return ResponseEntity.ok(response);
+        } else {
+            // 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();
+        }
+        // 返回响应
     }
 
-    private void setResponse(StockHistoryResponse response, String resolution) {
-        if (!"ok".equals(response.getS())) {
-            return;
-        }
-        if (Objects.isNull(response.getT())) {
-            return;
-        }
-        if (StringUtils.equals("H", resolution) || StringUtils.equals("D", resolution)) {
-            List<Long> t = new ArrayList<>();
-            List<Double> o = new ArrayList<>();
-            List<Double> h = new ArrayList<>();
-            List<Double> l = new ArrayList<>();
-            List<Double> c = new ArrayList<>();
-            List<Long> v = new ArrayList<>();
 
-            //根据时间过滤，只留当天的数据
-            Date currentTime = new Date();
-            //判断最后一条是不是当天的数据，如果不是，把最后一条的时间作为当天的时间
-            long getTime = response.getT().get(response.getT().size() - 1) * 1000L;
-            if (!DateUtil.isSameDay(currentTime, new Date(getTime))) {
-                currentTime = new Date(getTime);
-            }
-            int i = 0;
-            for (Long time : response.getT()) {
-                time = time * 1000;
-                if (DateUtil.isSameDay(currentTime, new Date(time))) {
-                    t.add(response.getT().get(i));
-                    o.add(response.getO().get(i));
-                    h.add(response.getH().get(i));
-                    l.add(response.getL().get(i));
-                    c.add(response.getC().get(i));
-                    v.add(response.getV().get(i));
-                }
-                i++;
-            }
-            response.setT(t);
-            response.setO(o);
-            response.setH(h);
-            response.setL(l);
-            response.setC(c);
-            response.setV(v);
-        }
-    }
 
 
     private String buildApiUrl(StockHistoryRequest request) {
@@ -772,9 +734,7 @@ public class MoneyApiController {
         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) {
@@ -790,16 +750,13 @@ public class MoneyApiController {
 
 
     public static void main(String[] args) {
-//        nseGainer();
-////        nseActives();
-////        nseTopLoser();
-////
-////        bseActives();
-////        bseGainer();
-////        bseTopLoser();
-        System.out.println(new Date());
-        System.out.println(new Date(1713949200000L));
-        System.out.println(DateUtil.isSameDay(new Date(), new Date(1713949200000L)));
+        nseGainer();
+        nseActives();
+        nseTopLoser();
+
+        bseActives();
+        bseGainer();
+        bseTopLoser();
     }
 
     private Cache<String, List<MoneyStockSuggestDTO>> gainerStockSuggestCache = CacheBuilder.newBuilder()

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

@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -24,16 +23,15 @@ import java.net.URL;
 public class MoneyProxyApiControl {
 
 
-    @GetMapping({"/market/api/proxy/queryStockMoneyProxy","/api/proxy/queryStockMoneyProxy"})
+    @RequestMapping(value = "/api/proxy/queryStockMoneyProxy",method = RequestMethod.GET)
     public JSONObject queryStockByMoneyIdAndExchangeType(String scId,String exchangeType){
-        log.info("queryStockByMoneyIdAndExchangeType");
         return stockByMoneyIdAndExchangeTypeFromHttp(scId,exchangeType);
     }
 
 
     public static JSONObject stockByMoneyIdAndExchangeTypeFromHttp(String scId, String exchangeType) {
         try {
-            String url = "https://moneycontrol.titanrwa.org/pricefeed/"+exchangeType+"/equitycash/" + scId ;
+            String url = "https://priceapi.moneycontrol.com/pricefeed/"+exchangeType+"/equitycash/" + scId ;
             URL obj = new URL(url);
             HttpURLConnection con = (HttpURLConnection) obj.openConnection();
             con.setRequestMethod("GET");
@@ -54,8 +52,7 @@ public class MoneyProxyApiControl {
                 log.error("HTTP request failed with response code: " + responseCode);
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("stockByMoneyIdAndExchangeTypeFromHttp failed {}",e.getMessage());
+            log.error("stockByMoneyIdAndExchangeTypeFromHttp",e);
         }
         return new JSONObject();
     }