refactor ts

src/api/demo/demo.js

@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询测试单表列表
-export function listDemo(query) {
-  return request({
-    url: '/demo/demo/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 自定义分页接口
-export function pageDemo(query) {
-  return request({
-    url: '/demo/demo/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询测试单表详细
-export function getDemo(id) {
-  return request({
-    url: '/demo/demo/' + id,
-    method: 'get'
-  })
-}
-
-// 新增测试单表
-export function addDemo(data) {
-  return request({
-    url: '/demo/demo',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改测试单表
-export function updateDemo(data) {
-  return request({
-    url: '/demo/demo',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除测试单表
-export function delDemo(id) {
-  return request({
-    url: '/demo/demo/' + id,
-    method: 'delete'
-  })
-}
-

src/api/demo/demo.ts

@@ -0,0 +1,55 @@
+import request from '@/utils/request';
+import { DemoForm, DemoQuery, DemoVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询测试单表列表
+export function listDemo(query: DemoQuery): AxiosPromise<DemoVO[]> {
+	return request({
+		url: '/demo/demo/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 自定义分页接口
+export function pageDemo(query: DemoQuery): AxiosPromise<DemoVO[]> {
+	return request({
+		url: '/demo/demo/page',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询测试单表详细
+export function getDemo(id: string | number): AxiosPromise<DemoVO> {
+	return request({
+		url: '/demo/demo/' + id,
+		method: 'get'
+	});
+}
+
+// 新增测试单表
+export function addDemo(data: DemoForm) {
+	return request({
+		url: '/demo/demo',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改测试单表
+export function updateDemo(data: DemoForm) {
+	return request({
+		url: '/demo/demo',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除测试单表
+export function delDemo(id: string | number | Array<string | number>) {
+	return request({
+		url: '/demo/demo/' + id,
+		method: 'delete'
+	});
+}

src/api/demo/tree.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询测试树表列表
-export function listTree(query) {
-  return request({
-    url: '/demo/tree/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询测试树表详细
-export function getTree(id) {
-  return request({
-    url: '/demo/tree/' + id,
-    method: 'get'
-  })
-}
-
-// 新增测试树表
-export function addTree(data) {
-  return request({
-    url: '/demo/tree',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改测试树表
-export function updateTree(data) {
-  return request({
-    url: '/demo/tree',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除测试树表
-export function delTree(id) {
-  return request({
-    url: '/demo/tree/' + id,
-    method: 'delete'
-  })
-}

src/api/demo/tree.ts

@@ -0,0 +1,46 @@
+import { AxiosPromise } from 'axios';
+import request from '@/utils/request';
+import { DemoTreeForm, DemoTreeVO, DemoTreeQuery } from './types';
+
+// 查询测试树表列表
+export function listTree(query?: DemoTreeQuery): AxiosPromise<DemoTreeVO[]> {
+	return request({
+		url: '/demo/tree/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询测试树表详细
+export function getTree(id: string | number): AxiosPromise<DemoTreeVO> {
+	return request({
+		url: '/demo/tree/' + id,
+		method: 'get'
+	});
+}
+
+// 新增测试树表
+export function addTree(data: DemoTreeForm) {
+	return request({
+		url: '/demo/tree',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改测试树表
+export function updateTree(data: DemoTreeForm) {
+	return request({
+		url: '/demo/tree',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除测试树表
+export function delTree(id: string | number | Array<string | number>) {
+	return request({
+		url: '/demo/tree/' + id,
+		method: 'delete'
+	});
+}

src/api/demo/types.ts

@@ -0,0 +1,55 @@
+export interface DemoVO extends BaseEntity {
+	id: number | string;
+	deptId: number | string;
+	userId: number | string;
+	orderNum: number;
+	testKey: string;
+	value: string;
+	createByName: string;
+	updateByName?: any;
+}
+
+export interface DemoQuery extends PageQuery {
+	testKey: string;
+	value: string;
+	createTime: string;
+}
+export interface DemoForm {
+	id: string | number | undefined;
+	deptId: string | number | undefined;
+	userId: string | number | undefined;
+	orderNum: number;
+	testKey: string;
+	value: string;
+	version: string;
+	ossConfigId: string | number | undefined;
+	createTime?: string;
+}
+
+export interface DemoTreeVO extends BaseEntity {
+	id: number | string;
+	parentId: number | string;
+	deptId: number | string;
+	userId: number | string;
+	treeName: string;
+	children?: DemoTreeVO[];
+}
+
+export interface DemoTreeQuery {
+	treeName: string;
+	createTime: string;
+}
+
+export interface DemoTreeForm {
+	id: string | number | undefined;
+	parentId: string | number | undefined;
+	deptId: string | number | undefined;
+	userId: string | number | undefined;
+	treeName: string;
+}
+
+export interface DemoTreeOptionsType {
+	id: string | number;
+	treeName: string;
+	children?: DemoTreeOptionsType[];
+}

src/api/login.js

@@ -1,83 +0,0 @@
-import request from '@/utils/request'
-
-// 登录方法
-export function login(tenantId, username, password, code, uuid) {
-  const data = {
-    tenantId,
-    username,
-    password,
-    code,
-    uuid
-  }
-  return request({
-    url: '/auth/login',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
-}
-
-// 注册方法
-export function register(data) {
-  return request({
-    url: '/auth/register',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取用户详细信息
-export function getInfo() {
-  return request({
-    url: '/system/user/getInfo',
-    method: 'get'
-  })
-}
-
-// 退出方法
-export function logout() {
-  return request({
-    url: '/auth/logout',
-    method: 'post'
-  })
-}
-
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    url: '/code',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
-}
-
-// 短信验证码
-export function getCodeSms() {
-  return request({
-    url: '/sms/code',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
-}
-
-// 获取租户列表
-export function getTenantList() {
-  return request({
-    url: '/auth/tenant/list',
-    headers: {
-      isToken: false
-    },
-    method: 'get'
-  })
-}

src/api/login.ts

@@ -0,0 +1,81 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types';
+import { UserInfo } from '@/api/system/user/types';
+
+/**
+ * @param data {LoginData}
+ * @returns
+ */
+export function login(data: LoginData): AxiosPromise<LoginResult> {
+	const params = {
+		tenantId: data.tenantId,
+		username: data.username.trim(),
+		password: data.password,
+		code: data.code,
+		uuid: data.uuid
+	};
+	return request({
+		url: '/auth/login',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data: params
+	});
+}
+
+// 注册方法
+export function register(data: any) {
+	return request({
+		url: '/auth/register',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data: data
+	});
+}
+
+/**
+ * 注销
+ */
+export function logout() {
+	return request({
+		url: '/auth/logout',
+		method: 'post'
+	});
+}
+
+/**
+ * 获取验证码
+ */
+export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
+	return request({
+		url: '/code',
+		headers: {
+			isToken: false
+		},
+		method: 'get',
+		timeout: 20000
+	});
+}
+
+// 获取用户详细信息
+export function getInfo(): AxiosPromise<UserInfo> {
+	return request({
+		url: '/system/user/getInfo',
+		method: 'get'
+	});
+}
+
+// 获取租户列表
+export function getTenantList(): AxiosPromise<TenantInfo> {
+	return request({
+		url: '/auth/tenant/list',
+		headers: {
+			isToken: false
+		},
+		method: 'get'
+	});
+}

src/api/menu.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-// 获取路由
-export const getRouters = () => {
-  return request({
-    url: '/system/menu/getRouters',
-    method: 'get'
-  })
-}

src/api/menu.ts

@@ -0,0 +1,11 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RouteRecordRaw } from 'vue-router';
+
+// 获取路由
+export function getRouters(): AxiosPromise<RouteRecordRaw[]> {
+	return request({
+		url: '/system/menu/getRouters',
+		method: 'get'
+	});
+}

src/api/monitor/cache.js

@@ -1,57 +0,0 @@
-import request from '@/utils/request'
-
-// 查询缓存详细
-export function getCache() {
-  return request({
-    url: '/monitor/cache',
-    method: 'get'
-  })
-}
-
-// 查询缓存名称列表
-export function listCacheName() {
-  return request({
-    url: '/monitor/cache/getNames',
-    method: 'get'
-  })
-}
-
-// 查询缓存键名列表
-export function listCacheKey(cacheName) {
-  return request({
-    url: '/monitor/cache/getKeys/' + cacheName,
-    method: 'get'
-  })
-}
-
-// 查询缓存内容
-export function getCacheValue(cacheName, cacheKey) {
-  return request({
-    url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey,
-    method: 'get'
-  })
-}
-
-// 清理指定名称缓存
-export function clearCacheName(cacheName) {
-  return request({
-    url: '/monitor/cache/clearCacheName/' + cacheName,
-    method: 'delete'
-  })
-}
-
-// 清理指定键名缓存
-export function clearCacheKey(cacheName, cacheKey) {
-  return request({
-    url: '/monitor/cache/clearCacheKey/' + cacheName + '/'  + cacheKey,
-    method: 'delete'
-  })
-}
-
-// 清理全部缓存
-export function clearCacheAll() {
-  return request({
-    url: '/monitor/cache/clearCacheAll',
-    method: 'delete'
-  })
-}

src/api/monitor/cache/index.ts

@@ -0,0 +1,59 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CacheVO } from './types';
+
+// 查询缓存详细
+export function getCache(): AxiosPromise<CacheVO> {
+	return request({
+		url: '/monitor/cache',
+		method: 'get'
+	});
+}
+
+// 查询缓存名称列表
+export function listCacheName() {
+	return request({
+		url: '/monitor/cache/getNames',
+		method: 'get'
+	});
+}
+
+// 查询缓存键名列表
+export function listCacheKey(cacheName: string) {
+	return request({
+		url: '/monitor/cache/getKeys/' + cacheName,
+		method: 'get'
+	});
+}
+
+// 查询缓存内容
+export function getCacheValue(cacheName: string, cacheKey: string) {
+	return request({
+		url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey,
+		method: 'get'
+	});
+}
+
+// 清理指定名称缓存
+export function clearCacheName(cacheName: string) {
+	return request({
+		url: '/monitor/cache/clearCacheName/' + cacheName,
+		method: 'delete'
+	});
+}
+
+// 清理指定键名缓存
+export function clearCacheKey(cacheName: string, cacheKey: string) {
+	return request({
+		url: '/monitor/cache/clearCacheKey/' + cacheName + '/' + cacheKey,
+		method: 'delete'
+	});
+}
+
+// 清理全部缓存
+export function clearCacheAll() {
+	return request({
+		url: '/monitor/cache/clearCacheAll',
+		method: 'delete'
+	});
+}

src/api/monitor/cache/types.ts

@@ -0,0 +1,7 @@
+export interface CacheVO {
+	commandStats: Array<{ name: string; value: string }>;
+
+	dbSize: number;
+
+	info: { [key: string]: string };
+}

src/api/monitor/loginInfo/index.ts

@@ -0,0 +1,36 @@
+import request from '@/utils/request';
+import { LoginInfoQuery, LoginInfoVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询登录日志列表
+export function list(query: LoginInfoQuery): AxiosPromise<LoginInfoVO[]> {
+	return request({
+		url: '/monitor/logininfor/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 删除登录日志
+export function delLoginInfo(infoId: string | number | Array<string | number>) {
+	return request({
+		url: '/monitor/logininfor/' + infoId,
+		method: 'delete'
+	});
+}
+
+// 解锁用户登录状态
+export function unlockLoginInfo(userName: string | Array<string>) {
+	return request({
+		url: '/monitor/logininfor/unlock/' + userName,
+		method: 'get'
+	});
+}
+
+// 清空登录日志
+export function cleanLoginInfo() {
+	return request({
+		url: '/monitor/logininfor/clean',
+		method: 'delete'
+	});
+}

src/api/monitor/loginInfo/types.ts

@@ -0,0 +1,20 @@
+export interface LoginInfoVO {
+	infoId: string | number;
+	tenantId: string | number;
+	userName: string;
+	status: string;
+	ipaddr: string;
+	loginLocation: string;
+	browser: string;
+	os: string;
+	msg: string;
+	loginTime: string;
+}
+
+export interface LoginInfoQuery extends PageQuery {
+	ipaddr: string;
+	userName: string;
+	status: string;
+	orderByColumn: string;
+	isAsc: string;
+}

src/api/monitor/logininfor.js

@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-// 查询登录日志列表
-export function list(query) {
-  return request({
-    url: '/monitor/logininfor/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除登录日志
-export function delLogininfor(infoId) {
-  return request({
-    url: '/monitor/logininfor/' + infoId,
-    method: 'delete'
-  })
-}
-
-// 解锁用户登录状态
-export function unlockLogininfor(userName) {
-  return request({
-    url: '/monitor/logininfor/unlock/' + userName,
-    method: 'get'
-  })
-}
-
-// 清空登录日志
-export function cleanLogininfor() {
-  return request({
-    url: '/monitor/logininfor/clean',
-    method: 'delete'
-  })
-}

src/api/monitor/online.js

@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 查询在线用户列表
-export function list(query) {
-  return request({
-    url: '/monitor/online/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 强退用户
-export function forceLogout(tokenId) {
-  return request({
-    url: '/monitor/online/' + tokenId,
-    method: 'delete'
-  })
-}

src/api/monitor/online/index.ts

@@ -0,0 +1,20 @@
+import request from '@/utils/request';
+import { OnlineQuery, OnlineVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询在线用户列表
+export function list(query: OnlineQuery): AxiosPromise<OnlineVO[]> {
+	return request({
+		url: '/monitor/online/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 强退用户
+export function forceLogout(tokenId: string) {
+	return request({
+		url: '/monitor/online/' + tokenId,
+		method: 'delete'
+	});
+}

src/api/monitor/online/types.ts

@@ -0,0 +1,15 @@
+export interface OnlineQuery extends PageQuery {
+	ipaddr: string;
+	userName: string;
+}
+
+export interface OnlineVO extends BaseEntity {
+	tokenId: string;
+	deptName: string;
+	userName: string;
+	ipaddr: string;
+	loginLocation: string;
+	browser: string;
+	os: string;
+	loginTime: number;
+}

src/api/monitor/operlog.js

@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 查询操作日志列表
-export function list(query) {
-  return request({
-    url: '/monitor/operlog/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除操作日志
-export function delOperlog(operId) {
-  return request({
-    url: '/monitor/operlog/' + operId,
-    method: 'delete'
-  })
-}
-
-// 清空操作日志
-export function cleanOperlog() {
-  return request({
-    url: '/monitor/operlog/clean',
-    method: 'delete'
-  })
-}

src/api/monitor/operlog/index.ts

@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+import { OperLogQuery, OperLogVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询操作日志列表
+export function list(query: OperLogQuery): AxiosPromise<OperLogVO[]> {
+	return request({
+		url: '/monitor/operlog/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 删除操作日志
+export function delOperlog(operId: string | number | Array<string | number>) {
+	return request({
+		url: '/monitor/operlog/' + operId,
+		method: 'delete'
+	});
+}
+
+// 清空操作日志
+export function cleanOperlog() {
+	return request({
+		url: '/monitor/operlog/clean',
+		method: 'delete'
+	});
+}

src/api/monitor/operlog/types.ts

@@ -0,0 +1,52 @@
+export interface OperLogQuery extends PageQuery {
+	title: string;
+	operName: string;
+	businessType: string;
+	status: string;
+	orderByColumn: string;
+	isAsc: string;
+}
+
+export interface OperLogVO extends BaseEntity {
+	operId: string | number;
+	tenantId: string;
+	title: string;
+	businessType: number;
+	businessTypes: number[] | undefined;
+	method: string;
+	requestMethod: string;
+	operatorType: number;
+	operName: string;
+	deptName: string;
+	operUrl: string;
+	operIp: string;
+	operLocation: string;
+	operParam: string;
+	jsonResult: string;
+	status: number;
+	errorMsg: string;
+	operTime: string;
+	costTime: number;
+}
+
+export interface OperLogForm {
+	operId: number | string | undefined;
+	tenantId: string | number | undefined;
+	title: string;
+	businessType: number;
+	businessTypes: number[] | undefined;
+	method: string;
+	requestMethod: string;
+	operatorType: number;
+	operName: string;
+	deptName: string;
+	operUrl: string;
+	operIp: string;
+	operLocation: string;
+	operParam: string;
+	jsonResult: string;
+	status: number;
+	errorMsg: string;
+	operTime: string;
+	costTime: number;
+}

src/api/system/config.js

@@ -1,72 +0,0 @@
-import request from '@/utils/request'
-
-// 查询参数列表
-export function listConfig(query) {
-  return request({
-    url: '/system/config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询参数详细
-export function getConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'get'
-  })
-}
-
-// 根据参数键名查询参数值
-export function getConfigKey(configKey) {
-  return request({
-    url: '/system/config/configKey/' + configKey,
-    method: 'get'
-  })
-}
-
-// 新增参数配置
-export function addConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改参数配置
-export function updateConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'put',
-    data: data
-  })
-}
-
-// 修改参数配置
-export function updateConfigByKey(key, value) {
-  return request({
-    url: '/system/config/updateByKey',
-    method: 'put',
-    data: {
-      configKey: key,
-      configValue: value
-    }
-  })
-}
-
-// 删除参数配置
-export function delConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'delete'
-  })
-}
-
-// 刷新参数缓存
-export function refreshCache() {
-  return request({
-    url: '/system/config/refreshCache',
-    method: 'delete'
-  })
-}

src/api/system/config/index.ts

@@ -0,0 +1,74 @@
+import request from '@/utils/request';
+import { ConfigForm, ConfigQuery, ConfigVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询参数列表
+export function listConfig(query: ConfigQuery): AxiosPromise<ConfigVO[]> {
+	return request({
+		url: '/system/config/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询参数详细
+export function getConfig(configId: string | number): AxiosPromise<ConfigVO> {
+	return request({
+		url: '/system/config/' + configId,
+		method: 'get'
+	});
+}
+
+// 根据参数键名查询参数值
+export function getConfigKey(configKey: string): AxiosPromise<ConfigVO> {
+	return request({
+		url: '/system/config/configKey/' + configKey,
+		method: 'get'
+	});
+}
+
+// 新增参数配置
+export function addConfig(data: ConfigForm) {
+	return request({
+		url: '/system/config',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改参数配置
+export function updateConfig(data: ConfigForm) {
+	return request({
+		url: '/system/config',
+		method: 'put',
+		data: data
+	});
+}
+
+// 修改参数配置
+export function updateConfigByKey(key: string, value: any) {
+	return request({
+		url: '/system/config/updateByKey',
+		method: 'put',
+		data: {
+			configKey: key,
+			configValue: value
+		}
+	});
+}
+
+// 删除参数配置
+export function delConfig(configId: string | number | Array<string | number>) {
+	return request({
+		url: '/system/config/' + configId,
+		method: 'delete'
+	});
+}
+
+// 刷新参数缓存
+export function refreshCache() {
+	return request({
+		url: '/system/config/refreshCache',
+		method: 'delete'
+	});
+}

src/api/system/config/types.ts

@@ -0,0 +1,23 @@
+export interface ConfigVO extends BaseEntity {
+	configId: number | string;
+	configName: string;
+	configKey: string;
+	configValue: string;
+	configType: string;
+	remark: string;
+}
+
+export interface ConfigForm {
+	configId: number | string | undefined;
+	configName: string;
+	configKey: string;
+	configValue: string;
+	configType: string;
+	remark: string;
+}
+
+export interface ConfigQuery extends PageQuery {
+	configName: string;
+	configKey: string;
+	configType: string;
+}

src/api/system/dept.js

@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-// 查询部门列表
-export function listDept(query) {
-  return request({
-    url: '/system/dept/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询部门列表（排除节点）
-export function listDeptExcludeChild(deptId) {
-  return request({
-    url: '/system/dept/list/exclude/' + deptId,
-    method: 'get'
-  })
-}
-
-// 查询部门详细
-export function getDept(deptId) {
-  return request({
-    url: '/system/dept/' + deptId,
-    method: 'get'
-  })
-}
-
-// 新增部门
-export function addDept(data) {
-  return request({
-    url: '/system/dept',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改部门
-export function updateDept(data) {
-  return request({
-    url: '/system/dept',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除部门
-export function delDept(deptId) {
-  return request({
-    url: '/system/dept/' + deptId,
-    method: 'delete'
-  })
-}

src/api/system/dept/index.ts

@@ -0,0 +1,62 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeptForm, DeptQuery, DeptVO } from './types';
+
+// 查询部门列表
+export const listDept = (query?: DeptQuery) => {
+	return request({
+		url: '/system/dept/list',
+		method: 'get',
+		params: query
+	});
+};
+
+// 查询部门列表（排除节点）
+export const listDeptExcludeChild = (deptId: string | number): AxiosPromise<DeptVO[]> => {
+	return request({
+		url: '/system/dept/list/exclude/' + deptId,
+		method: 'get'
+	});
+};
+
+// 查询部门详细
+export const getDept = (deptId: string | number): AxiosPromise<DeptVO> => {
+	return request({
+		url: '/system/dept/' + deptId,
+		method: 'get'
+	});
+};
+
+// 查询部门下拉树结构
+export const treeselect = (): AxiosPromise<DeptVO[]> => {
+	return request({
+		url: '/system/dept/treeselect',
+		method: 'get'
+	});
+};
+
+// 新增部门
+export const addDept = (data: DeptForm) => {
+	return request({
+		url: '/system/dept',
+		method: 'post',
+		data: data
+	});
+};
+
+// 修改部门
+export const updateDept = (data: DeptForm) => {
+	return request({
+		url: '/system/dept',
+		method: 'put',
+		data: data
+	});
+};
+
+// 删除部门
+export const delDept = (deptId: number | string) => {
+	return request({
+		url: '/system/dept/' + deptId,
+		method: 'delete'
+	});
+};

src/api/system/dept/types.ts

@@ -0,0 +1,45 @@
+/**
+ * 部门查询参数
+ */
+export interface DeptQuery extends PageQuery {
+	deptName?: string;
+	status?: number;
+}
+
+/**
+ * 部门类型
+ */
+export interface DeptVO extends BaseEntity {
+	id: number | string;
+	parentName: string;
+	parentId: number | string;
+	children: DeptVO[];
+	deptId: number | string;
+	deptName: string;
+	orderNum: number;
+	leader: string;
+	phone: string;
+	email: string;
+	status: string;
+	delFlag: string;
+	ancestors: string;
+	menuId: string | number;
+}
+
+/**
+ * 部门表单类型
+ */
+export interface DeptForm {
+	parentName?: string;
+	parentId?: number | string;
+	children?: DeptForm[];
+	deptId?: number | string;
+	deptName?: string;
+	orderNum?: number;
+	leader?: string;
+	phone?: string;
+	email?: string;
+	status?: string;
+	delFlag?: string;
+	ancestors?: string;
+}

src/api/system/dict/data.js

@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-// 查询字典数据列表
-export function listData(query) {
-  return request({
-    url: '/system/dict/data/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询字典数据详细
-export function getData(dictCode) {
-  return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'get'
-  })
-}
-
-// 根据字典类型查询字典数据信息
-export function getDicts(dictType) {
-  return request({
-    url: '/system/dict/data/type/' + dictType,
-    method: 'get'
-  })
-}
-
-// 新增字典数据
-export function addData(data) {
-  return request({
-    url: '/system/dict/data',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改字典数据
-export function updateData(data) {
-  return request({
-    url: '/system/dict/data',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除字典数据
-export function delData(dictCode) {
-  return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'delete'
-  })
-}

src/api/system/dict/data/index.ts

@@ -0,0 +1,53 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DictDataForm, DictDataQuery, DictDataVO } from './types';
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType: string): AxiosPromise<DictDataVO[]> {
+	return request({
+		url: '/system/dict/data/type/' + dictType,
+		method: 'get'
+	});
+}
+
+// 查询字典数据列表
+export function listData(query: DictDataQuery): AxiosPromise<DictDataVO[]> {
+	return request({
+		url: '/system/dict/data/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询字典数据详细
+export function getData(dictCode: string | number): AxiosPromise<DictDataVO> {
+	return request({
+		url: '/system/dict/data/' + dictCode,
+		method: 'get'
+	});
+}
+
+// 新增字典数据
+export function addData(data: DictDataForm) {
+	return request({
+		url: '/system/dict/data',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改字典数据
+export function updateData(data: DictDataForm) {
+	return request({
+		url: '/system/dict/data',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除字典数据
+export function delData(dictCode: string | number | Array<string | number>) {
+	return request({
+		url: '/system/dict/data/' + dictCode,
+		method: 'delete'
+	});
+}

src/api/system/dict/data/types.ts

@@ -0,0 +1,29 @@
+export interface DictDataQuery extends PageQuery {
+	dictName: string;
+	dictType: string;
+	status: string;
+	dictLabel: string;
+}
+
+export interface DictDataVO extends BaseEntity {
+	dictCode: string;
+	dictLabel: string;
+	dictValue: string;
+	cssClass: string;
+	listClass: ElTagType;
+	dictSort: number;
+	status: string;
+	remark: string;
+}
+
+export interface DictDataForm {
+	dictType?: string;
+	dictCode: string | undefined;
+	dictLabel: string;
+	dictValue: string;
+	cssClass: string;
+	listClass: ElTagType;
+	dictSort: number;
+	status: string;
+	remark: string;
+}

src/api/system/dict/type.js

@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-// 查询字典类型列表
-export function listType(query) {
-  return request({
-    url: '/system/dict/type/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询字典类型详细
-export function getType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'get'
-  })
-}
-
-// 新增字典类型
-export function addType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改字典类型
-export function updateType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除字典类型
-export function delType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'delete'
-  })
-}
-
-// 刷新字典缓存
-export function refreshCache() {
-  return request({
-    url: '/system/dict/type/refreshCache',
-    method: 'delete'
-  })
-}
-
-// 获取字典选择框列表
-export function optionselect() {
-  return request({
-    url: '/system/dict/type/optionselect',
-    method: 'get'
-  })
-}

src/api/system/dict/type/index.ts

@@ -0,0 +1,62 @@
+import request from '@/utils/request';
+import { DictTypeForm, DictTypeVO, DictTypeQuery } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询字典类型列表
+export function listType(query: DictTypeQuery): AxiosPromise<DictTypeVO[]> {
+	return request({
+		url: '/system/dict/type/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询字典类型详细
+export function getType(dictId: number | string): AxiosPromise<DictTypeVO> {
+	return request({
+		url: '/system/dict/type/' + dictId,
+		method: 'get'
+	});
+}
+
+// 新增字典类型
+export function addType(data: DictTypeForm) {
+	return request({
+		url: '/system/dict/type',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改字典类型
+export function updateType(data: DictTypeForm) {
+	return request({
+		url: '/system/dict/type',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除字典类型
+export function delType(dictId: string | number | Array<string | number>) {
+	return request({
+		url: '/system/dict/type/' + dictId,
+		method: 'delete'
+	});
+}
+
+// 刷新字典缓存
+export function refreshCache() {
+	return request({
+		url: '/system/dict/type/refreshCache',
+		method: 'delete'
+	});
+}
+
+// 获取字典选择框列表
+export function optionselect(): AxiosPromise<DictTypeVO[]> {
+	return request({
+		url: '/system/dict/type/optionselect',
+		method: 'get'
+	});
+}

src/api/system/dict/type/types.ts

@@ -0,0 +1,21 @@
+export interface DictTypeVO extends BaseEntity {
+	dictId: number | string;
+	dictName: string;
+	dictType: string;
+	status: string;
+	remark: string;
+}
+
+export interface DictTypeForm {
+	dictId: number | string | undefined;
+	dictName: string;
+	dictType: string;
+	status: string;
+	remark: string;
+}
+
+export interface DictTypeQuery extends PageQuery {
+	dictName: string;
+	dictType: string;
+	status: string;
+}

src/api/system/menu.js

@@ -1,68 +0,0 @@
-import request from '@/utils/request'
-
-// 查询菜单列表
-export function listMenu(query) {
-  return request({
-    url: '/system/menu/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询菜单详细
-export function getMenu(menuId) {
-  return request({
-    url: '/system/menu/' + menuId,
-    method: 'get'
-  })
-}
-
-// 查询菜单下拉树结构
-export function treeselect() {
-  return request({
-    url: '/system/menu/treeselect',
-    method: 'get'
-  })
-}
-
-// 根据角色ID查询菜单下拉树结构
-export function roleMenuTreeselect(roleId) {
-  return request({
-    url: '/system/menu/roleMenuTreeselect/' + roleId,
-    method: 'get'
-  })
-}
-
-// 根据角色ID查询菜单下拉树结构
-export function tenantPackageMenuTreeselect(packageId) {
-  return request({
-    url: '/system/menu/tenantPackageMenuTreeselect/' + packageId,
-    method: 'get'
-  })
-}
-
-// 新增菜单
-export function addMenu(data) {
-  return request({
-    url: '/system/menu',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改菜单
-export function updateMenu(data) {
-  return request({
-    url: '/system/menu',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除菜单
-export function delMenu(menuId) {
-  return request({
-    url: '/system/menu/' + menuId,
-    method: 'delete'
-  })
-}

src/api/system/menu/index.ts

@@ -0,0 +1,70 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MenuQuery, MenuVO, MenuForm, MenuTreeOption, RoleMenuTree } from './types';
+
+// 查询菜单列表
+export const listMenu = (query?: MenuQuery): AxiosPromise<MenuVO[]> => {
+	return request({
+		url: '/system/menu/list',
+		method: 'get',
+		params: query
+	});
+};
+
+// 查询菜单详细
+export const getMenu = (menuId: string | number): AxiosPromise<MenuVO> => {
+	return request({
+		url: '/system/menu/' + menuId,
+		method: 'get'
+	});
+};
+
+// 查询菜单下拉树结构
+export const treeselect = (): AxiosPromise<MenuTreeOption[]> => {
+	return request({
+		url: '/system/menu/treeselect',
+		method: 'get'
+	});
+};
+
+// 根据角色ID查询菜单下拉树结构
+export const roleMenuTreeselect = (roleId: string | number): AxiosPromise<RoleMenuTree> => {
+	return request({
+		url: '/system/menu/roleMenuTreeselect/' + roleId,
+		method: 'get'
+	});
+};
+
+// 根据角色ID查询菜单下拉树结构
+export const tenantPackageMenuTreeselect = (packageId: string | number): AxiosPromise<RoleMenuTree> => {
+	return request({
+		url: '/system/menu/tenantPackageMenuTreeselect/' + packageId,
+		method: 'get'
+	});
+};
+
+// 新增菜单
+export const addMenu = (data: MenuForm) => {
+	return request({
+		url: '/system/menu',
+		method: 'post',
+		data: data
+	});
+};
+
+// 修改菜单
+export const updateMenu = (data: MenuForm) => {
+	return request({
+		url: '/system/menu',
+		method: 'put',
+		data: data
+	});
+};
+
+// 删除菜单
+export const delMenu = (menuId: string | number) => {
+	return request({
+		url: '/system/menu/' + menuId,
+		method: 'delete'
+	});
+};

src/api/system/menu/types.ts

@@ -0,0 +1,69 @@
+import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
+
+/**
+ * 菜单树形结构类型
+ */
+export interface MenuTreeOption {
+	id: string | number;
+	label: string;
+	parentId: string | number;
+	weight: number;
+	children?: MenuTreeOption[];
+}
+
+export interface RoleMenuTree {
+	menus: MenuTreeOption[];
+	checkedKeys: string[];
+}
+
+/**
+ * 菜单查询参数类型
+ */
+export interface MenuQuery {
+	keywords?: string;
+	menuName?: string;
+	status?: string;
+}
+
+/**
+ * 菜单视图对象类型
+ */
+export interface MenuVO extends BaseEntity {
+	parentName: string;
+	parentId: string | number;
+	children: MenuVO[];
+	menuId: string | number;
+	menuName: string;
+	orderNum: number;
+	path: string;
+	component: string;
+	queryParam: string;
+	isFrame: string;
+	isCache: string;
+	menuType: MenuTypeEnum;
+	visible: string;
+	status: string;
+	icon: string;
+	remark: string;
+}
+
+export interface MenuForm {
+	parentName?: string;
+	parentId?: string | number;
+	children?: MenuForm[];
+	menuId?: string | number;
+	menuName: string;
+	orderNum: number;
+	path: string;
+	component?: string;
+	queryParam?: string;
+	isFrame?: string;
+	isCache?: string;
+	menuType?: MenuTypeEnum;
+	visible?: string;
+	status?: string;
+	icon?: string;
+	remark?: string;
+	query?: string;
+	perms?: string;
+}

src/api/system/notice.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询公告列表
-export function listNotice(query) {
-  return request({
-    url: '/system/notice/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询公告详细
-export function getNotice(noticeId) {
-  return request({
-    url: '/system/notice/' + noticeId,
-    method: 'get'
-  })
-}
-
-// 新增公告
-export function addNotice(data) {
-  return request({
-    url: '/system/notice',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改公告
-export function updateNotice(data) {
-  return request({
-    url: '/system/notice',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除公告
-export function delNotice(noticeId) {
-  return request({
-    url: '/system/notice/' + noticeId,
-    method: 'delete'
-  })
-}

src/api/system/notice/index.ts

@@ -0,0 +1,45 @@
+import request from '@/utils/request';
+import { NoticeForm, NoticeQuery, NoticeVO } from './types';
+import { AxiosPromise } from 'axios';
+// 查询公告列表
+export function listNotice(query: NoticeQuery): AxiosPromise<NoticeVO[]> {
+	return request({
+		url: '/system/notice/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询公告详细
+export function getNotice(noticeId: string | number): AxiosPromise<NoticeVO> {
+	return request({
+		url: '/system/notice/' + noticeId,
+		method: 'get'
+	});
+}
+
+// 新增公告
+export function addNotice(data: NoticeForm) {
+	return request({
+		url: '/system/notice',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改公告
+export function updateNotice(data: NoticeForm) {
+	return request({
+		url: '/system/notice',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除公告
+export function delNotice(noticeId: string | number | Array<string | number>) {
+	return request({
+		url: '/system/notice/' + noticeId,
+		method: 'delete'
+	});
+}

src/api/system/notice/types.ts

@@ -0,0 +1,26 @@
+export interface NoticeVO extends BaseEntity {
+	noticeId: number;
+	noticeTitle: string;
+	noticeType: string;
+	noticeContent: string;
+	status: string;
+	remark: string;
+	createByName: string;
+}
+
+export interface NoticeQuery extends PageQuery {
+	noticeTitle: string;
+	createByName: string;
+	status: string;
+	noticeType: string;
+}
+
+export interface NoticeForm {
+	noticeId: number | string | undefined;
+	noticeTitle: string;
+	noticeType: string;
+	noticeContent: string;
+	status: string;
+	remark: string;
+	createByName: string;
+}

src/api/system/oss.js

@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-
-// 查询OSS对象存储列表
-export function listOss(query) {
-  return request({
-    url: '/system/oss/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询OSS对象基于id串
-export function listByIds(ossId) {
-  return request({
-    url: '/system/oss/listByIds/' + ossId,
-    method: 'get'
-  })
-}
-
-// 删除OSS对象存储
-export function delOss(ossId) {
-  return request({
-    url: '/system/oss/' + ossId,
-    method: 'delete'
-  })
-}
-

src/api/system/oss/index.ts

@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+import { OssQuery, OssVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询OSS对象存储列表
+export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
+	return request({
+		url: '/system/oss/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询OSS对象基于id串
+export function listByIds(ossId: string | number): AxiosPromise<OssVO[]> {
+	return request({
+		url: '/system/oss/listByIds/' + ossId,
+		method: 'get'
+	});
+}
+
+// 删除OSS对象存储
+export function delOss(ossId: string | number | Array<string | number>) {
+	return request({
+		url: '/system/oss/' + ossId,
+		method: 'delete'
+	});
+}

src/api/system/oss/types.ts

@@ -0,0 +1,22 @@
+export interface OssVO extends BaseEntity {
+	ossId: string | number;
+	fileName: string;
+	originalName: string;
+	fileSuffix: string;
+	url: string;
+	createByName: string;
+	service: string;
+}
+
+export interface OssQuery extends PageQuery {
+	fileName: string;
+	originalName: string;
+	fileSuffix: string;
+	createTime: string;
+	service: string;
+	orderByColumn: string;
+	isAsc: string;
+}
+export interface OssForm {
+	file: undefined | string;
+}

src/api/system/ossConfig.js

@@ -1,58 +0,0 @@
-import request from '@/utils/request'
-
-// 查询对象存储配置列表
-export function listOssConfig(query) {
-  return request({
-    url: '/system/oss/config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询对象存储配置详细
-export function getOssConfig(ossConfigId) {
-  return request({
-    url: '/system/oss/config/' + ossConfigId,
-    method: 'get'
-  })
-}
-
-// 新增对象存储配置
-export function addOssConfig(data) {
-  return request({
-    url: '/system/oss/config',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改对象存储配置
-export function updateOssConfig(data) {
-  return request({
-    url: '/system/oss/config',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除对象存储配置
-export function delOssConfig(ossConfigId) {
-  return request({
-    url: '/system/oss/config/' + ossConfigId,
-    method: 'delete'
-  })
-}
-
-// 对象存储状态修改
-export function changeOssConfigStatus(ossConfigId, status, configKey) {
-  const data = {
-    ossConfigId,
-    status,
-    configKey
-  }
-  return request({
-    url: '/system/oss/config/changeStatus',
-    method: 'put',
-    data: data
-  })
-}

src/api/system/ossConfig/index.ts

@@ -0,0 +1,60 @@
+import request from '@/utils/request';
+import { OssConfigForm, OssConfigQuery, OssConfigVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询对象存储配置列表
+export function listOssConfig(query: OssConfigQuery): AxiosPromise<OssConfigVO[]> {
+	return request({
+		url: '/system/oss/config/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询对象存储配置详细
+export function getOssConfig(ossConfigId: string | number): AxiosPromise<OssConfigVO> {
+	return request({
+		url: '/system/oss/config/' + ossConfigId,
+		method: 'get'
+	});
+}
+
+// 新增对象存储配置
+export function addOssConfig(data: OssConfigForm) {
+	return request({
+		url: '/system/oss/config',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改对象存储配置
+export function updateOssConfig(data: OssConfigForm) {
+	return request({
+		url: '/system/oss/config',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除对象存储配置
+export function delOssConfig(ossConfigId: string | number | Array<string | number>) {
+	return request({
+		url: '/system/oss/config/' + ossConfigId,
+		method: 'delete'
+	});
+}
+
+// 对象存储状态修改
+export function changeOssConfigStatus(ossConfigId: string | number, status: string, configKey: string) {
+	const data = {
+		ossConfigId,
+		status,
+		configKey
+	};
+	return request({
+		url: '/system/oss/config/changeStatus',
+		method: 'put',
+		data: data
+	});
+}

src/api/system/ossConfig/types.ts

@@ -0,0 +1,38 @@
+export interface OssConfigVO extends BaseEntity {
+	ossConfigId: number | string;
+	configKey: string;
+	accessKey: string;
+	secretKey: string;
+	bucketName: string;
+	prefix: string;
+	endpoint: string;
+	domain: string;
+	isHttps: string;
+	region: string;
+	status: string;
+	ext1: string;
+	remark: string;
+	accessPolicy: string;
+}
+
+export interface OssConfigQuery extends PageQuery {
+	configKey: string;
+	bucketName: string;
+	status: string;
+}
+
+export interface OssConfigForm {
+	ossConfigId: string | number | undefined;
+	configKey: string;
+	accessKey: string;
+	secretKey: string;
+	bucketName: string;
+	prefix: string;
+	endpoint: string;
+	domain: string;
+	isHttps: string;
+	accessPolicy: string;
+	region: string;
+	status: string;
+	remark: string;
+}

src/api/system/post.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询岗位列表
-export function listPost(query) {
-  return request({
-    url: '/system/post/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询岗位详细
-export function getPost(postId) {
-  return request({
-    url: '/system/post/' + postId,
-    method: 'get'
-  })
-}
-
-// 新增岗位
-export function addPost(data) {
-  return request({
-    url: '/system/post',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改岗位
-export function updatePost(data) {
-  return request({
-    url: '/system/post',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除岗位
-export function delPost(postId) {
-  return request({
-    url: '/system/post/' + postId,
-    method: 'delete'
-  })
-}

src/api/system/post/index.ts

@@ -0,0 +1,46 @@
+import request from '@/utils/request';
+import { PostForm, PostQuery, PostVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询岗位列表
+export function listPost(query: PostQuery): AxiosPromise<PostVO[]> {
+	return request({
+		url: '/system/post/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询岗位详细
+export function getPost(postId: string | number): AxiosPromise<PostVO> {
+	return request({
+		url: '/system/post/' + postId,
+		method: 'get'
+	});
+}
+
+// 新增岗位
+export function addPost(data: PostForm) {
+	return request({
+		url: '/system/post',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改岗位
+export function updatePost(data: PostForm) {
+	return request({
+		url: '/system/post',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除岗位
+export function delPost(postId: string | number | (string | number)[]) {
+	return request({
+		url: '/system/post/' + postId,
+		method: 'delete'
+	});
+}

src/api/system/post/types.ts

@@ -0,0 +1,23 @@
+export interface PostVO extends BaseEntity {
+	postId: number | string;
+	postCode: string;
+	postName: string;
+	postSort: number;
+	status: string;
+	remark: string;
+}
+
+export interface PostForm {
+	postId: number | string | undefined;
+	postCode: string;
+	postName: string;
+	postSort: number;
+	status: string;
+	remark: string;
+}
+
+export interface PostQuery extends PageQuery {
+	postCode: string;
+	postName: string;
+	status: string;
+}

src/api/system/role.js

@@ -1,119 +0,0 @@
-import request from '@/utils/request'
-
-// 查询角色列表
-export function listRole(query) {
-  return request({
-    url: '/system/role/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色详细
-export function getRole(roleId) {
-  return request({
-    url: '/system/role/' + roleId,
-    method: 'get'
-  })
-}
-
-// 新增角色
-export function addRole(data) {
-  return request({
-    url: '/system/role',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改角色
-export function updateRole(data) {
-  return request({
-    url: '/system/role',
-    method: 'put',
-    data: data
-  })
-}
-
-// 角色数据权限
-export function dataScope(data) {
-  return request({
-    url: '/system/role/dataScope',
-    method: 'put',
-    data: data
-  })
-}
-
-// 角色状态修改
-export function changeRoleStatus(roleId, status) {
-  const data = {
-    roleId,
-    status
-  }
-  return request({
-    url: '/system/role/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除角色
-export function delRole(roleId) {
-  return request({
-    url: '/system/role/' + roleId,
-    method: 'delete'
-  })
-}
-
-// 查询角色已授权用户列表
-export function allocatedUserList(query) {
-  return request({
-    url: '/system/role/authUser/allocatedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色未授权用户列表
-export function unallocatedUserList(query) {
-  return request({
-    url: '/system/role/authUser/unallocatedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 取消用户授权角色
-export function authUserCancel(data) {
-  return request({
-    url: '/system/role/authUser/cancel',
-    method: 'put',
-    data: data
-  })
-}
-
-// 批量取消用户授权角色
-export function authUserCancelAll(data) {
-  return request({
-    url: '/system/role/authUser/cancelAll',
-    method: 'put',
-    params: data
-  })
-}
-
-// 授权用户选择
-export function authUserSelectAll(data) {
-  return request({
-    url: '/system/role/authUser/selectAll',
-    method: 'put',
-    params: data
-  })
-}
-
-// 根据角色ID查询部门树结构
-export function deptTreeSelect(roleId) {
-  return request({
-    url: '/system/role/deptTree/' + roleId,
-    method: 'get'
-  })
-}

src/api/system/role/index.ts

@@ -0,0 +1,144 @@
+import { UserVO } from '@/api/system/user/types';
+import { UserQuery } from '@/api/system/user/types';
+import { AxiosPromise } from 'axios';
+import { RoleQuery, RoleVO, RoleDeptTree } from './types';
+import request from '@/utils/request';
+
+export const listRole = (query: RoleQuery): AxiosPromise<RoleVO[]> => {
+	return request({
+		url: '/system/role/list',
+		method: 'get',
+		params: query
+	});
+};
+
+/**
+ * 查询角色详细
+ */
+export const getRole = (roleId: string | number): AxiosPromise<RoleVO> => {
+	return request({
+		url: '/system/role/' + roleId,
+		method: 'get'
+	});
+};
+
+/**
+ * 新增角色
+ */
+export const addRole = (data: any) => {
+	return request({
+		url: '/system/role',
+		method: 'post',
+		data: data
+	});
+};
+
+/**
+ * 修改角色
+ * @param data
+ */
+export const updateRole = (data: any) => {
+	return request({
+		url: '/system/role',
+		method: 'put',
+		data: data
+	});
+};
+
+/**
+ * 角色数据权限
+ */
+export const dataScope = (data: any) => {
+	return request({
+		url: '/system/role/dataScope',
+		method: 'put',
+		data: data
+	});
+};
+
+/**
+ * 角色状态修改
+ */
+export const changeRoleStatus = (roleId: string | number, status: string) => {
+	const data = {
+		roleId,
+		status
+	};
+	return request({
+		url: '/system/role/changeStatus',
+		method: 'put',
+		data: data
+	});
+};
+
+/**
+ * 删除角色
+ */
+export const delRole = (roleId: Array<string | number> | string | number) => {
+	return request({
+		url: '/system/role/' + roleId,
+		method: 'delete'
+	});
+};
+
+/**
+ * 查询角色已授权用户列表
+ */
+export const allocatedUserList = (query: UserQuery): AxiosPromise<UserVO[]> => {
+	return request({
+		url: '/system/role/authUser/allocatedList',
+		method: 'get',
+		params: query
+	});
+};
+
+/**
+ * 查询角色未授权用户列表
+ */
+export const unallocatedUserList = (query: UserQuery): AxiosPromise<UserVO[]> => {
+	return request({
+		url: '/system/role/authUser/unallocatedList',
+		method: 'get',
+		params: query
+	});
+};
+
+/**
+ * 取消用户授权角色
+ */
+export const authUserCancel = (data: any) => {
+	return request({
+		url: '/system/role/authUser/cancel',
+		method: 'put',
+		data: data
+	});
+};
+
+/**
+ * 批量取消用户授权角色
+ */
+export const authUserCancelAll = (data: any) => {
+	return request({
+		url: '/system/role/authUser/cancelAll',
+		method: 'put',
+		params: data
+	});
+};
+
+/**
+ * 授权用户选择
+ */
+export const authUserSelectAll = (data: any) => {
+	return request({
+		url: '/system/role/authUser/selectAll',
+		method: 'put',
+		params: data
+	});
+};
+// 根据角色ID查询部门树结构
+export const deptTreeSelect = (roleId: string | number): AxiosPromise<RoleDeptTree> => {
+	return request({
+		url: '/system/role/deptTree/' + roleId,
+		method: 'get'
+	});
+};

src/api/system/role/types.ts

@@ -0,0 +1,52 @@
+/**
+ * 菜单树形结构类型
+ */
+export interface DeptTreeOption {
+	id: string;
+	label: string;
+	parentId: string;
+	weight: number;
+	children?: DeptTreeOption[];
+}
+
+export interface RoleDeptTree {
+	checkedKeys: string[];
+	depts: DeptTreeOption[];
+}
+
+export interface RoleVO extends BaseEntity {
+	roleId: string | number;
+	roleName: string;
+	roleKey: string;
+	roleSort: number;
+	dataScope: string;
+	menuCheckStrictly: boolean;
+	deptCheckStrictly: boolean;
+	status: string;
+	delFlag: string;
+	remark?: any;
+	flag: boolean;
+	menuIds?: Array<string | number>;
+	deptIds?: Array<string | number>;
+	admin: boolean;
+}
+
+export interface RoleQuery extends PageQuery {
+	roleName: string;
+	roleKey: string;
+	status: string;
+}
+
+export interface RoleForm {
+	roleName: string;
+	roleKey: string;
+	roleSort: number;
+	status: string;
+	menuCheckStrictly: boolean;
+	deptCheckStrictly: boolean;
+	remark: string;
+	dataScope?: number;
+	roleId: string | undefined;
+	menuIds: Array<string | number>;
+	deptIds: Array<string | number>;
+}

src/api/system/tenant.js

@@ -1,88 +0,0 @@
-import request from '@/utils/request'
-
-// 查询租户列表
-export function listTenant(query) {
-  return request({
-    url: '/system/tenant/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询租户详细
-export function getTenant(id) {
-  return request({
-    url: '/system/tenant/' + id,
-    method: 'get'
-  })
-}
-
-// 新增租户
-export function addTenant(data) {
-  return request({
-    url: '/system/tenant',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改租户
-export function updateTenant(data) {
-  return request({
-    url: '/system/tenant',
-    method: 'put',
-    data: data
-  })
-}
-
-// 租户状态修改
-export function changeTenantStatus(id, tenantId, status) {
-  const data = {
-    id,
-    tenantId,
-    status
-  }
-  return request({
-    url: '/system/tenant/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除租户
-export function delTenant(id) {
-  return request({
-    url: '/system/tenant/' + id,
-    method: 'delete'
-  })
-}
-
-// 动态切换租户
-export function dynamicTenant(tenantId) {
-  return request({
-    url: '/system/tenant/dynamic/' + tenantId,
-    method: 'get'
-  })
-}
-
-// 清除动态租户
-export function dynamicClear() {
-  return request({
-    url: '/system/tenant/dynamic/clear',
-    method: 'get'
-  })
-}
-
-// 同步租户套餐
-export function syncTenantPackage(tenantId, packageId) {
-  const data = {
-    tenantId,
-    packageId
-  }
-  return request({
-    url: '/system/tenant/syncTenantPackage',
-    method: 'get',
-    params: data
-  })
-}
-

src/api/system/tenant/index.ts

@@ -0,0 +1,89 @@
+import request from '@/utils/request';
+import { TenantForm, TenantQuery, TenantVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询租户列表
+export function listTenant(query: TenantQuery): AxiosPromise<TenantVO[]> {
+	return request({
+		url: '/system/tenant/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询租户详细
+export function getTenant(id: string | number): AxiosPromise<TenantVO> {
+	return request({
+		url: '/system/tenant/' + id,
+		method: 'get'
+	});
+}
+
+// 新增租户
+export function addTenant(data: TenantForm) {
+	return request({
+		url: '/system/tenant',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改租户
+export function updateTenant(data: TenantForm) {
+	return request({
+		url: '/system/tenant',
+		method: 'put',
+		data: data
+	});
+}
+
+// 租户状态修改
+export function changeTenantStatus(id: string | number, tenantId: string | number, status: string) {
+	const data = {
+		id,
+		tenantId,
+		status
+	};
+	return request({
+		url: '/system/tenant/changeStatus',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除租户
+export function delTenant(id: string | number | Array<string | number>) {
+	return request({
+		url: '/system/tenant/' + id,
+		method: 'delete'
+	});
+}
+
+// 动态切换租户
+export function dynamicTenant(tenantId: string | number) {
+	return request({
+		url: '/system/tenant/dynamic/' + tenantId,
+		method: 'get'
+	});
+}
+
+// 清除动态租户
+export function dynamicClear() {
+	return request({
+		url: '/system/tenant/dynamic/clear',
+		method: 'get'
+	});
+}
+
+// 同步租户套餐
+export function syncTenantPackage(tenantId: string | number, packageId: string | number) {
+	const data = {
+		tenantId,
+		packageId
+	};
+	return request({
+		url: '/system/tenant/syncTenantPackage',
+		method: 'get',
+		params: data
+	});
+}

src/api/system/tenant/types.ts

@@ -0,0 +1,46 @@
+export interface TenantVO extends BaseEntity {
+	id: number | string;
+	tenantId: number | string;
+	username: string;
+	contactUserName: string;
+	contactPhone: string;
+	companyName: string;
+	licenseNumber: string;
+	address: string;
+	domain: string;
+	intro: string;
+	remark: string;
+	packageId: string | number;
+	expireTime: string;
+	accountCount: number;
+	status: string;
+}
+
+export interface TenantQuery extends PageQuery {
+	tenantId: string | number;
+
+	contactUserName: string;
+
+	contactPhone: string;
+
+	companyName: string;
+}
+
+export interface TenantForm {
+	id: number | string | undefined;
+	tenantId: number | string | undefined;
+	username: string;
+	password: string;
+	contactUserName: string;
+	contactPhone: string;
+	companyName: string;
+	licenseNumber: string;
+	domain: string;
+	address: string;
+	intro: string;
+	remark: string;
+	packageId: string | number;
+	expireTime: string;
+	accountCount: number;
+	status: string;
+}

src/api/system/tenantPackage.js

@@ -1,58 +0,0 @@
-import request from '@/utils/request'
-
-// 查询租户套餐列表
-export function listTenantPackage(query) {
-  return request({
-    url: '/system/tenant/package/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询租户套餐详细
-export function getTenantPackage(packageId) {
-  return request({
-    url: '/system/tenant/package/' + packageId,
-    method: 'get'
-  })
-}
-
-// 新增租户套餐
-export function addTenantPackage(data) {
-  return request({
-    url: '/system/tenant/package',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改租户套餐
-export function updateTenantPackage(data) {
-  return request({
-    url: '/system/tenant/package',
-    method: 'put',
-    data: data
-  })
-}
-
-// 租户套餐状态修改
-export function changePackageStatus(packageId, status) {
-  const data = {
-    packageId,
-    status
-  }
-  return request({
-    url: '/system/tenant/package/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-
-// 删除租户套餐
-export function delTenantPackage(packageId) {
-  return request({
-    url: '/system/tenant/package/' + packageId,
-    method: 'delete'
-  })
-}

src/api/system/tenantPackage/index.ts

@@ -0,0 +1,59 @@
+import request from '@/utils/request';
+import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询租户套餐列表
+export function listTenantPackage(query?: TenantPkgQuery): AxiosPromise<TenantPkgVO[]> {
+	return request({
+		url: '/system/tenant/package/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询租户套餐详细
+export function getTenantPackage(packageId: string | number): AxiosPromise<TenantPkgVO> {
+	return request({
+		url: '/system/tenant/package/' + packageId,
+		method: 'get'
+	});
+}
+
+// 新增租户套餐
+export function addTenantPackage(data: TenantPkgForm) {
+	return request({
+		url: '/system/tenant/package',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改租户套餐
+export function updateTenantPackage(data: TenantPkgForm) {
+	return request({
+		url: '/system/tenant/package',
+		method: 'put',
+		data: data
+	});
+}
+
+// 租户套餐状态修改
+export function changePackageStatus(packageId: number | string, status: string) {
+	const data = {
+		packageId,
+		status
+	};
+	return request({
+		url: '/system/tenant/package/changeStatus',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除租户套餐
+export function delTenantPackage(packageId: string | number | Array<string | number>) {
+	return request({
+		url: '/system/tenant/package/' + packageId,
+		method: 'delete'
+	});
+}

src/api/system/tenantPackage/types.ts

@@ -0,0 +1,22 @@
+export interface TenantPkgVO extends BaseEntity {
+	packageId: string | number;
+	packageName: string;
+	menuIds: string;
+	remark: string;
+	menuCheckStrictly: boolean;
+	status: string;
+}
+
+export interface TenantPkgQuery extends PageQuery {
+	packageName: string;
+	status: string;
+}
+
+export interface TenantPkgForm {
+	packageId: string | number | undefined;
+	packageName: string;
+	menuIds: string;
+	remark: string;
+	menuCheckStrictly: boolean;
+	status: string;
+}

src/api/system/user.js

@@ -1,135 +0,0 @@
-import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
-
-// 查询用户列表
-export function listUser(query) {
-  return request({
-    url: '/system/user/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询用户详细
-export function getUser(userId) {
-  return request({
-    url: '/system/user/' + parseStrEmpty(userId),
-    method: 'get'
-  })
-}
-
-// 新增用户
-export function addUser(data) {
-  return request({
-    url: '/system/user',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改用户
-export function updateUser(data) {
-  return request({
-    url: '/system/user',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除用户
-export function delUser(userId) {
-  return request({
-    url: '/system/user/' + userId,
-    method: 'delete'
-  })
-}
-
-// 用户密码重置
-export function resetUserPwd(userId, password) {
-  const data = {
-    userId,
-    password
-  }
-  return request({
-    url: '/system/user/resetPwd',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
-  return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/system/user/profile',
-    method: 'get'
-  })
-}
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
-    params: data
-  })
-}
-
-// 用户头像上传
-export function uploadAvatar(data) {
-  return request({
-    url: '/system/user/profile/avatar',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询授权角色
-export function getAuthRole(userId) {
-  return request({
-    url: '/system/user/authRole/' + userId,
-    method: 'get'
-  })
-}
-
-// 保存授权角色
-export function updateAuthRole(data) {
-  return request({
-    url: '/system/user/authRole',
-    method: 'put',
-    params: data
-  })
-}
-
-// 查询部门下拉树结构
-export function deptTreeSelect() {
-  return request({
-    url: '/system/user/deptTree',
-    method: 'get'
-  })
-}

src/api/system/user/index.ts

@@ -0,0 +1,180 @@
+import { DeptVO } from './../dept/types';
+import { RoleVO } from '@/api/system/role/types';
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { UserForm, UserQuery, UserVO, UserInfoVO } from './types';
+import { parseStrEmpty } from '@/utils/ruoyi';
+
+/**
+ * 查询用户列表
+ * @param query
+ */
+export function listUser(query: UserQuery): AxiosPromise<UserVO[]> {
+	return request({
+		url: '/system/user/list',
+		method: 'get',
+		params: query
+	});
+}
+
+/**
+ * 获取用户详情
+ * @param userId
+ */
+export function getUser(userId?: string | number): AxiosPromise<UserInfoVO> {
+	return request({
+		url: '/system/user/' + parseStrEmpty(userId),
+		method: 'get'
+	});
+}
+
+/**
+ * 新增用户
+ */
+export function addUser(data: UserForm) {
+	return request({
+		url: '/system/user',
+		method: 'post',
+		data: data
+	});
+}
+
+/**
+ * 修改用户
+ */
+export function updateUser(data: UserForm) {
+	return request({
+		url: '/system/user',
+		method: 'put',
+		data: data
+	});
+}
+
+/**
+ * 删除用户
+ * @param userId 用户ID
+ */
+export function delUser(userId: Array<string | number> | string | number) {
+	return request({
+		url: '/system/user/' + userId,
+		method: 'delete'
+	});
+}
+
+/**
+ * 用户密码重置
+ * @param userId 用户ID
+ * @param password 密码
+ */
+export function resetUserPwd(userId: string | number, password: string) {
+	const data = {
+		userId,
+		password
+	};
+	return request({
+		url: '/system/user/resetPwd',
+		method: 'put',
+		data: data
+	});
+}
+
+/**
+ * 用户状态修改
+ * @param userId 用户ID
+ * @param status 用户状态
+ */
+export function changeUserStatus(userId: number | string, status: string) {
+	const data = {
+		userId,
+		status
+	};
+	return request({
+		url: '/system/user/changeStatus',
+		method: 'put',
+		data: data
+	});
+}
+
+/**
+ * 查询用户个人信息
+ */
+export function getUserProfile(): AxiosPromise<UserInfoVO> {
+	return request({
+		url: '/system/user/profile',
+		method: 'get'
+	});
+}
+
+/**
+ * 修改用户个人信息
+ * @param data 用户信息
+ */
+export function updateUserProfile(data: UserForm) {
+	return request({
+		url: '/system/user/profile',
+		method: 'put',
+		data: data
+	});
+}
+
+/**
+ * 用户密码重置
+ * @param oldPassword 旧密码
+ * @param newPassword 新密码
+ */
+export function updateUserPwd(oldPassword: string, newPassword: string) {
+	const data = {
+		oldPassword,
+		newPassword
+	};
+	return request({
+		url: '/system/user/profile/updatePwd',
+		method: 'put',
+		params: data
+	});
+}
+
+/**
+ * 用户头像上传
+ * @param data 头像文件
+ */
+export function uploadAvatar(data: FormData) {
+	return request({
+		url: '/system/user/profile/avatar',
+		method: 'post',
+		data: data
+	});
+}
+
+/**
+ * 查询授权角色
+ * @param userId 用户ID
+ */
+export function getAuthRole(userId: string | number): AxiosPromise<{ user: UserVO; roles: RoleVO[] }> {
+	return request({
+		url: '/system/user/authRole/' + userId,
+		method: 'get'
+	});
+}
+
+/**
+ * 保存授权角色
+ * @param data 用户ID
+ */
+export function updateAuthRole(data: { userId: string; roleIds: string }) {
+	return request({
+		url: '/system/user/authRole',
+		method: 'put',
+		params: data
+	});
+}
+
+/**
+ * 查询部门下拉树结构
+ */
+export function deptTreeSelect(): AxiosPromise<DeptVO[]> {
+	return request({
+		url: '/system/user/deptTree',
+		method: 'get'
+	});
+}

src/api/system/user/types.ts

@@ -0,0 +1,84 @@
+import { DeptVO } from './../dept/types';
+import { RoleVO } from '@/api/system/role/types';
+import { PostVO } from '@/api/system/post/types';
+
+/**
+ * 用户信息
+ */
+export interface UserInfo {
+	user: UserVO;
+	roles: string[];
+	permissions: string[];
+}
+
+/**
+ * 用户查询对象类型
+ */
+export interface UserQuery extends PageQuery {
+	userName?: string;
+	phonenumber?: string;
+	status?: string;
+	deptId?: string | number;
+	roleId?: string | number;
+}
+
+/**
+ * 用户返回对象
+ */
+export interface UserVO extends BaseEntity {
+	userId: string | number;
+	deptId: number;
+	userName: string;
+	nickName: string;
+	userType: string;
+	email: string;
+	phonenumber: string;
+	sex: string;
+	avatar: string;
+	status: string;
+	delFlag: string;
+	loginIp: string;
+	loginDate: string;
+	remark: string;
+	dept: DeptVO;
+	roles: RoleVO[];
+	roleIds: any;
+	postIds: any;
+	roleId: any;
+	admin: boolean;
+}
+
+/**
+ * 用户表单类型
+ */
+export interface UserForm {
+	id?: string;
+	userId?: string;
+	deptId?: number;
+	userName: string;
+	nickName?: string;
+	password: string;
+	phonenumber?: string;
+	email?: string;
+	sex?: string;
+	status: string;
+	remark?: string;
+	postIds: string[];
+	roleIds: string[];
+}
+
+export interface UserInfoVO {
+	user: UserVO;
+	roles: RoleVO[];
+	roleIds: string[];
+	posts: PostVO[];
+	postIds: string[];
+	roleGroup: string;
+	postGroup: string;
+}
+
+export interface ResetPwdForm {
+	oldPassword: string;
+	newPassword: string;
+	confirmPassword: string;
+}

src/api/tool/gen.js

@@ -1,85 +0,0 @@
-import request from '@/utils/request'
-
-// 查询生成表数据
-export function listTable(query) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/list',
-    method: 'get',
-    params: query
-  })
-}
-// 查询db数据库列表
-export function listDbTable(query) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/db/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询表详细信息
-export function getGenTable(tableId) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/' + tableId,
-    method: 'get'
-  })
-}
-
-// 修改代码生成信息
-export function updateGenTable(data) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen',
-    method: 'put',
-    data: data
-  })
-}
-
-// 导入表
-export function importTable(data) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/importTable',
-    method: 'post',
-    params: data
-  })
-}
-
-// 预览生成代码
-export function previewTable(tableId) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/preview/' + tableId,
-    method: 'get'
-  })
-}
-
-// 删除表数据
-export function delTable(tableId) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/' + tableId,
-    method: 'delete'
-  })
-}
-
-// 生成代码（自定义路径）
-export function genCode(tableName) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/genCode/' + tableName,
-    method: 'get'
-  })
-}
-
-// 同步数据库
-export function synchDb(tableName) {
-  return request({
-    headers: { 'datasource': localStorage.getItem("dataName") },
-    url: '/tool/gen/synchDb/' + tableName,
-    method: 'get'
-  })
-}

src/api/tool/gen/index.ts

@@ -0,0 +1,87 @@
+import request from '@/utils/request';
+import { DbTableQuery, DbTableVO, TableQuery, TableVO, GenTableVO, DbTableForm } from './types';
+import { AxiosPromise } from 'axios';
+
+// 查询生成表数据
+export const listTable = (query: TableQuery): AxiosPromise<TableVO[]> => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/list',
+		method: 'get',
+		params: query
+	});
+};
+// 查询db数据库列表
+export const listDbTable = (query: DbTableQuery): AxiosPromise<DbTableVO[]> => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/db/list',
+		method: 'get',
+		params: query
+	});
+};
+
+// 查询表详细信息
+export const getGenTable = (tableId: string | number): AxiosPromise<GenTableVO> => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/' + tableId,
+		method: 'get'
+	});
+};
+
+// 修改代码生成信息
+export const updateGenTable = (data: DbTableForm) => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen',
+		method: 'put',
+		data: data
+	});
+};
+
+// 导入表
+export const importTable = (data: { tables: string }) => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/importTable',
+		method: 'post',
+		params: data
+	});
+};
+
+// 预览生成代码
+export const previewTable = (tableId: string | number) => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/preview/' + tableId,
+		method: 'get'
+	});
+};
+
+// 删除表数据
+export const delTable = (tableId: string | number | Array<string | number>) => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/' + tableId,
+		method: 'delete'
+	});
+};
+
+// 生成代码（自定义路径）
+export const genCode = (tableName: string) => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/genCode/' + tableName,
+		method: 'get'
+	});
+};
+
+// 同步数据库
+export const synchDb = (tableName: string) => {
+	return request({
+		headers: { datasource: localStorage.getItem('dataName') },
+		url: '/tool/gen/synchDb/' + tableName,
+		method: 'get'
+	});
+};

src/api/tool/gen/types.ts

@@ -0,0 +1,178 @@
+export interface TableVO extends BaseEntity {
+	createDept: number | string;
+	tableId: string | number;
+	tableName: string;
+	tableComment: string;
+	subTableName?: any;
+	subTableFkName?: any;
+	className: string;
+	tplCategory: string;
+	packageName: string;
+	moduleName: string;
+	businessName: string;
+	functionName: string;
+	functionAuthor: string;
+	genType: string;
+	genPath: string;
+	pkColumn?: any;
+	columns?: any;
+	options?: any;
+	remark?: any;
+	treeCode?: any;
+	treeParentCode?: any;
+	treeName?: any;
+	menuIds?: any;
+	parentMenuId?: any;
+	parentMenuName?: any;
+	tree: boolean;
+	crud: boolean;
+}
+
+export interface TableQuery extends PageQuery {
+	tableName: string;
+	tableComment: string;
+	dataName: string;
+}
+
+export interface DbColumnVO extends BaseEntity {
+	createDept?: any;
+	columnId?: any;
+	tableId?: any;
+	columnName?: any;
+	columnComment?: any;
+	columnType?: any;
+	javaType?: any;
+	javaField?: any;
+	isPk?: any;
+	isIncrement?: any;
+	isRequired?: any;
+	isInsert?: any;
+	isEdit?: any;
+	isList?: any;
+	isQuery?: any;
+	queryType?: any;
+	htmlType?: any;
+	dictType?: any;
+	sort?: any;
+	increment: boolean;
+	capJavaField?: any;
+	usableColumn: boolean;
+	superColumn: boolean;
+	list: boolean;
+	pk: boolean;
+	insert: boolean;
+	edit: boolean;
+	query: boolean;
+	required: boolean;
+}
+
+export interface DbTableVO {
+	createDept?: any;
+	tableId?: any;
+	tableName: string;
+	tableComment: string;
+	subTableName?: any;
+	subTableFkName?: any;
+	className?: any;
+	tplCategory?: any;
+	packageName?: any;
+	moduleName?: any;
+	businessName?: any;
+	functionName?: any;
+	functionAuthor?: any;
+	genType?: any;
+	genPath?: any;
+	pkColumn?: any;
+	columns: DbColumnVO[];
+	options?: any;
+	remark?: any;
+	treeCode?: any;
+	treeParentCode?: any;
+	treeName?: any;
+	menuIds?: any;
+	parentMenuId?: any;
+	parentMenuName?: any;
+	tree: boolean;
+	crud: boolean;
+}
+
+export interface DbTableQuery extends PageQuery {
+	tableName: string;
+	tableComment: string;
+}
+
+export interface GenTableVO {
+	info: DbTableVO;
+	rows: DbColumnVO[];
+	tables: DbTableVO[];
+}
+
+export interface DbColumnForm extends BaseEntity {
+	createDept: number;
+	columnId: string;
+	tableId: string;
+	columnName: string;
+	columnComment: string;
+	columnType: string;
+	javaType: string;
+	javaField: string;
+	isPk: string;
+	isIncrement: string;
+	isRequired: string;
+	isInsert?: any;
+	isEdit: string;
+	isList: string;
+	isQuery?: any;
+	queryType: string;
+	htmlType: string;
+	dictType: string;
+	sort: number;
+	increment: boolean;
+	capJavaField: string;
+	usableColumn: boolean;
+	superColumn: boolean;
+	list: boolean;
+	pk: boolean;
+	insert: boolean;
+	edit: boolean;
+	query: boolean;
+	required: boolean;
+}
+
+export interface DbParamForm {
+	treeCode?: any;
+	treeName?: any;
+	treeParentCode?: any;
+	parentMenuId: string;
+}
+
+export interface DbTableForm extends BaseEntity {
+	createDept?: any;
+	tableId: string | string;
+	tableName: string;
+	tableComment: string;
+	subTableName?: any;
+	subTableFkName?: any;
+	className: string;
+	tplCategory: string;
+	packageName: string;
+	moduleName: string;
+	businessName: string;
+	functionName: string;
+	functionAuthor: string;
+	genType: string;
+	genPath: string;
+	pkColumn?: any;
+	columns: DbColumnForm[];
+	options: string;
+	remark?: any;
+	treeCode?: any;
+	treeParentCode?: any;
+	treeName?: any;
+	menuIds?: any;
+	parentMenuId: string;
+	parentMenuName?: any;
+	tree: boolean;
+	crud: boolean;
+	params: DbParamForm;
+}

src/api/types.ts

@@ -0,0 +1,54 @@
+/**
+ * 注册
+ */
+export type RegisterForm = {
+	tenantId: string;
+	username: string;
+	password: string;
+	confirmPassword?: string;
+	code?: string;
+	uuid?: string;
+	userType?: string;
+};
+
+/**
+ * 登录请求
+ */
+export interface LoginData {
+	tenantId: string;
+	username: string;
+	password: string;
+	rememberMe?: boolean;
+	code?: string;
+	uuid?: string;
+}
+
+/**
+ * 登录响应
+ */
+export interface LoginResult {
+	token: string;
+}
+
+/**
+ * 验证码返回
+ */
+export interface VerifyCodeResult {
+	captchaEnabled: boolean;
+	uuid?: string;
+	img?: string;
+}
+
+/**
+ * 租户
+ */
+export interface TenantVO {
+	companyName: string;
+	domain: any;
+	tenantId: string;
+}
+
+export interface TenantInfo {
+	tenantEnabled: boolean;
+	voList: TenantVO[];
+}