From 5ce072de78ae263b52dc0e2be5c7391b23c093cf Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 27 Apr 2025 18:29:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/StockApiController.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/controller/StockApiController.java b/src/main/java/com/nq/controller/StockApiController.java
index 33fe10f..c545ae9 100644
--- a/src/main/java/com/nq/controller/StockApiController.java
+++ b/src/main/java/com/nq/controller/StockApiController.java
@@ -1,5 +1,6 @@
package com.nq.controller;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.nq.common.ServerResponse;
import com.nq.pojo.SiteSetting;
import com.nq.service.IStockService;
@@ -59,12 +60,25 @@
@RequestMapping("getGoldCrudeOil.do")
@ResponseBody
public ServerResponse getGoldCrudeOil(HttpServletRequest request) {
- String gold = RedisShardedPoolUtils.get(RedisKeyConstant.gold);
- String crudeOil = RedisShardedPoolUtils.get(RedisKeyConstant.crude_oil);
- HashMap<String,String> map = new HashMap<>();
- map.put(new GoogleTranslateUtil().translate("GOLD",request.getHeader("lang")),gold);
- map.put(new GoogleTranslateUtil().translate("CRUDE OIL",request.getHeader("lang")),crudeOil);
- return ServerResponse.createBySuccess(map);
+
+ String gold = RedisShardedPoolUtils.get(RedisKeyConstant.XAUUSD);
+ String crudeOil = RedisShardedPoolUtils.get(RedisKeyConstant.USOIL);
+
+ HashMap<String,HashMap> hashMap = new HashMap<>();
+
+ HashMap<String,String> goldMap = new HashMap<>();
+ goldMap.put("XAUUSD",gold);
+ goldMap.put("hcrate",RedisShardedPoolUtils.get("XAUUSD"+"_H"));
+ goldMap.put("hcrateP",RedisShardedPoolUtils.get("XAUUSD"+"_H")+"%");
+ hashMap.put("XAUUSD",goldMap);
+
+ HashMap<String,String> crudOilMap = new HashMap<>();
+ crudOilMap.put("USOIL",crudeOil);
+ crudOilMap.put("hcrate",RedisShardedPoolUtils.get("USOIL"+"_H"));
+ crudOilMap.put("hcrateP",RedisShardedPoolUtils.get("USOIL"+"_H")+"%");
+ hashMap.put("USOIL",crudOilMap);
+
+ return ServerResponse.createBySuccess(hashMap);
}
@@ -79,7 +93,7 @@
//通过股票代码查询股票信息
@RequestMapping({"getSingleStock.do"})
@ResponseBody
- public ServerResponse getSingleStock(@RequestParam("code") String code, HttpServletRequest request) {
+ public ServerResponse getSingleStock(@RequestParam("code") String code, HttpServletRequest request) throws JsonProcessingException {
return this.iStockService.getSingleStock(code, request);
}
@@ -90,9 +104,15 @@
public Object getKData(
@RequestParam("pid") String pid,
@RequestParam("interval") String interval,
- @RequestParam("stockType") String stockType
+ @RequestParam("stockType") String stockType,
+ HttpServletRequest request
) {
- return this.iStockService.getKData(pid,interval,stockType);
+ try {
+ return this.iStockService.getKData(pid,interval,stockType);
+ }catch (Exception e){
+ log.error("获取k线失败",e.getMessage());
+ }
+ return ServerResponse.createByErrorMsg("获取k线失败",request);
}
--
Gitblit v1.9.3