Merge branch 'develop' of http://192.168.0.12:3000/Coder/24Hour.Service into develop

24Hour/CaseServiceTwentyClient.cs

@@ -0,0 +1,43 @@
+using com.sun.xml.@internal.xsom;
+using Elight.Entity.APPDto.Lawyer;
+using Elight.Utility.Extensions;
+using Microsoft.AspNetCore.DataProtection;
+
+namespace _24Hour
+{
+    public class CaseServiceTwentyClient
+    {
+        private readonly HttpClient httpCliet;
+        public CaseServiceTwentyClient(HttpClient _httpCliet)
+        {
+            this.httpCliet = _httpCliet;
+
+            httpCliet.DefaultRequestHeaders.Add("Accept", "application/json");
+            httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample");
+            httpCliet.DefaultRequestHeaders.ConnectionClose = true;
+        }
+        public object GetCaseList()
+        {
+            return null;
+        }
+        public async Task<JZJBXXDto> GetArchivesInfo(string bmsah)
+        {
+            var path = Path.Combine(Environment.CurrentDirectory, "datajson.txt");
+            var json = await System.IO.File.ReadAllTextAsync(path);
+            var convert = json.ConvertToModel<JZJBXXDto>();
+            convert.Id = Guid.NewGuid().ToString();
+            foreach (var ml in convert.jzml)
+            {
+                ml.Id = Guid.NewGuid().ToString();
+                ml.jzId = convert.Id;
+                foreach (var item in ml.jzwj)
+                {
+                    item.jzmlId = ml.Id;
+                    item.Id = Guid.NewGuid().ToString();
+                }
+            }
+            return convert;
+        }
+
+    }
+}

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -34,80 +34,23 @@ namespace _24Hour.Controllers.Common
         private readonly SqlSugarClient _db;//数据库
         private readonly WriteSysLog _logs;//操作日志
         App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户
-        private readonly ILogger<LoginController> _logger;//日志
+        private readonly ILogger<LawyerArchivesController> logger;//日志
         Result result = new Result();
+        private readonly CaseServiceTwentyClient twentyClient;
 
         private readonly IMapper mapper;
-        public LawyerArchivesController(ILogger<LoginController> logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper)
+        public LawyerArchivesController(ILogger<LawyerArchivesController> _logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper, CaseServiceTwentyClient _twentyClient)
         {
-            this._logger = logger;
+            this.logger = _logger;
             _db = db;
             _logs = logs;
-            _userdata = user.Userdata();
             this.mapper = _mapper;
+            this.twentyClient = _twentyClient;
+            _userdata = user.Userdata();
         }
         #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 (System.Exception ex)
-            {
-                result.IsSucceed = false;
-            }
-            return Task.FromResult(result);
-        }
-        /// <summary>
         /// 同步外网律师人员信息(未完成) (根据律师身份证号更新或新增用户信息)
         /// </summary>
         /// <param name="user"></param>
@@ -135,6 +78,7 @@ namespace _24Hour.Controllers.Common
                 {
                     //insert
                     _db.BeginTran();
+                    user.Id = Guid.NewGuid().ToString();
                     var num = await _db.Insertable(user).ExecuteCommandAsync();
                     _db.CommitTran();
                     if (num > 0)
@@ -156,57 +100,19 @@ namespace _24Hour.Controllers.Common
             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)
+        public async Task<Result> QueryLawyerArchives([FromQuery] 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)
@@ -219,7 +125,6 @@ namespace _24Hour.Controllers.Common
             result.result = data;
             return result;
         }
