From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/controller/StockApiController.java | 76 +++-----------------------------------
1 files changed, 6 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/nq/controller/StockApiController.java b/src/main/java/com/nq/controller/StockApiController.java
index 775b006..d265e7a 100644
--- a/src/main/java/com/nq/controller/StockApiController.java
+++ b/src/main/java/com/nq/controller/StockApiController.java
@@ -67,25 +67,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
@@ -99,65 +82,18 @@
- //查询股票历史数据数据
- @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();
-// }
/**
*大宗交易 列表
*/
@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 = "10") 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);
}
--
Gitblit v1.9.3