diff --git a/GDZZ.Application/Entity/Course.cs b/GDZZ.Application/Entity/Course.cs new file mode 100644 index 0000000..ebc4ab0 --- /dev/null +++ b/GDZZ.Application/Entity/Course.cs @@ -0,0 +1,39 @@ +using System; +using SqlSugar; +using System.ComponentModel; +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity +{ + /// + /// 课程表 + /// + [SugarTable("mini_course")] + [Description("课程表")] + public class Course : DEntityBase + { + /// + /// 文件ID字段 + /// + public long FileID { get; set; } + /// + /// 文件描述 + /// + public string Info { get; set; } + /// + /// 标价 + /// + public decimal Price { get; set; } + /// + /// 标签 + /// + public string Tags { get; set; } + /// + /// 缩略图 + /// + public string Url { get; set; } + /// + /// 标题 + /// + public string Title { get; set; } + } +} \ No newline at end of file diff --git a/GDZZ.Application/Entity/MiniBanner.cs b/GDZZ.Application/Entity/MiniBanner.cs index 9508063..d8c7b0a 100644 --- a/GDZZ.Application/Entity/MiniBanner.cs +++ b/GDZZ.Application/Entity/MiniBanner.cs @@ -19,5 +19,13 @@ namespace GDZZ.Application.Entity /// 跳转链接 /// public string Skip { get; set; } + /// + /// 活动名字 + /// + public string Name { get; set; } + /// + /// 活动类型 + /// + public int Type { get; set; } } } \ No newline at end of file diff --git a/GDZZ.Application/Entity/MiniResume.cs b/GDZZ.Application/Entity/MiniResume.cs index 9d8b14c..5832449 100644 --- a/GDZZ.Application/Entity/MiniResume.cs +++ b/GDZZ.Application/Entity/MiniResume.cs @@ -2,6 +2,8 @@ using SqlSugar; using System.ComponentModel; using GDZZ.Core.Entity; +using GDZZ.Application.Enum; + namespace GDZZ.Application.Entity { /// @@ -59,5 +61,9 @@ namespace GDZZ.Application.Entity /// 地区ID合集 /// public string RegionStrID { get; set; } + /// + /// 状态 + /// + public ResumeStatusEnum Status { get; set; } } } \ No newline at end of file diff --git a/GDZZ.Application/Entity/Recommend.cs b/GDZZ.Application/Entity/Recommend.cs new file mode 100644 index 0000000..79ecff8 --- /dev/null +++ b/GDZZ.Application/Entity/Recommend.cs @@ -0,0 +1,23 @@ +using System; +using SqlSugar; +using System.ComponentModel; +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity +{ + /// + /// 推荐表 + /// + [SugarTable("mini_recommend")] + [Description("推荐表")] + public class Recommend : DEntityBase + { + /// + /// 推荐图标 + /// + public string Picture { get; set; } + /// + /// 推荐标题 + /// + public string Text { get; set; } + } +} \ No newline at end of file diff --git a/GDZZ.Application/Enum/ResumeStatusEnum.cs b/GDZZ.Application/Enum/ResumeStatusEnum.cs new file mode 100644 index 0000000..2de9558 --- /dev/null +++ b/GDZZ.Application/Enum/ResumeStatusEnum.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GDZZ.Application.Enum +{ + public enum ResumeStatusEnum + { + /// + /// 已发布 + /// + [Description("已发布")] Release = 0, + + /// + /// 招聘成功 + /// + [Description("招聘成功")] Success = 1, + + + /// + /// 审核通过 + /// + [Description("审核通过")] Approved = 2, + + + /// + /// 审核未通过 + /// + [Description("审核未通过")] Rejected = 3, + + + + + + } +} diff --git a/GDZZ.Application/GDZZ.Application.xml b/GDZZ.Application/GDZZ.Application.xml index 259af55..63001dc 100644 --- a/GDZZ.Application/GDZZ.Application.xml +++ b/GDZZ.Application/GDZZ.Application.xml @@ -144,6 +144,41 @@ 沟通ID + + + 课程表 + + + + + 文件ID字段 + + + + + 文件描述 + + + + + 标价 + + + + + 标签 + + + + + 缩略图 + + + + + 标题 + + 意见反馈 @@ -279,6 +314,16 @@ 跳转链接 + + + 活动名字 + + + + + 活动类型 + + 支付记录 @@ -389,6 +434,26 @@ 地区ID合集 + + + 状态 + + + + + 推荐表 + + + + + 推荐图标 + + + + + 推荐标题 + + 职业表 @@ -469,6 +534,26 @@ 联系费用 + + + 已发布 + + + + + 招聘成功 + + + + + 审核通过 + + + + + 审核未通过 + + 联系费用 @@ -835,6 +920,13 @@ + + + 获取用户职业 + + + + 分页查询基础用户 @@ -1204,6 +1296,183 @@ 公司简介 + + + 课程表服务 + + + + + 分页查询课程表 + + + + + + + 增加课程表 + + + + + + + 删除课程表 + + + + + + + 更新课程表 + + + + + + + 获取课程表 + + + + + + + 获取课程表列表 + + + + + + + 课程表输出参数 + + + + + 主键Id + + + + + 文件ID字段 + + + + + 文件描述 + + + + + 标价 + + + + + 标签 + + + + + 缩略图 + + + + + 标题 + + + + + 课程表输入参数 + + + + + 文件ID字段 + + + + + 文件描述 + + + + + 标价 + + + + + 标签 + + + + + 缩略图 + + + + + 标题 + + + + + 主键Id + + + + + 主键Id + + + + + 课程表输出参数 + + + + + 主键Id + + + + + 文件ID字段 + + + + + 文件描述 + + + + + 标价 + + + + + 标签 + + + + + 缩略图 + + + + + 标题 + + + + + 视频路径 + + 意见反馈输出参数 @@ -1656,6 +1925,11 @@ 跳转链接 + + + 活动类型 + + 广告图片 @@ -1918,6 +2192,11 @@ 地区ID合集 + + + 状态 + + 小程序招聘列表服务 diff --git a/GDZZ.Application/Service/BaseUser/BaseUserService.cs b/GDZZ.Application/Service/BaseUser/BaseUserService.cs index 83cb987..c90b15b 100644 --- a/GDZZ.Application/Service/BaseUser/BaseUserService.cs +++ b/GDZZ.Application/Service/BaseUser/BaseUserService.cs @@ -133,6 +133,23 @@ namespace GDZZ.Application } + + + /// + /// 获取用户职业 + /// + /// + /// + [HttpGet("/Mini/User/GetUserSelf")] + public async Task GetUserSelf(long userID) + { + return await this.Self.FirstOrDefaultAsync(s => s.CreatedUserId == userID); + } + + + + + /// /// 分页查询基础用户 /// diff --git a/GDZZ.Application/Service/Course/CourseService.cs b/GDZZ.Application/Service/Course/CourseService.cs new file mode 100644 index 0000000..f1d29a6 --- /dev/null +++ b/GDZZ.Application/Service/Course/CourseService.cs @@ -0,0 +1,113 @@ +using GDZZ.Core; +using Furion.DependencyInjection; +using Furion.DynamicApiController; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using System.Linq; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +using GDZZ.Core.Entity; + +namespace GDZZ.Application +{ + /// + /// 课程表服务 + /// + [ApiDescriptionSettings("Application", Name = "Course", Order = 1)] + public class CourseService : ICourseService, IDynamicApiController, ITransient + { + private readonly SqlSugarRepository _rep; + + public CourseService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询课程表 + /// + /// + /// + [HttpGet("/Mini/Course/page")] + public async Task Page([FromQuery] CourseInput input) + { + var entities = await _rep.AsQueryable() + .InnerJoin((n, u) => n.FileID == u.Id) + .WhereIF(!UserManager.IsTenantAdmin, n => n.CreatedUserId == UserManager.UserId) + .WhereIF(!string.IsNullOrWhiteSpace(input.Tags), n => n.Tags == input.Tags) + .WhereIF(!string.IsNullOrWhiteSpace(input.Title), n => n.Title == input.Title) + .Select((n, u) => new CourseOutput + { + FileID = u.Id, + Id = n.Id, + Info = u.Info, + Price = n.Price, + Tags = n.Tags, + Title = n.Title, + Url = n.Url, + VoiderUrl = "/"+u.FilePath+"/"+u.FileObjectName + }) + .ToPagedListAsync(input.PageNo, input.PageSize); + return entities.XnPagedResult(); + } + + /// + /// 增加课程表 + /// + /// + /// + [HttpPost("/Mini/Course/page")] + public async Task Add(AddCourseInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + } + + /// + /// 删除课程表 + /// + /// + /// + [HttpPost("/Course/delete")] + public async Task Delete(DeleteCourseInput input) + { + var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + await _rep.DeleteAsync(entity); + } + + /// + /// 更新课程表 + /// + /// + /// + [HttpPost("/Course/edit")] + public async Task Update(UpdateCourseInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } + + /// + /// 获取课程表 + /// + /// + /// + [HttpGet("/Course/detail")] + public async Task Get([FromQuery] QueryeCourseInput input) + { + return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + } + + /// + /// 获取课程表列表 + /// + /// + /// + [HttpGet("/Course/list")] + public async Task List([FromQuery] CourseInput input) + { + return await _rep.ToListAsync(); + } + } +} diff --git a/GDZZ.Application/Service/Course/Dto/CourseDto.cs b/GDZZ.Application/Service/Course/Dto/CourseDto.cs new file mode 100644 index 0000000..738c00e --- /dev/null +++ b/GDZZ.Application/Service/Course/Dto/CourseDto.cs @@ -0,0 +1,47 @@ +using System; +using GDZZ.Core; + +namespace GDZZ.Application +{ + /// + /// 课程表输出参数 + /// + public class CourseDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 文件ID字段 + /// + public long FileID { get; set; } + + /// + /// 文件描述 + /// + public string Info { get; set; } + + /// + /// 标价 + /// + public decimal Price { get; set; } + + /// + /// 标签 + /// + public string Tags { get; set; } + + /// + /// 缩略图 + /// + public string Url { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + } +} diff --git a/GDZZ.Application/Service/Course/Dto/CourseInput.cs b/GDZZ.Application/Service/Course/Dto/CourseInput.cs new file mode 100644 index 0000000..0010e05 --- /dev/null +++ b/GDZZ.Application/Service/Course/Dto/CourseInput.cs @@ -0,0 +1,72 @@ +using GDZZ.Core; +using System; +using System.ComponentModel.DataAnnotations; + +namespace GDZZ.Application +{ + /// + /// 课程表输入参数 + /// + public class CourseInput : PageInputBase + { + /// + /// 文件ID字段 + /// + public virtual long FileID { get; set; } + + /// + /// 文件描述 + /// + public virtual string Info { get; set; } + + /// + /// 标价 + /// + public virtual decimal Price { get; set; } + + /// + /// 标签 + /// + public virtual string Tags { get; set; } + + /// + /// 缩略图 + /// + public virtual string Url { get; set; } + + /// + /// 标题 + /// + public virtual string Title { get; set; } + + } + + public class AddCourseInput : CourseInput + { + } + + public class DeleteCourseInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class UpdateCourseInput : CourseInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class QueryeCourseInput : DeleteCourseInput + { + + } +} diff --git a/GDZZ.Application/Service/Course/Dto/CourseOutput.cs b/GDZZ.Application/Service/Course/Dto/CourseOutput.cs new file mode 100644 index 0000000..c35b0b0 --- /dev/null +++ b/GDZZ.Application/Service/Course/Dto/CourseOutput.cs @@ -0,0 +1,52 @@ +using System; + +namespace GDZZ.Application +{ + /// + /// 课程表输出参数 + /// + public class CourseOutput + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 文件ID字段 + /// + public long FileID { get; set; } + + /// + /// 文件描述 + /// + public string Info { get; set; } + + /// + /// 标价 + /// + public decimal Price { get; set; } + + /// + /// 标签 + /// + public string Tags { get; set; } + + /// + /// 缩略图 + /// + public string Url { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 视频路径 + /// + public string VoiderUrl { get; set; } + + + } +} diff --git a/GDZZ.Application/Service/Course/ICourseService.cs b/GDZZ.Application/Service/Course/ICourseService.cs new file mode 100644 index 0000000..ef21d3e --- /dev/null +++ b/GDZZ.Application/Service/Course/ICourseService.cs @@ -0,0 +1,16 @@ +using GDZZ.Core; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + public interface ICourseService + { + Task Add(AddCourseInput input); + Task Delete(DeleteCourseInput input); + Task Get([FromQuery] QueryeCourseInput input); + Task List([FromQuery] CourseInput input); + Task Page([FromQuery] CourseInput input); + Task Update(UpdateCourseInput input); + } +} \ No newline at end of file diff --git a/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs index 63c89ac..3b6bec3 100644 --- a/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs +++ b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs @@ -18,6 +18,12 @@ namespace GDZZ.Application /// 跳转链接 /// public virtual string Skip { get; set; } + + /// + /// 活动类型 + /// + public int Type { get; set; } + } diff --git a/GDZZ.Application/Service/MiniBanner/MiniBannerService.cs b/GDZZ.Application/Service/MiniBanner/MiniBannerService.cs index aca19be..592819a 100644 --- a/GDZZ.Application/Service/MiniBanner/MiniBannerService.cs +++ b/GDZZ.Application/Service/MiniBanner/MiniBannerService.cs @@ -31,6 +31,7 @@ namespace GDZZ.Application public async Task Page([FromQuery] MiniBannerInput input) { var entities = await _rep.AsQueryable() + .Where(u => u.Type == input.Type) .ToPagedListAsync(input.PageNo, input.PageSize); return entities.XnPagedResult(); } @@ -90,7 +91,7 @@ namespace GDZZ.Application [HttpGet("/Mini/GetBannerList")] public async Task List([FromQuery] MiniBannerInput input) { - return await _rep.ToListAsync(); + return await _rep.Where(u => u.Type == input.Type).ToListAsync(); } } } diff --git a/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs b/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs index c26997d..ad84d6e 100644 --- a/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs +++ b/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs @@ -1,4 +1,5 @@ -using System; +using GDZZ.Application.Enum; +using System; namespace GDZZ.Application { @@ -82,5 +83,10 @@ namespace GDZZ.Application /// 地区ID合集 /// public string RegionStrID { get; set; } + + /// + /// 状态 + /// + public ResumeStatusEnum Status { get; set; } } } diff --git a/GDZZ.Application/Service/MiniResume/MiniResumeService.cs b/GDZZ.Application/Service/MiniResume/MiniResumeService.cs index c0ebf59..8f538c8 100644 --- a/GDZZ.Application/Service/MiniResume/MiniResumeService.cs +++ b/GDZZ.Application/Service/MiniResume/MiniResumeService.cs @@ -56,17 +56,22 @@ namespace GDZZ.Application public async Task GetResumeList([FromQuery] MiniResumeInput input) { var entities =await _rep.AsQueryable() - + .WhereIF(!string.IsNullOrWhiteSpace(input.RegionName), u => u.RegionName.Contains(input.RegionName.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Title.Contains(input.SearchValue)) + .WhereIF(!string.IsNullOrWhiteSpace(input.Record), u => u.Record.Contains(input.Record.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Level), u => u.Record.Contains(input.Level.Trim())) .LeftJoin((u, y) => u.CompanyID == y.Id) //关联公司信息 - .Select((u, y) => new MiniResumeOutput { CompanyID =y.Id,CompanyName = y.Name, Logo = y.logo,Id = u.Id, Info = u.Info,Sak = u.Sak, Salary = u.Salary,Title = u.Title, - Time = u.CreatedTime.Value.ToString("yyyy/MM/dd"),RegionName = u.RegionName, - Record = u.Record,Level = u.Level, + Time = u.CreatedTime.Value.ToString("yyyy/MM/dd"), + RegionName = u.RegionName, + Record = u.Record, + Level = u.Level, + Status = u.Status }).MergeTable() .OrderByDescending(u => u.Time) .ToPagedListAsync(input.PageNo, input.PageSize); @@ -103,6 +108,7 @@ namespace GDZZ.Application RegionName = u.RegionName, Record = u.Record, Level = u.Level, + Status = u.Status }).MergeTable() .ToListAsync(); return entities; @@ -117,16 +123,16 @@ namespace GDZZ.Application /// /// [AllowAnonymous] - [HttpPost("/Mini/SearchRetFun")] + [HttpGet("/Mini/SearchRetFun")] public async Task SearchRetFun(MiniResumeInput input) { var entities = await _rep.AsQueryable() .LeftJoin((u, y) => u.CompanyID == y.Id) //关联公司信息 .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Title.Contains(input.SearchValue)) - .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.CompanyName.Contains(input.SearchValue)) - .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Level.Contains(input.SearchValue)) - .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.RegionName.Contains(input.SearchValue)) - .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Sak.Contains(input.SearchValue)) + //.WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.CompanyName.Contains(input.SearchValue)) + //.WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Level.Contains(input.SearchValue)) + //.WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.RegionName.Contains(input.SearchValue)) + //.WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Sak.Contains(input.SearchValue)) //.WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), (u, y) => y.Name.Contains(input.SearchValue)) .Select((u, y) => new MiniResumeOutput { @@ -142,6 +148,7 @@ namespace GDZZ.Application RegionName = u.RegionName, Record = u.Record, Level = u.Level, + Status = u.Status }).MergeTable() .ToPagedListAsync(input.PageNo, input.PageSize); return entities.XnPagedResult(); diff --git a/GDZZ.Core/Entity/SysFile.cs b/GDZZ.Core/Entity/SysFile.cs index bb7e5f5..af339b9 100644 --- a/GDZZ.Core/Entity/SysFile.cs +++ b/GDZZ.Core/Entity/SysFile.cs @@ -1,67 +1,78 @@ -using SqlSugar; +using System; +using SqlSugar; using System.ComponentModel; +using GDZZ.Core.Entity; using System.ComponentModel.DataAnnotations; -namespace GDZZ.Core.Entity; -/// -/// 文件信息表 -/// -[SugarTable("sys_file")] -[Description("文件信息表")] -public class SysFile : DEntityBase +namespace GDZZ.Core.Entity { - /// - /// 文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地） - /// - [SugarColumn(ColumnDescription = "文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地")] - public int FileLocation { get; set; } + /// + /// 文件信息表 + /// + [SugarTable("sys_file")] + [Description("文件信息表")] + public class SysFile : DEntityBase + { + /// + /// 文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地） + /// + [SugarColumn(ColumnDescription = "文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地")] + public int FileLocation { get; set; } - /// - /// 文件仓库 - /// - [MaxLength(100)] - [SugarColumn(ColumnDescription = "文件仓库",IsNullable =true)] - public string FileBucket { get; set; } + /// + /// 文件仓库 + /// + [MaxLength(100)] + [SugarColumn(ColumnDescription = "文件仓库", IsNullable = true)] + public string FileBucket { get; set; } - /// - /// 文件名称（上传时候的文件名） - /// - [MaxLength(100)] - [SugarColumn(ColumnDescription = "文件名称（上传时候的文件名）", IsNullable = true)] - public string FileOriginName { get; set; } + /// + /// 文件名称（上传时候的文件名） + /// + [MaxLength(100)] + [SugarColumn(ColumnDescription = "文件名称（上传时候的文件名）", IsNullable = true)] + public string FileOriginName { get; set; } - /// - /// 文件后缀 - /// - [MaxLength(50)] - [SugarColumn(ColumnDescription = "文件后缀", IsNullable = true)] - public string FileSuffix { get; set; } + /// + /// 文件后缀 + /// + [MaxLength(50)] + [SugarColumn(ColumnDescription = "文件后缀", IsNullable = true)] + public string FileSuffix { get; set; } - /// - /// 文件大小kb - /// - [MaxLength(10)] - [SugarColumn(ColumnDescription = "文件大小kb", IsNullable = true)] - public string FileSizeKb { get; set; } + /// + /// 文件大小kb + /// + [MaxLength(10)] + [SugarColumn(ColumnDescription = "文件大小kb", IsNullable = true)] + public string FileSizeKb { get; set; } - /// - /// 文件大小信息，计算后的 - /// - [MaxLength(50)] - [SugarColumn(ColumnDescription = "文件大小信息，计算后的", IsNullable = true)] - public string FileSizeInfo { get; set; } + /// + /// 文件大小信息，计算后的 + /// + [MaxLength(50)] + [SugarColumn(ColumnDescription = "文件大小信息，计算后的", IsNullable = true)] + public string FileSizeInfo { get; set; } - /// - /// 存储到bucket的名称（文件唯一标识id） - /// - [MaxLength(100)] - [SugarColumn(ColumnDescription = "存储到bucket的名称（文件唯一标识id）", IsNullable = true)] - public string FileObjectName { get; set; } + /// + /// 存储到bucket的名称（文件唯一标识id） + /// + [MaxLength(100)] + [SugarColumn(ColumnDescription = "存储到bucket的名称（文件唯一标识id）", IsNullable = true)] + public string FileObjectName { get; set; } - /// - /// 存储路径 - /// - [MaxLength(100)] - [SugarColumn(ColumnDescription = "存储路径", IsNullable = true)] - public string FilePath { get; set; } -} + /// + /// 存储路径 + /// + [MaxLength(100)] + [SugarColumn(ColumnDescription = "存储路径", IsNullable = true)] + public string FilePath { get; set; } + + /// + /// 文件描述 + /// + [MaxLength(2000)] + [SugarColumn(ColumnDescription = "文件描述", IsNullable = true)] + public string Info { get; set; } + } +} \ No newline at end of file diff --git a/GDZZ.Core/GDZZ.Core.xml b/GDZZ.Core/GDZZ.Core.xml index 898b075..3697cd0 100644 --- a/GDZZ.Core/GDZZ.Core.xml +++ b/GDZZ.Core/GDZZ.Core.xml @@ -1095,6 +1095,11 @@ 存储路径 + + + 文件描述 + + 系统操作/审计日志表 diff --git a/GDZZ.Core/Service/File/SysFileService.cs b/GDZZ.Core/Service/File/SysFileService.cs index 14f1c84..8eb9a80 100644 --- a/GDZZ.Core/Service/File/SysFileService.cs +++ b/GDZZ.Core/Service/File/SysFileService.cs @@ -43,8 +43,11 @@ public class SysFileService : ISysFileService, IDynamicApiController, ITransient var fileBucket = !string.IsNullOrEmpty(input.FileBucket?.Trim()); var fileOriginName = !string.IsNullOrEmpty(input.FileOriginName?.Trim()); + //rmrf- + var files = await _sysFileInfoRep.AsQueryable() .WhereIF(input.FileLocation > 0, u => u.FileLocation == input.FileLocation) + .WhereIF(!UserManager.IsSuperAdmin,u =>u.CreatedUserId == UserManager.UserId) .WhereIF(!string.IsNullOrWhiteSpace(input.FileBucket), u => u.FileBucket.Contains(input.FileBucket.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.FileOriginName), u => u.FileOriginName.Contains(input.FileOriginName.Trim())) .Select() @@ -206,7 +209,8 @@ public class SysFileService : ISysFileService, IDynamicApiController, ITransient FileOriginName = originalFilename, FileSuffix = fileSuffix.TrimStart('.'), FileSizeKb = fileSizeKb.ToString(), - FilePath = pathType + FilePath = pathType, + Info = "", }; newFile = await App.GetService().Insertable(newFile).ExecuteReturnEntityAsync(); using (var stream = File.Create(Path.Combine(filePath, newFile.FileObjectName))) diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/406280485560390.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/406280485560390.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/406280485560390.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/406629268217926.dng b/GDZZ.Web.Entry/wwwroot/Upload/Default/406629268217926.dng new file mode 100644 index 0000000..e827326 Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/406629268217926.dng differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/406641520476230.jpg b/GDZZ.Web.Entry/wwwroot/Upload/Default/406641520476230.jpg new file mode 100644 index 0000000..31d00b4 Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/406641520476230.jpg differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/406641534951494.dng b/GDZZ.Web.Entry/wwwroot/Upload/Default/406641534951494.dng new file mode 100644 index 0000000..776cbfd Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/406641534951494.dng differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/406687070941253.jpg b/GDZZ.Web.Entry/wwwroot/Upload/Default/406687070941253.jpg new file mode 100644 index 0000000..31d00b4 Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/406687070941253.jpg differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/407044645756998.mp4 b/GDZZ.Web.Entry/wwwroot/Upload/Default/407044645756998.mp4 new file mode 100644 index 0000000..81d11df Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/407044645756998.mp4 differ