From 331800c37d20f0fb12513a8a4143b36c2e2764cb Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 02 Aug 2025 15:11:29 +0800
Subject: [PATCH] pc接口调整
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 32 ++++++++--------
.idea/inspectionProfiles/Project_Default.xml | 3 +
src/main/java/com/nq/service/IEchoServices.java | 3 +
src/main/java/com/nq/controller/echo/EChoController.java | 8 +++
src/main/java/com/nq/controller/protol/UserController.java | 11 +++++
src/main/java/com/nq/service/IUserStockSubscribeService.java | 5 ++
src/main/java/com/nq/service/impl/EchoServices.java | 24 ++++++++++++
src/main/resources/mapper/UserStockSubscribeMapper.xml | 2
8 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 03a53c0..1cc84ac 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -63,6 +63,9 @@
<inspection_tool class="AlibabaUnsupportedExceptionWithModifyAsList" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaUseQuietReferenceNotation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,com.github.pagehelper.page.PageMethod,startPage" />
+ </inspection_tool>
<inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
<option name="TOP_LEVEL_CLASS_OPTIONS">
<value>
diff --git a/src/main/java/com/nq/controller/echo/EChoController.java b/src/main/java/com/nq/controller/echo/EChoController.java
index 56946ce..952d9de 100644
--- a/src/main/java/com/nq/controller/echo/EChoController.java
+++ b/src/main/java/com/nq/controller/echo/EChoController.java
@@ -81,7 +81,13 @@
return ServerResponse.createBySuccess(iEchoServices.queryOrderEcho(request));
}
-
+ @PostMapping("queryOrderEchoPage.do")
+ @ResponseBody
+ public ServerResponse queryOrderEcho(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+ HttpServletRequest request) {
+ return iEchoServices.queryOrderEchoPage(pageNum, pageSize, request);
+ }
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 7fa335c..4fb7f15 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -330,6 +330,17 @@
return this.iUserStockSubscribeService.getOneSubscribeByUserId(type, status, request);
}
+ /*新股申购-用户新股申购数据分页*/
+ @RequestMapping({"getOneSubscribeByUserIdPage.do"})
+ @ResponseBody
+ public ServerResponse getOneSubscribeByUserIdPage(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+ @RequestParam(value ="type",required = false)String type,
+ @RequestParam(value ="status",required = false)Integer status,
+ HttpServletRequest request) {
+ return this.iUserStockSubscribeService.getOneSubscribeByUserIdPage(pageNum, pageSize, type, status, request);
+ }
+
/*新股申购-用户提交金额*/
@RequestMapping({"submitSubscribe.do"})
@ResponseBody
diff --git a/src/main/java/com/nq/service/IEchoServices.java b/src/main/java/com/nq/service/IEchoServices.java
index 1acd5f5..ff006e0 100644
--- a/src/main/java/com/nq/service/IEchoServices.java
+++ b/src/main/java/com/nq/service/IEchoServices.java
@@ -1,5 +1,6 @@
package com.nq.service;
+import com.nq.common.ServerResponse;
import com.nq.pojo.EChoBean;
import com.nq.pojo.OrderEchoBean;
import com.nq.pojo.OrderEchoOut;
@@ -20,6 +21,8 @@
List<OrderEchoOut> queryOrderEcho(HttpServletRequest request);
+ ServerResponse queryOrderEchoPage(int pageNum, int pageSize, HttpServletRequest request);
+
List<OrderEChoReponse> queryALLOrderEcho();
diff --git a/src/main/java/com/nq/service/IUserStockSubscribeService.java b/src/main/java/com/nq/service/IUserStockSubscribeService.java
index f525c25..78166e2 100644
--- a/src/main/java/com/nq/service/IUserStockSubscribeService.java
+++ b/src/main/java/com/nq/service/IUserStockSubscribeService.java
@@ -52,6 +52,11 @@
ServerResponse getOneSubscribeByUserId(String type, Integer status, HttpServletRequest request);
/**
+ * 新股申购-查询用户最新新股申购数据分页
+ */
+ ServerResponse getOneSubscribeByUserIdPage(int pageNum, int pageSize, String type, Integer status, HttpServletRequest request);
+
+ /**
* 新股申购-用户提交金额
*/
ServerResponse userSubmit(Integer id,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 73d09fb..db29246 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -2,15 +2,22 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.nq.common.ResponseCode;
+import com.nq.common.ServerResponse;
import com.nq.dao.EChoMapper;
import com.nq.dao.OrderEchoMapper;
import com.nq.dao.UserAssetsMapper;
import com.nq.dao.UserPositionMapper;
+import com.nq.enums.EStockAIStatus;
import com.nq.enums.EStockType;
import com.nq.pojo.*;
import com.nq.pojo.reponse.OrderEChoReponse;
import com.nq.service.IEchoServices;
import com.nq.service.IUserService;
+import com.nq.utils.PropertiesUtil;
+import com.nq.vo.subscribe.UserStockSubscribeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -94,6 +101,23 @@
}
@Override
+ public ServerResponse queryOrderEchoPage(int pageNum, int pageSize, HttpServletRequest request) {
+ try {
+ User user = iUserService.getCurrentRefreshUser(request);
+ if (user == null) {
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ }
+ PageHelper.startPage(pageNum, pageSize);
+ List<OrderEchoOut> orderEchoOutList = orderEchoMapper.queryByUserId(user.getId());
+ PageInfo<OrderEchoOut> pageInfo = new PageInfo<>(orderEchoOutList);
+ return ServerResponse.createBySuccess(pageInfo);
+ } catch (Exception ex) {
+ log.error("echoService queryOrderEchoPage error", ex);
+ }
+ return ServerResponse.createByError();
+ }
+
+ @Override
public List<OrderEChoReponse> queryALLOrderEcho() {
return orderEchoMapper.queryAll();
}
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 3192693..027f2a9 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -499,26 +499,26 @@
String header = request.getHeader(property);
if (header != null) {
User user = iUserService.getCurrentRefreshUser(request);
-
List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
- /*if (type==null||type.equals("")){
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
- }else{
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
- }*/
-
- List<UserStockSubscribeVo> list = new ArrayList<>();
- for (UserStockSubscribeVo userStockSubscribe1 : userStockSubscribe) {
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
- .eq("newlist_id", userStockSubscribe1.getNewStockId()));
- if (stockSubscribe != null) {
- list.add(userStockSubscribe1);
- }
- }
- return ServerResponse.createBySuccess(list);
+ return ServerResponse.createBySuccess(userStockSubscribe);
}
return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
}
+
+ @Override
+ public ServerResponse getOneSubscribeByUserIdPage(int pageNum,int pageSize,String type, Integer status, HttpServletRequest request) {
+ String property = PropertiesUtil.getProperty("user.cookie.name");
+ String header = request.getHeader(property);
+ if (header != null) {
+ User user = iUserService.getCurrentRefreshUser(request);
+ PageHelper.startPage(pageNum, pageSize);
+ List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
+ PageInfo<UserStockSubscribeVo> pageInfo = new PageInfo<>(userStockSubscribe);
+ return ServerResponse.createBySuccess(pageInfo);
+ }
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ }
+
/**
* 新股申购-用户提交金额
*/
diff --git a/src/main/resources/mapper/UserStockSubscribeMapper.xml b/src/main/resources/mapper/UserStockSubscribeMapper.xml
index 5e10fc3..df5034f 100644
--- a/src/main/resources/mapper/UserStockSubscribeMapper.xml
+++ b/src/main/resources/mapper/UserStockSubscribeMapper.xml
@@ -257,7 +257,7 @@
,s.stock_type,s.list_date,s.subscription_time
FROM user_stock_subscribe u
LEFT JOIN stock_subscribe s on s.newlist_id = u.new_stock_id
- WHERE 1=1
+ WHERE 1=1 AND s.newlist_id is not null
<if test="userId != null">
and u.user_id = #{userId}
</if>
--
Gitblit v1.9.3