From 7f73eadee4c6b73f2c0608254bc9e9b82f023c3d Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 04 Aug 2025 10:31:58 +0800
Subject: [PATCH] 新增分页
---
src/main/java/com/nq/controller/backend/AdminStockAiController.java | 3 ++-
src/main/java/com/nq/service/IEchoServices.java | 2 ++
src/main/java/com/nq/controller/backend/AdminExchangeRateController.java | 3 ++-
src/main/java/com/nq/controller/echo/EChoController.java | 8 ++++++++
src/main/java/com/nq/service/IStockAiService.java | 2 +-
src/main/java/com/nq/service/impl/EchoServices.java | 13 +++++++++++++
src/main/java/com/nq/service/impl/StockAiServiceImpl.java | 10 ++++++----
src/main/java/com/nq/controller/StockInkApiController.java | 5 +++--
8 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/controller/StockInkApiController.java b/src/main/java/com/nq/controller/StockInkApiController.java
index d35db52..c06296f 100644
--- a/src/main/java/com/nq/controller/StockInkApiController.java
+++ b/src/main/java/com/nq/controller/StockInkApiController.java
@@ -33,8 +33,9 @@
@RequestMapping("getStockAiList.do")
@ResponseBody
public ServerResponse getStockAiList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
- @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
- return stockAiService.getStockAiList(pageNum, pageSize);
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+ @RequestParam(value = "stockName") String stockName) {
+ return stockAiService.getStockAiList(pageNum, pageSize, stockName);
}
/**
diff --git a/src/main/java/com/nq/controller/backend/AdminExchangeRateController.java b/src/main/java/com/nq/controller/backend/AdminExchangeRateController.java
index 6cc932c..d7b815a 100644
--- a/src/main/java/com/nq/controller/backend/AdminExchangeRateController.java
+++ b/src/main/java/com/nq/controller/backend/AdminExchangeRateController.java
@@ -4,6 +4,7 @@
import com.nq.enums.EStockType;
import com.nq.pojo.ExchangeRate;
import com.nq.service.ExchangeRateService;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@@ -38,7 +39,7 @@
if (model == null) {
return ServerResponse.createByErrorMsg("editRate model is null");
}
- if (model.getRata() == null || model.getCurrency().isEmpty() || model.getConversionCurrency().isEmpty()) {
+ if (model.getRata() == null || StringUtils.isBlank(model.getCurrency()) || StringUtils.isBlank(model.getConversionCurrency())) {
return ServerResponse.createByErrorMsg("请输入货币和汇率参数不能为空");
}
if (model.getCurrency().equals(model.getConversionCurrency())) {
diff --git a/src/main/java/com/nq/controller/backend/AdminStockAiController.java b/src/main/java/com/nq/controller/backend/AdminStockAiController.java
index e25ee1b..da957ff 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockAiController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockAiController.java
@@ -5,6 +5,7 @@
import com.nq.pojo.StockAIOrderPosition;
import com.nq.service.IStockAiService;
import com.nq.service.IStockService;
+ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -93,7 +94,7 @@
if (id == null) {
return ServerResponse.createByErrorMsg("id is null");
}
- if (status.isEmpty()) {
+ if (StringUtils.isBlank(status)) {
return ServerResponse.createByErrorMsg("status is null");
}
return stockAiService.orderOperation(id, status);
diff --git a/src/main/java/com/nq/controller/echo/EChoController.java b/src/main/java/com/nq/controller/echo/EChoController.java
index 952d9de..ba58565 100644
--- a/src/main/java/com/nq/controller/echo/EChoController.java
+++ b/src/main/java/com/nq/controller/echo/EChoController.java
@@ -44,6 +44,14 @@
return ServerResponse.createBySuccess(iEchoServices.queryList());
}
+ @PostMapping("queryEchoPage.do")
+ @ResponseBody
+ public ServerResponse queryEchoPage(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+ HttpServletRequest request) {
+ return iEchoServices.queryListPage(pageNum, pageSize);
+ }
+
@PostMapping("buyEcho.do")
@ResponseBody
diff --git a/src/main/java/com/nq/service/IEchoServices.java b/src/main/java/com/nq/service/IEchoServices.java
index ff006e0..4c5661b 100644
--- a/src/main/java/com/nq/service/IEchoServices.java
+++ b/src/main/java/com/nq/service/IEchoServices.java
@@ -15,6 +15,8 @@
public List<EChoBean> queryList();
+ ServerResponse queryListPage(int pageNum, int pageSize);
+
boolean buyECho(String eId, BigDecimal money, String accectType, HttpServletRequest request);
diff --git a/src/main/java/com/nq/service/IStockAiService.java b/src/main/java/com/nq/service/IStockAiService.java
index c1f00f9..be3c3b1 100644
--- a/src/main/java/com/nq/service/IStockAiService.java
+++ b/src/main/java/com/nq/service/IStockAiService.java
@@ -10,7 +10,7 @@
public interface IStockAiService {
- ServerResponse getStockAiList(Integer pageNum, Integer pageSize);
+ ServerResponse getStockAiList(Integer pageNum, Integer pageSize, String stockName);
ServerResponse buyStockAi(Long id, BigDecimal buyNum, HttpServletRequest request);
diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index db29246..67e3ae1 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -55,6 +55,19 @@
}
@Override
+ public ServerResponse queryListPage(int pageNum, int pageSize) {
+ try {
+ PageHelper.startPage(pageNum, pageSize);
+ List<EChoBean> eChoBeans = eChoMapper.selectList(null);
+ PageInfo<EChoBean> pageInfo = new PageInfo<>(eChoBeans);
+ return ServerResponse.createBySuccess(pageInfo);
+ } catch (Exception ex) {
+ log.error("echoService queryListPage error", ex);
+ }
+ return ServerResponse.createByError();
+ }
+
+ @Override
public boolean buyECho(String eId, BigDecimal money, String accectType, HttpServletRequest request) {
User user = this.iUserService.getCurrentRefreshUser(request);
diff --git a/src/main/java/com/nq/service/impl/StockAiServiceImpl.java b/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
index b1b2304..ef8d8d5 100644
--- a/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
@@ -15,6 +15,7 @@
import com.nq.vo.stock.ai.StockAiOrderTypeVO;
import com.nq.vo.stock.ai.StockAiOrderVO;
import com.nq.vo.stock.ai.StockAiVO;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,11 +55,12 @@
* @return
*/
@Override
- public ServerResponse getStockAiList(Integer pageNum, Integer pageSize) {
+ public ServerResponse getStockAiList(Integer pageNum, Integer pageSize, String stockName) {
try {
PageHelper.startPage(pageNum, pageSize);
List<StockAI> stockAiList = stockAiMapper.selectList(new QueryWrapper<StockAI>()
- .eq("status", EStockAIStatus.online.getValue()));
+ .eq("status", EStockAIStatus.online.getValue())
+ .eq(StringUtils.isNotBlank(stockName),"stock_name", stockName));
// 获取分页信息
PageInfo<StockAI> pageInfo = new PageInfo<>(stockAiList);
return ServerResponse.createBySuccess(pageInfo);
@@ -197,8 +199,8 @@
if (model == null) {
return ServerResponse.createByErrorMsg("editStockAi model is null");
}
- if (model.getStockType().isEmpty() || model.getStockName().isEmpty() || model.getMinPrice() == null
- || model.getSuccessRate() == null || model.getExpectedEarning() == null || model.getStatus().isEmpty()) {
+ if (StringUtils.isBlank(model.getStockType()) || StringUtils.isBlank(model.getStockName()) || model.getMinPrice() == null
+ || model.getSuccessRate() == null || model.getExpectedEarning() == null || StringUtils.isBlank(model.getStatus())) {
return ServerResponse.createByErrorMsg("请完善必填信息");
}
if (!model.getStockType().equals(EStockType.US.getCode()) && !model.getStockType().equals(EStockType.MX.getCode())) {
--
Gitblit v1.9.3