diff --git a/GDZZ.Application/Entity/MiniBanner.cs b/GDZZ.Application/Entity/MiniBanner.cs new file mode 100644 index 0000000..9508063 --- /dev/null +++ b/GDZZ.Application/Entity/MiniBanner.cs @@ -0,0 +1,23 @@ +using System; +using SqlSugar; +using System.ComponentModel; +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity +{ + /// + /// 活动广告列表 + /// + [SugarTable("mini_banner")] + [Description("活动广告列表")] + public class MiniBanner : DEntityBase + { + /// + /// 广告图片 + /// + public string Url { get; set; } + /// + /// 跳转链接 + /// + public string Skip { get; set; } + } +} \ No newline at end of file diff --git a/GDZZ.Application/Entity/MiniResume.cs b/GDZZ.Application/Entity/MiniResume.cs index ee07007..1bd36f2 100644 --- a/GDZZ.Application/Entity/MiniResume.cs +++ b/GDZZ.Application/Entity/MiniResume.cs @@ -20,10 +20,6 @@ namespace GDZZ.Application.Entity /// public string Sak { get; set; } /// - /// 待遇 - /// - public int Salary { get; set; } - /// /// 详情 /// public string Info { get; set; } @@ -47,5 +43,13 @@ namespace GDZZ.Application.Entity /// 学历 /// public string Record { get; set; } + /// + /// 公司名称 + /// + public string CompanyName { get; set; } + /// + /// 待遇 + /// + public string Salary { get; set; } } } \ No newline at end of file diff --git a/GDZZ.Application/Enum/SalaryEnum.cs b/GDZZ.Application/Enum/SalaryEnum.cs new file mode 100644 index 0000000..f831a09 --- /dev/null +++ b/GDZZ.Application/Enum/SalaryEnum.cs @@ -0,0 +1,17 @@ +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 SalaryEnum + { + + } +} diff --git a/GDZZ.Application/GDZZ.Application.xml b/GDZZ.Application/GDZZ.Application.xml index 168f921..1b97fa6 100644 --- a/GDZZ.Application/GDZZ.Application.xml +++ b/GDZZ.Application/GDZZ.Application.xml @@ -194,6 +194,21 @@ 好友ID + + + 活动广告列表 + + + + + 广告图片 + + + + + 跳转链接 + + 小程序招聘列表 @@ -209,11 +224,6 @@ 要求 - - - 待遇 - - 详情 @@ -244,6 +254,16 @@ 学历 + + + 公司名称 + + + + + 待遇 + + 职业表 @@ -289,6 +309,11 @@ 地区级别 1-省、自治区、直辖市 2-地级市、地区、自治州、盟 3-市辖区、县级市、县 + + + + + redis枚举配置 @@ -471,6 +496,11 @@ 基础用户服务 + + + 获取配置文件 + + 更新基础用户 @@ -1237,6 +1267,123 @@ + + + 活动广告列表输出参数 + + + + + 主键Id + + + + + 广告图片 + + + + + 跳转链接 + + + + + 活动广告列表输入参数 + + + + + 广告图片 + + + + + 跳转链接 + + + + + 广告图片 + + + + + 主键Id + + + + + 主键Id + + + + + 活动广告列表输出参数 + + + + + 主键Id + + + + + 广告图片 + + + + + 跳转链接 + + + + + 活动广告列表服务 + + + + + 分页查询活动广告列表 + + + + + + + 增加活动广告列表 + + + + + + + 删除活动广告列表 + + + + + + + 更新活动广告列表 + + + + + + + 获取活动广告详情 + + + + + + + 获取活动广告列表列表 + + + + 小程序招聘列表输出参数 @@ -1342,6 +1489,11 @@ 地区 + + + 公司地区 + + 经验 diff --git a/GDZZ.Application/Service/BaseUser/BaseUserService.cs b/GDZZ.Application/Service/BaseUser/BaseUserService.cs index 1fd8902..0d899c0 100644 --- a/GDZZ.Application/Service/BaseUser/BaseUserService.cs +++ b/GDZZ.Application/Service/BaseUser/BaseUserService.cs @@ -7,6 +7,11 @@ using SqlSugar; using System.Linq; using System.Threading.Tasks; using GDZZ.Application.Entity; +using Microsoft.Extensions.Options; +using GDZZ.Core.Entity; +using System.Threading; +using Furion.FriendlyException; + namespace GDZZ.Application { /// @@ -16,10 +21,20 @@ namespace GDZZ.Application public class BaseUserService : IBaseUserService, IDynamicApiController, ITransient { private readonly SqlSugarRepository _rep; + private readonly SqlSugarRepository _sysUserRep; // 用户表仓储 + + /// + /// 获取配置文件 + /// + private readonly ThirdParty _oauthConfig; - public BaseUserService(SqlSugarRepository rep) + + + public BaseUserService(SqlSugarRepository rep, SqlSugarRepository _sysUserRep) { _rep = rep; + this._sysUserRep= _sysUserRep; + } @@ -31,15 +46,23 @@ namespace GDZZ.Application [HttpPost("/Mini/User/edit")] public async Task Update(UpdateBaseUserInput input) { - var entity = input.Adapt(); - await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - } - - - - + //后台系统用户 + var sysuser = await this._sysUserRep.SingleAsync(x => x.Id == UserManager.UserId); + if (sysuser == null) + { + throw Oops.Oh("修改失败!", sysuser); + } + + var user = this._rep.AsQueryable() + .Filter("TenantId", true) + .First(x => x.CreatedUserId == UserManager.UserId); + user.AvatarUrl = input.AvatarUrl; + sysuser.Avatar = input.AvatarUrl; + await this._sysUserRep.AsUpdateable(sysuser).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + await this._rep.AsUpdateable(user).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } diff --git a/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerDto.cs b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerDto.cs new file mode 100644 index 0000000..682455b --- /dev/null +++ b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerDto.cs @@ -0,0 +1,27 @@ +using System; +using GDZZ.Core; + +namespace GDZZ.Application +{ + /// + /// 活动广告列表输出参数 + /// + public class MiniBannerDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 广告图片 + /// + public string Url { get; set; } + + /// + /// 跳转链接 + /// + public string Skip { get; set; } + + } +} diff --git a/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs new file mode 100644 index 0000000..63c89ac --- /dev/null +++ b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerInput.cs @@ -0,0 +1,58 @@ +using GDZZ.Core; +using System; +using System.ComponentModel.DataAnnotations; + +namespace GDZZ.Application +{ + /// + /// 活动广告列表输入参数 + /// + public class MiniBannerInput : PageInputBase + { + /// + /// 广告图片 + /// + public virtual string Url { get; set; } + + /// + /// 跳转链接 + /// + public virtual string Skip { get; set; } + + } + + public class AddMiniBannerInput : MiniBannerInput + { + /// + /// 广告图片 + /// + [Required(ErrorMessage = "广告图片不能为空")] + public override string Url { get; set; } + + } + + public class DeleteMiniBannerInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class UpdateMiniBannerInput : MiniBannerInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class QueryeMiniBannerInput : DeleteMiniBannerInput + { + + } +} diff --git a/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerOutput.cs b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerOutput.cs new file mode 100644 index 0000000..0667e48 --- /dev/null +++ b/GDZZ.Application/Service/MiniBanner/Dto/MiniBannerOutput.cs @@ -0,0 +1,26 @@ +using System; + +namespace GDZZ.Application +{ + /// + /// 活动广告列表输出参数 + /// + public class MiniBannerOutput + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 广告图片 + /// + public string Url { get; set; } + + /// + /// 跳转链接 + /// + public string Skip { get; set; } + + } +} diff --git a/GDZZ.Application/Service/MiniBanner/IMiniBannerService.cs b/GDZZ.Application/Service/MiniBanner/IMiniBannerService.cs new file mode 100644 index 0000000..800c9d5 --- /dev/null +++ b/GDZZ.Application/Service/MiniBanner/IMiniBannerService.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 IMiniBannerService + { + Task Add(AddMiniBannerInput input); + Task Delete(DeleteMiniBannerInput input); + Task Get([FromQuery] QueryeMiniBannerInput input); + Task List([FromQuery] MiniBannerInput input); + Task Page([FromQuery] MiniBannerInput input); + Task Update(UpdateMiniBannerInput input); + } +} \ No newline at end of file diff --git a/GDZZ.Application/Service/MiniBanner/MiniBannerService.cs b/GDZZ.Application/Service/MiniBanner/MiniBannerService.cs new file mode 100644 index 0000000..4d4414a --- /dev/null +++ b/GDZZ.Application/Service/MiniBanner/MiniBannerService.cs @@ -0,0 +1,96 @@ +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; +namespace GDZZ.Application +{ + /// + /// 活动广告列表服务 + /// + [ApiDescriptionSettings("Application",Name = "MiniBanner", Order = 1)] + public class MiniBannerService : IMiniBannerService, IDynamicApiController, ITransient + { + private readonly SqlSugarRepository _rep; + + public MiniBannerService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询活动广告列表 + /// + /// + /// + [HttpGet("/MiniBanner/page")] + public async Task Page([FromQuery] MiniBannerInput input) + { + var entities = await _rep.AsQueryable() + .ToPagedListAsync(input.PageNo, input.PageSize); + return entities.XnPagedResult(); + } + + /// + /// 增加活动广告列表 + /// + /// + /// + [HttpPost("/MiniBanner/add")] + public async Task Add(AddMiniBannerInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + } + + /// + /// 删除活动广告列表 + /// + /// + /// + [HttpPost("/MiniBanner/delete")] + public async Task Delete(DeleteMiniBannerInput input) + { + var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + await _rep.DeleteAsync(entity); + } + + /// + /// 更新活动广告列表 + /// + /// + /// + [HttpPost("/MiniBanner/edit")] + public async Task Update(UpdateMiniBannerInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommandAsync(); + } + + /// + /// 获取活动广告详情 + /// + /// + /// + [HttpGet("/MiniBanner/detail")] + public async Task Get([FromQuery] QueryeMiniBannerInput input) + { + return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + } + + /// + /// 获取活动广告列表列表 + /// + /// + /// + [HttpGet("/Mini/Banner/list")] + public async Task List([FromQuery] MiniBannerInput input) + { + return await _rep.ToListAsync(); + } + } +} diff --git a/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs b/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs index 487c279..05a11d6 100644 --- a/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs +++ b/GDZZ.Application/Service/MiniResume/Dto/MiniResumeOutput.cs @@ -25,7 +25,7 @@ namespace GDZZ.Application /// /// 待遇 /// - public int Salary { get; set; } + public string Salary { get; set; } /// /// 详情 @@ -58,6 +58,11 @@ namespace GDZZ.Application /// public string RegionName { get; set; } + /// + /// 公司地区 + /// + public string CompanyRegionName { get; set; } + /// /// 经验 /// diff --git a/GDZZ.Web.Core/applicationconfig.json b/GDZZ.Web.Core/applicationconfig.json index 90f9750..753bddc 100644 --- a/GDZZ.Web.Core/applicationconfig.json +++ b/GDZZ.Web.Core/applicationconfig.json @@ -8,7 +8,7 @@ // "DefaultRoutePrefix": "api666" //默认路由前缀，默认api，但是如果action上面写死route的话 就无效了特性的优先级最高 //}, "SystemSettings": { - "SuperAdminViewAllData": false, //超管是否可以查看所有租户的数据 + "SuperAdminViewAllData": true, //超管是否可以查看所有租户的数据 "IsGlobalRequestLog": false //是否开启全局请求日志 }, "AppSettings": { diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/393982716891205.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/393982716891205.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/393982716891205.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/393985287737413.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985287737413.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985287737413.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/393985432600646.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985432600646.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985432600646.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/393985610420294.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985610420294.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985610420294.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/393985951617094.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985951617094.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/393985951617094.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/393986562232389.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/393986562232389.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/393986562232389.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394239155683398.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394239155683398.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394239155683398.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394239880396870.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394239880396870.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394239880396870.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394241430675525.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394241430675525.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394241430675525.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394241981198406.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394241981198406.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394241981198406.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394242377371718.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394242377371718.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394242377371718.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394243480006726.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394243480006726.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394243480006726.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394244295925829.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394244295925829.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394244295925829.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394245418266694.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394245418266694.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394245418266694.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394245975556166.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394245975556166.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394245975556166.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394247216066630.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394247216066630.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394247216066630.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394248414658630.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/394248414658630.png new file mode 100644 index 0000000..c9c67b2 Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394248414658630.png differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/394248503562310.jpg b/GDZZ.Web.Entry/wwwroot/Upload/Default/394248503562310.jpg new file mode 100644 index 0000000..87c5c50 Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/394248503562310.jpg differ