-
         public class DecodeData
         {
             public string EncodingString { get; set; }
@@ -269,7 +174,7 @@ namespace _24Hour.Controllers.Common
         /// </summary>
         /// <param name="info"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpDelete]
         [Route("DeleteLawyerArchives")]
         public async Task<Result> DeleteLawyerArchives(CurrencyDelete Currency)
         {
@@ -304,7 +209,7 @@ namespace _24Hour.Controllers.Common
         /// </summary>
         /// <param name="info"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPut]
         [Route("UpdateLawyerArchives")]
         public async Task<Result> UpdateLawyerArchives(LawyerArchivesDto Lawyerdata)
         {
@@ -358,26 +263,28 @@ namespace _24Hour.Controllers.Common
         /// <remarks>数据的返回格式已确定，内容时真实数据经过修改的</remarks>
         [HttpGet]
         [Route("QueryFileFromtwenty")]
-        public Task<Result> QueryFileFromtwenty(string bmsah)
+        public async Task<Result> QueryFileFromtwenty(string bmsah)
         {
             if (bmsah == "安北检刑诉受[2023]433333333333号")
             {
-                var a = GetInfo();
-                var data = new
+                var a = await twentyClient.GetArchivesInfo(bmsah);
+                var data = new[]
                 {
-                    id = a.jzbh,
-                    lable = a.jzmc,
-                    children = a?.jzml?.Select(x => new
-                    {
-                        id = x.mlbh,
-                        lable = x.mlxsmc,
-                        children = x.jzwj.Select(q => new
+                    new {
+                        id = a.jzbh,
+                        lable = a.jzmc,
+                        children = a?.jzml?.Select(x => new
                         {
-                            id = q.wjxh,
-                            lable = q.wjxsmc,
-                            filepath = q.jpgwjlj
+                            id = x.mlbh,
+                            lable = x.mlxsmc,
+                            children = x.jzwj.Select(q => new
+                            {
+                                id = q.wjxh,
+                                lable = q.wjxsmc,
+                                filepath = q.jpgwjlj
+                            })
                         })
-                    })
+                    }
                 };
                 result.IsSucceed = true;
                 result.result = data;
@@ -386,43 +293,105 @@ namespace _24Hour.Controllers.Common
             {
                 result.IsSucceed = false;
             }
-            return Task.FromResult(result);
+            return result;
         }
-        private JZJBXXDto GetInfo()
+        /// <summary>
+        /// 上传已选中的第三级页码的id
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// {
+        ///     "IsSucceed": false,
+        ///     "Message": null,
+        ///     "result": "9f272d7f-2b66-4314-95a3-ca4e0de2b1ec"
+        /// }
+        ///返回的id 用于在调用 AddLawyerArchives 传入jzlbxxId
+        /// </remarks>
+        [HttpPost("AddArchivesInfoByChildId")]
+        public async Task<Result> AddArchivesInfoByChildId(AddArchivesInfoInput input)
         {
-            var path = Path.Combine(Environment.CurrentDirectory, "datajson.txt");
-            var json = System.IO.File.ReadAllText(path);
-            var convert = json.ConvertToModel<JZJBXXDto>();
-            convert.Id = Guid.NewGuid().ToString();
-            foreach (var ml in convert.jzml)
+            try
             {
-                ml.Id = Guid.NewGuid().ToString();
-                foreach (var item in ml.jzwj)
+                var dto = await twentyClient.GetArchivesInfo(input.Bmsah);
+                //先将没有被选中的第三级文件排除
+                foreach (var item in dto.jzml)
                 {
-                    item.Id = Guid.NewGuid().ToString();
+                    item.jzwj = item.jzwj.Where(x => input.Ids.Contains(x.wjxh)).ToList();
                 }
+                //再排除没有文件的目录信息
+                //这样筛选后获取的数据就可以保证不会出现空子节点的父节点
+                dto.jzml = dto.jzml.Where(x => x.jzwj.Any()).ToList();
+
+                var insert = await AddArchivesInfo(dto);
+                result.result = insert.result.Id;
             }
-            return convert;
+            catch (Exception ex)
+            {
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+            }
+            return result;
         }
         /// <summary>
-        /// 上传已选中的第三级页码的id
+        /// 一体机 根据卷宗id获取详细的卷宗信息
         /// </summary>
-        /// <param name="bmsah"></param>
-        /// <param name="ids"></param>
+        /// <param name="jzid"></param>
         /// <returns></returns>
-        [HttpPost("AddArchivesInfoByChildId")]
-        public Task<Result> AddArchivesInfoByChildId(AddArchivesInfoInput input)
+        [HttpGet("QueryArchiveById")]
+        public async Task<Result> QueryArchiveById(string jzid)
         {
-            return Task.FromResult(result);
+            try
+            {
+                var list = await _db.Queryable<JZJBXX>()
+                    .Includes(x => x.jzml, q => q.jzwj)
+                    .FirstAsync(x => x.Id == jzid);
+
+                var data = mapper.Map<JZJBXXDto>(list);
+                result.result = data;
+                result.IsSucceed = true;
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return result;
         }
         /// <summary>
+        /// 一体机查询当前用户已有的 被同意的 预约阅卷信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("QueryReservedInfo")]
+        public async Task<Result> QueryReservedInfo()
+        {
+            try
+            {
+                logger.LogInformation("12312312312");
+                var list = await _db.Queryable<LawyerArchives>()
+                  .Where(x => x.lawyerId == _userdata.Id)
+                  .Where(x => x.status == 0)
+                  .Where(x => x.permissibleStartTime <= DateTime.Now && x.permissibleEndTime >= DateTime.Now)
+                  .ToListAsync();
+
+                var data = mapper.Map<IEnumerable<LawyerArchivesDto>>(list);
+                result.result = data;
+                result.IsSucceed = true;
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return result;
+        }
+
+        #endregion
+        #region HiddenApi
+        /// <summary>
         /// 添加卷宗信息
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        ///<remarks>
-        /// Get 把从QueryFileFromtwenty 接口获取的数据返回到这里
-        ///</remarks>
+        [HiddenApi]
         [HttpPost]
         [Route("AddArchivesInfo")]
         public async Task<Result<JZJBXXDto>> AddArchivesInfo(JZJBXXDto dto)
@@ -452,7 +421,102 @@ namespace _24Hour.Controllers.Common
                 return res;
             }
         }
+        /// <summary>
+        /// 同步外网预约信息（不需要调用此接口） 
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [HiddenApi]
+        [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>
+        /// <returns></returns>
+        [HttpGet]
+        [HiddenApi]
+        [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]
+        [HiddenApi]
+        [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 (System.Exception ex)
+            {
+                result.IsSucceed = false;
+            }
+            return Task.FromResult(result);
+        }
         #endregion
     }
 }

24Hour/Program.cs

@@ -20,6 +20,7 @@ using AutoMapper;
 using System.Reflection;
 using Elight.Entity;
 using _24Hour;
+using Microsoft.Extensions.DependencyInjection;
 
 #region builder
 
@@ -177,7 +178,10 @@ builder.Services.AddHttpClient<WechatMessagerClient>(opt =>
 {
     opt.BaseAddress = new Uri("https://api.weixin.qq.com/sns");
 });
-
+builder.Services.AddHttpClient<CaseServiceTwentyClient>(opt =>
+{
+    opt.BaseAddress = new Uri(Configuration.GetSection("CaseTwenty:SysAddress").Value);
+});
 //builder.Services.AddAuthorization();
 builder.Services.AddHttpContextAccessor();
 builder.Services.AddScoped<WebSocketController>();
@@ -195,6 +199,11 @@ builder.Services.AddScoped<SqlSugarClient>(sp =>
     });
     return db;
 });
+//添加httpclient 日志记录
+builder.Services.AddHttpLogging(logging =>
+{
+    logging.LoggingFields = Microsoft.AspNetCore.HttpLogging.HttpLoggingFields.All;
+});
 
 #region 定时任务
 // 配置Quartz.NET调度器
@@ -244,6 +253,9 @@ app.UseWebSockets(new WebSocketOptions
 app.UseStaticFiles();
 //app.UseHttpsRedirection();
 //路由
+
+//使用httpclient日志记录 必须在UseStaticFiles下面
+app.UseHttpLogging();
 app.UseRouting();
 app.UseAuthentication(); // 启用身份验证中间件
 app.UseAuthorization(); // 启用授权中间件

24Hour/appsettings.json

@@ -50,5 +50,11 @@
     "secret": "e752e4fba67526eca21313a18c96a58f",
     "secid": "e752e4fba67526eca21313a18c96a58f",
     "miniprogram_state": "trial"
+  },
+  "CaseTwenty": {
+    "SysAddress": "http://127.0.0.1"
+  },
+  "SyncDataFromJiguang": {
+    "enable": "false"
   }
 }

