新增律师阅卷模块对应的接口和model

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -0,0 +1,357 @@
+using AutoMapper;
+using com.sun.xml.@internal.bind.v2.model.core;
+using Elight.Entity;
+using Elight.Entity.APPDto.Lawyer;
+using Elight.Entity.AppMode.Lawyer;
+using Elight.Logic;
+using Elight.Logic.Model.Lawyer;
+using Elight.Utility;
+using Elight.Utility.Code;
+using Elight.Utility.Extensions;
+using Elight.Utility.logs;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using SqlSugar;
+using System.Net.WebSockets;
+using System.Text;
+using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion;
+using User = Elight.Utility.User;
+
+namespace _24Hour.Controllers.Common
+{
+    /// <summary>
+    /// 律师服务
+    /// </summary>
+    [Authorize]
+    [ApiController]
+    [Route("api/Lawyer")]
+    public class LawyerArchivesController : Controller
+    {
+        #region Identity
+        private readonly SqlSugarClient _db;//数据库
+        private readonly WriteSysLog _logs;//操作日志
+        App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户
+        private readonly ILogger<LoginController> _logger;//日志
+        Result result = new Result();
+
+        private readonly IMapper mapper;
+        public LawyerArchivesController(ILogger<LoginController> logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper)
+        {
+            this._logger = logger;
+            _db = db;
+            _logs = logs;
+            _userdata = user.Userdata();
+            this.mapper = _mapper;
+        }
+        #endregion
+
+
+
+        #region 律师阅卷
+        /// <summary>
+        /// 加密二维码信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("EncodeData")]
+        public async Task<Result> EncodeData(string id)
+        {
+            var data = await _db.Queryable<App_LawyerServicesModel>().LeftJoin<App_Sys_UserModel>((lawyer, user) => lawyer.createuserId == user.Id)
+            .Where(lawyer => lawyer.Id == id)
+            .Select((lawyer, user) => new
+            {
+                info = lawyer,
+                user
+            }).FirstAsync();
+            if (data != null)
+            {
+                var dto = new
+                {
+                    info = mapper.Map<QRLawyerServiceDto>(data.info),
+                    user = mapper.Map<QRUserDto>(data.user)
+                };
+                var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto)));
+                result.IsSucceed = true;
+                result.result = encodingdata;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 解码二维码信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("DecodeQRData")]
+        public Task<Result> DecodeQRData(DecodeData data)
+        {
+            try
+            {
+                var basestr = Convert.FromBase64String(data.EncodingString);
+                var str = Encoding.UTF8.GetString(basestr);
+
+                var model = str.ConvertToAnonymousType(new
+                {
+                    info = default(QRLawyerServiceDto),
+                    user = default(QRUserDto)
+                });
+                result.IsSucceed = true;
+                result.result = model;
+            }
+            catch (Exception ex)
+            {
+                result.IsSucceed = false;
+            }
+            return Task.FromResult(result);
+        }
+        /// <summary>
+        /// 同步外网律师人员信息(未完成) (根据律师身份证号更新或新增用户信息)
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("AddUserInfo")]
+        public async Task<Result> AddUserInfo(App_Sys_UserModel user)
+        {
+            try
+            {
+                var data = await _db.Queryable<App_Sys_UserModel>().FirstAsync(x => x.cardId == user.cardId);
+                if (data != null)
+                {
+                    //update
+                    _db.BeginTran();
+                    var num = await _db.Updateable(user).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+                    _db.CommitTran();
+                    if (num > 0)
+                    {
+                        result.IsSucceed = true;
+                        result.result = "修改成功";
+                    }
+                }
+                else
+                {
+                    //insert
+                    _db.BeginTran();
+                    var num = await _db.Insertable(user).ExecuteCommandAsync();
+                    _db.CommitTran();
+                    if (num > 0)
+                    {
+                        result.IsSucceed = true;
+                        result.Message = "添加成功";
+                    }
+                    else
+                    {
+                        result.IsSucceed = false;
+                        result.Message = "添加失败";
+                    }
+                }
+            }
+            catch
+            {
+                result.IsSucceed = false;
+            }
+            return result;
+        }
+        /// <summary>
+        /// 同步外网预约信息（未完成）
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("AddLawyerServiceInfo")]
+        public async Task<Result> AddLawyerServiceInfo(App_LawyerServicesModel info)
+        {
+            var data = await _db.Queryable<App_LawyerServicesModel>().FirstAsync(x => x.Id == info.Id);
+            if (data != null)
+            {
+                result.IsSucceed = true;
+                result.Message = "改数据已同步";
+                return result;
+            }
+            else
+            {
+                _db.BeginTran();
+                var num = await _db.Insertable(info).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.Message = "添加成功";
+                    result.result = mapper.Map<LawyerArchivesDto>(info);
+                    return result;
+                }
+                else
+                {
+                    result.IsSucceed = false;
+                    result.Message = "添加失败";
+                    return result;
+                }
+
+            }
+        }
+        /// <summary>
+        /// 查询律师阅卷信息
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("QueryLawyerArchives")]
+        public async Task<Result> QueryLawyerArchives(LawyerArchivesInput input)
+        {
+            RefAsync<int> totalNumber = 0;//总数据
+            //查询律师服务
+            var list = await _db.Queryable<LawyerArchives>().LeftJoin<App_LawyerServicesModel>((archives, services) => archives.lawyerservicesId == services.Id)
+                .WhereIF(input.bmsah != null, (archives, services) => archives.bmsah == input.bmsah)
+                .WhereIF(input.lawyerId != null, (archives, services) => archives.lawyerId == input.lawyerId)
+                .WhereIF(input.lawyerservicesId != null, (archives, services) => archives.lawyerservicesId == input.lawyerservicesId)
+                .WhereIF(input.Id != null, (archives, services) => archives.Id == input.Id)
+                .WhereIF(input.unitCode != null, (archives, services) => services.unitCode == input.unitCode)
+                .WhereIF(input.receptionuserId != null, (archives, services) => services.receptionuser == input.receptionuserId)
+                .WhereIF(input.state != null, (archives, services) => services.state == input.state)
+                .ToPageListAsync(input.PageIndex, input.PageSize, totalNumber);
+
+            input.RowsCount = totalNumber;
+            var data = new QueryResult<LawyerArchives>(input, list.OrderByDescending(q => q.createTime).ToList());
+            result.IsSucceed = true;
+            result.result = data;
+            return result;
+        }
+
+        public class DecodeData
+        {
+            public string EncodingString { get; set; }
+        }
+        /// <summary>
+        /// 新增阅卷信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("AddLawyerArchives")]
+        public async Task<Result> AddLawyerArchives(LawyerArchivesDto dto)
+        {
+            try
+            {
+                var data = await _db.Queryable<LawyerArchives>().FirstAsync(x => x.lawyerservicesId == dto.lawyerservicesId);
+                if (data != null)
+                {
+                    result.IsSucceed = false;
+                    result.Message = "该预约信息已经处理，无法再次新建阅卷预约";
+                    return result;
+                }
+                var entity = mapper.Map<LawyerArchives>(dto);
+
+                entity.Id = Guid.NewGuid().ToString();
+                entity.createrId = _userdata.Id;
+                entity.createTime = DateTime.Now;
+
+                _db.BeginTran();
+                var num = await _db.Insertable(entity).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.Message = "添加成功";
+                    result.result = mapper.Map<LawyerArchivesDto>(entity);
+                }
+            }
+            catch
+            {
+                result.IsSucceed = false;
+            }
+            return result;
+        }
+        /// <summary>
+        /// 删除律师阅卷信息
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("DeleteLawyerArchives")]
+        public async Task<Result> DeleteLawyerArchives(CurrencyDelete Currency)
+        {
+            try
+            {
+                _db.BeginTran();
+                var Deletelist = await _db.Queryable<LawyerArchives>().In(q => q.Id, Currency.id).ToListAsync();
+                Deletelist.ForEach(q =>
+                {
+                    q.IsDeleted = 1;
+                });
+                var num = await _db.Updateable(Deletelist).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = "删除成功";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "删除律师阅卷预约");
+            }
+            _logs.WriteSysLogadd("律师阅卷服务", "删除律师阅卷预约", result, _db);
+            return result;
+        }
+        /// <summary>
+        /// 修改律师阅卷信息
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("UpdateLawyerArchives")]
+        public async Task<Result> UpdateLawyerArchives(LawyerArchivesDto Lawyerdata)
+        {
+            try
+            {
+                _db.BeginTran();
+                var num = await _db.Updateable(Lawyerdata).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = "修改成功";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "删除律师阅卷预约");
+            }
+            _logs.WriteSysLogadd("律师阅卷服务", "删除律师阅卷预约", result, _db);
+            return result;
+        }
+        /// <summary>
+        /// 从2.0系统查询案件信息（未完成）
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("QueryCaseFromtwenty")]
+        public Task<Result> QueryCaseFromtwenty(string bmsah,string idcard,string name,string casename)
+        {
+            return Task.FromResult(result);
+        }
+
+        /// <summary>
+        /// 添加卷宗信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("AddArchivesInfo")]
+        public Task<Result<JZJBXXDto>> AddArchivesInfo(JZJBXXDto dto)
+        {
+            Result<JZJBXXDto> res = new Result<JZJBXXDto>();
+            return Task.FromResult(res);
+        }
+
+        #endregion
+    }
+}

