init

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java

@@ -1,7 +1,6 @@
 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;
@@ -13,6 +12,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.UserInfo;
+import com.ruoyi.xq.dto.admin.user.UserInfoAdminVo;
 import com.ruoyi.xq.service.UserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -41,8 +41,8 @@ public class UserInfoController extends BaseController {
      */
     @SaCheckPermission("xq:userInfo:list")
     @GetMapping("/list")
-    public TableDataInfo<UserInfo> list(UserInfo bo, PageQuery pageQuery) {
+    public TableDataInfo<UserInfoAdminVo> list(UserInfoAdminVo bo, PageQuery pageQuery) {
-        Page<UserInfo> page = userInfoService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserInfoAdminVo> page = userInfoService.appPage(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 

ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java

@@ -50,10 +50,6 @@ public class User implements Serializable {
      * 头像
      */
     private String avatar;
-    /**
-     * 自定义头像 1-自定义头像 0-默认头像
-     */
-    private Integer avatarState;
     /**
      * 性别 0-未知 1-女 2-男
      */

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserInfoAdminVo.java

@@ -0,0 +1,105 @@
+package com.ruoyi.xq.dto.admin.user;
+
+import com.ruoyi.xq.domain.UserInfo;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class UserInfoAdminVo extends UserInfo {
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 用户类型: 0普通用户  1 内部用户   2 审核人员账号
+     */
+    private Integer type;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 性别 0-未知 1-女 2-男
+     */
+    private Integer gender;
+    /**
+     * 年龄
+     */
+    private Long age;
+    /**
+     * 生日
+     */
+    private LocalDate birthday;
+    /**
+     * 身高
+     */
+    private Integer height;
+    /**
+     * 体重
+     */
+    private Integer weight;
+    /**
+     * 体型
+     */
+    private Integer somatotype;
+    /**
+     * 生肖
+     */
+    private Integer zodiac;
+    /**
+     * 星座
+     */
+    private Integer sign;
+    /**
+     * 居住地
+     */
+    private String residence;
+    /**
+     * 户籍地
+     */
+    private String address;
+    /**
+     * 居住城市
+     */
+    private String residenceCity;
+    /**
+     * 学历
+     */
+    private Integer education;
+    /**
+     * 婚况
+     */
+    private Integer marriage;
+    /**
+     * 职业
+     */
+    private Integer profession;
+    /**
+     * 年收入
+     */
+    private Integer annualIncome;
+    /**
+     * 公司性质
+     */
+    private Integer companyNature;
+    /**
+     * 为谁征婚
+     */
+    private Integer forPersonals;
+    /**
+     * 自我描述
+     */
+    private String remark;
+    /**
+     * 状态 0-可用  1-不可用
+     */
+    private Integer status;
+
+    private Integer finishBaseStatus;
+
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserAnnualIncomeEnum.java

@@ -1,5 +1,5 @@
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserCarStatusEnum.java

@@ -1,6 +1,6 @@
 
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserChildStatusEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserCompanyNatureEnum.java

@@ -1,5 +1,5 @@
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserDrinkStatusEnum.java

@@ -1,7 +1,7 @@
 
 
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserEducationEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 import lombok.Getter;
 

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserFamilyBackgroundEnum.java

@@ -1,5 +1,5 @@
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserFamilyRankingEnum.java

@@ -1,5 +1,5 @@
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserFindTagEnum.java

@@ -1,5 +1,5 @@
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserForPersonalsEnum.java

@@ -1,5 +1,5 @@
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserGenderEnum.java

@@ -1,5 +1,5 @@
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserHousingStatusEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserLiveAtParentEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserLoveAtDistanceEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserMarriageEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserNationEnum.java

@@ -1,13 +1,13 @@
 
 
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;
 
 /**
- * 民族
+ * 民族（直接用汉字）
  * <p>created on 2024/2/26 16:50</p>
  * @author duet
  */

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserProfessionEnum.java

@@ -1,10 +1,10 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;
 
 /**
- * 职业
+ * 职业 (职业太多。 直接用汉字)
  * <p>created on 2024/2/26 16:50</p>
  * @author duet
  */

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserSignEnum.java

@@ -1,10 +1,10 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;
 
 /**
- * 星座
+ * 星座（直接用汉字）
  * <p>created on 2024/2/26 16:50</p>
  * @author duet
  */

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserSmokeStatusEnum.java

@@ -1,6 +1,6 @@
 
 
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;
@@ -13,9 +13,9 @@ import lombok.Getter;
 @Getter
 public enum UserSmokeStatusEnum {
     BX_FG(1,"不吸，很反感"),
-    BX_BFG(1,"不吸烟，但不反感"),
+    BX_BFG(2,"不吸烟，但不反感"),
-    SJOEXY(1,"社交偶尔吸烟"),
+    SJOEXY(3,"社交偶尔吸烟"),
-    YBLS(1,"烟不离手"),
+    YBLS(4,"烟不离手"),
     ;
 
 

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserSomatotypeEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserWantChildEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserWhenMarriageEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/UserZodiacEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xq.enums.userauth;
+package com.ruoyi.xq.enums.userinfo;
 
 
 import lombok.Getter;

ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CaiLoginManager.java

@@ -19,7 +19,7 @@ import com.ruoyi.xq.domain.*;
 import com.ruoyi.xq.enums.common.AuditEnum;
 import com.ruoyi.xq.enums.common.CodeEnum;
 import com.ruoyi.xq.enums.common.SystemConfigEnum;
-import com.ruoyi.xq.enums.userauth.UserGenderEnum;
+import com.ruoyi.xq.enums.userinfo.UserGenderEnum;
 import com.ruoyi.xq.executor.ExecutorConstant;
 import com.ruoyi.xq.lock.LockKey;
 import com.ruoyi.xq.service.*;
@@ -38,7 +38,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Collections;
-import java.util.concurrent.TimeUnit;
 
 @Component
 @Slf4j

ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserInfoMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.xq.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.xq.domain.UserInfo;
+import com.ruoyi.xq.dto.admin.user.UserInfoAdminVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户信息Mapper接口
@@ -11,4 +14,5 @@ import com.ruoyi.xq.domain.UserInfo;
  */
 public interface UserInfoMapper extends BaseMapper<UserInfo> {
 
+    Page<UserInfoAdminVo> pageApp(@Param("build") Page<Object> build, @Param("bo") UserInfoAdminVo bo);
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java

@@ -1,7 +1,10 @@
 package com.ruoyi.xq.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.xq.domain.UserInfo;
+import com.ruoyi.xq.dto.admin.user.UserInfoAdminVo;
 
 /**
  * 用户信息Service接口
@@ -13,4 +16,6 @@ public interface UserInfoService extends IService<UserInfo> {
     UserInfo getByUsercode(String usercode);
 
     UserInfo getByUserId(Long userId);
+
+    Page<UserInfoAdminVo> appPage(PageQuery pageQuery, UserInfoAdminVo bo);
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java

@@ -1,8 +1,11 @@
 package com.ruoyi.xq.service.impl;
 
 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.common.core.domain.PageQuery;
 import com.ruoyi.xq.domain.UserInfo;
+import com.ruoyi.xq.dto.admin.user.UserInfoAdminVo;
 import com.ruoyi.xq.mapper.UserInfoMapper;
 import com.ruoyi.xq.service.UserInfoService;
 import lombok.RequiredArgsConstructor;
@@ -27,4 +30,9 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper,UserInfo> im
     public UserInfo getByUserId(Long userId) {
         return this.getOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserId, userId));
     }
+
+    @Override
+    public Page<UserInfoAdminVo> appPage(PageQuery pageQuery, UserInfoAdminVo bo) {
+        return baseMapper.pageApp(pageQuery.build(), bo);
+    }
 }

ruoyi-xq/src/main/resources/mapper/xq/UserInfoMapper.xml

@@ -4,36 +4,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.xq.mapper.UserInfoMapper">
 
-    <resultMap type="com.ruoyi.xq.domain.UserInfo" id="UserInfoResult">
+    <select id="pageApp" resultType="com.ruoyi.xq.dto.admin.user.UserInfoAdminVo">
-        <result property="id" column="id"/>
+        select t2.*,
-        <result property="userId" column="user_id"/>
+            t1.nickname,t1.type,t1.mobile,t1.avatar,t1.gender,t1.age,t1.birthday,
-        <result property="usercode" column="usercode"/>
+        t1.height,t1.weight,t1.somatotype,t1.zodiac,t1.sign,t1.residence,t1.address,t1.residence_city,
-        <result property="housingStatus" column="housing_status"/>
+        t1.education,t1.marriage,t1.profession,t1.annual_income,t1.company_nature,t1.for_personals,
-        <result property="carStatus" column="car_status"/>
+        t1.remark,t1.status,t1.finish_base_status
-        <result property="smokeStatus" column="smoke_status"/>
+        from xq_user t1
-        <result property="drinkStatus" column="drink_status"/>
+        join xq_user_info t2 on t1.id = t2.user_id
-        <result property="nation" column="nation"/>
+        <where>
-        <result property="childStatus" column="child_status"/>
+            <if test="bo.usercode != null and bo.usercode != ''">
-        <result property="familyBackground" column="family_background"/>
+                and t1.usercode = #{bo.usercode}
-        <result property="familyRanking" column="family_ranking"/>
+            </if>
-        <result property="loveAtDistance" column="love_at_distance"/>
+            <if test="bo.mobile != null and bo.mobile != ''">
-        <result property="whenMarriage" column="when_marriage"/>
+                and t1.mobile = #{bo.mobile}
-        <result property="wantChild" column="want_child"/>
+            </if>
-        <result property="liveAtParent" column="live_at_parent"/>
+            <if test="bo.nickname != null and bo.nickname != ''">
-        <result property="findTag" column="find_tag"/>
+                and t1.nickname like concat('%',#{bo.nickname},'%')
-        <result property="graduateSchool" column="graduate_school"/>
+            </if>
-        <result property="hobbys" column="hobbys"/>
+        </where>
-        <result property="filterAge" column="filter_age"/>
+    </select>
-        <result property="filterHeight" column="filter_height"/>
-        <result property="filterSomatotype" column="filter_somatotype"/>
-        <result property="filterMarriage" column="filter_marriage"/>
-        <result property="filterEducation" column="filter_education"/>
-        <result property="filterResidence" column="filter_residence"/>
-        <result property="filterAnnualIncome" column="filter_annual_income"/>
-        <result property="filterChildStatus" column="filter_child_status"/>
-        <result property="filterHousingStatus" column="filter_housing_status"/>
-        <result property="filterCarStatus" column="filter_car_status"/>
-    </resultMap>
 
 
 </mapper>