From 6ca466185554ac1671af9556d4b2f9df9c8c9974 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 16:09:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockServiceImpl.java |  183 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 151 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 4d964e1..bf35ca2 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,6 +1,10 @@
 package com.nq.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -11,12 +15,14 @@
 import com.google.gson.reflect.TypeToken;
 import com.nq.common.ServerResponse;
 import com.nq.dao.*;
+import com.nq.enums.EConfigKey;
 import com.nq.enums.EStockType;
 import com.nq.pojo.*;
 import com.nq.pojo.reponse.RPageInfo;
 import com.nq.service.*;
 import com.nq.utils.http.HttpClientRequest;
 import com.nq.utils.PropertiesUtil;
+import com.nq.utils.http.HttpRequest;
 import com.nq.utils.redis.RedisKeyUtil;
 import com.nq.utils.redis.RedisShardedPoolUtils;
 import com.nq.utils.stock.pinyin.GetPyByChinese;
@@ -26,12 +32,15 @@
 import com.nq.vo.stock.k.MinDataVO;
 import com.nq.vo.stock.k.echarts.EchartsDataVO;
 
+import java.lang.reflect.Type;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,6 +80,11 @@
     @Autowired
     SiteNewsMapper siteNewsMapper;
 
+    @Autowired
+    StockConfigMapper stockConfigMapper;
+
+    @Resource
+    StockSettingMapper stockSettingMapper;
 
     public ServerResponse getMarket() {
         String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -237,7 +251,7 @@
         Integer depositAmt = 0;
         String introduction = null;
         String result = null;
-        com.alibaba.fastjson2.JSONObject json = null;
+        JSONObject json = null;
         //期货
         String url = null;
         if (code.contains("sh") || code.contains("sz")) { //指数
@@ -267,7 +281,7 @@
             if (result.contains("msg")) {
                 introduction = "暂无数据";
             } else {
-                json = com.alibaba.fastjson2.JSONObject.parseObject(result);
+                json = JSONObject.parseObject(result);
                 if (json.getJSONObject("data").getJSONArray("gszl").size() > 0) {
                     introduction = json.getJSONObject("data").getJSONArray("gszl").getJSONObject(0).getString("COMPPROFILE");
                 } else {
@@ -280,12 +294,12 @@
          * 105.UCL&ut=fa5fd1943c7b386f172d6893dbfba10b&wbp2u=%7C0%7C0%7C0%7Cweb&_=时间戳
          */
         long now = System.currentTimeMillis();
-        com.alibaba.fastjson2.JSONObject buyjson = null;
+        JSONObject buyjson = null;
         String buyresult = null;
         try {
             String buyurl = PropertiesUtil.getProperty("us.stock.buy.url") + stockVO.getType() + "." + stock.getStockCode() + "&ut=fa5fd1943c7b386f172d6893dbfba10b&wbp2u=%7C0%7C0%7C0%7Cweb&_=" + now;
             buyresult = HttpClientRequest.doGet(buyurl);
-            buyjson = com.alibaba.fastjson2.JSONObject.parseObject(buyresult);
+            buyjson = JSONObject.parseObject(buyresult);
         } catch (Exception e) {
             log.error("获取分时交易数据失败", e);
             buyjson.put("data", "暂无数据");
@@ -403,7 +417,7 @@
         EchartsDataVO echartsDataVO = StockApi.assembleEchartsDataVO(minDataVO);
         return ServerResponse.createBySuccess(echartsDataVO);
     }
-    @lombok.Data
+    @Data
     class kData {
         long t;
         String c;
@@ -660,8 +674,8 @@
         log.info("涨停板接口:{}", url);
         String res = HttpClientRequest.doGet(url);
 
-        com.alibaba.fastjson2.JSONObject json = com.alibaba.fastjson2.JSONObject.parseObject(res);
-        com.alibaba.fastjson2.JSONArray pool = null;
+        JSONObject json = JSONObject.parseObject(res);
+        JSONArray pool = null;
         if (json.getJSONObject("data") != null) {
             pool = json.getJSONObject("data").getJSONArray("pool");
         }
@@ -677,13 +691,13 @@
         url = url.replace("20221202", day1) + time;
 //    log.info("涨停板接口:{}",url);
         String res = HttpClientRequest.doGet(url);
-        com.alibaba.fastjson2.JSONObject json = com.alibaba.fastjson2.JSONObject.parseObject(res);
-        com.alibaba.fastjson2.JSONArray pool = null;
+        JSONObject json = JSONObject.parseObject(res);
+        JSONArray pool = null;
         if (json.getJSONObject("data") != null) {
             pool = json.getJSONObject("data").getJSONArray("pool");
             if (pool != null) {
                 for (int i = 0; i < pool.size(); i++) {
-                    com.alibaba.fastjson2.JSONObject jsonObject = pool.getJSONObject(i);
+                    JSONObject jsonObject = pool.getJSONObject(i);
                     String c = jsonObject.getString("c");
                     if (c.equals(code)) {
                         pool.removeAll(pool);
@@ -702,36 +716,29 @@
             //新闻列表
             List<SiteNews> newsList = this.siteNewsMapper.getTopNewsList(pageSize);
 
-            String usCodeList = PropertiesUtil.getProperty("us_home_indices_code");
+            /*String usCodeList = PropertiesUtil.getProperty("us_home_indices_code");
             String hkCodeList = PropertiesUtil.getProperty("hk_home_indices_code");
             String inCodeList = PropertiesUtil.getProperty("in_home_indices_code");
-            String twCodeList = PropertiesUtil.getProperty("tw_home_indices_code");
+            String twCodeList = PropertiesUtil.getProperty("tw_home_indices_code");*/
 
-            List<String> usStockCodeList = Arrays.asList(usCodeList.split(","));
-            List<String> hkStockCodeList = Arrays.asList(hkCodeList.split(","));
-            List<String> inStockCodeList = Arrays.asList(inCodeList.split(","));
-            List<String> twStockCodeList = Arrays.asList(twCodeList.split(","));
+            List<StockConfig> stockConfigList = stockConfigMapper.selectList
+                    (new LambdaQueryWrapper<StockConfig>()
+                            .like(StockConfig::getCKey, EConfigKey.INDICES.getCode()));
 
             List<DataStockBean> usDataStockBeans = Lists.newArrayList();
-            List<DataStockBean> hkDataStockBeans = Lists.newArrayList();
-            List<DataStockBean> inDataStockBeans = Lists.newArrayList();
-            List<DataStockBean> twDataStockBeans = Lists.newArrayList();
+            List<DataStockBean> jpDataStockBeans = Lists.newArrayList();
             // 创建Gson对象(全局复用,避免重复创建)
             Gson gson = new Gson();
 
             // 统一处理各地区股票数据
-            processStockData(usStockCodeList, EStockType.US.getCode(), usDataStockBeans, gson);
-            processStockData(hkStockCodeList, EStockType.HK.getCode(), hkDataStockBeans, gson);
-            processStockData(inStockCodeList, EStockType.IN.getCode(), inDataStockBeans, gson);
-            processStockData(twStockCodeList, EStockType.TW.getCode(), twDataStockBeans, gson);
+            processStockData(stockConfigList, EStockType.US.getCode(), usDataStockBeans, gson);
+            processStockData(stockConfigList, EStockType.JP.getCode(), jpDataStockBeans, gson);
 
             // 组装返回结果
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("newsList", newsList);                //新闻列表
             resultMap.put("usDataStockBeans", usDataStockBeans);//美国指数
-            resultMap.put("hkDataStockBeans", hkDataStockBeans);//香港指数
-            resultMap.put("inDataStockBeans", inDataStockBeans);//印度指数
-            resultMap.put("twDataStockBeans", twDataStockBeans);//台湾指数
+            resultMap.put("jpDataStockBeans", jpDataStockBeans);//日本指数
             return ServerResponse.createBySuccess(resultMap);
         } catch (Exception e){
             e.printStackTrace();
@@ -740,11 +747,30 @@
     }
 
     // 提取的通用处理方法
-    private void processStockData(List<String> stockCodeList, String stockType,
-                                  List<DataStockBean> targetList, Gson gson) {
+    private void processStockData(List<StockConfig> stockConfigList, String stockType,
+                                  List<DataStockBean> targetList, Gson gson) throws Exception {
+        String key = EConfigKey.getEConfigKeyByStockType(stockType).getCode();
+        StockConfig stockConfig = stockConfigList.stream()
+                .filter(x -> x.getCKey().equals(key)).findFirst().orElse(null);
+        if (stockConfig == null) {
+            return;
+        }
+        String stockCodes = stockConfig.getCValue();
+        String[] stockCodeList = stockCodes.split(",");
+        //实时获取数据
+        //String result = RedisKeyUtil.doPost(stockCodes, stockType);
+        EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
+        String result = HttpRequest.doGrabGet(eStockType.stockUrl + "indices?key=" + eStockType.getStockKey() + "&country_id=" + eStockType.getContryId());
+        // 把JSON数据解析为List<DataStockBean>
+        Type listType = new TypeToken<List<DataStockBean>>(){}.getType();
+        List<DataStockBean> list = new Gson().fromJson(result, listType);
+
         for (String stockCode : stockCodeList) {  // 增强for循环简化代码
             // 获取基础股票数据
-            DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, stockCode);
+            //DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, stockCode);
+            DataStockBean cacheBaseStock = list.stream()
+                    .filter(x -> stockCode.equals(x.getId()))
+                    .findFirst().orElse(null);
             if (cacheBaseStock == null) {  // 增加空指针防护(可选,根据实际业务)
                 continue;
             }
@@ -770,7 +796,7 @@
     @Override
     public ServerResponse getIndicesList(String stockType) {
         try {
-            String codeList;
+            /*String codeList;
             if(stockType.equals(EStockType.US.getCode())) {
                 codeList = PropertiesUtil.getProperty("us_home_indices_code");
             } else if(stockType.equals(EStockType.HK.getCode())) {
@@ -780,9 +806,15 @@
             } else if(stockType.equals(EStockType.TW.getCode())) {
                 codeList = PropertiesUtil.getProperty("tw_home_indices_code");
             } else
-                codeList = PropertiesUtil.getProperty("us_home_indices_code");
+                codeList = PropertiesUtil.getProperty("us_home_indices_code");*/
 
-            List<String> stockCodeList = Arrays.asList(codeList.split(","));
+            String key = EConfigKey.getEConfigKeyByStockType(stockType).getCode();
+            StockConfig stockConfig = stockConfigMapper.selectOne(new LambdaQueryWrapper<StockConfig>()
+                            .eq(StockConfig::getCKey, key));
+            if (stockConfig == null) {
+                return ServerResponse.createByErrorMsg("stockConfig [" + key + "] is null");
+            }
+            List<String> stockCodeList = Arrays.asList(stockConfig.getCValue().split(","));
 
             Map<Integer, Object> resultMap = new HashMap<>();
             for (int i = 0; i < stockCodeList.size(); i++) {
@@ -811,6 +843,7 @@
             stockType = stock.getStockType();
             Map<String, Object> resultMap = new HashMap<>();
 
+            //实时获取数据
             String s = RedisKeyUtil.doPost(pid, stockType);
             Map<String, Object> stringObjectMap = RedisKeyUtil.jsonToMap(s);
             resultMap.put("id", pid);
@@ -878,4 +911,90 @@
         }
         return ServerResponse.createByError();
     }
+
+    @Override
+    public ServerResponse getPremarketStock() {
+        try {
+            List<StockSetting> stockSettings = stockSettingMapper.selectList(new QueryWrapper<>());
+            List<PremarketStockVO> resultList = new ArrayList<>();
+            
+            Date now = new Date();
+            
+            for (StockSetting setting : stockSettings) {
+                String startTime = setting.getStartTime();
+                String endTime = setting.getEndTime();
+                
+                // 判断当前时间是否在交易时间内(startTime和endTime是完整的日期时间格式)
+                if (isTimeInRange(now, startTime, endTime)) {
+                    Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", setting.getStockCode()));
+                    if (stock == null) {
+                        continue; // 股票不存在,跳过
+                    }
+                    
+                    // 先获取真实数据,用于获取前收盘价和当前价格
+                    StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
+                    if (realTimeStock == null || realTimeStock.getPc() == null) {
+                        continue; // 无法获取真实数据,跳过
+                    }
+                    
+                    // 获取前收盘价和当前价格(last)
+                    BigDecimal prevClose = new BigDecimal(realTimeStock.getPc());
+                    BigDecimal last = new BigDecimal(realTimeStock.getLast());
+                    
+                    // 计算盘前价格(根据StockSetting配置)
+                    BigDecimal premarketPrice;
+                    if ("0".equals(setting.getType())) {
+                        // type=0: 直接指定价格
+                        premarketPrice = new BigDecimal(setting.getPrice());
+                    } else {
+                        // type=1: 百分比调价格,基于last计算
+                        premarketPrice = last.multiply(new BigDecimal(setting.getPrice()));
+                    }
+                    
+                    // 根据盘前价格计算涨跌幅 = (盘前价格 - 前收盘价) / 前收盘价
+                    BigDecimal hcrate = BigDecimal.ZERO;
+                    if (prevClose.compareTo(BigDecimal.ZERO) > 0) {
+                        hcrate = premarketPrice.subtract(prevClose)
+                                .divide(prevClose, 4, RoundingMode.HALF_UP);
+                    }
+                    
+                    // 格式化涨跌幅为带百分号的字符串
+                    String hcrateP = hcrate.multiply(new BigDecimal("100"))
+                            .setScale(2, RoundingMode.HALF_UP) + "%";
+                    
+                    PremarketStockVO vo = new PremarketStockVO();
+                    vo.setCode(setting.getStockCode());
+                    vo.setPrice(premarketPrice); // price返回盘前价格
+                    vo.setHcrate(hcrate);
+                    vo.setHcrateP(hcrateP);
+                    resultList.add(vo);
+                }
+            }
+            
+            return ServerResponse.createBySuccess(resultList);
+        } catch (Exception e) {
+            log.error("getPremarketStock error", e);
+            return ServerResponse.createByErrorMsg("查询盘前交易数据失败");
+        }
+    }
+
+    /**
+     * 判断当前时间是否在指定时间范围内
+     * @param now 当前时间
+     * @param startTime 开始时间,完整的日期时间格式
+     * @param endTime 结束时间,完整的日期时间格式
+     * @return
+     */
+    private boolean isTimeInRange(Date now, String startTime, String endTime) {
+        try {
+            DateTime start = DateUtil.parseDateTime(startTime);
+            DateTime end = DateUtil.parseDateTime(endTime);
+            
+            // 判断当前时间是否在开始时间和结束时间之间
+            return now.after(start) && now.before(end);
+        } catch (Exception e) {
+            log.error("isTimeInRange error", e);
+            return false;
+        }
+    }
 }

--
Gitblit v1.9.3