fanfan 2 лет назад
Родитель
Сommit
c47c4afac6

+ 1 - 1
.vscode/vue3.2.code-snippets

@@ -4,13 +4,13 @@
     "body": [
     "body": [
       "<template>",
       "<template>",
       "\t<div>\n",
       "\t<div>\n",
+      "\t\t$1",
       "\t</div>",
       "\t</div>",
       "</template>\n",
       "</template>\n",
       "<script setup lang='ts'>",
       "<script setup lang='ts'>",
       "</script>\n",
       "</script>\n",
       "<style lang='less' scoped>\n",
       "<style lang='less' scoped>\n",
       "</style>",
       "</style>",
-      "$2"
     ],
     ],
     "description": "Vue3_quick"
     "description": "Vue3_quick"
   }
   }

+ 42 - 40
src/api/infra/infraStorageConfigApi.ts

@@ -2,97 +2,99 @@ import { defHttp } from '/@/utils/http/axios';
 import { setParams } from '/@/utils/index';
 import { setParams } from '/@/utils/index';
 
 
 enum Api {
 enum Api {
-  infraStorageConfigQueryPage = '/file/storageConfig/query/page',
-  infraStorageConfigDetail = '/file/storageConfig/detail',
-  infraStorageConfigAdd = '/file/storageConfig/add',
-  infraStorageConfigEdit = '/file/storageConfig/edit',
-  infraStorageConfigRemove = '/file/storageConfig/removeByIds',
+  infraStorageconfigQueryPage = '/infra/storageconfig/query/page',
+  infraStorageconfigDetail = '/infra/storageconfig/detail',
+  infraStorageconfigAdd = '/infra/storageconfig/add',
+  infraStorageconfigEdit = '/infra/storageconfig/edit',
+  infraStorageconfigRemove = '/infra/storageconfig/removeByIds',
 }
 }
 
 
 /**
 /**
  *
  *
- * @author lf
- * @date  2023/04/14 11:43
- * @description: 根据条件查询文件存储配置列表,权限 - file:storageConfig:query
+ * @author fan
+ * @date  2023/05/04 14:21
+ * @description: 根据条件查询文件存储配置列表,权限 - infra:storageconfig:query
  * @method: POST
  * @method: POST
  * @param:
  * @param:
- *       {String}  code  like   文件配置编码
- *       {String}  name  like   文件配置名称
- *       {Boolean}  master  eq   是否为主配置
- *       {String}  storageType  eq   存储类型    字典值:  sys_storage_config
+ *       {String}  name     文件配置名称
+ *       {String}  type     存储类型
  * @return:
  * @return:
  *       {String}  code  文件配置编码
  *       {String}  code  文件配置编码
  *       {String}  name  文件配置名称
  *       {String}  name  文件配置名称
- *       {Boolean}  master  是否为主配置
- *       {String}  storageType  存储类型    字典值:  sys_storage_config
+ *       {Boolean}  master  主配置
+ *       {String}  type  存储类型
+ *       {String}  config  文件配置
  *       {String}  remark  备注
  *       {String}  remark  备注
  */
  */
 
 
-export const infraStorageConfigQueryPage = (params?: object) => {
-  return defHttp.post({ url: Api.infraStorageConfigQueryPage, params: setParams(params) });
+export const infraStorageconfigQueryPage = (params?: object) => {
+  return defHttp.post({ url: Api.infraStorageconfigQueryPage, params: setParams(params) });
 };
 };
 /**
 /**
  *
  *
- * @author lf
- * @date  2023/04/14 11:43
- * @description: 根据id查询文件存储配置详细信息,权限 - file:storageConfig:query
+ * @author fan
+ * @date  2023/05/04 14:21
+ * @description: 根据id查询文件存储配置详细信息,权限 - infra:storageconfig:query
  * @method: GET
  * @method: GET
  * @param:  id 文件存储配置主键id
  * @param:  id 文件存储配置主键id
  * @return:
  * @return:
  *       {String}  code  文件配置编码
  *       {String}  code  文件配置编码
  *       {String}  name  文件配置名称
  *       {String}  name  文件配置名称
- *       {Boolean}  master  是否为主配置
- *       {String}  storageType  存储类型    字典值:  sys_storage_config
+ *       {Boolean}  master  主配置
+ *       {String}  type  存储类型
+ *       {String}  config  文件配置
  *       {String}  remark  备注
  *       {String}  remark  备注
  */
  */
