From 0d0954f75facbf8b3dcc70c3d5258d7d96a0942c Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sun, 18 Jun 2023 23:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E3=80=90=E9=A6=96=E9=A1=B5=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modular/login/pojo/UserIndexInfo.java |  9 ++---
 .../login/service/UserIndexInfoService.java   | 37 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java
index d513c55c7..970f92fec 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/UserIndexInfo.java
@@ -1,8 +1,6 @@
 package cn.stylefeng.roses.kernel.sys.modular.login.pojo;
 
-import cn.stylefeng.roses.kernel.file.api.format.FileUrlFormatProcess;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
-import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
 import lombok.Data;
 
 import java.util.List;
@@ -31,11 +29,10 @@ public class UserIndexInfo {
     private String realName;
 
     /**
-     * 用户头像的文件id
+     * 头像地址
      */
-    @ChineseDescription("用户头像的文件id")
-    @SimpleFieldFormat(processClass = FileUrlFormatProcess.class)
-    private Long avatarFileId;
+    @ChineseDescription("头像地址")
+    private String avatarUrl;
 
     /**
      * 当前用户的部门和任职信息
diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java
index 95938b622..d77e48312 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java
@@ -2,9 +2,13 @@ package cn.stylefeng.roses.kernel.sys.modular.login.service;
 
 import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
+import cn.stylefeng.roses.kernel.sys.api.SysUserServiceApi;
+import cn.stylefeng.roses.kernel.sys.api.pojo.user.SimpleUserDTO;
 import cn.stylefeng.roses.kernel.sys.modular.login.pojo.UserIndexInfo;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * 获取用户首页信息的业务
  *
@@ -14,6 +18,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserIndexInfoService {
 
+    @Resource
+    private SysUserServiceApi sysUserServiceApi;
+
     /**
      * 获取用户首页信息
      *
@@ -22,11 +29,39 @@ public class UserIndexInfoService {
      */
     public UserIndexInfo getUserIndexInfo() {
 
+        // 返回结果初始化
+        UserIndexInfo userIndexInfo = new UserIndexInfo();
+
         // 获取当前登录用户
         LoginUser loginUser = LoginContext.me().getLoginUser();
 
+        // 1. 获取用户的姓名和头像
+        this.fillUserBaseInfo(loginUser.getUserId(), userIndexInfo);
 
-        return null;
+        // 2. 获取用户的部门和任职信息
+
+        // 3. 获取用户的权限编码集合
+
+        // 4. 获取用户的当前登录App和菜单
+
+        // 5. 获取菜单和路由的appId映射关系
+
+        // 6. 构建websocket url
+
+        return userIndexInfo;
+    }
+
+    /**
+     * 填充用户的基本姓名和头像信息
+     *
+     * @author fengshuonan
+     * @since 2023/6/18 23:01
+     */
+    private void fillUserBaseInfo(Long userId, UserIndexInfo userIndexInfo) {
+        SimpleUserDTO simpleUserDTO = sysUserServiceApi.getUserInfoByUserId(userId);
+        userIndexInfo.setUserId(simpleUserDTO.getUserId());
+        userIndexInfo.setRealName(simpleUserDTO.getRealName());
+        userIndexInfo.setAvatarUrl(simpleUserDTO.getAvatarUrl());
     }
 
 }