diff --git a/admin-client/src/services/apps/liveforum/T_UsersService.ts b/admin-client/src/services/apps/liveforum/T_UsersService.ts new file mode 100644 index 0000000..ca9fc12 --- /dev/null +++ b/admin-client/src/services/apps/liveforum/T_UsersService.ts @@ -0,0 +1,74 @@ +import Http from "@/core/utils/Http"; + +/** + * T_Users服务 + */ +export default class T_UsersService { + + static urlPrefix = "/api/v1/admin/T_Users"; + + /** + * 获取数据列表 + * @param current + * @param pageSize + * @param search + * @param searchSort + * @returns + */ + static findList(current: number, pageSize: number, search: any = {}, searchSort: any[] = []) { + return Http.post(`${this.urlPrefix}/findList`, { + page: current, + size: pageSize, + search, + searchSort + }) + } + + /** + * 删除集合数据 + * + * @param ids + * @returns + */ + static deleteList(ids: string[]) { + return Http.post(`${this.urlPrefix}/deleteList`, ids) + } + + /** + * 查询表单 + * + * @param id + * @returns + */ + static findForm(id?: string | undefined) { + return Http.get(`${this.urlPrefix}/findForm${(id ? '/' + id : '')}`) + } + + /** + * 保存表单数据 + * + * @param id + * @param formData + * @returns + */ + static saveForm(id: string | undefined, formData: any) { + return Http.post(`${this.urlPrefix}/${id ? 'update' : 'create'}`, formData) + } + + /** + * 导出 excel + * + * @param search + * @param searchSort + * @returns + */ + static exportExcel(search: any = {}, searchSort: any[] = []) { + return Http.download(`${this.urlPrefix}/exportExcel`, { + page: -1, + size: -1, + search, + searchSort + }); + } + +} \ No newline at end of file diff --git a/admin-client/src/views/apps/liveforum/t_users/Index.vue b/admin-client/src/views/apps/liveforum/t_users/Index.vue new file mode 100644 index 0000000..484841b --- /dev/null +++ b/admin-client/src/views/apps/liveforum/t_users/Index.vue @@ -0,0 +1,247 @@ + + + \ No newline at end of file diff --git a/admin-client/src/views/apps/liveforum/t_users/Info.vue b/admin-client/src/views/apps/liveforum/t_users/Info.vue new file mode 100644 index 0000000..3d1db33 --- /dev/null +++ b/admin-client/src/views/apps/liveforum/t_users/Info.vue @@ -0,0 +1,172 @@ + + + \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/LiveForum/T_Users/T_UsersService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/LiveForum/T_UsersService.cs similarity index 72% rename from admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/LiveForum/T_Users/T_UsersService.cs rename to admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/LiveForum/T_UsersService.cs index eb50095..93dc031 100644 --- a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/LiveForum/T_Users/T_UsersService.cs +++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/LiveForum/T_UsersService.cs @@ -1,5 +1,5 @@ -using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; -namespace MiaoYu.Api.Admin.ApplicationServices.Apps; +using MiaoYu.Repository.LiveForum.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.ApplicationServices.Apps.LiveForum; /// /// 用户表,存储用户基本信息(移除登录相关字段) 服务 T_UsersService @@ -20,47 +20,29 @@ public class T_UsersService : ApplicationService> public async Task FindListAsync(PagingSearchInput pagingSearchInput) { var query = this._defaultRepository.Select - - - //用户ID - .WhereIf(pagingSearchInput.Search?.Id > 0, - w => pagingSearchInput.Search.Id == w.Id) - - - //用户昵称 - .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.NickName), + + //用户ID + .WhereIf(pagingSearchInput.Search?.Id!=null&&pagingSearchInput.Search?.Id>0, + w => w.Id== pagingSearchInput.Search.Id) + + + //用户昵称 + .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.NickName), w => w.NickName.Contains(pagingSearchInput.Search.NickName ?? "")) - - - //手机号 - .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.PhoneNumber), + + + //手机号 + .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.PhoneNumber), w => w.PhoneNumber.Contains(pagingSearchInput.Search.PhoneNumber ?? "")) - - + + .OrderByDescending(w => w.Id) .Select(w => new { w.Id, - w.NickName, - w.Avatar, - w.Gender, - w.PhoneNumber, - w.Birthday, - w.Signature, - w.LevelId, - w.Experience, - w.IsVip, - w.VipExpireTime, - w.IsCertified, - w.CertifiedType, - w.Status, - w.LastLoginTime, - w.LastLoginIp, - w.RegisterIp, - w.CreatedAt, - w.UpdatedAt, - // w.LastModificationTime, - // w.CreationTime + w.NickName,w.Avatar,w.Gender,w.PhoneNumber,w.Birthday,w.Signature,w.LevelId,w.Experience,w.IsVip,w.VipExpireTime,w.IsCertified,w.CertifiedType,w.Status,w.LastLoginTime,w.LastLoginIp,w.RegisterIp,w.CreatedAt,w.UpdatedAt, + // w.LastModificationTime, + // w.CreationTime }) ; @@ -91,7 +73,7 @@ public class T_UsersService : ApplicationService> /// /// id /// - public async Task> FindFormAsync(int id) + public async Task> FindFormAsync(int id) { var res = new Dictionary(); var form = await this._defaultRepository.FindByIdAsync(id); diff --git a/admin-server/MiaoYu.Api.Admin/Controllers/Apps/LiveForum/T_Users/T_UsersController.cs b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/LiveForum/T_UsersController.cs similarity index 94% rename from admin-server/MiaoYu.Api.Admin/Controllers/Apps/LiveForum/T_Users/T_UsersController.cs rename to admin-server/MiaoYu.Api.Admin/Controllers/Apps/LiveForum/T_UsersController.cs index 8cacce0..0f3c1db 100644 --- a/admin-server/MiaoYu.Api.Admin/Controllers/Apps/LiveForum/T_Users/T_UsersController.cs +++ b/admin-server/MiaoYu.Api.Admin/Controllers/Apps/LiveForum/T_UsersController.cs @@ -1,6 +1,6 @@ -using MiaoYu.Api.Admin.ApplicationServices.Apps; -using MiaoYu.Repository.ChatAI.Admin.Entities.Apps; -namespace MiaoYu.Api.Admin.Controllers.Apps; +using MiaoYu.Api.Admin.ApplicationServices.Apps.LiveForum; +using MiaoYu.Repository.LiveForum.Admin.Entities.Apps; +namespace MiaoYu.Api.Admin.Controllers.Apps.LiveForum; /// /// 用户表,存储用户基本信息(移除登录相关字段) 控制器 diff --git a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj index 0b17774..a6e0f75 100644 --- a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj +++ b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj @@ -53,6 +53,7 @@ + diff --git a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml index d401d4f..8deb540 100644 --- a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml +++ b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.xml @@ -129,40 +129,40 @@ - + 用户表,存储用户基本信息(移除登录相关字段) 服务 T_UsersService - + 获取列表数据 - + 根据id数组删除 ids - + 查询表单数据 id - + 保存数据 form - + 导出Excel @@ -2150,47 +2150,47 @@ 默认服务 - + 用户表,存储用户基本信息(移除登录相关字段) 控制器 - + 获取列表 - + 根据id数组删除 ids - + 查询表单数据 id - + 添加 - + 编辑 - + 导出Excel diff --git a/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev5/tempModel.cshtml b/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev5/tempModel.cshtml index e7e3813..08bdd3b 100644 --- a/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev5/tempModel.cshtml +++ b/admin-server/MiaoYu.Api.Admin/wwwroot/code_generation/templatev5/tempModel.cshtml @@ -74,7 +74,8 @@ if (lowCodeTableInfo.CsType.ToLower().Contains("string")) return "DefaultEntityStringKey"; - + if (lowCodeTableInfo.CsType.ToLower().Contains("int64")) + return "EntityIdentity"; if (lowCodeTableInfo.CsType.ToLower().Contains("int")) return "EntityIdentity"; diff --git a/admin-server/MiaoYu.Repository.LiveForum.Admin/Entities/Apps/T_Users/T_Users.cs b/admin-server/MiaoYu.Repository.LiveForum.Admin/Entities/Apps/LiveForum/T_Users.cs similarity index 84% rename from admin-server/MiaoYu.Repository.LiveForum.Admin/Entities/Apps/T_Users/T_Users.cs rename to admin-server/MiaoYu.Repository.LiveForum.Admin/Entities/Apps/LiveForum/T_Users.cs index 3e34e98..30f213c 100644 --- a/admin-server/MiaoYu.Repository.LiveForum.Admin/Entities/Apps/T_Users/T_Users.cs +++ b/admin-server/MiaoYu.Repository.LiveForum.Admin/Entities/Apps/LiveForum/T_Users.cs @@ -1,11 +1,11 @@ -namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps; +namespace MiaoYu.Repository.LiveForum.Admin.Entities.Apps; /// /// 用户表,存储用户基本信息(移除登录相关字段) /// [EntityDescription(FieldIgnored = true)] [Table("T_Users")] -public class T_Users : EntityIdentity +public class T_Users : EntityIdentity { @@ -16,7 +16,7 @@ public class T_Users : EntityIdentity /// - /// 头像 => 备注: 用户头像URL地址 + /// 用户头像 => 备注: 用户头像URL地址 /// public string? Avatar { get; set; } @@ -34,13 +34,13 @@ public class T_Users : EntityIdentity /// - /// 生日 => 备注: 用户生日 + /// 用户生日 => 备注: 用户生日 /// public DateTime? Birthday { get; set; } /// - /// 签名 => 备注: 个性签名 + /// 个性签名 => 备注: 个性签名 /// public string? Signature { get; set; } @@ -58,13 +58,13 @@ public class T_Users : EntityIdentity /// - /// vip => 备注: 是否为VIP用户 + /// VIP => 备注: 是否为VIP用户 /// public Boolean IsVip { get; set; } /// - /// 过期时间 => 备注: VIP过期时间 + /// VIP过期时间 => 备注: VIP过期时间 /// public DateTime? VipExpireTime { get; set; } @@ -88,13 +88,13 @@ public class T_Users : EntityIdentity /// - /// 登录时间 => 备注: 最后登录时间 + /// 最后登录时间 => 备注: 最后登录时间 /// public DateTime? LastLoginTime { get; set; } /// - /// 登录IP => 备注: 最后登录IP地址 + /// 最后登录IP => 备注: 最后登录IP地址 /// public string? LastLoginIp { get; set; } diff --git a/admin-server/MiaoYu.Repository.LiveForum.Admin/MiaoYu.Repository.LiveForum.Admin.xml b/admin-server/MiaoYu.Repository.LiveForum.Admin/MiaoYu.Repository.LiveForum.Admin.xml index 863d085..c88d531 100644 --- a/admin-server/MiaoYu.Repository.LiveForum.Admin/MiaoYu.Repository.LiveForum.Admin.xml +++ b/admin-server/MiaoYu.Repository.LiveForum.Admin/MiaoYu.Repository.LiveForum.Admin.xml @@ -4,97 +4,97 @@ MiaoYu.Repository.LiveForum.Admin - + 用户表,存储用户基本信息(移除登录相关字段) - + 用户昵称 => 备注: 用户昵称,用于显示 - + - 头像 => 备注: 用户头像URL地址 + 用户头像 => 备注: 用户头像URL地址 - + 性别 => 备注: 性别:0-未知,1-男,2-女 - + 手机号 => 备注: PhoneNumber - + - 生日 => 备注: 用户生日 + 用户生日 => 备注: 用户生日 - + - 签名 => 备注: 个性签名 + 个性签名 => 备注: 个性签名 - + 等级 => 备注: 用户等级ID,外键关联T_UserLevels表 - + 经验值 => 备注: 当前经验值 - + - vip => 备注: 是否为VIP用户 + VIP => 备注: 是否为VIP用户 - + - 过期时间 => 备注: VIP过期时间 + VIP过期时间 => 备注: VIP过期时间 - + 认证状态 => 备注: 是否已认证 - + 认证类型 => 备注: 认证类型:1-SK认证,2-其他认证 - + 账户状态 => 备注: 账户状态:0-禁用,1-正常,2-冻结 - + - 登录时间 => 备注: 最后登录时间 + 最后登录时间 => 备注: 最后登录时间 - + - 登录IP => 备注: 最后登录IP地址 + 最后登录IP => 备注: 最后登录IP地址 - + 注册IP => 备注: 注册时的IP地址 - + 创建时间 => 备注: 账户创建时间 - + 更新时间 => 备注: 账户信息更新时间