-export const infraStorageConfigDetail = (id: string) => {
-  return defHttp.get({ url: Api.infraStorageConfigDetail + '/' + id });
+export const infraStorageconfigDetail = (id: string) => {
+  return defHttp.get({ url: Api.infraStorageconfigDetail + '/' + id });
 };
 };
 
 
 /**
 /**
  *
  *
- * @author lf
- * @date  2023/04/14 11:43
- * @description: 添加文件存储配置,权限 - file:storageConfig:add
+ * @author fan
+ * @date  2023/05/04 14:21
+ * @description: 添加文件存储配置,权限 - infra:storageconfig:add
  * @method: POST
  * @method: POST
  * @param:
  * @param:
  *       {String}  code  文件配置编码
  *       {String}  code  文件配置编码
  *       {String}  name  文件配置名称
  *       {String}  name  文件配置名称
- *       {Boolean}  master  是否为主配置
- *       {String}  storageType  存储类型    字典值:  sys_storage_config
+ *       {Boolean}  master  主配置
+ *       {String}  type  存储类型
+ *       {String}  config  文件配置
  *       {String}  remark  备注
  *       {String}  remark  备注
  * @return:
  * @return:
  *       0 添加失败
  *       0 添加失败
  *       1 添加成功
  *       1 添加成功
  */
  */
-export const infraStorageConfigAdd = (params?: object) => {
-  return defHttp.post({ url: Api.infraStorageConfigAdd, params: params });
+export const infraStorageconfigAdd = (params?: object) => {
+  return defHttp.post({ url: Api.infraStorageconfigAdd, params: params });
 };
 };
 
 
 /**
 /**
  *
  *
- * @author lf
- * @date  2023/04/14 11:43
- * @description: 通过主键id编辑文件存储配置,权限 - file:storageConfig:edit
+ * @author fan
+ * @date  2023/05/04 14:21
+ * @description: 通过主键id编辑文件存储配置,权限 - infra:storageconfig:edit
  * @method: POST
  * @method: POST
  * @param:
  * @param:
  *       {String}  code  文件配置编码
  *       {String}  code  文件配置编码
  *       {String}  name  文件配置名称
  *       {String}  name  文件配置名称
- *       {Boolean}  master  是否为主配置
- *       {String}  storageType  存储类型    字典值:  sys_storage_config
+ *       {Boolean}  master  主配置
+ *       {String}  type  存储类型
+ *       {String}  config  文件配置
  *       {String}  remark  备注
  *       {String}  remark  备注
  * @return:
  * @return:
  *       0 编辑失败
  *       0 编辑失败
  *       1 编辑成功
  *       1 编辑成功
  */
  */
-export const infraStorageConfigEdit = (params?: object) => {
-  return defHttp.post({ url: Api.infraStorageConfigEdit, params: params });
+export const infraStorageconfigEdit = (params?: object) => {
+  return defHttp.post({ url: Api.infraStorageconfigEdit, params: params });
 };
 };
 
 
 /**
 /**
- * @description: 删除,权限 - file:storageConfig:remove
+ * @description: 删除,权限 - infra:storageconfig:remove
  * @method: POST
  * @method: POST
  */
  */
-export const infraStorageConfigRemove = (params: Array<string | number>) => {
-  return defHttp.post({ url: Api.infraStorageConfigRemove, params: params });
+export const infraStorageconfigRemove = (params: Array<string | number>) => {
+  return defHttp.post({ url: Api.infraStorageconfigRemove, params: params });
 };
 };

+ 2 - 2
src/api/monitor/onlineApi.ts

