From 2818327f844e65e1efc398271b7e4ebf9e8d8364 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 15 Jan 2026 18:44:53 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/StockApiController.java |  153 +++++++++++++++++++++++++-------------------------
 1 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/src/main/java/com/nq/controller/StockApiController.java b/src/main/java/com/nq/controller/StockApiController.java
index 775b006..b3d76ee 100644
--- a/src/main/java/com/nq/controller/StockApiController.java
+++ b/src/main/java/com/nq/controller/StockApiController.java
@@ -1,9 +1,7 @@
 package com.nq.controller;
 
 import com.nq.common.ServerResponse;
-import com.nq.pojo.SiteSetting;
-import com.nq.service.IStockService;
-import com.nq.service.StockDzService;
+import com.nq.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +22,8 @@
     IStockService iStockService;
     @Autowired
     StockDzService stockDzService;
+    @Autowired
+    IUserPositionService iUserPositionService;
 
     //查询 股票指数、大盘指数信息
     @RequestMapping({"getMarket.do"})
@@ -54,6 +54,7 @@
 
 
 
+
     @RequestMapping("getOptionStock.do")
     @ResponseBody()
     public  ServerResponse getOptionStock(HttpServletRequest request){
@@ -67,25 +68,8 @@
     public ServerResponse getSingleStock(@RequestParam("code") String code, HttpServletRequest request) {
         return this.iStockService.getSingleStock(code, request);
     }
-    //美股股票代码查询股票信息
-    @RequestMapping({"getSingleStockByCode.do"})
-    @ResponseBody
-    public ServerResponse getSingleStockByCode(@RequestParam("code") String code) {
-        return this.iStockService.getSingleStockByCode(code);
-    }
 
-    @RequestMapping({"getMinK.do"})
-    @ResponseBody
-    public ServerResponse getMinK(@RequestParam("code") String code, @RequestParam("time") Integer time, @RequestParam("ma") Integer ma, @RequestParam("size") Integer size) {
-        return this.iStockService.getMinK(code, time, ma, size);
-    }
 
-    /*查询股票日线*/
-    @RequestMapping({"getDayK.do"})
-    @ResponseBody
-    public ServerResponse getDayK(@RequestParam("code") String code) {
-        return this.iStockService.getDayK_Echarts(code);
-    }
     /*查询股票日线*/
     @RequestMapping({"getKData.do"})
     @ResponseBody
@@ -98,66 +82,38 @@
     }
 
 
-
-    //查询股票历史数据数据
-    @RequestMapping({"getMinK_Echarts.do"})
-    @ResponseBody
-    public ServerResponse getMinK_Echarts(@RequestParam("code") String code, @RequestParam("time") Integer time, @RequestParam("ma") Integer ma, @RequestParam("size") Integer size) {
-        return this.iStockService.getMinK_Echarts(code, time, ma, size);
-    }
-
-    /*期货分时-k线*/
-    @RequestMapping({"getFuturesMinK_Echarts.do"})
-    @ResponseBody
-    public ServerResponse getFuturesMinK_Echarts(@RequestParam("code") String code, @RequestParam("time") Integer time, @RequestParam("size") Integer size) {
-        return this.iStockService.getFuturesMinK_Echarts(code, time, size);
-    }
-
-    /*指数分时-k线*/
-    @RequestMapping({"getIndexMinK_Echarts.do"})
-    @ResponseBody
-    public ServerResponse getIndexMinK_Echarts(@RequestParam("code") String code, @RequestParam("time") Integer time, @RequestParam("size") Integer size) {
-        return this.iStockService.getIndexMinK_Echarts(code, time, size);
-    }
-
-    /*查询期货日线*/
-    @RequestMapping({"getFuturesDayK.do"})
-    @ResponseBody
-    public ServerResponse getFuturesDayK(@RequestParam("code") String code) {
-        return this.iStockService.getFuturesDayK(code);
-    }
-
-    /*指数日线*/
-    @RequestMapping({"getIndexDayK.do"})
-    @ResponseBody
-    public ServerResponse getIndexDayK(@RequestParam("code") String code) {
-        return this.iStockService.getIndexDayK(code);
-    }
-
-   /* 股票日线*/
-   @RequestMapping({"getStockDayK.do"})
-   @ResponseBody
-   public ServerResponse getStockDayK(@RequestParam("code") String code) {
-       return this.iStockService.getStockDayK(code);
-   }
-
-
-
-
-//    //查询股票需要换数据源的股票
-//    @RequestMapping({"stockDataBase.do"})
-//    @ResponseBody
-//    public ServerResponse stockDataBase() {
-//        return this.iStockService.stockDataBase();
-//    }
-
     /**
-     *大宗交易 列表
+     * 大宗交易 列表
+     * @param pageNum
+     * @param pageSize
+     * @param orderBy
+     * @param keyWords 搜索内容
+     * @return
      */
     @PostMapping({"getDzList.do"})
     @ResponseBody
-    public ServerResponse getDzList() {
-        return this.stockDzService.getDzList();
+    public ServerResponse getDzList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+                                    @RequestParam(value = "orderBy", required = false) String orderBy,
+                                    @RequestParam(value = "keyWords", required = false) String keyWords,
+                                    HttpServletRequest request) {
+        return stockDzService.getDzList(pageNum, pageSize, orderBy,keyWords , request);
+    }
+
+    /**
+     * 大宗交易订单列表
+     * @param pageNum
+     * @param pageSize
+     * @param status    状态 //0:待审核  1:成功 2:失败
+     * @return
+     */
+    @RequestMapping({"getDzOrderList.do"})
+    @ResponseBody
+    public ServerResponse getDzOrderList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+                                         @RequestParam(value = "status", required = false) Integer status,
+                                         HttpServletRequest request) {
+        return iUserPositionService.getDzOrderList(pageNum, pageSize, status, request);
     }
 
 
@@ -181,4 +137,49 @@
     public ServerResponse getVipByCode(String code) {
         return this.iStockService.getVipByCode(code);
     }
+
+    /**
+     * 获取首页数据 新闻和指数列表
+     * @param pageSize
+     * @return
+     */
+    @PostMapping({"getHomePageData.do"})
+    @ResponseBody
+    public ServerResponse getHomePageData(@RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
+        return this.iStockService.getIndicesIndexListAndNews(pageSize);
+    }
+
+    /**
+     * 获取指数id和name 默认US
+     * @param stockType
+     * @return
+     */
+    @RequestMapping("getIndicesList.do")
+    @ResponseBody
+    public ServerResponse getIndicesList(@RequestParam(value = "stockType", defaultValue = "US") String stockType)   {
+        return this.iStockService.getIndicesList(stockType);
+    }
+
+    /**
+     * 获取单个指数数据和k线图 默认US
+     * @param stockType
+     * @return
+     */
+    @RequestMapping("getIndicesAndKData.do")
+    @ResponseBody
+    public ServerResponse getIndicesAndKData(@RequestParam(value = "pid") String pid,
+                                             @RequestParam(value = "stockType", defaultValue = "US") String stockType) {
+        return this.iStockService.getIndicesAndKData(pid, stockType);
+    }
+
+    /**
+     * 查询盘前交易数据
+     * 只返回当前时间在交易时间内的盘前数据,返回code和price两个字段
+     */
+    @RequestMapping("getPremarketStock.do")
+    @ResponseBody
+    public ServerResponse getPremarketStock() {
+        return ServerResponse.createBySuccess(this.iStockService.getPremarketStock());
+    }
+
 }

--
Gitblit v1.9.3