shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123333

Browse Source
This commit is contained in:
张良(004796)
2024-02-21 14:11:43 +08:00
parent 61d00af5c6
commit c6efe0eb0b
6 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicListVo.java
View File

@@ -21,6 +21,8 @@ public class DynamicListVo extends DynamicVo{
private String avatar;
@Schema(description = "昵称")
private String nickname;
@Schema(description = "时间差值文字显示")
private String timeDiffText;
@Schema(description = "是否关注用户")
private boolean star;
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserMinInfoVo.java
View File

@@ -14,6 +14,9 @@ public class UserMinInfoVo {
private Integer isAnchor;
@Schema(description = "蜜瓜号")
private String usercode;
@Schema(description = "性别")
private Integer gender;
@Schema(description = "昵称")
private String nickname;
@Schema(description = "头像")

13
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java
View File

@@ -33,10 +33,15 @@ public class UserBlacklistServiceImpl extends ServiceImpl<UserBlacklistMapper, U
throw new ServiceException("不能对自己操作哦");
}
if(actionType == 1){ // 拉黑
UserBlacklist userBlacklist = new UserBlacklist();
userBlacklist.setUserId(userId);
userBlacklist.setBlackUid(blackUserId);
this.save(userBlacklist);
UserBlacklist one = this.getOne(Wrappers.lambdaQuery(UserBlacklist.class)
.eq(UserBlacklist::getUserId, userId)
.eq(UserBlacklist::getBlackUid, blackUserId));
if(one == null){
UserBlacklist userBlacklist = new UserBlacklist();
userBlacklist.setUserId(userId);
userBlacklist.setBlackUid(blackUserId);
this.save(userBlacklist);
}
}else { // 取消拉黑
this.remove(Wrappers.lambdaQuery(UserBlacklist.class)
.eq(UserBlacklist::getUserId,userId)

1
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
View File

@@ -393,6 +393,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
vo.setIsAnchor(user.getIsAnchor());
vo.setUsercode(user.getUsercode());
vo.setNickname(user.getNickname());
vo.setGender(user.getGender());
vo.setAvatar(user.getAvatar());
vo.setAge(user.getAge());
vo.setCity(user.getCity());

2
ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml
View File

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="pageApp" resultType="com.ruoyi.cai.dto.app.vo.user.UserListVo">
select t2.id as user_id,t2.avatar,t2.gender,t2.city_id,t2.city,t2.nickname,t2.usercode,t2.age
from cai_user_blacklist t1
join cai_user t2 on t1.user_id = t2.id
join cai_user t2 on t1.black_uid = t2.id
where t1.user_id = #{userId}
</select>