Compare commits

..

8 Commits

Author SHA1 Message Date
VoGiaHuy2058
cd06493b9c done requuiement 2025-06-18 10:37:12 +07:00
VoGiaHuy2058
476645109d done for stockTemp repository 2025-06-18 07:52:49 +07:00
VoGiaHuy2058
66eccce4cb apply new daily stock 2025-06-17 17:33:18 +07:00
owen l
5ab279daa6 Update .gitlab-ci.yml file 2025-06-17 06:34:34 +00:00
vpckiet
be24a57d2d Merge branch 'feature/update_money_stock' into 'develop'
update money ipo

See merge request india/india_market_java!63
2025-06-02 06:55:25 +00:00
vpckiet
aa796cf853 update money ipo 2025-06-02 13:51:29 +07:00
vpckiet
9a06979f07 Merge branch 'feature/update_ipo' into 'develop'
update money ipo check

See merge request india/india_market_java!61
2025-05-22 07:33:13 +00:00
vpckiet
fcab660024 Merge branch 'feature/update_ipo' into 'develop'
update ipo check

See merge request india/india_market_java!60
2025-05-22 07:01:22 +00:00
16 changed files with 427 additions and 43 deletions

View File

@@ -4,6 +4,11 @@ stages:
- dockerize
- deploy
variables:
company_name: juyoutech
project_name: germany_stock
service_name: market
build:
image: maven:3.6.3-openjdk-8
stage: build
@@ -48,18 +53,22 @@ dockerize:
- main
- develop
script:
- echo ">>>>>>Start Building Image<<<<<<"
- ls
- ls target
- echo $DOCKER_PASSWORD
- echo $CI_PIPELINE_ID
- docker build -t juyoutech/india_stock_market:latest .
- docker tag juyoutech/india_stock_market:latest juyoutech/india_stock_market:$CI_PIPELINE_ID
- docker tag juyoutech/india_stock_market:latest juyoutech/india_stock_market:$CI_COMMIT_BRANCH
- docker login -u juyoutech -p dckr_pat_8rg23IBA2kZMOCX4IJKApb8m5l8
- docker push juyoutech/india_stock_market:latest
- docker push juyoutech/india_stock_market:$CI_PIPELINE_ID
- docker push juyoutech/india_stock_market:$CI_COMMIT_BRANCH
- 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:
@@ -72,8 +81,8 @@ deploy-dev:
- |
curl -X POST \
-H "Content-Type: application/json" \
-d '{"namespace":"yddev", "deployment_name":"india-stock-market"}' \
https://updater-yddev.moneytj.com/restart-deployment
-d '{"namespace":"dgdev", "deployment_name":"germany-stock-market"}' \
https://updater-dgdev.moneytj.com/restart-deployment
- echo "Application successfully deployed."

View File

@@ -89,6 +89,12 @@
<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>

View File

@@ -29,6 +29,10 @@ 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");
@@ -39,6 +43,8 @@ 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));
}

View File

@@ -23,6 +23,8 @@ 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);
@@ -38,7 +40,6 @@ public class QStockIpoPO extends EntityPathBase<StockIpoPO> {
public final StringPath stockCode = createString("stockCode");
public final StringPath stockName = createString("stockName");
public final StringPath exchangeType = createString("exchangeType");
public final NumberPath<java.math.BigDecimal> stockPrice = createNumber("stockPrice", java.math.BigDecimal.class);

View File

@@ -0,0 +1,43 @@
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);
}
}

View File

@@ -41,23 +41,23 @@ public class StockMarketLaunch implements CommandLineRunner {
MDC.put(MdcUtil.TRACE_ID, MdcUtil.getTraceId());
log.info("StockMarketLaunch RUNNING....");
String marketDomain = env.getProperty("market.domain");
if(StringUtils.isNotBlank(marketDomain)) {
log.info("发现marketDomain: {}", marketDomain);
SiteSetting siteSetting = SiteSettingRepository.of().get();
if(siteSetting == null) {
log.info("找不到siteSetting信息, 无法设置");
} else {
log.info("设置前: {}", JSON.toJSONString(siteSetting));
boolean flag = siteSetting.checkAndAddIfNoExists(marketDomain);
if(! flag) {
SiteSettingRepository.of().saveAndFlush(siteSetting);
log.info("已经设置: {}....", JSON.toJSONString(siteSetting));
} else {
log.info("包含, 跳过....");
}
}
}
// String marketDomain = env.getProperty("market.domain");
// if(StringUtils.isNotBlank(marketDomain)) {
// log.info("发现marketDomain: {}", marketDomain);
// SiteSetting siteSetting = SiteSettingRepository.of().get();
// if(siteSetting == null) {
// log.info("找不到siteSetting信息, 无法设置");
// } else {
// log.info("设置前: {}", JSON.toJSONString(siteSetting));
// boolean flag = siteSetting.checkAndAddIfNoExists(marketDomain);
// if(! flag) {
// SiteSettingRepository.of().saveAndFlush(siteSetting);
// log.info("已经设置: {}....", JSON.toJSONString(siteSetting));
// } else {
// log.info("包含, 跳过....");
// }
// }
// }
}
// @Bean

View File

@@ -0,0 +1,25 @@
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);
}
}

View File

@@ -0,0 +1,26 @@
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* Stock
*
* @author rplees
* @email rplees.i.ly@gmail.com
* @created 2023/06/17
*/
@Data
@NoArgsConstructor
@SuperBuilder
@EqualsAndHashCode(
callSuper = false
)
public class StockTemp extends StockTempPO {
}

View File

@@ -0,0 +1,63 @@
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);
}
}

View File

@@ -0,0 +1,28 @@
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
}

View File

@@ -0,0 +1,39 @@
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;
}

