From 993755aece09ef32798c04cfdaf4921cd5572743 Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Sat, 08 Nov 2025 00:33:58 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockServiceImpl.java |   70 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 0f810db..cf68fe3 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,5 +1,7 @@
 package com.nq.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
@@ -26,6 +28,7 @@
 import com.nq.utils.stock.pinyin.GetPyByChinese;
 import com.nq.utils.stock.qq.QqStockApi;
 import com.nq.utils.stock.sina.StockApi;
+import com.nq.utils.timeutil.TimeUtil;
 import com.nq.utils.translate.GoogleTranslateUtil;
 import com.nq.vo.stock.*;
 import com.nq.vo.stock.k.MinDataVO;
@@ -38,6 +41,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -87,6 +91,9 @@
     @Autowired
     ISiteSettingService iSiteSettingService;
 
+    @Resource
+    StockTimeSettingMapper stockTimeSettingMapper;
+
 
     @Autowired
     InStockMapper inStockMapper;
@@ -97,6 +104,9 @@
 
     @Autowired
     IPriceServices iPriceServices;
+    @Autowired
+    ITradingHourService tradingHourService;
+
 
 
     public ServerResponse getMarket() {
@@ -169,19 +179,48 @@
         return ServerResponse.createBySuccess(pageInfo);
     }
 
+//    @Override
+//    public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
+//        List<Stock> stockList = new ArrayList<>();
+//        PageHelper.startPage(pageNum, pageSize);
+//        stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+//        List<StockListVO> stockListVOS = Lists.newArrayList();
+//        if (stockList.size() > 0){
+//            stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
+//        }
+//        RPageInfo pageInfo = new RPageInfo();
+//        pageInfo.setList(stockListVOS);
+//        pageInfo.setStockType(stockType);
+//        pageInfo.setTotal(stockListVOS.size());
+//
+//        return ServerResponse.createBySuccess(pageInfo);
+//    }
+
+
+
+
     @Override
     public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
-        List<Stock> stockList = new ArrayList<>();
+        // 启动分页
         PageHelper.startPage(pageNum, pageSize);
-        stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+
+        // 查询数据（此时返回的已经是分页后的数据）
+        List<Stock> stockList = stockMapper.findStockByType(orderBy, stockType, keyWords);
+
+        // 获取分页信息
+        PageInfo<Stock> pageInfo = new PageInfo<>(stockList);
+
         List<StockListVO> stockListVOS = Lists.newArrayList();
-        if (stockList.size() > 0){
+        if (stockList.size() > 0) {
             stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
         }
-        RPageInfo pageInfo = new RPageInfo();
-        pageInfo.setList(stockListVOS);
-        pageInfo.setStockType(stockType);
-        return ServerResponse.createBySuccess(pageInfo);
+
+        RPageInfo rPageInfo = new RPageInfo();
+        rPageInfo.setList(stockListVOS);
+        rPageInfo.setStockType(stockType);
+        rPageInfo.setTotal(pageInfo.getTotal());  // 使用 PageInfo 中的总条数
+
+        return ServerResponse.createBySuccess(rPageInfo);
     }
 
     @Override
@@ -213,6 +252,11 @@
         if(null != cacheBaseStock){
             stockVO.setOpen_px(cacheBaseStock.getOpen());
             stockVO.setPreclose_px(cacheBaseStock.getPrevClose());
+        }
+        if(tradingHourService.isPreMarket(stock.getStockCode())){
+            stockVO.setPreMarket(1);
+        }else {
+            stockVO.setPreMarket(0);
         }
         Map map = Maps.newHashMap();
         map.put("introduction", introduction);
@@ -466,6 +510,18 @@
         return ServerResponse.createBySuccess(filteredList);
     }
 
+    @Override
+    public ServerResponse getExchange() {
+        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","US"));
+        if(stockTimeSetting == null){
+            return  ServerResponse.createBySuccess(false);
+        }
+        if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+            return  ServerResponse.createBySuccess(false);
+        }
+        return ServerResponse.createBySuccess(TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime()));
+    }
+
 
     @Override
     public ServerResponse getOptionStock(HttpServletRequest request) {

--
Gitblit v1.9.3