From 8fc18b7fc8d60c3bb781dc278d4ffe3e604bc51b Mon Sep 17 00:00:00 2001 From: liujiaqiang <1448951783@qq.com> Date: Wed, 27 Sep 2023 11:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=85=A5AutoMapper=EF=BC=8CIMapper?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0Dto=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BA=BA=E5=8D=95=E4=BD=8D=E8=8E=B7=E5=8F=96=E6=89=80?= =?UTF-8?q?=E6=9C=89=E9=A2=84=E7=BA=A6=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E9=A5=AD=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/24Hour.csproj | 1 + 24Hour/Controllers/Common/CommonController.cs | 65 +++++--- 24Hour/Controllers/LoginController.cs | 2 + 24Hour/Program.cs | 17 ++- Elight.Entity/APPDto/App_CloudCabinetDto.cs | 119 +++++++++++++++ Elight.Entity/APPDto/App_ConfessionDto.cs | 115 ++++++++++++++ Elight.Entity/APPDto/App_DocumentDto.cs | 119 +++++++++++++++ Elight.Entity/APPDto/App_HearingDto.cs | 135 +++++++++++++++++ Elight.Entity/APPDto/App_LawyerServicesDto.cs | 141 ++++++++++++++++++ Elight.Entity/APPDto/App_ReceptionDto.cs | 121 +++++++++++++++ Elight.Entity/APPDto/App_RemoteDto.cs | 132 ++++++++++++++++ Elight.Entity/AuthManageProfile.cs | 29 ++++ Elight.Entity/Elight.Entity.csproj | 1 + 13 files changed, 974 insertions(+), 23 deletions(-) create mode 100644 Elight.Entity/APPDto/App_CloudCabinetDto.cs create mode 100644 Elight.Entity/APPDto/App_ConfessionDto.cs create mode 100644 Elight.Entity/APPDto/App_DocumentDto.cs create mode 100644 Elight.Entity/APPDto/App_HearingDto.cs create mode 100644 Elight.Entity/APPDto/App_LawyerServicesDto.cs create mode 100644 Elight.Entity/APPDto/App_ReceptionDto.cs create mode 100644 Elight.Entity/APPDto/App_RemoteDto.cs create mode 100644 Elight.Entity/AuthManageProfile.cs diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj index 9f4b3c8..65591ab 100644 --- a/24Hour/24Hour.csproj +++ b/24Hour/24Hour.csproj @@ -13,6 +13,7 @@ + diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index a42cd0a..25f2ae4 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -1,4 +1,6 @@ -using com.sun.org.apache.xalan.@internal.xsltc.runtime; +using AutoMapper; +using com.sun.org.apache.xalan.@internal.xsltc.runtime; +using com.sun.tools.@internal.xjc.api; using Elight.Entity; using Elight.Entity.SystemModel; using Elight.Logic; @@ -13,6 +15,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Quartz.Logging; using SqlSugar; +using sun.security.x509; using System.Drawing.Printing; using System.Security.AccessControl; using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion; @@ -35,9 +38,10 @@ namespace _24Hour.Controllers.Common App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 private readonly List _Unitdata;//当前用户 private readonly ILogger _logger;//日志 + private readonly IMapper _mapper; DateTime unixStartTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc); Result result = new Result(); - public CommonController(ILogger logger, SqlSugarClient db, WriteSysLog logs, User user, WebSocketController SocketCon) + public CommonController(IMapper mapper,ILogger logger, SqlSugarClient db, WriteSysLog logs, User user, WebSocketController SocketCon) { _logger = logger; _db = db; @@ -45,6 +49,7 @@ namespace _24Hour.Controllers.Common _userdata = user.Userdata(); _SocketCon = SocketCon; _Unitdata = _db.Queryable().Where(q => q.IsDelete == 0).ToList(); + _mapper = mapper; } #endregion @@ -61,6 +66,8 @@ namespace _24Hour.Controllers.Common { RefAsync totalNumber = 0;//总数据 var list = new List(); + //获取单位Id + var Unitlist = await _db.Queryable().ToListAsync(); //获取工作台信息 var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); var Userdata = await _db.Queryable().Where(q => q.usertype == 0 ).ToArrayAsync(); @@ -85,7 +92,8 @@ namespace _24Hour.Controllers.Common ettime = "", creationtime = q.creationtime, username = q.createusername, - + unitCode= q.unitCode, + unitName = Unitlist.FirstOrDefault(x => x.unitCode == q.unitCode)?.unitname, handleId = q.receptionuser, handleuser = q.receptionusername, operatorId = q.operatorId, @@ -111,6 +119,8 @@ namespace _24Hour.Controllers.Common matter = q.name, sttime = q.sttime, ettime = q.ettime, + unitCode = q.unitCode, + unitName = Unitlist.FirstOrDefault(x => x.unitCode == q.unitCode)?.unitname, state = q.state, creationtime = q.creationtime, username = q.createusername, @@ -136,6 +146,8 @@ namespace _24Hour.Controllers.Common color = da?.color, icon = da?.icon, matter = q.matter, + unitCode = q.unitCode, + unitName = Unitlist.FirstOrDefault(x => x.unitCode == q.unitCode)?.unitname, sttime = q.sttime, ettime = q.ettime, state = q.state, @@ -167,6 +179,8 @@ namespace _24Hour.Controllers.Common sttime = q.sttime, ettime = "", state = q.state, + unitCode = q.unitCode, + unitName = Unitlist.FirstOrDefault(x => x.unitCode == q.unitCode)?.unitname, creationtime = q.creationtime, username = q.createusername, handleId = q.meetwitId, @@ -195,6 +209,8 @@ namespace _24Hour.Controllers.Common sttime = q.reservationtime, ettime = "", state = q.state, + unitCode = q.unitCode, + unitName = Unitlist.FirstOrDefault(x => x.unitCode == q.unitCode)?.unitname, creationtime = q.creationtime, username = q.lawyeruser, handleId = q.receptionuser, @@ -245,12 +261,14 @@ namespace _24Hour.Controllers.Common .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); if (list.Count>0) { - var unitdal = _Unitdata.Where(q => q.unitCode == list.FirstOrDefault().unitCode).FirstOrDefault(); + var datalist = _mapper.Map, List>(list); + var unitdal = _Unitdata.Where(q => q.unitCode == datalist.FirstOrDefault()?.unitCode).FirstOrDefault(); if (unitdal!= null) { - list.FirstOrDefault().unitCode = unitdal.unitname; + datalist.FirstOrDefault().unitName = unitdal.unitname; } - result.result = list.FirstOrDefault(); + + result.result = datalist.FirstOrDefault(); } else { @@ -263,10 +281,11 @@ namespace _24Hour.Controllers.Common .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); if (Remotedata.Count>0) { - var unitdatote = _Unitdata.Where(q => q.unitCode == Remotedata.FirstOrDefault().unitCode).FirstOrDefault(); + var Remotedatalist = _mapper.Map, List>(Remotedata); + var unitdatote = _Unitdata.Where(q => q.unitCode == Remotedatalist.FirstOrDefault()?.unitCode).FirstOrDefault(); if (unitdatote!= null) - Remotedata.FirstOrDefault().unitCode = unitdatote.unitname; - result.result = Remotedata.FirstOrDefault(); + Remotedatalist.FirstOrDefault().unitName = unitdatote.unitname; + result.result = Remotedatalist.FirstOrDefault(); } break; case 2: @@ -275,10 +294,11 @@ namespace _24Hour.Controllers.Common .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); if (Receptiondata.Count>0) { - var unitdatR = _Unitdata.Where(q => q.unitCode == Receptiondata.FirstOrDefault().unitCode).FirstOrDefault(); + var Receptiondatalist = _mapper.Map, List>(Receptiondata); + var unitdatR = _Unitdata.Where(q => q.unitCode == Receptiondatalist.FirstOrDefault().unitCode).FirstOrDefault(); if (unitdatR!= null) - Receptiondata.FirstOrDefault().unitCode = unitdatR.unitname; - result.result = Receptiondata.FirstOrDefault(); + Receptiondatalist.FirstOrDefault().unitName = unitdatR.unitname; + result.result = Receptiondatalist.FirstOrDefault(); } break; case 3: @@ -287,10 +307,11 @@ namespace _24Hour.Controllers.Common .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); if (Hearingdata.Count>0) { - var unitdata = _Unitdata.Where(q => q.unitCode == Hearingdata.FirstOrDefault().unitCode).FirstOrDefault(); + var Hearingdatalist = _mapper.Map, List>(Hearingdata); + var unitdata = _Unitdata.Where(q => q.unitCode == Hearingdatalist.FirstOrDefault().unitCode).FirstOrDefault(); if (unitdata!= null) - Hearingdata.FirstOrDefault().unitCode = unitdata.unitname; - result.result = Hearingdata.FirstOrDefault(); + Hearingdatalist.FirstOrDefault().unitName = unitdata.unitname; + result.result = Hearingdatalist.FirstOrDefault(); } break; case 4: @@ -299,10 +320,11 @@ namespace _24Hour.Controllers.Common .Where(q => q.Id == Id).ToListAsync(); if (Documentdata.Count>0) { - var unitda = _Unitdata.Where(q => q.unitCode == Documentdata.FirstOrDefault().dwbm).FirstOrDefault(); + var Documentdatalist = _mapper.Map, List>(Documentdata); + var unitda = _Unitdata.Where(q => q.unitCode == Documentdatalist.FirstOrDefault().dwbm).FirstOrDefault(); if (unitda!= null) - Documentdata.FirstOrDefault().dwbm = unitda.unitname; - result.result = Documentdata.FirstOrDefault(); + Documentdatalist.FirstOrDefault().unitName = unitda.unitname; + result.result = Documentdatalist.FirstOrDefault(); } break; case 5: @@ -311,9 +333,10 @@ namespace _24Hour.Controllers.Common .Where(q => q.Id == Id).ToListAsync(); if (CloudCabinetdata.Count>0) { - var unitdat = _Unitdata.Where(q => q.unitCode == CloudCabinetdata.FirstOrDefault().dwbm).FirstOrDefault(); - CloudCabinetdata.FirstOrDefault().dwbm = unitdat.unitname; - result.result = CloudCabinetdata.FirstOrDefault(); + var CloudCabinetdatalist = _mapper.Map, List>(CloudCabinetdata); + var unitdat = _Unitdata.Where(q => q.unitCode == CloudCabinetdatalist.FirstOrDefault().dwbm).FirstOrDefault(); + CloudCabinetdatalist.FirstOrDefault().unitName = unitdat.unitname; + result.result = CloudCabinetdatalist.FirstOrDefault(); } break; case 6: diff --git a/24Hour/Controllers/LoginController.cs b/24Hour/Controllers/LoginController.cs index 2476d12..a3d4302 100644 --- a/24Hour/Controllers/LoginController.cs +++ b/24Hour/Controllers/LoginController.cs @@ -166,6 +166,7 @@ namespace _24Hour.Controllers ); //var token = new JwtSecurityTokenHandler().CreateToken(jwttoken); var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken); + var Unitdate = await _db.Queryable().FirstAsync(x => x.unitCode == date.unitCode); ret.IsSucceed = true; ret.result = new { @@ -177,6 +178,7 @@ namespace _24Hour.Controllers duties = date.duties, identity = date.identity, unitCode = date.unitCode, + unitname = Unitdate?.unitname, department = date.department, departmentName = date.departmentName, token = tokenString diff --git a/24Hour/Program.cs b/24Hour/Program.cs index 6a24efa..5619017 100644 --- a/24Hour/Program.cs +++ b/24Hour/Program.cs @@ -16,14 +16,27 @@ using Quartz.Spi; using Microsoft.IdentityModel.Logging; using System.Collections.Specialized; using System.Runtime.InteropServices; - +using AutoMapper; +using System.Reflection; +using Elight.Entity; + #region builder - + var builder = WebApplication.CreateBuilder(args); var Configuration = builder.Configuration; builder.WebHost.UseUrls(Configuration.GetSection("UrlsConfiguration:Urls").Value.Split(",")); // Add services to the container. +#region + + +AutoMapper.IConfigurationProvider config = new MapperConfiguration(cfg => +{ + cfg.AddProfile(); +}); +builder.Services.AddSingleton(config); +builder.Services.AddScoped(); +#endregion builder.Services.AddControllers().AddJsonOptions(options => { options.JsonSerializerOptions.PropertyNamingPolicy = null; diff --git a/Elight.Entity/APPDto/App_CloudCabinetDto.cs b/Elight.Entity/APPDto/App_CloudCabinetDto.cs new file mode 100644 index 0000000..771dfdb --- /dev/null +++ b/Elight.Entity/APPDto/App_CloudCabinetDto.cs @@ -0,0 +1,119 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 云柜管理 + /// + [DataContract] + public class App_CloudCabinetDto + { + [DataMember] + public string? Id { get; set; } + /// + /// 编号 + /// + [DataMember] + public string? bh { get; set; } + + /// + /// 身份证 + /// + [DataMember] + public string? sfzh { get; set; } + + /// + /// 姓名 + /// + [DataMember] + public string? xm { get; set; } + + /// + /// 地址 + /// + [DataMember] + public string? zz { get; set; } + + /// + /// 联系号码 + /// + [DataMember] + public string? lxhm { get; set; } + + /// + /// + /// + [DataMember] + public string? jhlxbh { get; set; } + /// + /// + /// + [DataMember] + public string? jhlxmc { get; set; } + + /// + /// 材料件数 + /// + [DataMember] + public string? cljs { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? bz { get; set; } + + /// + /// 创建时间 + /// + [DataMember] + public string? cjsj { get; set; } + + /// + /// 取件时间 + /// + [DataMember] + public string? qjsj { get; set; } + /// + /// 单位编码 + /// + [DataMember] + public string? dwbm { get; set; } + /// + /// 取件码 + /// + [DataMember] + public string? wbkqmm { get; set; } + /// + /// 干警取件码 + /// + [DataMember] + public string? gjkqmm { get; set; } + /// + /// 状态 + /// + [DataMember] + public string? zt { get; set; } + /// + /// 干警手机号 + /// + [DataMember] + public string? gjlxhm { get; set; } + /// + /// 菜单类型 + /// + [DataMember] + public string? reservationId { get; set; } + /// + /// 单位名称 + /// + [DataMember] + public string? unitName { get; set; } + } +} diff --git a/Elight.Entity/APPDto/App_ConfessionDto.cs b/Elight.Entity/APPDto/App_ConfessionDto.cs new file mode 100644 index 0000000..a99007d --- /dev/null +++ b/Elight.Entity/APPDto/App_ConfessionDto.cs @@ -0,0 +1,115 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 认罪认罚 + /// + [DataContract] + public class App_ConfessionDto + { + [DataMember] + public string? Id { get; set; } + + /// + /// 操作人id + /// + [DataMember] + public string? operatorId { get; set; } + /// + /// 操作人 + /// + [DataMember] + public string? operatorName { get; set; } + /// + /// 单位编码 + /// + [DataMember] + public string? unitCode { get; set; } + /// + /// 预约手机号 + /// + [DataMember] + public string? phone { get; set; } + + /// + /// 预约事由 + /// + [DataMember] + public string? matter { get; set; } + + [DataMember] + public string? reason { get; set; } + + /// + /// 预约时间 + /// + [DataMember] + public DateTime? sttime { get; set; } + + /// + /// 同意受理时间 + /// + [DataMember] + public DateTime? acceptancetime { get; set; } + + /// + /// 会见人Id + /// + [DataMember] + public string? meetwitId { get; set; } + + /// + /// 会见人 + /// + [DataMember] + public string? meetwitname { get; set; } + + /// + /// 预约类型 + /// + [DataMember] + public string? reservationId { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 状态 0：待办理，1：同意，2:拒绝，3:结束 + /// + [DataMember] + public int state { get; set; } + + [DataMember] + public string? createusername { get; set; } + + [DataMember] + public string? createuserId { get; set; } + + /// + /// 创建日期 + /// + [DataMember] + public DateTime? creationtime { get; set; } = DateTime.Now; + + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + /// + /// 单位名称 + /// + [DataMember] + public string? unitName { get; set; } + } +} diff --git a/Elight.Entity/APPDto/App_DocumentDto.cs b/Elight.Entity/APPDto/App_DocumentDto.cs new file mode 100644 index 0000000..231151e --- /dev/null +++ b/Elight.Entity/APPDto/App_DocumentDto.cs @@ -0,0 +1,119 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 文书签收 + /// + [DataContract] + public class App_DocumentDto + { + [DataMember] + public string? Id { get; set; } + + /// + /// 文书编号 + /// + [DataMember] + public string? wsslbh { get; set; } + + /// + /// 文书名称 + /// + [DataMember] + public string? wsmc { get; set; } + + /// + /// 部门手受案号 + /// + [DataMember] + public string? bmsah { get; set; } + + /// + /// 单位编号 + /// + [DataMember] + public string? dwbm { get; set; } + + /// + /// 案件名称 + /// + [DataMember] + public string? ajmc { get; set; } + + /// + /// 姓名 + /// + [DataMember] + public string? zrrxm { get; set; } + /// + /// 联系号码 + /// + [DataMember] + public string? zrrlshm { get; set; } + + /// + /// 身份证 + /// + [DataMember] + public string? zjhm { get; set; } + + /// + /// 文书名称 + /// + [DataMember] + public string? fwqwjmc { get; set; } + + /// + /// 登记时间 + /// + [DataMember] + public string? djsj { get; set; } + /// + /// 办案检察官 + /// + [DataMember] + public string? cbjcgbm { get; set; } + /// + /// 办案检察官手机号 + /// + [DataMember] + public string? dhhm { get; set; } + /// + /// 存放时间 + /// + [DataMember] + public string? sdsj { get; set; } + /// + /// 签收时间 + /// + [DataMember] + public string? qmsj { get; set; } + /// + /// 状态 00：新建：01：待发送；02：已发送；03：待签收；04：已签收 ；99：已入卷 + /// + [DataMember] + public string? zt { get; set; } + /// + /// 最新更新时间 + /// + [DataMember] + public string? zhxgsj { get; set; } + /// + /// 菜单类型 + /// + [DataMember] + public string? reservationId { get; set; } + /// + /// 单位名称 + /// + [DataMember] + public string? unitName { get; set; } + } +} diff --git a/Elight.Entity/APPDto/App_HearingDto.cs b/Elight.Entity/APPDto/App_HearingDto.cs new file mode 100644 index 0000000..a76b05b --- /dev/null +++ b/Elight.Entity/APPDto/App_HearingDto.cs @@ -0,0 +1,135 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 听证服务 + /// + [DataContract] + public class App_HearingDto + { + [DataMember] + [SugarColumn(IsPrimaryKey = true)] + public string? Id { get; set; } + + ///// + ///// 操作人id + ///// + //[DataMember] + public string? operatorId { get; set; } + /// + /// 操作人 + /// + [DataMember] + public string? operatorName { get; set; } + /// + /// 单位编码 + /// + [DataMember] + public string? unitCode { get; set; } + + /// + /// 律师所名称 + /// + [DataMember] + public string? lawyerunit { get; set; } + + /// + /// 律师人名称 + /// + [DataMember] + public string? lawyeruser { get; set; } + + /// + /// 联系方式 + /// + [DataMember] + public string? contact { get; set; } + /// + /// 预约时间 + /// + [DataMember] + public DateTime? reservationtime { get; set; } + + /// + /// 同意受理时间 + /// + [DataMember] + public DateTime? acceptancetime { get; set; } + + /// + /// 所在地 + /// + [DataMember] + public string? location { get; set; } + + /// + /// 听证请求原因 + /// + [DataMember] + public string? witnessrequest { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 预约类型 + /// + [DataMember] + public string? reservationId { get; set; } + /// + /// 接待人Id + /// + [DataMember] + public string? receptionuser { get; set; } + + /// + /// 接待人 + /// + [DataMember] + public string? receptionusername { get; set; } + + /// + /// 0:待办理，1：同意 2：拒绝 + /// + [DataMember] + public int? state { get; set; } + /// + /// 拒绝原因 + /// + [DataMember] + public string? reason { get; set; } + + [DataMember] + public string? createusername { get; set; } + + [DataMember] + public string? createuserId { get; set; } + + /// + /// 创建日期 + /// + [DataMember] + public DateTime? creationtime { get; set; } = DateTime.Now; + + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + /// + /// 单位名称 + /// + [DataMember] + public string? unitName { get; set; } + } +} diff --git a/Elight.Entity/APPDto/App_LawyerServicesDto.cs b/Elight.Entity/APPDto/App_LawyerServicesDto.cs new file mode 100644 index 0000000..f854124 --- /dev/null +++ b/Elight.Entity/APPDto/App_LawyerServicesDto.cs @@ -0,0 +1,141 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 律师服务 + /// + [DataContract] + public class App_LawyerServicesDto + { + [DataMember] + public string? Id { get; set; } + /// + /// 单位编码 + /// + [DataMember] + public string? unitCode { get; set; } + /// + /// 预约类型 + /// + [DataMember] + public string? reservationId { get; set; } + + /// + /// 律师名称 + /// + [DataMember] + public string? name { get; set; } + + /// + /// 手机号 + /// + [DataMember] + public string? phone { get; set; } + + /// + /// 访问日期 + /// + [DataMember] + public DateTime? receptiontime { get; set; } + + /// + /// 同意受理时间 + /// + [DataMember] + public DateTime? acceptancetime { get; set; } + + /// + /// 访问事由 + /// + [DataMember] + public string? matter { get; set; } + + /// + /// 访问对象 + /// + [DataMember] + public string? objectstr { get; set; } + + /// + /// 接待人Id + /// + [DataMember] + public string? receptionuser { get; set; } + + /// + /// 接待人名称 + /// + [DataMember] + public string? receptionusername { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + /// + /// 拒绝原因 + /// + [DataMember] + public string? reason { get; set; } + + /// + /// 0:待办理，1：同意 ，2：拒绝 3， 结束 + /// + [DataMember] + public int state { get; set; } + + /// + /// 创建人 + /// + [DataMember] + public string? createusername { get; set; } + /// + /// 创建人Id + /// + [DataMember] + public string? createuserId { get; set; } + + + /// + /// 操作人id + /// + [DataMember] + public string? operatorId { get; set; } + /// + /// 操作人 + /// + [DataMember] + public string? operatorName { get; set; } + + /// + /// 创建日期 + /// + [DataMember] + public DateTime? creationtime { get; set; } = DateTime.Now; + + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + + /// + /// 附件 + /// + [DataMember] + public string annex { get; set; } + /// + /// 单位名称 + /// + [DataMember] + public string? unitName { get; set; } + } +} diff --git a/Elight.Entity/APPDto/App_ReceptionDto.cs b/Elight.Entity/APPDto/App_ReceptionDto.cs new file mode 100644 index 0000000..7d9fffe --- /dev/null +++ b/Elight.Entity/APPDto/App_ReceptionDto.cs @@ -0,0 +1,121 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 预约接待 + /// + [DataContract] + public class App_ReceptionDto + { + [DataMember] + public string? Id { get; set; } + /// + /// 单位编码 + /// + [DataMember] + public string? unitCode { get; set; } + + /// + /// 操作人id + /// + [DataMember] + public string? operatorId { get; set; } + /// + /// 操作人 + /// + [DataMember] + public string? operatorName { get; set; } + /// + /// 预约手机号 + /// + [DataMember] + public string? phone { get; set; } + + /// + /// 预约事由 + /// + [DataMember] + public string? matter { get; set; } + + [DataMember] + public string? reason { get; set; } + + /// + /// 开始时间 + /// + [DataMember] + public DateTime? sttime { get; set; } + + /// + /// 结束时间 + /// + [DataMember] + public DateTime? ettime { get; set; } + + /// + /// 同意受理时间 + /// + [DataMember] + public DateTime? acceptancetime { get; set; } + + /// + /// 会见人Id + /// + [DataMember] + public string? meetwitId { get; set; } + + /// + /// 会见人 + /// + [DataMember] + public string? meetwitname { get; set; } + + /// + /// 预约类型 + /// + [DataMember] + public string? reservationId { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 状态 0：待办理，1：同意，2:拒绝，3:结束 + /// + [DataMember] + public int state { get; set; } + + [DataMember] + public string? createusername { get; set; } + + [DataMember] + public string? createuserId { get; set; } + + /// + /// 创建日期 + /// + [DataMember] + public DateTime? creationtime { get; set; } = DateTime.Now; + + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + /// + /// 单位名称 + /// + [DataMember] + public string? unitName { get; set; } + } +} diff --git a/Elight.Entity/APPDto/App_RemoteDto.cs b/Elight.Entity/APPDto/App_RemoteDto.cs new file mode 100644 index 0000000..af7a4f0 --- /dev/null +++ b/Elight.Entity/APPDto/App_RemoteDto.cs @@ -0,0 +1,132 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + /// + /// 远程会见 + /// + [DataContract] + public class App_RemoteDto + { + [DataMember] + public string? Id { get; set; } + + /// + /// 操作人id + /// + [DataMember] + public string? operatorId { get; set; } + /// + /// 操作人 + /// + [DataMember] + public string? operatorName { get; set; } + /// + /// 单位编码 + /// + [DataMember] + public string? unitCode { get; set; } + /// + /// 手机推流地址 + /// + [DataMember] + public string? appurl { get; set; } + + /// + /// 会议号 + /// + [DataMember] + public string? Code { get; set; } + + /// + /// 会议名称 + /// + [DataMember] + public string? name { get; set; } + /// + /// 预约人手机号 + /// + [DataMember] + public string? phone { get; set; } + + [DataMember] + public string? reason { get; set; } + + /// + /// 开始时间 + /// + [DataMember] + public DateTime? sttime { get; set; } + + /// + /// 结束时间 + /// + [DataMember] + public DateTime? ettime { get; set; } + + /// + /// 同意受理时间 + /// + [DataMember] + public DateTime? acceptancetime { get; set; } + + /// + /// 会见人Id + /// + [DataMember] + public string? meetwitId { get; set; } + + /// + /// 会见人 + /// + [DataMember] + public string? meetwitname { get; set; } + + /// + /// 预约类型 + /// + [DataMember] + public string? reservationId { get; set; } + + /// + /// 备注 + /// + [DataMember] + public string? notes { get; set; } + + /// + /// 0:待开始，1已结束,2:会议取消 + /// + [DataMember] + public int state { get; set; } + + [DataMember] + public string? createusername { get; set; } + + [DataMember] + public string? createuserId { get; set; } + + /// + /// 创建日期 + /// + [DataMember] + public DateTime? creationtime { get; set; } = DateTime.Now; + + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + /// + /// 单位名称 + /// + [DataMember] + public string? unitName { get; set; } + } +} diff --git a/Elight.Entity/AuthManageProfile.cs b/Elight.Entity/AuthManageProfile.cs new file mode 100644 index 0000000..d428ee6 --- /dev/null +++ b/Elight.Entity/AuthManageProfile.cs @@ -0,0 +1,29 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity +{ + public class AuthManageProfile : Profile + { + public AuthManageProfile() + { + CreateMap(); + + CreateMap(); + + CreateMap(); + + CreateMap(); + + CreateMap(); + + CreateMap(); + + CreateMap(); + } + } +} diff --git a/Elight.Entity/Elight.Entity.csproj b/Elight.Entity/Elight.Entity.csproj index 47da372..a028bc6 100644 --- a/Elight.Entity/Elight.Entity.csproj +++ b/Elight.Entity/Elight.Entity.csproj @@ -7,6 +7,7 @@ +