@@ -1,8 +1,8 @@
 import { setParams } from '/@/utils';
 import { setParams } from '/@/utils';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
 enum Api {
 enum Api {
-  onlineForceLogout = '/online/forceLogout',
-  onlineList = '/online/list',
+  onlineForceLogout = '/monitor/online/forceLogout',
+  onlineList = '/monitor/online/query/page',
 }
 }
 
 
 /**
 /**

+ 74 - 0
src/api/sys/sysPosApi.ts

@@ -0,0 +1,74 @@
+import { defHttp } from '/@/utils/http/axios';
+import { setParams } from '/@/utils/index';
+
+enum Api {
+  sysPosQueryPage = '/sys/pos/query/page',
+  sysPosDetail = '/sys/pos/detail',
+  sysPosAdd = '/sys/pos/add',
+  sysPosEdit = '/sys/pos/edit',
+  sysPosRemove = '/sys/pos/removeByIds',
+}
+
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 14:05
+ * @description: 根据条件查询岗位管理列表,权限 - sys:pos:query
+ * @method: POST
+ * @param:
+ * @return:
+ */
+
+export const sysPosQueryPage = (params?: object) => {
+  return defHttp.post({ url: Api.sysPosQueryPage, params: setParams(params) });
+};
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 14:05
+ * @description: 根据id查询岗位管理详细信息,权限 - sys:pos:query
+ * @method: GET
+ * @param:  id 岗位管理主键id
+ * @return:
+ */
+export const sysPosDetail = (id: string) => {
+  return defHttp.get({ url: Api.sysPosDetail + '/' + id });
+};
+
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 14:05
+ * @description: 添加岗位管理,权限 - sys:pos:add
+ * @method: POST
+ * @param:
+ * @return:
+ *       0 添加失败
+ *       1 添加成功
+ */
+export const sysPosAdd = (params?: object) => {
+  return defHttp.post({ url: Api.sysPosAdd, params: params });
+};
+
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 14:05
+ * @description: 通过主键id编辑岗位管理,权限 - sys:pos:edit
+ * @method: POST
+ * @param:
+ * @return:
+ *       0 编辑失败
+ *       1 编辑成功
+ */
+export const sysPosEdit = (params?: object) => {
+  return defHttp.post({ url: Api.sysPosEdit, params: params });
+};
+
+/**
+ * @description: 删除,权限 - sys:pos:remove
+ * @method: POST
+ */
+export const sysPosRemove = (params: Array<string | number>) => {
+  return defHttp.post({ url: Api.sysPosRemove, params: params });
+};

+ 43 - 0
src/api/sys/sysSettingApi.ts

@@ -0,0 +1,43 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  sysSettingDetail = '/sys/config/get/current',
+  sysSettingQuery = '/sys/config/edit',
+  sysSettingEdit = '/sys/config/edit',
+}
+
+/**
+ *
+ * @author fan
+ * @date  2023/05/04 15:42
+ * @description: 获取系统默认配置信息
+ * @method: POST
+ */
+
+export const sysSettingQuery = (params?: object) => {
+  return defHttp.post({ url: Api.sysSettingQuery, params: params });
+};
+/**
+ *
+ * @author fan
+ * @date  2023/05/04 15:42
+ * @description: 查看系统当前配置信息
+ * @method: GET
+ */
+export const sysSettingDetail = () => {
+  return defHttp.get({ url: Api.sysSettingDetail });
+};
+
+/**
+ *
+ * @author fan
+ * @date  2023/05/04 15:42
+ * @description: 修改系统配置信息
+ * @method: POST
+ * @return:
+ *       0 编辑失败
+ *       1 编辑成功
+ */
+export const sysSettingEdit = (params?: object) => {
+  return defHttp.post({ url: Api.sysSettingEdit, params: params });
+};

+ 25 - 17
src/api/sys/sysTenantApi.ts