24Hour/Controllers/Common/LawyerservicesController.cs

@@ -1,4 +1,6 @@
-using Elight.Entity;
+using com.sun.xml.@internal.bind.v2.model.core;
+using Elight.Entity;
+using Elight.Entity.APPDto.Lawyer;
 using Elight.Logic;
 using Elight.Utility;
 using Elight.Utility.Code;
@@ -6,9 +8,13 @@ using Elight.Utility.Extensions;
 using Elight.Utility.logs;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using SqlSugar;
-using System.Net.WebSockets;
+using System.Net.WebSockets;
+using System.Text;
+using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion;
 using static java.security.cert.CertPathValidatorException;
+using User = Elight.Utility.User;
 
 namespace _24Hour.Controllers.Common
 {
@@ -20,6 +26,7 @@ namespace _24Hour.Controllers.Common
     [Route("api/Lawyer")]
     public class LawyerservicesController : Controller
     {
+
         private static Dictionary<string, WebSocket> CONNECT_POOL = new Dictionary<string, WebSocket>();//用户连接池
         #region Identity
         private readonly SqlSugarClient _db;//数据库
@@ -80,7 +87,7 @@ namespace _24Hour.Controllers.Common
                 .WhereIF(Lawyerdata.unitId != null, q => q.unitCode.Contains(Lawyerdata.unitId))
                 .WhereIF(Lawyerdata.state != null, q => q.state == Lawyerdata.state)
                 .WhereIF(Lawyerdata.StartTime != null && Lawyerdata.EndTime != null, q => q.receptiontime >= Lawyerdata.StartTime && q.receptiontime < Lawyerdata.EndTime.Value.AddDays(1))
-                .Where(q => q.IsDeleted == 0&&q.unitCode == _userdata.unitCode).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber);
+                .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber);
             Lawyerdata.RowsCount = totalNumber;
             var data = new QueryResult<App_LawyerServicesModel>(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList());
             result.IsSucceed = true;
