From 01b3fecb2d1b03861a72d53a7afea6ca557a209c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 02 Apr 2026 15:02:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/enums/EStockType.java |   63 ++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nq/enums/EStockType.java b/src/main/java/com/nq/enums/EStockType.java
index d567b68..baa0561 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,12 @@
 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","$"),
+
+    JP("JP","日本股票","35",PropertiesUtil.getProperty("JP_HTTP_API"),PropertiesUtil.getProperty("JP_KEY"),"JPY","¥");
+
+
     private String code;
     private String typeDesc;
     public String contryId;
@@ -20,20 +23,52 @@
     public String stockUrl;
     public  String stockKey;
 
+    private String symbol;
 
-    EStockType(String code, String typeDesc, String contryId, String stockUrl, String stockKey) {
+    private String symbol1;
+
+    public static EStockType getDefault() {
+        return US; // 指定默认
+    }
+
+    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 if(EStockType.JP.getCode().equals(code)){
+            return JP;
         }else{
-            return  IN;
+            return US;
+        }
+    }
+
+    public static boolean isExistByCode(String code){
+        if(EStockType.US.getCode().equals(code)){
+            return true;
+        }else if(EStockType.JP.getCode().equals(code)){
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    //根据货币获取类型
+    public static EStockType getEStockTypeBySymbol(String symbol){
+        if(EStockType.US.getSymbol().equals(symbol)){
+            return US;
+        }else if(EStockType.JP.getSymbol().equals(symbol)){
+            return JP;
+        }else{
+            return null;
         }
     }
 
@@ -53,6 +88,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