From e3bf8cd433de638049a43b82a4c0dc86d8ae602f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Thu, 28 Mar 2024 23:19:08 +0800 Subject: [PATCH] init --- .../xq/controller/UserStatusController.java | 83 +++++++++++++++++++ .../java/com/ruoyi/xq/domain/UserStatus.java | 59 +++++++++++++ .../com/ruoyi/xq/mapper/UserStatusMapper.java | 14 ++++ .../ruoyi/xq/service/UserStatusService.java | 14 ++++ .../impl/AccountChangeLogServiceImpl.java | 1 + .../service/impl/UserStatusServiceImpl.java | 21 +++++ .../resources/mapper/xq/UserInfoMapper.xml | 2 +- .../resources/mapper/xq/UserStatusMapper.xml | 21 +++++ .../resources/mapper/xq/UserVisitorMapper.xml | 2 +- 9 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserStatusController.java create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserStatus.java create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserStatusMapper.java create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStatusService.java create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java create mode 100644 ruoyi-xq/src/main/resources/mapper/xq/UserStatusMapper.xml diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserStatusController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserStatusController.java new file mode 100644 index 0000000..c3467f4 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserStatusController.java @@ -0,0 +1,83 @@ +package com.ruoyi.xq.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.xq.domain.UserStatus; +import com.ruoyi.xq.service.UserStatusService; +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-03-28 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/xq/userStatus") +public class UserStatusController extends BaseController { + + private final UserStatusService userStatusService; + + /** + * 查询用户状态列表 + */ + @SaCheckPermission("xq:userStatus:list") + @GetMapping("/list") + public TableDataInfo list(UserStatus bo, PageQuery pageQuery) { + Page page = userStatusService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + return TableDataInfo.build(page); + } + + /** + * 获取用户状态详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("xq:userStatus:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(userStatusService.getById(id)); + } + + /** + * 修改用户状态 + */ + @SaCheckPermission("xq:userStatus:edit") + @Log(title = "用户状态", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody UserStatus bo) { + return toAjax(userStatusService.updateById(bo)); + } + + /** + * 删除用户状态 + * + * @param ids 主键串 + */ + @SaCheckPermission("xq:userStatus:remove") + @Log(title = "用户状态", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(userStatusService.removeBatchByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserStatus.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserStatus.java new file mode 100644 index 0000000..2b3ee71 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserStatus.java @@ -0,0 +1,59 @@ +package com.ruoyi.xq.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 用户状态对象 xq_user_status + * + * @author 77 + * @date 2024-03-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("xq_user_status") +public class UserStatus extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + /** + * 用户ID + */ + private Long userId; + /** + * 用户号 + */ + private String usercode; + /** + * 征婚状态 1-寻找中 2-已脱单 3-隐藏资料 + */ + private Integer personalsStatus; + /** + * 谁可查看头像 1-所有用户 2-VIP用户 3-实名用户 4-实名认证且VIP用户 5-不公开 + */ + private Integer showAvatar; + /** + * 谁可查看资料 1-所有用户 2-VIP用户 3-实名用户 4-实名认证且VIP用户 + */ + private Integer showInfo; + /** + * 是否允许交换手机号 + */ + private Integer allowTransMobile; + /** + * 是否允许交换微信 + */ + private Integer allowTransWx; + +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserStatusMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserStatusMapper.java new file mode 100644 index 0000000..0444e7f --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserStatusMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.xq.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.xq.domain.UserStatus; + +/** + * 用户状态Mapper接口 + * + * @author 77 + * @date 2024-03-28 + */ +public interface UserStatusMapper extends BaseMapper { + +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStatusService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStatusService.java new file mode 100644 index 0000000..149c04c --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserStatusService.java @@ -0,0 +1,14 @@ +package com.ruoyi.xq.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.xq.domain.UserStatus; + +/** + * 用户状态Service接口 + * + * @author 77 + * @date 2024-03-28 + */ +public interface UserStatusService extends IService { + +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java index 0644e82..bc5ea7b 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java @@ -46,6 +46,7 @@ public class AccountChangeLogServiceImpl extends ServiceImpl implements UserStatusService { + + + + +} diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserInfoMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserInfoMapper.xml index f05a14c..eacb55a 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserInfoMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserInfoMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t1.nickname,t1.type,t1.mobile,t1.avatar,t1.gender,t1.age,t1.birthday, t1.height,t1.weight,t1.somatotype,t1.zodiac,t1.sign,t1.residence_name,t1.address_name,t1.residence_city_name, t1.education,t1.marriage,t1.profession,t1.annual_income,t1.company_nature,t1.for_personals, - t1.remark,t1.status,t1.finish_base_status + t1.remark,t1.status,t1.finish_base_status11 from xq_user t1 join xq_user_info t2 on t1.id = t2.user_id diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserStatusMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserStatusMapper.xml new file mode 100644 index 0000000..e2f8715 --- /dev/null +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserStatusMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserVisitorMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserVisitorMapper.xml index 258a631..c1a48d3 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserVisitorMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserVisitorMapper.xml @@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id}