diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java index fb35849..819b547 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java @@ -18,10 +18,7 @@ import com.ruoyi.xq.domain.UserInfo; import com.ruoyi.xq.dto.admin.user.FullUserVo; import com.ruoyi.xq.dto.admin.user.UserAdminUpdateVo; import com.ruoyi.xq.dto.admin.user.UserAdminVo; -import com.ruoyi.xq.dto.admin.user.req.AddUserReq; -import com.ruoyi.xq.dto.admin.user.req.ResetPasswordAdminReq; -import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq; -import com.ruoyi.xq.dto.admin.user.req.UpdateUserReq; +import com.ruoyi.xq.dto.admin.user.req.*; import com.ruoyi.xq.dto.app.common.IdReq; import com.ruoyi.xq.service.UserInfoService; import com.ruoyi.xq.service.UserInviteService; @@ -198,6 +195,17 @@ public class UserController extends BaseController { return R.ok(); } + @SaCheckPermission("xq:user:edit") + @Log(title = "修改用户标签", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R editTag(@RequestBody UpdateUserTagReq bo) { + userService.update(Wrappers.lambdaUpdate(User.class) + .in(User::getId, bo.getUserIds()) + .set(User::getTag, bo.getTag())); + return R.ok(); + } + /** * 删除用户管理 * diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java index 6d0a43a..cb4b5e2 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java @@ -173,6 +173,8 @@ public class User implements Serializable { private String openId; + private String tag; + private LocalDateTime createTime; private LocalDateTime updateTime; diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserTagReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserTagReq.java new file mode 100644 index 0000000..56125ea --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserTagReq.java @@ -0,0 +1,11 @@ +package com.ruoyi.xq.dto.admin.user.req; + +import lombok.Data; + +import java.util.List; + +@Data +public class UpdateUserTagReq { + private Integer tag; + private List userIds; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserListVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserListVo.java index 245379f..97313ac 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserListVo.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserListVo.java @@ -34,6 +34,8 @@ public class HomeUserListVo { private Integer education; @Schema(description = "职业") private String profession; + @Schema(description = "标签, 1-火热标签 2-活跃标签") + private String tag; @Schema(description = "是否已经实名") private Boolean cardNumAuthBool = false; diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml index 1ed931b..aafa57c 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"