~

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserController.java

@@ -12,6 +12,7 @@ import com.alipay.api.domain.AlipayTradeCreateModel;
 import com.alipay.api.request.AlipayTradeCreateRequest;
 import com.alipay.api.response.AlipayTradeCreateResponse;
 import com.ruoyi.app.domain.dto.PayConfig;
+import com.ruoyi.app.domain.vo.AppUserInfoVo;
 import com.ruoyi.app.domain.vo.AppUserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -128,4 +129,12 @@ public class AppUserController extends BaseController
     {
         return AjaxResult.success(appUserService.userNetData(appUser));
     }
+
+    @GetMapping("/listUser")
+    @ApiOperation(value = "app用户列表", notes = "app用户列表", httpMethod = "GET")
+    public TableDataInfo listUser(AppUser appUser) {
+        startPage();
+        List<AppUserInfoVo> list = appUserService.listUser(appUser);
+        return getDataTable(list);
+    }
 }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java

@@ -161,6 +161,8 @@ public class AppUser extends BaseEntity
 
     private Long appId;
 
+    private int status;
+
     /** 订单记录 */
     @Excel(name = "订单记录")
     private Long orderId;

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserInfoVo.java

@@ -0,0 +1,32 @@
+package com.ruoyi.app.domain.vo;
+
+import com.ruoyi.app.domain.AppUser;
+import com.ruoyi.app.domain.UserSkill;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.List;
+
+/**
+ * app用户对象 app_user
+ * 
+ * @author wyh
+ * @date 2024-04-23
+ */
+@Data
+public class AppUserInfoVo {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @Excel(name = "昵称")
+    private String nickname;
+
+    @Excel(name = "用户名")
+    private String username;
+
+    @Excel(name = "头像")
+    private String avatarUrl;
+}

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.app.mapper;
 import java.util.List;
 import com.ruoyi.app.domain.AppUser;
 import com.ruoyi.app.domain.vo.AppUserDataVo;
+import com.ruoyi.app.domain.vo.AppUserInfoVo;
 import com.ruoyi.app.domain.vo.AppUserNetVo;
 import com.ruoyi.app.domain.vo.AppUserVo;
 import org.apache.ibatis.annotations.Param;
@@ -68,4 +69,6 @@ public interface AppUserMapper
 
     List<Long> listByOrderTime();
     void updateAppUserById(@Param("ids")List<Long> ids);
+
+    List<AppUserInfoVo> listUser(AppUser appUser);
 }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserService.java

@@ -2,6 +2,7 @@ package com.ruoyi.app.service;
 
 import java.util.List;
 import com.ruoyi.app.domain.AppUser;
+import com.ruoyi.app.domain.vo.AppUserInfoVo;
 import com.ruoyi.app.domain.vo.AppUserNetVo;
 import com.ruoyi.app.domain.vo.AppUserVo;
 
@@ -64,4 +65,6 @@ public interface IAppUserService
     AppUser selectAppUserByPhone(String phoneNumber);
 
     public AppUserNetVo userNetData(AppUser appUser);
+
+    List<AppUserInfoVo> listUser(AppUser appUser);
 }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java

@@ -3,23 +3,18 @@ package com.ruoyi.app.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.ruoyi.app.domain.AppSchool;
-import com.ruoyi.app.domain.AppUserFriend;
-import com.ruoyi.app.domain.UserSkill;
+import com.ruoyi.app.domain.*;
 import com.ruoyi.app.domain.vo.AppUserDataVo;
+import com.ruoyi.app.domain.vo.AppUserInfoVo;
 import com.ruoyi.app.domain.vo.AppUserNetVo;
 import com.ruoyi.app.domain.vo.AppUserVo;
-import com.ruoyi.app.mapper.AppSchoolMapper;
-import com.ruoyi.app.mapper.AppUserFriendMapper;
-import com.ruoyi.app.mapper.UserSkillMapper;
+import com.ruoyi.app.mapper.*;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.bean.BeanUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.app.mapper.AppUserMapper;
-import com.ruoyi.app.domain.AppUser;
 import com.ruoyi.app.service.IAppUserService;
 
 /**
@@ -43,6 +38,9 @@ public class AppUserServiceImpl implements IAppUserService
     @Autowired
     private AppSchoolMapper appSchoolMapper;
 
+    @Autowired
+    private AppUserFansMapper appUserFansMapper;
+
     /**
      * 查询app用户
      * 
@@ -213,4 +211,32 @@ public class AppUserServiceImpl implements IAppUserService
         appUserNetVo.setCompanyUserList(companylList);
         return appUserNetVo;
     }
+
+    @Override
+    public List<AppUserInfoVo> listUser(AppUser appUser) {
+        int status = appUser.getStatus();
+        List<Long> ids = new ArrayList<>();
+        switch (status){
+            case 1://好友
+                AppUserFriend appUserFriend = new AppUserFriend();
+                appUserFriend.setUserId(appUser.getAppId());
+                List<AppUserFriend> list = appUserFriendMapper.selectAppUserFriendList(appUserFriend);
+                ids = list.stream().map(x->x.getFriendId()).collect(Collectors.toList());
+                break;
+            case 2://关注
+                AppUserFans appUserFans = new AppUserFans();
+                appUserFans.setUserId(appUser.getAppId());
+                List<AppUserFans> userFans = appUserFansMapper.selectAppUserFansList(appUserFans);
+                ids = userFans.stream().map(x->x.getFriendId()).collect(Collectors.toList());
+                break;
+            case 3://粉丝
+                appUserFans = new AppUserFans();
+                appUserFans.setUserId(null);
+                appUserFans.setFriendId(appUser.getAppId());
+                userFans = appUserFansMapper.selectAppUserFansList(appUserFans);
+                ids = userFans.stream().map(x->x.getFriendId()).collect(Collectors.toList());
+                break;
+        }
+        return appUserMapper.listUser(appUser);
+    }
 }

gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml

@@ -147,6 +147,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by a.id
     </select>
 
+    <select id="selectList" parameterType="AppUser" resultType="com.ruoyi.app.domain.vo.AppUserInfoVo">
+        select
+        <include refid="appUserColumns"/>
+        from app_user a
+        <where>
+            <if test="ids != null and ids.size()"> a.id in
+                <foreach collection="ids" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <select id="selectList" parameterType="AppUser" resultType="com.ruoyi.app.domain.vo.AppUserDataVo">
         select
         <include refid="appUserColumns"/>,