From 0128d6437e0a1e02f04712c4efff8edb8a556028 Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Mon, 1 Jan 2024 17:03:08 +0800 Subject: [PATCH] init --- .../controller/admin/UserGreetController.java | 96 +++++++++++++++++++ .../cai/controller/app/IndexController.java | 16 +++- .../java/com/ruoyi/cai/domain/UserGreet.java | 46 +++++++++ .../cai/dto/app/query/UserUpdateReq.java | 2 + .../query/{ => index}/AnchorListQuery.java | 2 +- .../cai/dto/app/query/index/GreetQuery.java | 13 +++ .../dto/app/query/{ => index}/UserQuery.java | 3 +- .../ruoyi/cai/manager/CurrentUserManager.java | 7 ++ .../com/ruoyi/cai/mapper/AnchorMapper.java | 2 +- .../com/ruoyi/cai/mapper/UserGreetMapper.java | 14 +++ .../java/com/ruoyi/cai/mapper/UserMapper.java | 5 +- .../com/ruoyi/cai/service/AnchorService.java | 2 +- .../ruoyi/cai/service/UserGreetService.java | 14 +++ .../com/ruoyi/cai/service/UserService.java | 8 +- .../cai/service/impl/AnchorServiceImpl.java | 2 +- .../service/impl/UserGreetServiceImpl.java | 18 ++++ .../cai/service/impl/UserServiceImpl.java | 27 +++--- .../resources/mapper/cai/UserGreetMapper.xml | 17 ++++ .../main/resources/mapper/cai/UserMapper.xml | 11 +++ 19 files changed, 276 insertions(+), 29 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGreet.java rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{ => index}/AnchorListQuery.java (91%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/GreetQuery.java rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{ => index}/UserQuery.java (88%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGreetMapper.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGreetService.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java create mode 100644 ruoyi-cai/src/main/resources/mapper/cai/UserGreetMapper.xml diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java new file mode 100644 index 00000000..0d95ad1f --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java @@ -0,0 +1,96 @@ +package com.ruoyi.cai.controller.admin; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.cai.domain.UserGreet; +import com.ruoyi.cai.service.UserGreetService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +/** + * 群发审核 + * + * @author 77 + * @date 2024-01-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/userGreet") +public class UserGreetController extends BaseController { + + private final UserGreetService userGreetService; + + /** + * 查询群发审核列表 + */ + @SaCheckPermission("cai:userGreet:list") + @GetMapping("/list") + public TableDataInfo list(UserGreet bo, PageQuery pageQuery) { + Page page = userGreetService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + return TableDataInfo.build(page); + } + + + /** + * 获取群发审核详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:userGreet:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Integer id) { + return R.ok(userGreetService.getById(id)); + } + + /** + * 新增群发审核 + */ + @SaCheckPermission("cai:userGreet:add") + @Log(title = "群发审核", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody UserGreet bo) { + return toAjax(userGreetService.save(bo)); + } + + /** + * 修改群发审核 + */ + @SaCheckPermission("cai:userGreet:edit") + @Log(title = "群发审核", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody UserGreet bo) { + return toAjax(userGreetService.updateById(bo)); + } + + /** + * 删除群发审核 + * + * @param ids 主键串 + */ + @SaCheckPermission("cai:userGreet:remove") + @Log(title = "群发审核", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Integer[] ids) { + return toAjax(userGreetService.removeBatchByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java index 651d6504..f1e1a645 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java @@ -2,8 +2,9 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.Banner; -import com.ruoyi.cai.dto.app.query.AnchorListQuery; -import com.ruoyi.cai.dto.app.query.UserQuery; +import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; +import com.ruoyi.cai.dto.app.query.index.GreetQuery; +import com.ruoyi.cai.dto.app.query.index.UserQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.cai.dto.app.vo.IndexBannerVo; import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; @@ -49,19 +50,26 @@ public class IndexController { } @GetMapping("/anchor/page") - @Operation(summary = "查询主播-分页") + @Operation(summary = "首页查询主播接口-分页") public TableDataInfo page(PageQuery page, AnchorListQuery query){ Page res = anchorService.pageApp(page,query); return TableDataInfo.build(res); } @GetMapping("/user/page") - @Operation(summary = "用户全局查询-分页") + @Operation(summary = "首页用户搜索接口-分页") public TableDataInfo page(PageQuery page, UserQuery query){ Page res = userService.pageApp(page,query); return TableDataInfo.build(res); } + @GetMapping("/user/greet/page") + @Operation(summary = "群打招呼界面-用户搜索接口") + public TableDataInfo greetQuery(PageQuery page, GreetQuery query){ + Page res = userService.greetPageApp(page,query); + return TableDataInfo.build(res); + } + @GetMapping("/home/info") @Operation(summary = "获取指定用户主页信息") public R info(Long userId){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGreet.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGreet.java new file mode 100644 index 00000000..f469b184 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGreet.java @@ -0,0 +1,46 @@ +package com.ruoyi.cai.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 群发审核对象 cai_user_greet + * + * @author 77 + * @date 2024-01-01 + */ +@Data +@TableName("cai_user_greet") +public class UserGreet implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * + */ + @TableId(value = "id") + private Integer id; + /** + * + */ + private Integer userId; + /** + * 招呼类型: 0文本 1 语音 2 图片 + */ + private Integer type; + /** + * 标题 + */ + private String title; + /** + * 审核状态 0 审核中, 1 审核通过, 2 审核不通过 + */ + private Integer status; + + private LocalDateTime createTime; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java index 2e487959..89a72cf6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java @@ -15,6 +15,8 @@ public class UserUpdateReq { private String nickname; @Schema(description = "生日") private LocalDateTime birthday; + @Schema(description = "性别") + private Integer gender; @Schema(description = "头像") private String avatar; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorListQuery.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java similarity index 91% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorListQuery.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java index f696cc92..95ec3261 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorListQuery.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.query; +package com.ruoyi.cai.dto.app.query.index; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/GreetQuery.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/GreetQuery.java new file mode 100644 index 00000000..9204eb06 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/GreetQuery.java @@ -0,0 +1,13 @@ +package com.ruoyi.cai.dto.app.query.index; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "群打招呼用户搜索") +public class GreetQuery { + @Schema(description = "城市") + private Long city; + @Schema(description = "搜索类型 1=活跃 2=同城") + private Integer type = 1; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserQuery.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java similarity index 88% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserQuery.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java index a3e00be3..4a68b695 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserQuery.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.query; +package com.ruoyi.cai.dto.app.query.index; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -11,7 +11,6 @@ public class UserQuery { private String nickname; @Schema(description = "蜜瓜号") private String usercode; - @Schema(description = "性别") private Integer gender; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index 00f6dc87..1a2b6d34 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -13,6 +13,7 @@ import com.ruoyi.cai.dto.app.vo.user.UserAccountVo; import com.ruoyi.cai.dto.app.vo.user.UserAlbumDTO; import com.ruoyi.cai.dto.app.vo.user.UserCountVo; import com.ruoyi.cai.service.*; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.BeanConvertUtil; import com.ruoyi.yunxin.client.ImUserRefClient; @@ -115,6 +116,12 @@ public class CurrentUserManager { updateFlag=true; updateYunxin=true; } + if(res.getGender() != null){ + User user = userService.getById(res.getUserId()); + if(user.getGender() != 0 && !user.getGender().equals(res.getGender())){ + throw new ServiceException("性别不可以修改"); + } + } if(res.getCity() != null){ update.set(User::getCity,res.getCity()); updateFlag=true; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorMapper.java index 1e9fdf0f..025bf29c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.Anchor; import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo; -import com.ruoyi.cai.dto.app.query.AnchorListQuery; +import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGreetMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGreetMapper.java new file mode 100644 index 00000000..8f3f3a6f --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGreetMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cai.domain.UserGreet; + +/** + * 群发审核Mapper接口 + * + * @author 77 + * @date 2024-01-01 + */ +public interface UserGreetMapper extends BaseMapper { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java index 2cf57e1b..4ee8e01e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java @@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.admin.vo.UserAdminVo; -import com.ruoyi.cai.dto.app.query.UserQuery; +import com.ruoyi.cai.dto.app.query.index.GreetQuery; +import com.ruoyi.cai.dto.app.query.index.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import org.apache.ibatis.annotations.Param; @@ -17,6 +18,6 @@ import org.apache.ibatis.annotations.Param; public interface UserMapper extends BaseMapper { Page pageAdmin(@Param("build") Page build, @Param("query") User query); - Page pageApp(@Param("build") Page build, @Param("query") UserQuery query); + Page greetPageApp(@Param("build") Page build, @Param("query") GreetQuery query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorService.java index 7de05222..20b864a6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.Anchor; import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo; -import com.ruoyi.cai.dto.app.query.AnchorListQuery; +import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.common.core.domain.PageQuery; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGreetService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGreetService.java new file mode 100644 index 00000000..c8926cf6 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGreetService.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.UserGreet; + +/** + * 群发审核Service接口 + * + * @author 77 + * @date 2024-01-01 + */ +public interface UserGreetService extends IService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java index 4f267799..33c65560 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java @@ -2,11 +2,10 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.auth.CaiRegisterUser; -import com.ruoyi.cai.auth.LoginCaiUser; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.admin.vo.UserAdminVo; -import com.ruoyi.cai.dto.app.query.UserQuery; +import com.ruoyi.cai.dto.app.query.index.GreetQuery; +import com.ruoyi.cai.dto.app.query.index.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.common.core.domain.PageQuery; @@ -24,6 +23,7 @@ public interface UserService extends IService { Page pageAdmin(PageQuery pageQuery, User query); Page pageApp(PageQuery page, UserQuery query); + Page greetPageApp(PageQuery page, GreetQuery query); UserInfoVo info(Long userId); @@ -36,4 +36,6 @@ public interface UserService extends IService { void checkFinishStatus(Long userId); void resetPassword(String mobile, String password); + + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorServiceImpl.java index 266757d6..6b2e2701 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.Anchor; import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo; -import com.ruoyi.cai.dto.app.query.AnchorListQuery; +import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.cai.mapper.AnchorMapper; import com.ruoyi.cai.service.AnchorService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java new file mode 100644 index 00000000..6d3b672a --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGreetServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.cai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.cai.domain.UserGreet; +import com.ruoyi.cai.mapper.UserGreetMapper; +import com.ruoyi.cai.service.UserGreetService; +import org.springframework.stereotype.Service; + +/** + * 群发审核Service业务层处理 + * + * @author 77 + * @date 2024-01-01 + */ +@Service +public class UserGreetServiceImpl extends ServiceImpl implements UserGreetService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java index a63e762e..6bb9c363 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java @@ -4,31 +4,23 @@ import cn.dev33.satoken.secure.BCrypt; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.auth.CaiRegisterUser; -import com.ruoyi.cai.auth.LoginCaiUser; import com.ruoyi.cai.domain.Anchor; import com.ruoyi.cai.domain.User; -import com.ruoyi.cai.domain.UserInfo; import com.ruoyi.cai.dto.admin.vo.UserAdminVo; -import com.ruoyi.cai.dto.app.query.UserQuery; +import com.ruoyi.cai.dto.app.query.index.GreetQuery; +import com.ruoyi.cai.dto.app.query.index.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; -import com.ruoyi.cai.enums.CodeEnum; -import com.ruoyi.cai.manager.CodeManager; import com.ruoyi.cai.mapper.UserMapper; import com.ruoyi.cai.service.*; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.ServletUtils; -import io.swagger.v3.oas.annotations.media.Schema; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; - /** * 用户Service业务层处理 * @@ -68,6 +60,11 @@ public class UserServiceImpl extends ServiceImpl implements Us return baseMapper.pageApp(page.build(),query); } + @Override + public Page greetPageApp(PageQuery page, GreetQuery query) { + return baseMapper.greetPageApp(page.build(),query); + } + @Override public UserInfoVo info(Long userId) { Long currentUserId = LoginHelper.getUserId(); @@ -82,12 +79,14 @@ public class UserServiceImpl extends ServiceImpl implements Us vo.setUsercode(user.getUsercode()); vo.setNickname(user.getNickname()); vo.setAvatar(user.getAvatar()); + vo.setPrice(0L); + vo.setServiceCount(0L); if(anchor != null){ vo.setPrice(anchor.getPrice()); - vo.setServiceCount(anchor.getServiceCount()); - }else{ - vo.setPrice(null); - vo.setServiceCount(null); + if(anchor.getOrderSwitch() == 2){ // 不隐藏接单数 + vo.setServiceCount(anchor.getServiceCount()); + } + } vo.setFansNum(userFollowService.getFansNumByUserId(userId)); vo.setStar(userFollowService.checkStar(currentUserId, userId)); diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserGreetMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserGreetMapper.xml new file mode 100644 index 00000000..e424e5e8 --- /dev/null +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserGreetMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml index 02f27182..841841b4 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml @@ -40,6 +40,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.gender = #{query.gender} + order by t2.last_live_time desc + +