24Hour/datajson.txt

@@ -19,7 +19,7 @@
             "dwbm": "410503",
             "jzwj": [
                 {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c1",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -39,7 +39,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c2",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -59,7 +59,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c3",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -92,7 +92,7 @@
             "dwbm": "410503",
             "jzwj": [
                 {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c4",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -112,7 +112,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c5",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -132,7 +132,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c6",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -152,7 +152,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c7",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",

Elight.Entity/APPDto/Lawyer/JZMLDto.cs

@@ -17,6 +17,10 @@ namespace Elight.Entity.APPDto.Lawyer
     {
         public string? Id { get; set; }
         /// <summary>
+        /// 卷宗Id
+        /// </summary>
+        public string? jzId { get; set; }
+        /// <summary>
         /// 
         /// </summary>
         public string? taskid { get; set; }

Elight.Entity/APPDto/Lawyer/JZWJItemDto.cs

@@ -18,6 +18,12 @@ namespace Elight.Entity.APPDto.Lawyer
         /// 文件唯一标识
         /// </summary>
         public string? Id { get; set; }
+        /// <summary>
+        /// 卷宗目录Id
+        /// </summary>
+
+        public string? jzmlId { get; set; }
+
         public string? wjxh { get; set; }
 
         /// <summary>

Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs

@@ -12,70 +12,40 @@ namespace Elight.Entity.APPDto.Lawyer
     {
         [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; }
+        [DataMember]
+        public string? remake { get; set; }
+        [DataMember]
+        public DateTime? createTime { get; set; }
+        [DataMember]
+        public string? createrId { get; set; }
         /// <summary>
-        /// 备注
+        /// 是否删除：0：未删除、1：删除
         /// </summary>
         [DataMember]
-        public string? remake { get; set; }
+        public int? IsDeleted { get; set; } = 0;
     }
 }

Elight.Entity/AppMode/Lawyer/JZJBXX.cs

@@ -56,5 +56,10 @@ namespace Elight.Entity.AppMode.Lawyer
         /// 案件类别名称
         /// </summary>
         public string ajlbmc { get; set; }
+        /// <summary>
+        /// 导航
+        /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(JZML.jzId))]//BookA表中的studenId
+        public List<JZML> jzml { get; set; }//注意禁止给books手动赋值
     }
 }

