From 6404cb07e5281cfd901267c4fd560ba89bd5e2fd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ysz' into ysz
---
src/main/java/com/nq/enums/EStockType.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/enums/EStockType.java b/src/main/java/com/nq/enums/EStockType.java
index d567b68..7ba37cd 100644
--- a/src/main/java/com/nq/enums/EStockType.java
+++ b/src/main/java/com/nq/enums/EStockType.java
@@ -1,8 +1,7 @@
package com.nq.enums;
-import com.nq.constant.StockConstant;
-import lombok.Data;
+import com.nq.utils.PropertiesUtil;
/**
* 股票类型
@@ -11,8 +10,16 @@
public enum EStockType {
- IN("IN","印度股票","14", StockConstant.HTTP_API,StockConstant.KEY),
- US("US","美国股票","5",StockConstant.US_API_URL,StockConstant.US_KEY);
+
+// US("US","美国股票","5",PropertiesUtil.getProperty("US_HTTP_API"),PropertiesUtil.getProperty("US_KEY"),"USD","$"),
+// HK("HK","香港股票","39",PropertiesUtil.getProperty("HK_HTTP_API"),PropertiesUtil.getProperty("HK_KEY"),"HKD","HK$"),
+ MAS("MAS","马来西亚股票","42",PropertiesUtil.getProperty("MY_HTTP_API"),PropertiesUtil.getProperty("MY_KEY"),"MAS","RM"),
+ SGP("SGP","新加坡股票","36",PropertiesUtil.getProperty("SGP_HTTP_API"),PropertiesUtil.getProperty("SGP_KEY"),"SGP","S$");
+//
+// IN("IN","印度股票","14", PropertiesUtil.getProperty("IN_HTTP_API"),PropertiesUtil.getProperty("IN_KEY"),"INR","₹");
+// TH("TH","泰国股票","41",PropertiesUtil.getProperty("TH_HTTP_API"),PropertiesUtil.getProperty("TH_KEY")),
+// HG("HG","韩国股票","11",PropertiesUtil.getProperty("HG_HTTP_API"),PropertiesUtil.getProperty("HG_KEY")),
+// SZHB("SZHB","数字货币","41",PropertiesUtil.getProperty("SZHB_HTTP_API"),PropertiesUtil.getProperty("SZHB_KEY"));
private String code;
private String typeDesc;
public String contryId;
@@ -20,21 +27,29 @@
public String stockUrl;
public String stockKey;
+ private String symbol;
- EStockType(String code, String typeDesc, String contryId, String stockUrl, String stockKey) {
+ private String symbol1;
+
+
+ EStockType(String code, String typeDesc, String contryId, String stockUrl, String stockKey,String symbol,String symbol1) {
this.code = code;
this.typeDesc = typeDesc;
this.contryId = contryId;
this.stockUrl = stockUrl;
this.stockKey = stockKey;
+ this.symbol = symbol;
+ this.symbol1 = symbol1;
}
public static EStockType getEStockTypeByCode(String code){
- if(EStockType.US.getCode().equals(code)){
- return US;
- }else{
- return IN;
+ if(EStockType.MAS.getCode().equals(code)){
+ return MAS;
+
+ }else if(EStockType.SGP.getCode().equals(code)){
+ return SGP;
}
+ return MAS;
}
public String getContryId() {
@@ -53,6 +68,22 @@
return code;
}
+ public String getSymbol() {
+ return symbol;
+ }
+
+ public void setSymbol(String symbol) {
+ this.symbol = symbol;
+ }
+
+ public String getSymbol1() {
+ return symbol1;
+ }
+
+ public void setSymbol1(String symbol1) {
+ this.symbol1 = symbol1;
+ }
+
public String getTypeDesc() {
return typeDesc;
}
--
Gitblit v1.9.3