@@ -109,7 +116,6 @@ namespace _24Hour.Controllers.Common
                     result.IsSucceed = true;
                     result.result = "添加成功";
                 }
-
             }
             catch (System.Exception ex)
             {
@@ -183,15 +189,19 @@ namespace _24Hour.Controllers.Common
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
-                LogService.WriteLog(ex, "删除律师服务预约");
+                LogService.WriteLog(ex, "删除律师阅卷");
             }
             _logs.WriteSysLogadd("律师服务", "删除律师服务预约", result, _db);
             return result;
-        }
+        }
         #endregion
-
+
+
+        
+
+
         #region 律师预约修改办理人及状态修改
-
+
         /// <summary>
         /// 修改律师服务预约办理人
         /// </summary>
@@ -204,8 +214,8 @@ namespace _24Hour.Controllers.Common
         {
             try
             {
-                var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().Where(q=>q.Id==Id).ToListAsync();
+                var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().Where(q => q.Id == Id).ToListAsync();
-                if (Lawyerbol.Count()>0)
+                if (Lawyerbol.Count() > 0)
                 {
                     Lawyerbol.FirstOrDefault().receptionuser = transactors;
                     _db.BeginTran();
@@ -244,7 +254,7 @@ namespace _24Hour.Controllers.Common
         /// <returns></returns>
         [HttpGet]
         [Route("UpdateLawyerstate")]
-        public async Task<Result> UpdateLawyerstate(string? Id, int state,string? reason)
+        public async Task<Result> UpdateLawyerstate(string? Id, int state, string? reason)
         {
             try
             {
@@ -252,11 +262,11 @@ namespace _24Hour.Controllers.Common
                 if (Lawyerbol.Any())
                 {
                     Lawyerbol.FirstOrDefault().state = state;
-                    if(reason.NotNull())
+                    if (reason.NotNull())
-                    Lawyerbol.FirstOrDefault().reason = reason;
+                        Lawyerbol.FirstOrDefault().reason = reason;
                     Lawyerbol.FirstOrDefault().acceptancetime = DateTime.Now;
                     _db.BeginTran();
-                    var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.state, it.reason,it.acceptancetime }).ExecuteCommandAsync();
+                    var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.state, it.reason, it.acceptancetime }).ExecuteCommandAsync();
                     _db.CommitTran();
                     if (num > 0)
                     {

24Hour/Program.cs

@@ -61,8 +61,14 @@ builder.Services.AddSwaggerGen(c =>
     c.OrderActionsBy(o => o.RelativePath);
     var basePath = System.AppDomain.CurrentDomain.BaseDirectory;//获取应用程序所在目录（绝对，不受工作目录影响，建议采用此方法获取路径）
     var xmlPath = Path.Combine(basePath, "24Hour.xml");
+    var xmlPathentity = Path.Combine(basePath, "Elight.Entity.xml");
+    var xmlPathlogic = Path.Combine(basePath, "Elight.Logic.xml");
     if (File.Exists(xmlPath))//避免没有该文件时报错
-        c.IncludeXmlComments(xmlPath, true);
+        c.IncludeXmlComments(xmlPath, true);
+    if (File.Exists(xmlPathentity))//避免没有该文件时报错
+        c.IncludeXmlComments(xmlPathentity, true);
+    if (File.Exists(xmlPathlogic))//避免没有该文件时报错
+        c.IncludeXmlComments(xmlPathlogic, true);
     //添加Jwt验证设置
     c.AddSecurityRequirement(new OpenApiSecurityRequirement()
                         {
@@ -252,6 +258,7 @@ app.UseSwaggerUI(c =>
 {
     c.SwaggerEndpoint("/swagger/v1/swagger.json", "24小时一体机 API V1");
     c.RoutePrefix = string.Empty;
+  
 });
 #endregion
 

Elight.Entity/APPDto/App_LawyerServicesDto.cs

@@ -51,6 +51,11 @@ namespace Elight.Entity
         [DataMember]
         public DateTime? acceptancetime { get; set; }
 
+        /// <summary>
+        /// 访问结束时间
+        /// </summary>
+        public DateTime? receptionEndtime { get; set; }
+
         /// <summary>
         /// 访问事由
         /// </summary>
@@ -137,5 +142,17 @@ namespace Elight.Entity
         /// </summary>
         [DataMember]
         public string? unitName { get; set; }
+
+        /// <summary>
+        /// 当事人姓名
+        /// </summary>
+        [DataMember]
+        public string party { get;set;}
+
+        /// <summary>
+        /// 当事人身份证
+        /// </summary>
+        [DataMember]
+        public string partyIDcard { get;set;}
     }
 }

Elight.Entity/APPDto/Lawyer/JZJBXX.cs

@@ -0,0 +1,57 @@
+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.APPDto.Lawyer
+{
+    /// <summary>
+    /// 卷宗基本信息
+    /// </summary>
+    public class JZJBXXDto
+    {
+        /// <summary>
+        /// 部门受案号 v
+        /// </summary>
+        public string Id { get; set; }
+
+        public string bmsah { get; set; }
+
+        /// <summary>
+        /// 卷宗编号v
+        /// </summary>
+        public string jzbh { get; set; }
+
+        /// <summary>
+        /// 单位编码 
+        /// </summary>
+        public string dwbm { get; set; }
+
+        /// <summary>
+        /// （简案）王奇涉嫌危险驾驶案  v
+        /// </summary>
+        public string jzmc { get; set; }
+
+        /// <summary>
+        /// 卷宗制作人 
+        /// </summary>
+        public string jzzzr { get; set; }
+
+        /// <summary>
+        /// 案件类别编码 
+        /// </summary>
+        public string ajlbbm { get; set; }
+        /// <summary>
+        /// 案件类别名称
+        /// </summary>
+        public string ajlbmc { get; set; }
+        /// <summary>
+        /// 卷宗目录 v
+        /// </summary>
+
+        public List<JZMLDto> jzml { get; set; }
+    }
+}

Elight.Entity/APPDto/Lawyer/JZML.cs

@@ -0,0 +1,67 @@
+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.APPDto.Lawyer
+{
+
+
+    /// <summary>
+    /// 卷宗目录
+    /// </summary>
+    public class JZMLDto
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string taskid { get; set; }
+
+        /// <summary>
+        /// 卷宗编号
+        /// </summary>
+        public string jzbh { get; set; }
+
+        /// <summary>
+        /// 目录编号
+        /// </summary>
+        public string mlbh { get; set; }
+
+        /// <summary>
+        /// 父目录编号
+        /// </summary>
+        public string fmlbh { get; set; }
+
+        /// <summary>
+        /// 目录显示名称
+        /// </summary>
+        public string mlxsmc { get; set; }
+
+        /// <summary>
+        /// 目录信息
+        /// </summary>
+        public string mlxx { get; set; }
+
+        /// <summary>
+        /// 目录顺序号
+        /// </summary>
+        public string mlsxh { get; set; }
+
+        /// <summary>
+        /// 目录类型 卷，目录看，文件   
+        /// </summary>
+        public string mllx { get; set; }
+
+        /// <summary>
+        /// 单位编码
+        /// </summary>
+        public string dwbm { get; set; }
+        public List<JZWJItemDto> jzwj { get; set; }
+    }
+
+
+    
+}

Elight.Entity/APPDto/Lawyer/JZWJItem.cs

@@ -0,0 +1,106 @@
+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.APPDto.Lawyer
+{
+
+    /// <summary>
+    /// 卷宗文件
+    /// </summary>
+    public class JZWJItemDto
+    {
+        /// <summary>
+        /// 文件唯一标识
+        /// </summary>
+        public string Id { get; set; }
+        public string wjxh { get; set; }
+
+        /// <summary>
+        /// 目录编号
+        /// </summary>
+        public string mlbh { get; set; }
+
+        /// <summary>
+        /// 源文件路径
+        /// </summary>
+        public string ywjlj { get; set; }
+
+        /// <summary>
+        /// 缩略图文件路径
+        /// </summary>
+        public string sltwjlj { get; set; }
+
+        /// <summary>
+        /// pdf文件路径
+        /// </summary>
+        public string pdfwjlj { get; set; }
+
+        /// <summary>
+        /// 图片实际显示路径！
+        /// </summary>
+        public string jpgwjlj { get; set; }
+
+        /// <summary>
+        /// 文件页码
+        /// </summary>
+        public string wjym { get; set; }
+
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        public string wjlx { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string wjscbz { get; set; }
+
+        /// <summary>
+        /// 文件顺序号  排序
+        /// </summary>
+        public int wjsxh { get; set; }
+
+        /// <summary>
+        /// 文件显示名称   第二页
+        /// </summary>
+        public string wjxsmc { get; set; }
+
+        /// <summary>
+        /// 卷宗编号
+        /// </summary>
+        public string jzbh { get; set; }
+
+        /// <summary>
+        /// 文件ocr识别状态
+        /// </summary>
+        public string wjocrsbzt { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string cjsj { get; set; }
+
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public string time { get; set; }
+
+
+        public string taskid { get; set; }
+
+        /// <summary>
+        /// 文件标识
+        /// </summary>
+        public string wjbs { get; set; }
+
+        /// <summary>
+        /// 标识编号
+        /// </summary>
+        public string bsbh { get; set; }
+    }
+}

Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs

@@ -0,0 +1,81 @@
+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.APPDto.Lawyer
+{
+    public class LawyerArchivesDto
+    {
+        [DataMember]
+        public string? Id { get; set; }
+        /// <summary>
+        /// 预约记录Id
+        /// </summary>
+        [DataMember]
+        public string? lawyerservicesId { get; set; }
+        /// <summary>
+        /// 卷宗id
+        /// </summary>
+        [DataMember]
+        public string? jzlbxxId { get; set; }
+        /// <summary>
+        /// 部门受案号
+        /// </summary>
+        [DataMember]
+        public string? bmsah { get; set; }
+        /// <summary>
+        /// 律师Id
+        /// </summary>
+        [DataMember]
+        public string? lawyerId { get; set; }
+        /// <summary>
+        /// 律师名字
+        /// </summary>
+        [DataMember]
+        public string? lawyerName { get; set; }
+        /// <summary>
+        /// 授权开始查阅时间
+        /// </summary>
+        [DataMember]
+        public DateTime? permissibleStartTime { get; set; }
+        /// <summary>
+        /// 授权截至查阅时间
+        /// </summary>
+        [DataMember]
+        public DateTime? permissibleEndTime { get; set; }
+        /// <summary>
+        /// 实际开始查阅时间
+        /// </summary>
+        [DataMember]
+        public DateTime? actualStartTime { get; set; }
+        /// <summary>
+        /// 实际截至查阅时间
+        /// </summary>
+        [DataMember]
+        public DateTime? actualEndTime { get; set; }
+        /// <summary>
+        /// 0 待查阅 1查阅中 2 已查阅
+        /// </summary>
+        [DataMember]
+        public ushort? status { get; set; }
+        /// <summary>
+        /// 0 未复制 1打印 2刻录 3 both
+        /// </summary>
+        [DataMember]
+        public ushort? copyStatus { get; set; }
+        /// <summary>
+        /// 0 不限制 1限制打印 2 限制刻录 3全部禁止
+        /// </summary>
+        [DataMember]
+        public ushort? copyLimit { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [DataMember]
+        public string? remake { get; set; }
+    }
+}

Elight.Entity/APPDto/Lawyer/QRDto.cs

@@ -0,0 +1,37 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elight.Entity.APPDto.Lawyer
+{
+    public class QRUserDto
+    {
+        public string? Id { get; set; }
+        public string? unitCode { get; set; }
+        public string? name { get; set; }
+        public string? phone { get; set; }
+        public string? cardId { get; set; }
+    }
+    public class QRLawyerServiceDto
+    {
+        public string? Id { get; set; }
+        public string? unitCode { get; set; }
+        public string? phone { get; set; }
+        public string? matter { get; set; }
+        public string? reason { get; set; }
+        public DateTime? acceptancetime { get; set; }
+        /// <summary>
+        /// 访问对象
+        /// </summary>
+        public string? objectstr { get; set; }
+        public string? reservationId { get; set; }
+        public string? notes { get; set; }
+        public int state { get; set; }
+        public string? createusername { get; set; }
+        public string? createuserId { get; set; }
+    }
+}

Elight.Entity/APPDto/QRTransfter.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elight.Entity.APPDto
+{
+    public class QRTransfterDto
+    {
+        
+    }
+}

Elight.Entity/AppMode/App_LawyerServicesModel.cs

@@ -48,6 +48,11 @@ namespace Elight.Entity
         [DataMember]
         public DateTime? receptiontime { get; set; }
 
+        /// <summary>
+        /// 访问结束时间
+        /// </summary>
+        public DateTime? receptionEndtime { get; set; }
+
         /// <summary>
         /// 同意受理时间
         /// </summary>
@@ -104,9 +109,9 @@ namespace Elight.Entity
         /// 创建人Id
         /// </summary>
         [DataMember]
-        public string? createuserId { get; set; }
+        public string? createuserId { get; set; }
-
+
-
+
         /// <summary>
         /// 操作人id
         /// </summary>
@@ -134,6 +139,19 @@ namespace Elight.Entity
         /// 附件
         /// </summary>
         [DataMember]
-        public string annex { get; set; }
+        public string? annex { get; set; }
+        
+        /// <summary>
+        /// 当事人姓名
+        /// </summary>
+        [DataMember]
+        public string? party { get;set;}
+
+        /// <summary>
+        /// 当事人身份证
+        /// </summary>
+        [DataMember]
+        public string? partyIDcard { get;set;}
+
     }
 }

Elight.Entity/AppMode/Lawyer/DossierInfo.cs

@@ -0,0 +1,171 @@
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+
+//namespace Elight.Entity.AppMode.Lawyer
+//{
+//    /// <summary>
+//    /// 卷宗基本信息
+//    /// </summary>
+//    public class JZJBXX
+//    {
+//        /// <summary>
+//        /// 部门受案号 v
+//        /// </summary>
+//        public string bmsah { get; set; }
+//        /// <summary>
+//        /// 卷宗编号v
+//        /// </summary>
+//        public string jzbh { get; set; }
+//        /// <summary>
+//        /// 单位编码 
+//        /// </summary>
+//        public string dwbm { get; set; }
+//        /// <summary>
+//        /// （简案）王奇涉嫌危险驾驶案  v
+//        /// </summary>
+//        public string jzmc { get; set; }
+//        /// <summary>
+//        /// 卷宗制作人 
+//        /// </summary>
+//        public string jzzzr { get; set; }
+//        /// <summary>
+//        /// 案件类别编码 
+//        /// </summary>
+//        public string ajlbbm { get; set; }
+//        /// <summary>
+//        /// 案件类别名称
+//        /// </summary>
+//        public string ajlbmc { get; set; }
+//        /// <summary>
+//        /// 卷宗目录 v
+//        /// </summary>
+
+//        public List<JZML> jzml { get; set; }
+//    }
+
+
+//    /// <summary>
+//    /// 卷宗目录
+//    /// </summary>
+//    public class JZML
+//    {
+//        /// <summary>
+//        /// 
+//        /// </summary>
+//        public string taskid { get; set; }
+//        /// <summary>
+//        /// 卷宗编号
+//        /// </summary>
+//        public string jzbh { get; set; }
+//        /// <summary>
+//        /// 目录编号
+//        /// </summary>
+//        public string mlbh { get; set; }
+//        /// <summary>
+//        /// 父目录编号
+//        /// </summary>
+//        public string fmlbh { get; set; }
+//        /// <summary>
+//        /// 目录显示名称
+//        /// </summary>
+//        public string mlxsmc { get; set; }
+//        /// <summary>
+//        /// 目录信息
+//        /// </summary>
+//        public string mlxx { get; set; }
+//        /// <summary>
+//        /// 目录顺序号
+//        /// </summary>
+//        public string mlsxh { get; set; }
+//        /// <summary>
+//        /// 目录类型 卷，目录看，文件   
+//        /// </summary>
+//        public string mllx { get; set; }
+//        /// <summary>
+//        /// 单位编码
+//        /// </summary>
+//        public string dwbm { get; set; }
+//        public List<JZWJItem> jzwj { get; set; }
+//    }
+
+
+//    /// <summary>
+//    /// 卷宗文件
+//    /// </summary>
+//    public class JZWJItem
+//    {
+//        /// <summary>
+//        /// 文件唯一标识
+//        /// </summary>
+//        public string wjxh { get; set; }
+//        /// <summary>
+//        /// 目录编号
+//        /// </summary>
+//        public string mlbh { get; set; }
+//        /// <summary>
+//        /// 源文件路径
+//        /// </summary>
+//        public string ywjlj { get; set; }
+//        /// <summary>
+//        /// 缩略图文件路径
+//        /// </summary>
+//        public string sltwjlj { get; set; }
+//        /// <summary>
+//        /// pdf文件路径
+//        /// </summary>
+//        public string pdfwjlj { get; set; }
+//        /// <summary>
+//        /// 图片实际显示路径！
+//        /// </summary>
+//        public string jpgwjlj { get; set; }
+//        /// <summary>
+//        /// 文件页码
+//        /// </summary>
+//        public string wjym { get; set; }
+//        /// <summary>
+//        /// 文件类型
+//        /// </summary>
+//        public string wjlx { get; set; }
+//        /// <summary>
+//        /// 
+//        /// </summary>
+//        public string wjscbz { get; set; }
+//        /// <summary>
+//        /// 文件顺序号  排序
+//        /// </summary>
+//        public int wjsxh { get; set; }
+//        /// <summary>
+//        /// 文件显示名称   第二页
+//        /// </summary>
+//        public string wjxsmc { get; set; }
+//        /// <summary>
+//        /// 卷宗编号
+//        /// </summary>
+//        public string jzbh { get; set; }
+//        /// <summary>
+//        /// 文件ocr识别状态
+//        /// </summary>
+//        public string wjocrsbzt { get; set; }
+//        /// <summary>
+//        /// 创建时间
+//        /// </summary>
+//        public string cjsj { get; set; }
+//        /// <summary>
+//        /// 上传时间
+//        /// </summary>
+//        public string time { get; set; }
+        
+//        public string taskid { get; set; }
+//        /// <summary>
+//        /// 文件标识
+//        /// </summary>
+//        public string wjbs { get; set; }
+//        /// <summary>
+//        /// 标识编号
+//        /// </summary>
+//        public string bsbh { get; set; }
+//    }
+//}

Elight.Entity/AppMode/Lawyer/JZJBXX.cs

@@ -0,0 +1,60 @@
+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.AppMode.Lawyer
+{
+    /// <summary>
+    /// 卷宗基本信息
+    /// </summary>
+    [Serializable]
+    [DataContract]
+    [SugarTable("case_jzlbxx")]
+    public class JZJBXX
+    {
+
+        [DataMember]
+        [SugarColumn(IsPrimaryKey = true)]
+        public string Id { get; set; }
+        /// <summary>
+        /// 部门受案号 v
+        /// </summary>
+
+        [DataMember]
+        public string bmsah { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 卷宗编号v
+        /// </summary>
+        public string jzbh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 单位编码 
+        /// </summary>
+        public string dwbm { get; set; }
+        [DataMember]
+        /// <summary>
+        /// （简案）王奇涉嫌危险驾驶案  v
+        /// </summary>
+        public string jzmc { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 卷宗制作人 
+        /// </summary>
+        public string jzzzr { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 案件类别编码 
+        /// </summary>
+        public string ajlbbm { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 案件类别名称
+        /// </summary>
+        public string ajlbmc { get; set; }
+    }
+}

Elight.Entity/AppMode/Lawyer/JZML.cs

@@ -0,0 +1,70 @@
+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.AppMode.Lawyer
+{
+
+
+    /// <summary>
+    /// 卷宗目录
+    /// </summary>
+    [Serializable]
+    [DataContract]
+    [SugarTable("case_jzml")]
+    public class JZML
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string taskid { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 卷宗编号
+        /// </summary>
+        public string jzbh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 目录编号
+        /// </summary>
+        public string mlbh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 父目录编号
+        /// </summary>
+        public string fmlbh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 目录显示名称
+        /// </summary>
+        public string mlxsmc { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 目录信息
+        /// </summary>
+        public string mlxx { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 目录顺序号
+        /// </summary>
+        public string mlsxh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 目录类型 卷，目录看，文件   
+        /// </summary>
+        public string mllx { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 单位编码
+        /// </summary>
+        public string dwbm { get; set; }
+        public List<JZWJItem> jzwj { get; set; }
+    }
+
+
+    
+}

Elight.Entity/AppMode/Lawyer/JZWJItem.cs

@@ -0,0 +1,112 @@
+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.AppMode.Lawyer
+{
+
+    /// <summary>
+    /// 卷宗文件
+    /// </summary>
+    [Serializable]
+    [DataContract]
+    [SugarTable("case_jzwjitem")]
+    public class JZWJItem
+    {
+        /// <summary>
+        /// 文件唯一标识
+        /// </summary>
+        [DataMember]
+        [SugarColumn(IsPrimaryKey = true)]
+        public string Id { get; set; }
+        [DataMember]
+        public string wjxh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 目录编号
+        /// </summary>
+        public string mlbh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 源文件路径
+        /// </summary>
+        public string ywjlj { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 缩略图文件路径
+        /// </summary>
+        public string sltwjlj { get; set; }
+        [DataMember]
+        /// <summary>
+        /// pdf文件路径
+        /// </summary>
+        public string pdfwjlj { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 图片实际显示路径！
+        /// </summary>
+        public string jpgwjlj { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 文件页码
+        /// </summary>
+        public string wjym { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        public string wjlx { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 
+        /// </summary>
+        public string wjscbz { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 文件顺序号  排序
+        /// </summary>
+        public int wjsxh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 文件显示名称   第二页
+        /// </summary>
+        public string wjxsmc { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 卷宗编号
+        /// </summary>
+        public string jzbh { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 文件ocr识别状态
+        /// </summary>
+        public string wjocrsbzt { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string cjsj { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public string time { get; set; }
+        [DataMember]
+
+        public string taskid { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 文件标识
+        /// </summary>
+        public string wjbs { get; set; }
+        [DataMember]
+        /// <summary>
+        /// 标识编号
+        /// </summary>
+        public string bsbh { get; set; }
+    }
+}

Elight.Entity/AppMode/Lawyer/LawyerArchives.cs

@@ -0,0 +1,55 @@
+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.AppMode.Lawyer
+{
+    [Serializable]
+    [DataContract]
+    [SugarTable("case_lawyerarchives")]
+    public class LawyerArchives
+    {
+        [DataMember]
+        [SugarColumn(IsPrimaryKey = true)]
+        public string? Id { get; set; }
+        [DataMember]
+        public string? lawyerservicesId { get; set; }
+        [DataMember]
+        public string? jzlbxxId { get; set; }
+        [DataMember]
+        public string? bmsah { get; set; }
+        [DataMember]
+        public string? lawyerId { get; set; }
+        [DataMember]
+        public string? lawyerName { get; set; }
+        [DataMember]
+        public DateTime? permissibleStartTime { get; set; }
+        [DataMember]
+        public DateTime? permissibleEndTime { get; set; }
+        [DataMember]
+        public DateTime? actualStartTime { get; set; }
+        [DataMember]
+        public DateTime? actualEndTime { get; set; }
+        [DataMember]
+        public ushort? status { get; set; }
+        [DataMember]
+        public ushort? copyStatus { get; set; }
+        [DataMember]
+        public ushort? copyLimit { get; set; }
+        [DataMember]
+        public string? remake { get; set; }
+        [DataMember]
+        public DateTime? createTime { get; set; }
+        [DataMember]
+        public string? createrId { get; set; }
+        /// <summary>
+        /// 是否删除：0：未删除、1：删除
+        /// </summary>
+        [DataMember]
+        public int? IsDeleted { get; set; } = 0;
+    }
+}

Elight.Entity/AuthManageProfile.cs

@@ -1,4 +1,6 @@
 using AutoMapper;
+using Elight.Entity.APPDto.Lawyer;
+using Elight.Entity.AppMode.Lawyer;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,6 +13,30 @@ namespace Elight.Entity
     {
         public AuthManageProfile()
         {
+            CreateMap<JZJBXX, JZJBXXDto>().ReverseMap().ForAllMembers(opt =>
+            {
+                opt.UseDestinationValue();
+                opt.Condition((src, dest, srcm, destm) => srcm != null);
+            });
+            CreateMap<JZML, JZMLDto>().ReverseMap().ForAllMembers(opt =>
+            {
+                opt.UseDestinationValue();
+                opt.Condition((src, dest, srcm, destm) => srcm != null);
+            });
+            CreateMap<JZWJItem, JZWJItemDto>().ReverseMap().ForAllMembers(opt =>
+            {
+                opt.UseDestinationValue();
+                opt.Condition((src, dest, srcm, destm) => srcm != null);
+            });
+            CreateMap<LawyerArchives, LawyerArchivesDto>().ReverseMap().ForAllMembers(opt =>
+            {
+                opt.UseDestinationValue();
+                opt.Condition((src, dest, srcm, destm) => srcm != null);
+            });
+            CreateMap<App_LawyerServicesModel, QRLawyerServiceDto>().ReverseMap();
+            CreateMap<App_Sys_UserModel, QRUserDto>().ReverseMap();
+
+
             CreateMap<App_CloudCabinetModel, App_CloudCabinetDto>();
 
             CreateMap<App_ConfessionModel, App_ConfessionDto>();

Elight.Entity/Elight.Entity.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

Elight.Logic/Elight.Logic.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs

@@ -0,0 +1,55 @@
+using Elight.Utility.Code;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elight.Logic.Model.Lawyer
+{
+    public class LawyerArchivesInput:Paging
+    {
+        /// <summary>
+        /// 阅卷Id
+        /// </summary>
+        [DataMember]
+        public string? Id { get; set; }
+        /// <summary>
+        /// 预约Id
+        /// </summary>
+        [DataMember]
+        public string? lawyerservicesId { get; set; }
+        /// <summary>
+        /// 部门受案号
+        /// </summary>
+        [DataMember]
+        public string? bmsah { get; set; }
+        /// <summary>
+        /// 律师Id
+        /// </summary>
+        [DataMember]
+        public string? lawyerId { get; set; }
+        /// <summary>
+        /// 单位Id
+        /// </summary>
+        [DataMember]
+        public string? unitCode { get; set; }
+        /// <summary>
+        /// 预约类型
+        /// </summary>
+        [DataMember]
+        public string? reservationId { get; set; }
+        /// <summary>
+        /// 接待人Id
+        /// </summary>
+        [DataMember]
+        public string? receptionuserId { get; set; }
+        /// <summary>
+        /// 0:待办理，1：同意 ，2：拒绝 预约申请状态
+        /// </summary>
+        [DataMember]
+        public int? state { get; set; }
+    }
+}

Elight.Utility/Elight.Utility.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.2.3" />
+	<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Elight.Utility/Extensions/ConvertorHelper.cs

@@ -0,0 +1,145 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System;
+using System.Text.RegularExpressions;
+
+namespace Elight.Utility.Extensions
+{
+    public static class ConvertorHelper
+    {
+        /// <summary>
+        /// model=>json string
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="t"></param>
+        /// <returns></returns>
+
+        private readonly static JsonSerializerSettings settings = new JsonSerializerSettings()
+        {
+            NullValueHandling = NullValueHandling.Ignore,
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore
+        };
+        public static string ConvertToJsonStr<T>(this T t)
+        {
+            try
+            {
+                return JsonConvert.SerializeObject(t, Formatting.None, settings);
+
+            }
+            catch
+            {
+                return default;
+            }
+        }
+        public static T DeepCopy<T>(this T t)
+        {
+            return t.ConvertToJsonStr().ConvertToModel<T>();
+        }
+        /// <summary>
+        /// json转为匿名对象
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="json"></param>
+        /// <param name="anonymousTypeObject"></param>
+        /// <returns></returns>
+        public static T ConvertToAnonymousType<T>(this object json, T anonymousTypeObject)
+        {
+            try
+            {
+                return JsonConvert.DeserializeAnonymousType(json.ToString(), anonymousTypeObject);
+            }
+            catch
+            {
+                return default;
+            }
+        }
+        /// <summary>
+        /// object 转匿名类
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="anonymous"></param>
+        /// <param name="anonymousType"></param>
+        /// <returns></returns>
+        public static T ConvertToAnonymous<T>(this object anonymous, T anonymousType)
+        {
+            try
+            {
+                if (anonymous != null)
+                {
+                    return (T)anonymous;
+                }
+                else
+                {
+                    return default;
+                }
+            }
+            catch
+            {
+                return default;
+
+            }
+        }
+        /// <summary>
+        /// json string=>mdoel
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static T ConvertToModel<T>(this string str, [CallerMemberName] string methodname = "")
+        {
+            try
+            {
+                return JsonConvert.DeserializeObject<T>(str);
+            }
+            catch (Exception)
+            {
+                return default;
+            }
+        }
+        public static string ConvertToBase64(this string str)
+        {
+            return Convert.ToBase64String(Encoding.Default.GetBytes(str));
+        }
+        public static string ConvertToGetParam(this object obj)
+        {
+            StringBuilder strBui = new StringBuilder();
+
+            System.Reflection.PropertyInfo[] proArray = obj.GetType().GetProperties();
+            foreach (System.Reflection.PropertyInfo pro in proArray)
+            {
+                if (strBui.Length < 1)
+                {
+                    strBui.Append("?");
+                }
+                else
+                {
+                    strBui.Append("&");
+                }
+                strBui.Append(string.Format("{0}={1}", pro.Name, pro.GetValue(obj, null)));
+            }
+            return strBui.ToString();
+        }
+        // DateTime --> long
+        public static long ConvertDateTimeToLong(DateTime dt)
+        {
+            DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+            TimeSpan toNow = dt.Subtract(dtStart);
+            long timeStamp = toNow.Ticks;
+            timeStamp = long.Parse(timeStamp.ToString().Substring(0, timeStamp.ToString().Length - 4));
+            return timeStamp;
+        }
+        // long --> DateTime
+        public static DateTime ConvertLongToDateTime(long d)
+        {
+            DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+            long lTime = long.Parse(d + "0000");
+            TimeSpan toNow = new TimeSpan(lTime);
+            DateTime dtResult = dtStart.Add(toNow);
+            return dtResult;
+        }
+        
+    }
+}

Elight.Utility/Result.cs

@@ -23,19 +23,19 @@ namespace Elight.Utility.Code
         /// </summary>
         [DataMember]
         public string Message { get; set; }
-		/// <summary>
+        /// <summary>
-		/// 消息
+        /// 消息
-		/// </summary>
+        /// </summary>
-		[DataMember]
+        [DataMember]
-		public dynamic result { get; set; }
+        public dynamic result { get; set; }
-	}
+    }
 
     /// <summary>
     /// 消息
     /// </summary>
     [Serializable]
     [DataContract]
-    public class ResultData:Result
+    public class ResultData : Result
     {
         /// <summary>
         /// 数据
@@ -56,6 +56,6 @@ namespace Elight.Utility.Code
         /// 扩展数据
         /// </summary>
         [DataMember]
-        public T Data { get; set; }
+        public new T result { get; set; }
     }
 }