From 3698d82e83cdb9c687c0e932093e712bda729b42 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Thu, 28 Mar 2024 12:50:09 +0800
Subject: [PATCH] 韩国股票
---
src/main/java/com/nq/ws/WebsocketRunClient.java | 4 +-
src/main/java/com/nq/utils/stock/sina/StockApi.java | 5 ++
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java | 38 +++++++++---------
src/main/java/com/nq/controller/echo/EChoController.java | 8 ++++
src/main/java/com/nq/utils/task/stock/StockTask.java | 4 +-
target/stock-0.0.1-SNAPSHOT.jar.original | 0
src/main/java/com/nq/service/impl/UserServiceImpl.java | 3 +
7 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/nq/controller/echo/EChoController.java b/src/main/java/com/nq/controller/echo/EChoController.java
index 190b02d..a22df4e 100644
--- a/src/main/java/com/nq/controller/echo/EChoController.java
+++ b/src/main/java/com/nq/controller/echo/EChoController.java
@@ -3,6 +3,7 @@
import com.nq.common.ServerResponse;
import com.nq.pojo.User;
import com.nq.service.IEchoServices;
+import com.nq.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +23,9 @@
@Autowired
IEchoServices iEchoServices;
+ @Autowired
+ IUserService iUserService;
+
@PostMapping("queryEcho.do")
@ResponseBody
public ServerResponse queryEcho() {
@@ -32,6 +36,10 @@
@PostMapping("buyEcho.do")
@ResponseBody
public ServerResponse buyEcho(@RequestParam("eId") String eid, @RequestParam("money") Integer money, HttpServletRequest request) {
+ User user = this.iUserService.getCurrentRefreshUser(request);
+ if(user == null){
+ return ServerResponse.createByErrorMsg("Please Login");
+ }
if (iEchoServices.buyECho(eid, money,request)) {
return ServerResponse.createBySuccess("Buy Successed");
} else {
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 0c4ef39..cd56d9b 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -185,7 +185,8 @@
log.info("用户{}登陆成功, 登陆状态{} ,交易状态{}", new Object[]{user.getId(), user.getIsLogin(), user.getIsLock()});
- userAssetsServices.assetsByTypeAndUserId(EStockType.HG.getCode(),user.getId());
+ userAssetsServices.assetsByTypeAndUserId(EStockType.MAS.getCode(),user.getId());
+ userAssetsServices.assetsByTypeAndUserId(EStockType.US.getCode(),user.getId());
this.iSiteLoginLogService.saveLog(user, request);
return ServerResponse.createBySuccess(user);
}
diff --git a/src/main/java/com/nq/utils/stock/sina/StockApi.java b/src/main/java/com/nq/utils/stock/sina/StockApi.java
index 184aa75..f02b67a 100644
--- a/src/main/java/com/nq/utils/stock/sina/StockApi.java
+++ b/src/main/java/com/nq/utils/stock/sina/StockApi.java
@@ -38,6 +38,11 @@
Stock stock = stocks.get(i);
StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
StockListVO stockListVO = new StockListVO();
+
+ if(realTimeStock.getPcp().contains("%")){
+ realTimeStock.setPcp(realTimeStock.getPcp()+"%");
+ }
+
stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp()));
if(realTimeStock.getPcp().contains("-")){
stockListVO.setColor(0);
diff --git a/src/main/java/com/nq/utils/task/stock/StockTask.java b/src/main/java/com/nq/utils/task/stock/StockTask.java
index e7beb3d..40ab47d 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -56,8 +56,8 @@
* */
@Scheduled(cron = "0 0/3 * * * ?")
public void syncINStockData() {
-// loadAllStock(EStockType.US);
- loadAllStock(EStockType.HG);
+ loadAllStock(EStockType.US);
+ loadAllStock(EStockType.MAS);
}
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 7db3159..720492e 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -43,25 +43,25 @@
retMap.put(EStockType.IN.getStockKey(), websocketRunClient);
} catch (Exception e) {
}
-//
-// try {
-// USWebsocketRunClient usWebsocketRunClient = new USWebsocketRunClient(new URI(PropertiesUtil.getProperty("IN_WS_URL")));
-// usWebsocketRunClient.connect();
-// usWebsocketRunClient.setConnectionLostTimeout(0);
-// new Thread(() -> {
-// while (true) {
-// try {
-// Thread.sleep(8000);
-// usWebsocketRunClient.send("heartbeat".getBytes());
-// } catch (Exception e) {
-// usWebsocketRunClient.reconnect();
-// usWebsocketRunClient.setConnectionLostTimeout(0);
-// }
-// }
-// }).start();
-// retMap.put(EStockType.US.getStockKey(), usWebsocketRunClient);
-// } catch (Exception e) {
-// }
+
+ try {
+ USWebsocketRunClient usWebsocketRunClient = new USWebsocketRunClient(new URI(PropertiesUtil.getProperty("MAS_WS_URL")));
+ usWebsocketRunClient.connect();
+ usWebsocketRunClient.setConnectionLostTimeout(0);
+ new Thread(() -> {
+ while (true) {
+ try {
+ Thread.sleep(8000);
+ usWebsocketRunClient.send("heartbeat".getBytes());
+ } catch (Exception e) {
+ usWebsocketRunClient.reconnect();
+ usWebsocketRunClient.setConnectionLostTimeout(0);
+ }
+ }
+ }).start();
+ retMap.put(EStockType.US.getStockKey(), usWebsocketRunClient);
+ } catch (Exception e) {
+ }
return retMap;
}
diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index f134b2a..f8da7b5 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -23,7 +23,7 @@
@Override
public void onOpen(ServerHandshake serverHandshake) {
- send(("key:"+ EStockType.IN.getStockKey()+":"+EStockType.IN.getContryId()).getBytes());
+ send(("key:"+ EStockType.MAS.getStockKey()+":"+EStockType.MAS.getContryId()).getBytes());
}
@Override
@@ -34,7 +34,7 @@
ApplicationContext act = ApplicationContextRegisterUtil.getApplicationContext();
MandatoryLiquidationService liquidationService = (MandatoryLiquidationService) act.getBean(IMandatoryLiquidationService.class);
StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
- liquidationService.RealTimeDataProcess(EStockType.IN,stockDetailBean);
+ liquidationService.RealTimeDataProcess(EStockType.MAS,stockDetailBean);
}catch (Exception e){
}
diff --git a/target/stock-0.0.1-SNAPSHOT.jar.original b/target/stock-0.0.1-SNAPSHOT.jar.original
index 2a92bcb..fe44339 100644
--- a/target/stock-0.0.1-SNAPSHOT.jar.original
+++ b/target/stock-0.0.1-SNAPSHOT.jar.original
Binary files differ
--
Gitblit v1.9.3