From 219f37458e6145163c247bcdc29a5321d48e422a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 17 May 2024 14:40:54 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 2 +-
src/main/resources/application.properties | 8 +++-----
target/classes/mapper/UserMapper.xml | 3 +++
src/main/java/com/nq/controller/backend/AdminUserController.java | 11 +++++++++--
src/main/java/com/nq/dao/UserMapper.java | 2 +-
src/main/java/com/nq/service/IUserService.java | 2 +-
src/main/java/com/nq/service/impl/UserServiceImpl.java | 4 ++--
src/main/resources/mapper/UserMapper.xml | 3 +++
8 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminUserController.java b/src/main/java/com/nq/controller/backend/AdminUserController.java
index 7ed50d3..7bd1f7b 100644
--- a/src/main/java/com/nq/controller/backend/AdminUserController.java
+++ b/src/main/java/com/nq/controller/backend/AdminUserController.java
@@ -30,8 +30,15 @@
//分页查询所有用户列表信息 及模糊查询用户信息
@RequestMapping({"list.do"})
@ResponseBody
- public ServerResponse list(@RequestParam(value = "realName", required = false) String realName, @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "agentId", required = false) Integer agentId, @RequestParam(value = "accountType", required = false) Integer accountType, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize, HttpServletRequest request) {
- return this.iUserService.listByAdmin(realName, phone, agentId, accountType, pageNum, pageSize, request);
+ public ServerResponse list(@RequestParam(value = "realName", required = false) String realName,
+ @RequestParam(value = "phone", required = false) String phone,
+ @RequestParam(value = "agentId", required = false) Integer agentId,
+ @RequestParam(value = "accountType", required = false) Integer accountType,
+ @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+ @RequestParam(value = "id", required = false) String id,
+ HttpServletRequest request) {
+ return this.iUserService.listByAdmin(realName, phone, agentId, accountType, pageNum, pageSize,id, request);
}
//查询用户信息是否存在
diff --git a/src/main/java/com/nq/dao/UserMapper.java b/src/main/java/com/nq/dao/UserMapper.java
index 139c31e..4d89365 100644
--- a/src/main/java/com/nq/dao/UserMapper.java
+++ b/src/main/java/com/nq/dao/UserMapper.java
@@ -24,7 +24,7 @@
List listByAgent(@Param("realName") String paramString1, @Param("phone") String paramString2, @Param("searchId") Integer paramInteger1, @Param("accountType") Integer paramInteger2);
- List listByAdmin(@Param("realName") String paramString1, @Param("phone") String paramString2, @Param("searchId") Integer paramInteger1, @Param("accountType") Integer paramInteger2);
+ List listByAdmin(@Param("realName") String paramString1, @Param("phone") String paramString2, @Param("searchId") Integer paramInteger1, @Param("accountType") Integer paramInteger2,@Param("id") String id);
int CountUserSize(Integer paramInteger);
diff --git a/src/main/java/com/nq/service/IUserService.java b/src/main/java/com/nq/service/IUserService.java
index af09c4b..ae05921 100644
--- a/src/main/java/com/nq/service/IUserService.java
+++ b/src/main/java/com/nq/service/IUserService.java
@@ -62,7 +62,7 @@
ServerResponse addSimulatedAccount(Integer paramInteger1, String paramString1, String paramString2, Integer paramInteger2, HttpServletRequest paramHttpServletRequest);
- ServerResponse listByAdmin(String paramString1, String paramString2, Integer paramInteger1, Integer paramInteger2, int paramInt1, int paramInt2, HttpServletRequest paramHttpServletRequest);
+ ServerResponse listByAdmin(String paramString1, String paramString2, Integer paramInteger1, Integer paramInteger2, int paramInt1, int paramInt2,String id, HttpServletRequest paramHttpServletRequest);
ServerResponse findByUserId(Integer paramInteger);
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 2aa89c1..1828dd0 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -808,10 +808,10 @@
}
- public ServerResponse listByAdmin(String realName, String phone, Integer agentId, Integer accountType, int pageNum, int pageSize, HttpServletRequest request) {
+ public ServerResponse listByAdmin(String realName, String phone, Integer agentId, Integer accountType, int pageNum, int pageSize, String id,HttpServletRequest request) {
PageHelper.startPage(pageNum, pageSize);
- List<User> users = this.userMapper.listByAdmin(realName, phone, agentId, accountType);
+ List<User> users = this.userMapper.listByAdmin(realName, phone, agentId, accountType,id);
PageInfo pageInfo = new PageInfo(users);
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 43d84ef..26f6f4b 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -264,7 +264,7 @@
if(model!=null){
//所有人发站内信
if(model.getUserId() == 0){
- List<User> users = this.userMapper.listByAdmin(null, null, null, null);
+ List<User> users = this.userMapper.listByAdmin(null, null, null, null,null);
for(int k=0;k<users.size();k++){
User user = users.get(k);
SiteMessage siteMessage = new SiteMessage();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index be7416e..a4bcdc7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -175,20 +175,18 @@
spring.mail.host=smtp.gmail.com
# ????????
-spring.mail.port=465
# ????????????
spring.mail.username=barclays5510@gmail.com
# ????????????????????????????
spring.mail.password=nppwibbarixvbnqk
# ??TLS??
-spring.mail.properties.mail.smtp.starttls.enable=true
# ??????????
spring.mail.properties.mail.smtp.auth=true
# ??????
-spring.mail.properties.mail.transport.protocol=smtp
-spring.mail.protocol=smtp
spring.mail.properties.mail.smtp.ssl.enable=true
-spring.mail.properties.mail.smtp.socketFactory.port=465
+spring.mail.properties.mail.transport.protocol=smtp
spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+spring.mail.properties.mail.smtp.socketFactory.port=465
+
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 8efe003..ec05fdd 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -82,6 +82,9 @@
<include refid="Base_Column_List"/>
FROM user
<where>
+ <if test="id != null and id != '' ">
+ and id = #{id}
+ </if>
<if test="searchId != null ">
and agent_id = #{searchId}
</if>
diff --git a/target/classes/mapper/UserMapper.xml b/target/classes/mapper/UserMapper.xml
index 8efe003..ec05fdd 100644
--- a/target/classes/mapper/UserMapper.xml
+++ b/target/classes/mapper/UserMapper.xml
@@ -82,6 +82,9 @@
<include refid="Base_Column_List"/>
FROM user
<where>
+ <if test="id != null and id != '' ">
+ and id = #{id}
+ </if>
<if test="searchId != null ">
and agent_id = #{searchId}
</if>
--
Gitblit v1.9.3