From e46d28b79078df83ed136a0b3ea4f2f425df4f2c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 08 Oct 2024 16:58:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/utils/stock/sina/StockApi.java | 75 +++++++------------------------------
1 files changed, 14 insertions(+), 61 deletions(-)
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 f71417a..74aaddc 100644
--- a/src/main/java/com/nq/utils/stock/sina/StockApi.java
+++ b/src/main/java/com/nq/utils/stock/sina/StockApi.java
@@ -2,15 +2,12 @@
import com.alibaba.fastjson2.JSONObject;
-import com.google.gson.Gson;
import com.nq.common.ServerResponse;
-import com.nq.constant.StockConstant;
import com.nq.pojo.*;
-import com.nq.utils.HttpClientRequest;
+import com.nq.utils.http.HttpClientRequest;
import com.nq.utils.PropertiesUtil;
import com.nq.utils.redis.JsonUtil;
import com.nq.utils.redis.RedisKeyUtil;
-import com.nq.utils.redis.RedisShardedPoolUtils;
import com.nq.utils.stock.sina.vo.SinaStockMinData;
import com.nq.vo.stock.StockListVO;
import com.nq.vo.stock.StockUsVO;
@@ -19,7 +16,6 @@
import com.nq.vo.stock.k.echarts.EchartsDataVO;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.*;
import org.apache.commons.lang3.StringUtils;
@@ -43,10 +39,12 @@
StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
StockListVO stockListVO = new StockListVO();
stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp()));
+ stockListVO.setHcrateP(realTimeStock.getPcp()+"%");
if(realTimeStock.getPcp().contains("-")){
stockListVO.setColor(0);
}else{
stockListVO.setColor(1);
+ stockListVO.setHcrateP("+"+realTimeStock.getPcp()+"%");
}
stockListVO.setNowPrice(realTimeStock.getLast());
stockListVO.setToday_max(realTimeStock.getHigh());
@@ -59,7 +57,7 @@
stockListVO.setName(stock.getStockName());
stockListVO.setCode(stock.getStockCode());
stockListVO.setSpell(stock.getStockSpell());
- stockListVO.setGid(stock.getStockGid().toUpperCase());
+ stockListVO.setGid(stock.getStockGid());
stockListVO.setStock_plate(stock.getStockPlate());
stockListVO.setStock_type(stock.getStockType());
stockListVOs.add(stockListVO);
@@ -85,7 +83,15 @@
StockListVO stockListVO = new StockListVO();
try {
StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
- stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp().replace("%", "")));
+
+ stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp()));
+ stockListVO.setHcrateP(realTimeStock.getPcp()+"%");
+ if(realTimeStock.getPcp().contains("-")){
+ stockListVO.setColor(0);
+ }else{
+ stockListVO.setColor(1);
+ }
+
stockListVO.setNowPrice(realTimeStock.getLast());
stockListVO.setToday_max(realTimeStock.getHigh());
stockListVO.setToday_min(realTimeStock.getLow());
@@ -104,8 +110,6 @@
return null;
}
-
-
return stockListVO;
}
@@ -117,7 +121,7 @@
}
try {
StockRealTimeBean qhBean = RedisKeyUtil.getCacheRealTimeStock(stock);
- stockListVO.setHcrate(new BigDecimal(qhBean.getPcp().replace("%", "")));
+ stockListVO.setHcrate(qhBean.getPcp());
stockListVO.setNowPrice(qhBean.getLast());
stockListVO.setToday_max(qhBean.getHigh());
stockListVO.setToday_min(qhBean.getLow());
@@ -157,57 +161,6 @@
return stockListVO;
}
-
- //hk 数据转换
- public static StockVO otherStockVO(String Result) {
- StockVO stockVO = new StockVO();
- //判断是否是
- JSONObject jsonObject = JSONObject.parseObject(Result);
- stockVO.setName(jsonObject.getString("f14"));
-
- stockVO.setNowPrice(!Objects.equals(jsonObject.getString("f2"), "-") ? jsonObject.getString("f2") : "0");
-
- stockVO.setHcrate(new BigDecimal(!Objects.equals(jsonObject.getString("f3"), "-") ? jsonObject.getString("f3") : "0"));
-
- stockVO.setToday_max(!Objects.equals(jsonObject.getString("f15"), "-") ? jsonObject.getString("f15") : "0");
-
- stockVO.setToday_min(!Objects.equals(jsonObject.getString("f16"), "-") ? jsonObject.getString("f16") : "0");
-
- stockVO.setBusiness_amount(!Objects.equals(jsonObject.getString("f6"), "-") ? jsonObject.getString("f6") : "0");
-
- stockVO.setBusiness_balance(!Objects.equals(jsonObject.getString("f5"), "-") ? jsonObject.getString("f5") : "0");
-
- stockVO.setPreclose_px(!Objects.equals(jsonObject.getString("f18"), "-") ? jsonObject.getString("f18") : "0");
-
- stockVO.setOpen_px(!Objects.equals(jsonObject.getString("f17"), "-") ? jsonObject.getString("f17") : "0");
- stockVO.setType(jsonObject.getString("f13"));
- String buy = "0";
- stockVO.setBuy1(buy);
- stockVO.setBuy2(buy);
- stockVO.setBuy3(buy);
- stockVO.setBuy4(buy);
- stockVO.setBuy5(buy);
-
- stockVO.setSell1(buy);
- stockVO.setSell2(buy);
- stockVO.setSell3(buy);
- stockVO.setSell4(buy);
- stockVO.setSell5(buy);
-
- stockVO.setBuy1_num(buy);
- stockVO.setBuy2_num(buy);
- stockVO.setBuy3_num(buy);
- stockVO.setBuy4_num(buy);
- stockVO.setBuy5_num(buy);
-
- stockVO.setSell1_num(buy);
- stockVO.setSell2_num(buy);
- stockVO.setSell3_num(buy);
- stockVO.setSell4_num(buy);
- stockVO.setSell5_num(buy);
-
- return stockVO;
- }
//us 数据转换
public static StockUsVO otherUsStockVO(String Result) {
--
Gitblit v1.9.3