This commit is contained in:
PQZ 2025-04-15 10:31:11 +08:00
parent e5d8b00a93
commit dc44fac598
7 changed files with 33 additions and 19 deletions

View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.member.domain.MemberApply;
import com.ruoyi.member.vo.MemberApplyVO;
import com.ruoyi.member.vo.MemberBlacklistVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -50,19 +51,7 @@ public class MemberBlacklistController extends BaseController
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<MemberBlacklist> page = new Page<>(pageNum, pageSize);
IPage<MemberBlacklist> list = memberBlacklistService.queryListPage(blacklist, page);
return success(list);
}
/**
* 查询黑名单列表
*/
@PreAuthorize("@ss.hasPermi('member:blacklist:list')")
@GetMapping("/list")
public AjaxResult list(MemberBlacklist memberBlacklist)
{
List<MemberBlacklist> list = memberBlacklistService.list();
IPage<MemberBlacklistVO> list = memberBlacklistService.queryListPage(blacklist, page);
return success(list);
}

View File

@ -8,6 +8,7 @@ import com.ruoyi.member.domain.MemberApply;
import com.ruoyi.member.domain.MemberBlacklist;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.member.vo.MemberApplyVO;
import com.ruoyi.member.vo.MemberBlacklistVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -28,5 +29,5 @@ public interface MemberBlacklistMapper extends BaseMapper<MemberBlacklist> {
* @author PQZ
* @date 9:54 2025/3/18
**/
IPage<MemberBlacklist> queryListPage(@Param("entity") MemberBlacklist entity, Page<MemberBlacklist> page);
IPage<MemberBlacklistVO> queryListPage(@Param("entity") MemberBlacklist entity, Page<MemberBlacklist> page);
}

View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.member.domain.MemberBlacklist;
import com.ruoyi.member.vo.MemberBlacklistVO;
/**
* 黑名单Service接口
@ -24,5 +25,5 @@ public interface IMemberBlacklistService extends IService<MemberBlacklist> {
* @author PQZ
* @date 17:28 2025/4/14
**/
IPage<MemberBlacklist> queryListPage(MemberBlacklist blacklist, Page<MemberBlacklist> page);
IPage<MemberBlacklistVO> queryListPage(MemberBlacklist blacklist, Page<MemberBlacklist> page);
}

View File

@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.member.vo.MemberBlacklistVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -35,7 +36,7 @@ public class MemberBlacklistServiceImpl extends ServiceImpl<MemberBlacklistMappe
* @date 17:28 2025/4/14
**/
@Override
public IPage<MemberBlacklist> queryListPage(MemberBlacklist blacklist, Page<MemberBlacklist> page) {
public IPage<MemberBlacklistVO> queryListPage(MemberBlacklist blacklist, Page<MemberBlacklist> page) {
return memberBlacklistMapper.queryListPage(blacklist,page);
}
}

View File

@ -0,0 +1,12 @@
package com.ruoyi.member.vo;
import com.ruoyi.member.domain.MemberBlacklist;
import lombok.Data;
@Data
public class MemberBlacklistVO extends MemberBlacklist {
/**昵称*/
String nickName;
/**申请时间段止*/
String avatar;
}

View File

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口默认为8080
port: 8080
port: 8081
servlet:
# 应用的访问路径
context-path: /

View File

@ -19,8 +19,18 @@
<sql id="selectMemberBlacklistVo">
select id, user_id, black_user_id, black_user_type, creator, create_time, updater, update_time, del_flag from dl_member_blacklist
</sql>
<select id="queryListPage" resultType="com.ruoyi.member.domain.MemberBlacklist">
select * from dl_member_blacklist where del_flag = 0
<select id="queryListPage" resultType="com.ruoyi.member.vo.MemberBlacklistVO">
SELECT
main.id AS id,
su.nick_name AS nickName,
su.avatar AS avatar,
main.create_time AS createTime
FROM
dl_member_blacklist main
LEFT JOIN sys_user su ON main.black_user_id = su.user_id AND su.del_flag = 0
WHERE
main.del_flag = 0
<if test="entity.userId != null"> and main.user_id = #{entity.userId}</if>
</select>