View File

@@ -0,0 +1,15 @@
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> {
}

View File

@@ -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) || "NSE".equals(exchangeValue)) {
if ("BSE".equals(exchangeValue.toUpperCase()) || "NSE".equals(exchangeValue.toUpperCase())) {
log.info(Thread.currentThread().getName() + ",the stock url: " + url +
", the exchange Value: " + exchangeValue);
MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toLowerCase(Locale.ROOT))
MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toUpperCase(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.eq(exchangeValue.toLowerCase(Locale.ROOT)));
List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(name), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(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) || "NSE".equals(exchangeValue)) {
if ("BSE".equals(exchangeValue.toUpperCase(Locale.ROOT)) || "NSE".equals(exchangeValue.toUpperCase(Locale.ROOT))) {
log.info(Thread.currentThread().getName()+",stockName: " + textContent + ", self_link: " + linkAttribute +
", the exchange Value: " + exchangeValue);
MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toLowerCase(Locale.ROOT))
MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toUpperCase(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.eq(exchangeValue.toLowerCase(Locale.ROOT)));
List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(textContent), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(Locale.ROOT)));
if(CollectionUtil.isEmpty(all)){
moneyStockRepository.save(build);
}

View File

@@ -565,7 +565,7 @@ public class Scraper {
moneyStock.setStockName(stockIpo.getStockName());
moneyStock.setMoneyScId(stockIpo.getStockCode());
moneyStock.setSelfDispId(stockIpo.getStockCode());
moneyStock.setStockType(stockIpo.getExchangeType());
moneyStock.setStockType(stockIpo.getExchangeType().toUpperCase());
moneyStock.setSaveTime(DateTime.now());
moneyStock.setNseIndiaId(getNSEId(stockIpo));
@@ -596,10 +596,10 @@ public class Scraper {
JSONObject jsonData = jsonObject.getJSONObject("data");
if(stockIpo.getExchangeType().equals("NSE")){
if(stockIpo.getExchangeType().toUpperCase(Locale.ROOT).equals("NSE")){
return jsonData.getString("NSEID");
}
else if(stockIpo.getExchangeType().equals("BSE")){
else if(stockIpo.getExchangeType().toUpperCase(Locale.ROOT).equals("BSE")){
return jsonData.getString("BSEID");
}
}

View File

@@ -0,0 +1,123 @@
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 okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.json.*;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@Component
public class StockNewTask {
final StockTempRepository repository;
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=%d&hl=1&country=DE&lang=en&search_type=stocks&domain=production&sort_by_country=US&promo=true&exchange=XETR";
public StockNewTask(StockTempRepository repository) {
this.repository = repository;
}
@PostConstruct
public void test() throws Exception {
List<Symbol> allSymbols = new ArrayList<>();
int start = 0;
int symbolsRemaining;
do {
int finalStart = start;
if(start > 0){
finalStart = start + 1;
}
String url = BASE_URL + String.format(PARAMS, finalStart);
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);
Symbol symbol = new Symbol();
symbol.setSymbol(s.optString("symbol"));
symbol.setDescription(s.optString("description"));
symbol.setType(s.optString("type"));
symbol.setExchange(s.optString("exchange"));
symbol.setCurrencyCode(s.optString("currency_code"));
symbol.setCurrencyLogoid(s.optString("currency-logoid"));
symbol.setLogoid(s.optString("logoid"));
symbol.setProviderId(s.optString("provider_id"));
symbol.setSourceLogoid("https://s3-symbol-logo.tradingview.com/" + s.optString("source_logoid") + "--big.svg");
symbol.setSourceId(s.optString("source_id"));
symbol.setCountry(s.optString("country"));
symbol.setPrimaryListing(s.optBoolean("is_primary_listing", false));
symbol.setStockGid(symbol.getExchange() + ":" + symbol.getSymbol());
// typespecs array
JSONArray typespecsArr = s.optJSONArray("typespecs");
List<String> typespecsList = new ArrayList<>();
if (typespecsArr != null) {
for (int j = 0; j < typespecsArr.length(); j++) {
typespecsList.add(typespecsArr.getString(j));
}
}
symbol.setTypespecs(typespecsList);
allSymbols.add(symbol);
}
Thread.sleep(1000);
start += symbols.length();
System.out.println("Fetched: " + symbols.length() + ", Remaining: " + symbolsRemaining);
} while (symbolsRemaining > 0);
// Output test
for (int i = 0; i < Math.min(5, allSymbols.size()); i++) {
Symbol s = allSymbols.get(i);
System.out.println(s.getSymbol() + " - " + s.getDescription());
}
// Lúc này bạn có thể insert vào DB hoặc return từ service
allSymbols = allSymbols.stream().filter(x -> x.getType().equals("stock")).collect(Collectors.toList());
List<StockTemp> stockTemps = repository.findAllForCheck();
if(stockTemps != null && !stockTemps.isEmpty()){
for (Symbol symbol : allSymbols) {
if((symbol.getSymbol() + ":" + symbol.getExchange()).contains())
}
}
else{
repository.of().saveAll(stockTemps);
}
}
}

View File

@@ -3,7 +3,7 @@ spring:
show-sql: true
# Redis配置
redis:
host: 43.153.174.179
host: 43.153.142.41
password: a5v8b86P4mVzFlUqJV
port: 30001
database: 1
@@ -17,7 +17,7 @@ spring:
datasource:
stock-market:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://43.153.174.179:30000/india_stock?useUnicode=true&characterEncoding=utf-8
url: jdbc:mysql://43.153.142.41:30000/india_stock?useUnicode=true&characterEncoding=utf-8
username: root
password: uNejHIFQGJOUtYTmE
maxActive: 500