From d69d30b0e37ac4f0b12c3cd5b192d3c63af8cecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Fri, 26 Aug 2022 07:53:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 3601aff102b360d0440073ea183b62dec3e463d6
---
 src/api/system/user.ts         |   2 +-
 src/types/api/system/user.d.ts | 187 +++++++++------------------------
 2 files changed, 48 insertions(+), 141 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f2d77c81..08dd25a5 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -37,7 +37,7 @@ export function listUserPages(
  *
  * @param userId
  */
-export function getUserFormData(userId: number): AxiosPromise<UserFormData> {
+export function getUserDetail(userId: number): AxiosPromise<UserFormData> {
   return request({
     url: '/youlai-admin/api/v1/users/' + userId + '/form_data',
     method: 'get'
diff --git a/src/types/api/system/user.d.ts b/src/types/api/system/user.d.ts
index f2d77c81..7e459b8a 100644
--- a/src/types/api/system/user.d.ts
+++ b/src/types/api/system/user.d.ts
@@ -1,160 +1,67 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import {
-  UserFormData,
-  UserInfo,
-  UserPageResult,
-  UserQueryParam
-} from '@/types/api/system/user';
+import { PageQueryParam, PageResult } from '../base';
 
 /**
- * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
+ * 登录用户类型声明
  */
-export function getUserInfo(): AxiosPromise<UserInfo> {
-  return request({
-    url: '/youlai-admin/api/v1/users/me',
-    method: 'get'
-  });
+export interface UserInfo {
+  nickname: string;
+  avatar: string;
+  roles: string[];
+  perms: string[];
 }
 
 /**
- * 获取用户分页列表
- *
- * @param queryParams
+ * 用户查询参数类型声明
  */
-export function listUserPages(
-  queryParams: UserQueryParam
-): AxiosPromise<UserPageResult> {
-  return request({
-    url: '/youlai-admin/api/v1/users/pages',
-    method: 'get',
-    params: queryParams
-  });
+export interface UserQueryParam extends PageQueryParam {
+  keywords: string;
+  status: number;
+  deptId: number;
 }
 
 /**
- * 获取用户表单详情
- *
- * @param userId
+ * 用户分页列表项声明
  */
-export function getUserFormData(userId: number): AxiosPromise<UserFormData> {
-  return request({
-    url: '/youlai-admin/api/v1/users/' + userId + '/form_data',
-    method: 'get'
-  });
+export interface UserItem {
+  id: string;
+  username: string;
+  nickname: string;
+  mobile: string;
+  gender: number;
+  avatar: string;
+  email: string;
+  status: number;
+  deptName: string;
+  roleNames: string;
+  createTime: string;
 }
 
 /**
- * 添加用户
- *
- * @param data
+ * 用户分页项类型声明
  */
-export function addUser(data: any) {
-  return request({
-    url: '/youlai-admin/api/v1/users',
-    method: 'post',
-    data: data
-  });
+export type UserPageResult = PageResult<UserItem[]>;
+
+/**
+ * 用户表单类型声明
+ */
+export interface UserFormData {
+  id: number | undefined;
+  deptId: number;
+  username: string;
+  nickname: string;
+  password: string;
+  mobile: string;
+  email: string;
+  gender: number;
+  status: number;
+  remark: string;
+  roleIds: number[];
 }
 
 /**
- * 修改用户
- *
- * @param id
- * @param data
+ * 用户导入表单类型声明
  */
-export function updateUser(id: number, data: UserFormData) {
-  return request({
-    url: '/youlai-admin/api/v1/users/' + id,
-    method: 'put',
-    data: data
-  });
-}
-
-/**
- * 修改用户状态
- *
- * @param id
- * @param status
- */
-export function updateUserStatus(id: number, status: number) {
-  return request({
-    url: '/youlai-admin/api/v1/users/' + id + '/status',
-    method: 'patch',
-    params: { status: status }
-  });
-}
-
-/**
- * 修改用户密码
- *
- * @param id
- * @param password
- */
-export function updateUserPassword(id: number, password: string) {
-  return request({
-    url: '/youlai-admin/api/v1/users/' + id + '/password',
-    method: 'patch',
-    params: { password: password }
-  });
-}
-
-/**
- * 删除用户
- *
- * @param ids
- */
-export function deleteUsers(ids: string) {
-  return request({
-    url: '/youlai-admin/api/v1/users/' + ids,
-    method: 'delete'
-  });
-}
-
-/**
- * 下载用户导入模板
- *
- * @returns
- */
-export function downloadTemplate() {
-  return request({
-    url: '/youlai-admin/api/v1/users/template',
-    method: 'get',
-    responseType: 'arraybuffer'
-  });
-}
-
-/**
- * 导出用户
- *
- * @param queryParams
- * @returns
- */
-export function exportUser(queryParams: UserQueryParam) {
-  return request({
-    url: '/youlai-admin/api/v1/users/_export',
-    method: 'get',
-    params: queryParams,
-    responseType: 'arraybuffer'
-  });
-}
-
-/**
- * 导入用户
- *
- * @param file
- */
-export function importUser(deptId: number, roleIds: string, file: File) {
-  const formData = new FormData();
-  formData.append('file', file);
-  formData.append('deptId', deptId.toString());
-  formData.append('roleIds', roleIds);
-  return request({
-    url: '/youlai-admin/api/v1/users/_import',
-    method: 'post',
-    data: formData,
-    headers: {
-      'Content-Type': 'multipart/form-data'
-    }
-  });
+export interface UserImportFormData {
+  deptId: number;
+  roleIds: number[];
 }