@@ -11,19 +11,24 @@ enum Api {
 
 
 /**
 /**
  *
  *
- * @author fan
- * @date  2023/04/14 13:51
- * @description: 根据条件查询租户表列表,权限 - sys:tenant:query
+ * @author lf
+ * @date  2023/05/04 15:42
+ * @description: 根据条件查询租户表列表,权限 - sys:tenant:query
  * @method: POST
  * @method: POST
  * @param:
  * @param:
+ *       {String}  name  like   租户名称
+ *       {String}  type  eq   租户类型
+ *       {String}  packageId     租户套餐id
+ *       {Boolean}  disable  eq   租户状态
  * @return:
  * @return:
  *       {String}  name  租户名称
  *       {String}  name  租户名称
  *       {String}  contractUser  租户联系人
  *       {String}  contractUser  租户联系人
+ *       {String}  type  租户类型
  *       {String}  contactMobile  租户联系人电话
  *       {String}  contactMobile  租户联系人电话
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  packageId  租户套餐id
  *       {String}  packageId  租户套餐id
  *       {String}  remark  租户备注
  *       {String}  remark  租户备注
- *       {Boolean}  disable  租户状态 0、开启 1、关闭
+ *       {Boolean}  disable  租户状态
  */
  */
 
 
 export const sysTenantQueryPage = (params?: object) => {
 export const sysTenantQueryPage = (params?: object) => {
@@ -31,19 +36,20 @@ export const sysTenantQueryPage = (params?: object) => {
 };
 };
 /**
 /**
  *
  *
- * @author fan
- * @date  2023/04/14 13:51
- * @description: 根据id查询租户表详细信息,权限 - sys:tenant:query
+ * @author lf
+ * @date  2023/05/04 15:42
+ * @description: 根据id查询租户表详细信息,权限 - sys:tenant:query
  * @method: GET
  * @method: GET
- * @param:  id 租户表主键id
+ * @param:  id 租户表主键id
  * @return:
  * @return:
  *       {String}  name  租户名称
  *       {String}  name  租户名称
  *       {String}  contractUser  租户联系人
  *       {String}  contractUser  租户联系人
+ *       {String}  type  租户类型
  *       {String}  contactMobile  租户联系人电话
  *       {String}  contactMobile  租户联系人电话
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  packageId  租户套餐id
  *       {String}  packageId  租户套餐id
  *       {String}  remark  租户备注
  *       {String}  remark  租户备注
- *       {Boolean}  disable  租户状态 0、开启 1、关闭
+ *       {Boolean}  disable  租户状态
  */
  */
 export const sysTenantDetail = (id: string) => {
 export const sysTenantDetail = (id: string) => {
   return defHttp.get({ url: Api.sysTenantDetail + '/' + id });
   return defHttp.get({ url: Api.sysTenantDetail + '/' + id });
@@ -51,18 +57,19 @@ export const sysTenantDetail = (id: string) => {
 
 
 /**
 /**
  *
  *
- * @author fan
- * @date  2023/04/14 13:51
- * @description: 添加租户表,权限 - sys:tenant:add
+ * @author lf
+ * @date  2023/05/04 15:42
+ * @description: 添加租户表,权限 - sys:tenant:add
  * @method: POST
  * @method: POST
  * @param:
  * @param:
  *       {String}  name  租户名称
  *       {String}  name  租户名称
  *       {String}  contractUser  租户联系人
  *       {String}  contractUser  租户联系人
+ *       {String}  type  租户类型
  *       {String}  contactMobile  租户联系人电话
  *       {String}  contactMobile  租户联系人电话
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  packageId  租户套餐id
  *       {String}  packageId  租户套餐id
  *       {String}  remark  租户备注
  *       {String}  remark  租户备注
- *       {Boolean}  disable  租户状态 0、开启 1、关闭
+ *       {Boolean}  disable  租户状态
  * @return:
  * @return:
  *       0 添加失败
  *       0 添加失败
  *       1 添加成功
  *       1 添加成功
@@ -73,18 +80,19 @@ export const sysTenantAdd = (params?: object) => {
 
 
 /**
 /**
  *
  *
- * @author fan
- * @date  2023/04/14 13:51
- * @description: 通过主键id编辑租户表,权限 - sys:tenant:edit
+ * @author lf
+ * @date  2023/05/04 15:42
+ * @description: 通过主键id编辑租户表,权限 - sys:tenant:edit
  * @method: POST
  * @method: POST
  * @param:
  * @param:
  *       {String}  name  租户名称
  *       {String}  name  租户名称
  *       {String}  contractUser  租户联系人
  *       {String}  contractUser  租户联系人
+ *       {String}  type  租户类型
  *       {String}  contactMobile  租户联系人电话
  *       {String}  contactMobile  租户联系人电话
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  tenantUserId  租户所属用户id
  *       {String}  packageId  租户套餐id
  *       {String}  packageId  租户套餐id
  *       {String}  remark  租户备注
  *       {String}  remark  租户备注
- *       {Boolean}  disable  租户状态 0、开启 1、关闭
+ *       {Boolean}  disable  租户状态
  * @return:
  * @return:
  *       0 编辑失败
  *       0 编辑失败
  *       1 编辑成功
  *       1 编辑成功

+ 100 - 0
src/api/sys/sysTenantPackageApi.ts

@@ -0,0 +1,100 @@
+import { defHttp } from '/@/utils/http/axios';
+import { setParams } from '/@/utils/index';
+
+enum Api {
+  sysTenantPackageQueryPage = '/sys/tenantPackage/query/page',
+  sysTenantPackageDetail = '/sys/tenantPackage/detail',
+  sysTenantPackageAdd = '/sys/tenantPackage/add',
+  sysTenantPackageEdit = '/sys/tenantPackage/edit',
+  sysTenantPackageRemove = '/sys/tenantPackage/removeByIds',
+}
+
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 15:44
+ * @description: 根据条件查询租户套餐列表,权限 - sys:tenantPackage:query
+ * @method: POST
+ * @param:
+ *       {String}  packageCode  like   套餐编码
+ *       {String}  packageName  like   套餐名称
+ *       {String}  type  eq   套餐类型
+ *       {Boolean}  disable  eq   启用
+ * @return:
+ *       {String}  packageCode  套餐编码
+ *       {String}  packageName  套餐名称
+ *       {String}  remark  套餐备注
+ *       {Integer}  sort  排序
+ *       {String}  type  套餐类型
+ *       {Boolean}  disable  启用
+ */
+
+export const sysTenantPackageQueryPage = (params?: object) => {
+  return defHttp.post({ url: Api.sysTenantPackageQueryPage, params: setParams(params) });
+};
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 15:44
+ * @description: 根据id查询租户套餐详细信息,权限 - sys:tenantPackage:query
+ * @method: GET
+ * @param:  id 租户套餐主键id
+ * @return:
+ *       {String}  packageCode  套餐编码
+ *       {String}  packageName  套餐名称
+ *       {String}  remark  套餐备注
+ *       {Integer}  sort  排序
+ *       {String}  type  套餐类型
+ *       {Boolean}  disable  启用
+ */
+export const sysTenantPackageDetail = (id: string) => {
+  return defHttp.get({ url: Api.sysTenantPackageDetail + '/' + id });
+};
+
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 15:44
+ * @description: 添加租户套餐,权限 - sys:tenantPackage:add
+ * @method: POST
+ * @param:
+ *       {String}  packageCode  套餐编码
+ *       {String}  packageName  套餐名称
+ *       {String}  remark  套餐备注
+ *       {Integer}  sort  排序
+ *       {Boolean}  disable  启用
+ * @return:
+ *       0 添加失败
+ *       1 添加成功
+ */
+export const sysTenantPackageAdd = (params?: object) => {
+  return defHttp.post({ url: Api.sysTenantPackageAdd, params: params });
+};
+
+/**
+ *
+ * @author lf
+ * @date  2023/05/04 15:44
+ * @description: 通过主键id编辑租户套餐,权限 - sys:tenantPackage:edit
+ * @method: POST
+ * @param:
+ *       {String}  packageCode  套餐编码
+ *       {String}  packageName  套餐名称
+ *       {String}  remark  套餐备注
+ *       {Integer}  sort  排序
+ *       {Boolean}  disable  启用
+ * @return:
+ *       0 编辑失败
+ *       1 编辑成功
+ */
+export const sysTenantPackageEdit = (params?: object) => {
+  return defHttp.post({ url: Api.sysTenantPackageEdit, params: params });
+};
+
+/**
+ * @description: 删除,权限 - sys:tenantPackage:remove
+ * @method: POST
+ */
+export const sysTenantPackageRemove = (params: Array<string | number>) => {
+  return defHttp.post({ url: Api.sysTenantPackageRemove, params: params });
+};