Elight.Entity/AppMode/Lawyer/JZML.cs

@@ -22,6 +22,10 @@ namespace Elight.Entity.AppMode.Lawyer
         [SugarColumn(IsPrimaryKey = true)]
         public string Id { get; set; }
         /// <summary>
+        /// 卷宗Id
+        /// </summary>
+        public string? jzId { get; set; }
+        /// <summary>
         /// 
         /// </summary>
         public string taskid { get; set; }
@@ -65,6 +69,12 @@ namespace Elight.Entity.AppMode.Lawyer
         /// 单位编码
         /// </summary>
         public string dwbm { get; set; }
+
+        /// <summary>
+        /// 导航
+        /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(JZWJItem.jzmlId))]//BookA表中的studenId
+        public List<JZWJItem> jzwj { get; set; }//注意禁止给books手动赋值
     }
 
 

Elight.Entity/AppMode/Lawyer/JZWJItem.cs

@@ -23,6 +23,10 @@ namespace Elight.Entity.AppMode.Lawyer
         [DataMember]
         [SugarColumn(IsPrimaryKey = true)]
         public string Id { get; set; }
+        /// <summary>
+        /// 卷宗目录Id
+        /// </summary>
+        public string? jzmlId { get; set; }
         [DataMember]
         public string wjxh { get; set; }
         [DataMember]
@@ -69,7 +73,7 @@ namespace Elight.Entity.AppMode.Lawyer
         /// <summary>
         /// 文件顺序号  排序
         /// </summary>
-        public int wjsxh { get; set; }
+        public string wjsxh { get; set; }
         [DataMember]
         /// <summary>
         /// 文件显示名称   第二页

Elight.Entity/AuthManageProfile.cs

@@ -17,11 +17,7 @@ namespace Elight.Entity
             CreateMap<JZML, JZMLDto>().ReverseMap();
             CreateMap<JZWJItem, JZWJItemDto>().ReverseMap();
 
-            CreateMap<LawyerArchives, LawyerArchivesDto>().ReverseMap().ForAllMembers(opt =>
-            {
-                opt.UseDestinationValue();
-                opt.Condition((src, dest, srcm, destm) => srcm != null);
-            });
+            CreateMap<LawyerArchives, LawyerArchivesDto>().ReverseMap();
             CreateMap<App_LawyerServicesModel, QRLawyerServiceDto>().ReverseMap();
             CreateMap<App_Sys_UserModel, QRUserDto>().ReverseMap();
 

Elight.Logic/Job/QuartzHostedService.cs

@@ -2,6 +2,7 @@
 using Elight.Utility.logs;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Quartz;
 using Quartz.Spi;
 using SqlSugar;
@@ -19,16 +20,30 @@ namespace Elight.Logic.Job
         private readonly ISchedulerFactory _schedulerFactory;
         private readonly IJobFactory _jobFactory;
         private readonly WsJob _myJob;
+        private readonly IConfiguration configuration;
+        private readonly ILogger<QuartzHostedService> logger;
 
-        public QuartzHostedService(ISchedulerFactory schedulerFactory, IJobFactory jobFactory, WsJob myJob, IConfiguration configuration)
+        public QuartzHostedService(ISchedulerFactory schedulerFactory, IJobFactory jobFactory, WsJob myJob, IConfiguration _configuration, ILogger<QuartzHostedService> _logger)
         {
             _schedulerFactory = schedulerFactory;
             _jobFactory = jobFactory;
             _myJob = myJob;
+            this.configuration = _configuration;
+            this.logger = _logger;
         }
 
         public async Task StartAsync(CancellationToken cancellationToken)
         {
+            if (configuration.GetSection("SyncDataFromJiguang:enable").Value == "false")
+            {
+                logger.LogInformation("disabled data sync from jiguang api");
+                return;
+            }
+            else
+            {
+                logger.LogInformation("enable data sync from jiguang api ");
+            }
+
             try
             {
                 IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken);
@@ -63,7 +78,7 @@ namespace Elight.Logic.Job
             }
             catch (Exception ex)
             {
-                LogService.WriteLog(ex.Message+"___"+ex.InnerException, "同步程序错误");
+                LogService.WriteLog(ex.Message + "___" + ex.InnerException, "同步程序错误");
             }
             #endregion
         }

Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs

@@ -13,10 +13,6 @@ namespace Elight.Logic.Model.Lawyer
         /// </summary>
         public string Bmsah { get; set; }
         /// <summary>
-        /// 预约记录Id
-        /// </summary>
-        public string ServiceId { get; set; }
-        /// <summary>
         /// 被选中的三级id
         /// </summary>
         public List<string> Ids { get; set; }

Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs

@@ -17,11 +17,6 @@ namespace Elight.Logic.Model.Lawyer
         [DataMember]
         public string? Id { get; set; }
         /// <summary>
-        /// 预约Id
-        /// </summary>
-        [DataMember]
-        public string? lawyerservicesId { get; set; }
-        /// <summary>
         /// 部门受案号
         /// </summary>
         [DataMember]
@@ -37,11 +32,6 @@ namespace Elight.Logic.Model.Lawyer
         [DataMember]
         public string? unitCode { get; set; }
         /// <summary>
-        /// 预约类型
-        /// </summary>
-        [DataMember]
-        public string? reservationId { get; set; }
-        /// <summary>
         /// 接待人Id
         /// </summary>
         [DataMember]