对接2.0代理接口

24Hour/24Hour.csproj

@@ -47,6 +47,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<None Update="bgqyj.cn.pfx">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="caselist.txt">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>

24Hour/Controllers/Common/CommonController.cs

@@ -438,7 +438,30 @@ namespace _24Hour.Controllers.Common
             }
             return result;
         }
-
+        //[HttpGet]
+        //[Route("Countreservation")]
+        //public async Task<Result> Countreservation()
+        //{
+        //    var lawyerdata = await _db.Queryable<App_LawyerServicesModel>()
+        //            .Where(q => q.IsDeleted == 0)
+        //            .Where(q=>q.createuserId==_userdata.Id)
+        //            .Select(x => new
+        //            {
+        //                Id = x.Id,
+        //                state=x.state
+        //            })
+        //            .ToListAsync();
+        //    var lawyerwait = lawyerdata.Count(x => x.state == 0);
+        //    var lawyeragree = lawyerdata.Count(x => x.state == 1);
+        //    var lawyerdisagree = lawyerdata.Count(x => x.state == 2);
+        //    var lawyerended = lawyerdata.Count(x => x.state == 3);
+        //    result.IsSucceed = true;
+        //    result.result = new
+        //    {
+        //        all= lawyerwait+ lawyeragree + lawyerdisagree + lawyerended
+        //    };
+        //    return result;
+        //}
         /// <summary>
         /// app---根据当前登录人获取所有预约信息--type类型为：0律师服务，1远程会见，2远程接待
         /// </summary>

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using AutoMapper.Internal;
 using com.sun.xml.@internal.bind.v2.model.core;
+using Dto;
 using Elight.Entity;
 using Elight.Entity.APPDto.Lawyer;
 using Elight.Entity.AppMode.Lawyer;
@@ -519,6 +520,307 @@ namespace _24Hour.Controllers.Common
             return result;
         }
         /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="bmsah">部门受案号</param>
+        /// <param name="unitcode">单位编码</param>
+        /// <param name="PartyIdCard">当事人身份证</param>
+        /// <remarks>
+        /// 查询当事人信息，如果返回的集合为0，提示 当事人信息不存在，请注意核实当事人信息
+        /// request:安北检刑诉受[2023]410503000002号,410503,410502199606164872
+        /// response:
+        /// {
+        ///  "result": {
+        ///    "endRow": 1,
+        ///    "firstPage": 1,
+        ///    "hasNextPage": false,
+        ///    "isFirstPage": true,
+        ///    "isLastPage": true,
+        ///    "lastPage": 1,
+        ///    "list": [
+        ///      {
+        ///        "bmsah": "安北检刑诉受[2023]410503000002号",
+        ///        "gjdm": "9911180200001",
+        ///        "gjmc": "中国",
+        ///        "mzdm": "9912180100001",
+        ///        "mzmc": "汉族",
+        ///        "xbdm": "9909180000001",
+        ///        "xbmc": "男性",
+        ///        "xm": "李四",
+        ///        "zjhm": "410502199606164872",
+        ///        "zjlxdm": "9910180300001",
+        ///        "zjlxmc": "居民身份证",
+        ///        "zrrbm": "4105030323000001",
+        ///        "zrrlxdm": "0009000900001",
+        ///        "zrrlxmc": "嫌疑人"
+        ///      }
+        ///    ],
+        ///    "navigateFirstPage": 1,
+        ///    "navigateLastPage": 1,
+        ///    "navigatePages": 8,
+        ///    "navigatepageNums": [
+        ///      1
+        ///    ],
+        ///    "nextPage": 0,
+        ///    "pageNum": 1,
+        ///    "pageSize": 20,
+        ///    "pages": 1,
+        ///    "prePage": 0,
+        ///    "size": 1,
+        ///    "startRow": 1,
+        ///    "total": 1
+        ///  },
+        ///  "IsSucceed": true,
+        ///  "Message": "操作成功"
+        ///}
+        /// </remarks>
+        /// <returns></returns>
+
+        [HttpGet]
+        [Route("QueryDsrList")]
+        public async Task<Result> QueryDsrList(string bmsah, string unitcode, string PartyIdCard)
+        {
+            return await twentyClient.QueryDsrList(bmsah, unitcode, PartyIdCard);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="identityCardId">律师职业资格证书id</param>
+        /// <remarks>
+        /// 查询律师信息，如果返回的集合为0，提示 律师信息不存在，请注意核实律师信息
+        /// 
+        /// request：123445788876677
+        /// repones:
+        ///{
+        ///  "result": {
+        ///    "content": [
+        ///      {
+        ///        "cjsj": "2021-01-12T16:12:34.004+0800",
+        ///        "djdwbm": "410403",
+        ///        "djdwmc": "卫东区院",
+        ///        "jmsfzh": "123345666777778",
+        ///        "lxdh": null,
+        ///        "lxdz": null,
+        ///        "sfsc": "N",
+        ///        "sjbsbh": "8cdbeb3ce3da483780b4e1acf60677e0",
+        ///        "sjly": "3",
+        ///        "sqrbh": "42b84c481b734f52b37d5b99157057f4",
+        ///        "sqrlxdm": "1403187300001",
+        ///        "sqrlxmc": "辩护人",
+        ///        "sqrsfdm": "1404187300003",
+        ///        "sqrsfmc": "律师",
+        ///        "sqrxm": "张能能",
+        ///        "szlssws": "河南千会律师事务所",
+        ///        "tyshxydm": null,
+        ///        "zbls": null,
+        ///        "zhxgsj": "2021-01-21T15:10:51.982+0800",
+        ///        "zjhm": "123445788876677",
+        ///        "zjlxdm": "9910180300010",
+        ///        "zjlxmc": "律师执业证",
+        ///        "zyzh": null
+        ///      }
+        ///    ],
+        ///    "empty": false,
+        ///    "first": true,
+        ///    "last": true,
+        ///    "number": 0,
+        ///    "numberOfElements": 1,
+        ///    "pageable": {
+        ///      "offset": 0,
+        ///      "pageNumber": 0,
+        ///      "pageSize": 20,
+        ///      "paged": true,
+        ///      "unpaged": false,
+        ///      "sort": {
+        ///        "empty": false,
+        ///        "sorted": true,
+        ///        "unsorted": false
+        ///      }
+        ///    },
+        ///    "size": 20,
+        ///    "sort": {
+        ///    "empty": false,
+        ///      "sorted": true,
+        ///      "unsorted": false
+        ///    },
+        ///    "totalPages": 1,
+        ///    "totalElements": 1
+        ///  },
+        ///  "IsSucceed": true,
+        ///  "Message": "操作成功"
+        ///}
+        /// </remarks>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("QueryLsList")]
+        public async Task<Result<FindSqrxxDto>> QueryLsList(string identityCardId)
+        {
+            return await twentyClient.QueryLsList(identityCardId);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="input"></param>
+        /// <remarks>
+        /// request
+        ///{
+        ///  "Bmsah": "安北检刑诉受[2023]410503000002号",
+        ///  "UnitCode": "410503",
+        ///  "UnitName": "北关区检",
+        ///  "PartyIdCard": "410502199606164872",
+        ///  "PartyConsignor": "李四",
+        ///  "ProposerZJHM": "11111111111111111111111",
+        ///  "ProposerType": "",
+        ///  "ProposerTel": "123321",
+        ///  "ProposerSCC": "12545",
+        ///  "Wtr": "委托人",
+        ///  "Wtrydsrgxdm": "1424000000100",
+        ///  "Wtrydsrgxmc": "本人",
+        ///  "Zbls": "",
+        ///  "Lxdh": "",
+        ///  "Lxdz": ""
+        ///}
+        /// 
+        /// reponse
+        /// {
+        ///  "result": {
+        ///    "ajcbdwbm": "410503",
+        ///    "ajcbdwmc": "北关区检",
+        ///    "ajmc": "李四涉嫌故意伤害案",
+        ///    "bhdlbh": "2939f29f83dc4abaa6a1936014ebd46e",
+        ///    "bmsah": "安北检刑诉受[2023]410503000002号",
+        ///    "czr": "曲超艺",
+        ///    "czrybm": "4105030058",
+        ///    "dwbm": "410503",
+        ///    "flyznr": "",
+        ///    "sfagdj": "Y",
+        ///    "sfflyz": "N",
+        ///    "sqrbh": "53b591f325e34edcaf8ef097bb418a1e",
+        ///    "wfwgqkdm": "",
+        ///    "wfwgqkmc": "",
+        ///    "wfwgqknr": "",
+        ///    "wtr": "啦啦啦",
+        ///    "wtrydsrgxdm": "1424000000200",
+        ///    "wtrydsrgxmc": "近亲属",
+        ///    "zbls": "string",
+        ///    "zrrbm": "4105030323000001",
+        ///    "bhdlYxSqrInsertInputDto": {
+        ///      "djdwbm": "410423",
+        ///      "djdwmc": "鲁山县院",
+        ///      "jmsfzh": "123123193909161111",
+        ///      "lxdh": "string",
+        ///      "lxdz": "string",
+        ///      "sfgxlsk": false,
+        ///      "sqrlxdm": "1403187300001",
+        ///      "sqrlxmc": "辩护人",
+        ///      "sqrsfdm": "1404187300003",
+        ///      "sqrsfmc": "律师",
+        ///      "sqrxm": "王五",
+        ///      "szlssws": "大润发律所",
+        ///      "tyshxydm": null,
+        ///      "zjhm": "112313113434314134134",
+        ///      "zjlxdm": "9910180300010",
+        ///      "zjlxmc": "律师执业证"
+        ///    }
+        ///  },
+        ///  "IsSucceed": true,
+        ///  "Message": null
+        ///}
+        ///</remarks>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Register")]
+        public async Task<Result<SaveBhdlDjxxDto>> Register(RegisterDto input)
+        {
+            return await twentyClient.Register(input);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="input"></param>
+        /// <remarks>
+        /// request:{
+        ///  "bhdlbh": "2939f29f83dc4abaa6a1936014ebd46e",
+        ///  "bmsah": "安北检刑诉受[2023]410503000002号",
+        ///  "clqkbm": "",
+        ///  "clqkmc": "",
+        ///  "czr": "曲超艺",
+        ///  "czrybm": "4105030058",
+        ///  "dwbm": "410503",
+        ///  "jwgksxid": "",
+        ///  "sqrlxdm": "1403187300001",
+        ///  "sqrmc": "王五",
+        ///  "sqrq": "2023-11-30",
+        ///  "sqrsfdm": "1404187300003",
+        ///  "sxlxdm": "1405187400001",
+        ///  "sxlxmc": "申请阅卷",
+        ///  "zrrmc": "李四"
+        ///}
+        /// reponse:
+        /// {
+        ///  "result": {
+        ///    "ApplyMarKingDto": {
+        ///      "bhdlbh": "e027a707f262435d9fc29b080101beed",
+        ///      "bmsah": "安北检刑诉受[2023]410503000002号",
+        ///      "clqkbm": "",
+        ///      "clqkmc": "",
+        ///      "czr": "曲超艺",
+        ///      "czrybm": "4105030058",
+        ///      "dwbm": "410503",
+        ///      "jwgksxid": "",
+        ///      "sqrlxdm": "1403187300001",
+        ///      "sqrmc": "辩护人",
+        ///      "sqrq": "2023-11-30",
+        ///      "sqrsfdm": "1404187300003",
+        ///      "sxlxdm": "1405187400001",
+        ///      "sxlxmc": "申请阅卷",
+        ///      "zrrmc": "李四"
+        ///    },
+        ///    "sxbh": "5d89f1bd6df142aeb6d4d7582116811a"
+        ///  },
+        ///  "IsSucceed": true,
+        ///  "Message": null
+        ///}
+        ///</remarks>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("ApplyMarKing")]
+        public async Task<Result> ApplyMarKing(ApplyMarKingDto input)
+        {
+            return await twentyClient.ApplyMarKing(input);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="input"></param>
+        /// <remarks>
+        /// request
+        /// {
+        ///  "bhdlbh": "2939f29f83dc4abaa6a1936014ebd46e",
+        ///  "bmsah": "安北检刑诉受[2023]410503000002号",
+        ///  "dwbm": "410503",
+        ///  "fydysl": "",
+        ///  "fzfsdm": "",
+        ///  "fzfsmc": "",
+        ///  "jzztxsdm": "",
+        ///  "jzztxsmc": "",
+        ///  "sxbh": "5d89f1bd6df142aeb6d4d7582116811a",
+        ///  "yjfsdm": "",
+        ///  "yjfsmc": "",
+        ///  "yjjzsj": "2023-11-30",
+        ///  "yjkssj": "2023-12-30"
+        ///}
+        ///
+        ///reponse true 流程结束
+        ///</remarks>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Arrange")]
+        public async Task<Result> Arrange(ArrangeDto input)
+        {
+            return await twentyClient.Arrange(input);
+        }
+        /// <summary>
         /// PC端根据卷宗id获取卷宗信息
         /// </summary>
         /// <param name="jzid"></param>
@@ -1282,7 +1584,7 @@ namespace _24Hour.Controllers.Common
                     }
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 result.Message = ex.Message;
                 result.IsSucceed = false;
@@ -1442,7 +1744,7 @@ namespace _24Hour.Controllers.Common
                 result.IsSucceed = true;
                 return result;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 result.IsSucceed = false;
                 result.Message = ex.Message;

24Hour/Program.cs

@@ -76,12 +76,16 @@ builder.Services.AddSwaggerGen(c =>
     var xmlPath = Path.Combine(basePath, "24Hour.xml");
     var xmlPathentity = Path.Combine(basePath, "Elight.Entity.xml");
     var xmlPathlogic = Path.Combine(basePath, "Elight.Logic.xml");
+    var xmlDto = Path.Combine(basePath, "Dto.xml");
     if (File.Exists(xmlPath))//避免没有该文件时报错
         c.IncludeXmlComments(xmlPath, true);
     if (File.Exists(xmlPathentity))//避免没有该文件时报错
         c.IncludeXmlComments(xmlPathentity, true);
     if (File.Exists(xmlPathlogic))//避免没有该文件时报错
         c.IncludeXmlComments(xmlPathlogic, true);
+    if (File.Exists(xmlDto))//避免没有该文件时报错
+        c.IncludeXmlComments(xmlDto, true);
+
     //添加Jwt验证设置
     c.AddSecurityRequirement(new OpenApiSecurityRequirement()
                         {
@@ -233,8 +237,10 @@ builder.Services.TryAddSingleton<YgJob>();
 builder.Services.AddHostedService<QuartzHostedService>(); // 注册Quartz.NET的托管服务
 
 
+
 builder.Logging.AddLog4Net("log4net.config");
 
+
 //Task.Factory.StartNew(() =>
 //{
 //    try

24Hour/TwentySystemProxyClient.cs

@@ -34,6 +34,156 @@ namespace _24Hour
             var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
             return response.ConvertToModel<Result>();
         }
+        public async Task<Result<SaveBhdlDjxxDto>> Register(RegisterDto dto)
+        {
+            var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/Register", dto);
+            var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
+            return response.ConvertToModel<Result<SaveBhdlDjxxDto>>();
+        }
+        public async Task<Result<AjgldsrxxDto>> QueryDsrList(string Bmsah, string UnitCode, string PartyIdCard)
+        {
+
+            var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
+            var bodu = new
+            {
+                Bmsah = Bmsah,
+                UnitCode = UnitCode,
+                PartyIdCard = PartyIdCard
+            }.ConvertToGetParam();
+
+
+            var response = await Task.Run(async () =>
+            {
+       
+                if (UseOfflineData == "true")
+                {
+                    var json = "{\"data\":{\"endRow\":1,\"firstPage\":1,\"hasNextPage\":false,\"isFirstPage\":true,\"isLastPage\":true,\"lastPage\":1,\"list\":[{\"bmsah\":\"安北检刑诉受[2023]410503000002号\",\"gjdm\":\"9911180200001\",\"gjmc\":\"中国\",\"mzdm\":\"9912180100001\",\"mzmc\":\"汉族\",\"xbdm\":\"9909180000001\",\"xbmc\":\"男性\",\"xm\":\"李四\",\"zjhm\":\"410502199606164872\",\"zjlxdm\":\"9910180300001\",\"zjlxmc\":\"居民身份证\",\"zrrbm\":\"4105030323000001\",\"zrrlxdm\":\"0009000900001\",\"zrrlxmc\":\"嫌疑人\"}],\"navigateFirstPage\":1,\"navigateLastPage\":1,\"navigatePages\":8,\"navigatepageNums\":[1],\"nextPage\":0,\"pageNum\":1,\"pageSize\":20,\"pages\":1,\"prePage\":0,\"size\":1,\"startRow\":1,\"total\":1},\"code\":\"0\",\"success\":true,\"message\":\"操作成功\"}";
+                    return json;
+                }
+                else
+                {
+                    var request = await httpCliet.GetAsync($"/TwentySystem/DsrList{bodu}");
+                    return await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
+                }
+            });
+            var data = response.ConvertToAnonymousType(new
+            {
+                message = default(string),
+                success = default(bool),
+                code = default(string),
+                data = default(AjgldsrxxDto)
+            });
+            Result<AjgldsrxxDto> result = new Result<AjgldsrxxDto>();
+            if (data?.success == true)
+            {
+                result.IsSucceed = true;
+                result.Message = "操作成功";
+                result.result = data?.data;
+            }
+            else
+            {
+                result.IsSucceed = false;
+                result.Message = data?.message ?? "操作失败";
+            }
+            if (UseOfflineData=="true")
+            {
+                result.Message = "操作成功(测试数据)";
+            }
+            return result;
+
+        }
+        public async Task<Result<FindSqrxxDto>> QueryLsList(string ProposerZJHM)
+        {
+            var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
+            var bodu = new
+            {
+                ProposerZJHM = ProposerZJHM,
+            }.ConvertToGetParam();
+            var response = await Task.Run(async () =>
+            {
+          
+                if (UseOfflineData == "true")
+                {
+                    var json = "{\"data\":{\"content\":[{\"cjsj\":\"2021-01-12T16:12:34.004+0800\",\"djdwbm\":\"410403\",\"djdwmc\":\"卫东区院\",\"jmsfzh\":\"123345666777778\",\"lxdh\":null,\"lxdz\":null,\"sfsc\":\"N\",\"sjbsbh\":\"8cdbeb3ce3da483780b4e1acf60677e0\",\"sjly\":\"3\",\"sqrbh\":\"42b84c481b734f52b37d5b99157057f4\",\"sqrlxdm\":\"1403187300001\",\"sqrlxmc\":\"辩护人\",\"sqrsfdm\":\"1404187300003\",\"sqrsfmc\":\"律师\",\"sqrxm\":\"张能能\",\"szlssws\":\"河南千会律师事务所\",\"tyshxydm\":null,\"zbls\":null,\"zhxgsj\":\"2021-01-21T15:10:51.982+0800\",\"zjhm\":\"123445788876677\",\"zjlxdm\":\"9910180300010\",\"zjlxmc\":\"律师执业证\",\"zyzh\":null}],\"empty\":false,\"first\":true,\"last\":true,\"number\":0,\"numberOfElements\":1,\"pageable\":{\"offset\":0,\"pageNumber\":0,\"pageSize\":20,\"paged\":true,\"unpaged\":false,\"sort\":{\"empty\":false,\"sorted\":true,\"unsorted\":false}},\"size\":20,\"sort\":{\"empty\":false,\"sorted\":true,\"unsorted\":false},\"totalPages\":1,\"totalElements\":1},\"code\":\"0\",\"success\":true,\"message\":\"操作成功\"}";
+                    return json;
+                }
+                else
+                {
+                    var request = await httpCliet.GetAsync($"/TwentySystem/DsrList{bodu}");
+                    return await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
+                }
+            });
+            var data = response.ConvertToAnonymousType(new
+            {
+                message = default(string),
+                success = default(bool),
+                code = default(string),
+                data = default(FindSqrxxDto)
+            });
+            Result<FindSqrxxDto> result = new Result<FindSqrxxDto>();
+            if (data?.success == true)
+            {
+                result.IsSucceed = true;
+                result.Message = "操作成功";
+                result.result = data?.data;
+            }
+            else
+            {
+                result.IsSucceed = false;
+                result.Message = data?.message ?? "操作失败";
+            }
+            if (UseOfflineData=="true")
+            {
+                result.Message = "操作成功(测试数据)";
+            }
+            return result;
+        }
+        public async Task<Result<ApplyMarKingBackDto>> ApplyMarKing(ApplyMarKingDto dto)
+        {
+            var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
+           
+            var response = await Task.Run(async () =>
+            {
+
+                if (UseOfflineData == "true")
+                {
+                    var json = "{\"result\":{\"applyMarKingDto\":{\"bhdlbh\":\"e027a707f262435d9fc29b080101beed\",\"bmsah\":\"安北检刑诉受[2023]410503000002号\",\"clqkbm\":\"\",\"clqkmc\":\"\",\"czr\":\"曲超艺\",\"czrybm\":\"4105030058\",\"dwbm\":\"410503\",\"jwgksxid\":\"\",\"sqrlxdm\":\"1403187300001\",\"sqrmc\":\"辩护人\",\"sqrq\":\"2023-11-30\",\"sqrsfdm\":\"1404187300003\",\"sxlxdm\":\"1405187400001\",\"sxlxmc\":\"申请阅卷\",\"zrrmc\":\"李四\"},\"sxbh\":\"5d89f1bd6df142aeb6d4d7582116811a\"},\"isSucceed\":true,\"message\":null}";
+                    return json;
+                }
+                else
+                {
+                    var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/ApplyMarKing", dto);
+                    var res=  await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
+                    return res;
+                }
+            });
+
+            return response.ConvertToModel<Result<ApplyMarKingBackDto>>();
+        }
+        public async Task<Result> Arrange(ArrangeDto dto)
+        {
+            var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
+            
+
+            var response = await Task.Run(async () =>
+            {
+
+                if (UseOfflineData == "true")
+                {
+                    var json = "{\"isSucceed\":true,\"message\":null,\"result\":null}";
+                    return json;
+                }
+                else
+                {
+                    var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/Arrange", dto);
+                    var res = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
+                    return res;
+                }
+            });
+
+            return response.ConvertToModel<Result>();
+        }
+
         
     public async Task<Result<QueryResult<CaseInfo>>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size)
         {
@@ -53,7 +203,7 @@ namespace _24Hour
                 var response = await Task.Run(async () =>
                 {
                     var connectionString = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
-                    if (connectionString=="false")
+                    if (connectionString == "false")
                     {
                         var request = await httpCliet.GetAsync($"/TwentySystem/GetCaseInfo{param}");
                         var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
@@ -61,7 +211,7 @@ namespace _24Hour
                     }
                     else
                     {
-                        return await File.ReadAllTextAsync(Path.Combine(Environment.CurrentDirectory,"caselist.txt"));
+                        return await File.ReadAllTextAsync(Path.Combine(Environment.CurrentDirectory, "caselist.txt"));
                     }
                 });
                 if (string.IsNullOrEmpty(response) == false)
@@ -109,7 +259,7 @@ namespace _24Hour
         public async Task<Result<JZJBXXDto>> GetArchivesInfo(string bmsah, string dwbm)
         {
             var result = new Result<JZJBXXDto>();
-
+            var connectionString = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
             //var path = Path.Combine(Environment.CurrentDirectory, "datajson.txt");
             //var json = await System.IO.File.ReadAllTextAsync(path);
             var param = new
@@ -119,9 +269,9 @@ namespace _24Hour
             }.ConvertToGetParam();
 
 
-            var json = await Task.Run(async() =>
+            var json = await Task.Run(async () =>
             {
-                var connectionString = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
+            
                 if (connectionString == "false")
                 {
                     var request = await httpCliet.GetAsync($"/TwentySystem/GetJZXX{param}");
@@ -175,6 +325,7 @@ namespace _24Hour
                 result.Message = res.Message;
             }
            
+
             return result;
         }
         public class Paging<T>

24Hour/appsettings.json

@@ -8,7 +8,7 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     "DBType": "MySQL",
-        "MySQLConnString": "server=192.168.0.251;Database=equipmentrearend;Uid=root;Pwd=sa@admin;Allow User Variables=True;SslMode=none;AllowPublicKeyRetrieval=True;"
+    "MySQLConnString": "server=127.0.0.1;Database=equipmentrearend;Uid=root;Pwd=insght;Allow User Variables=True;SslMode=none;AllowPublicKeyRetrieval=True;"
   },
   //JwtConfig
   "JwtConfiguration": {
@@ -41,6 +41,20 @@
     "DomainUrl": "http://localhost:8006",
     "HubCorUrls": []
   },
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://localhost:8095"
+      },
+      "Https": {
+        "Url": "https://localhost:8099",
+        "Certificate": {
+          "Path": "bgqyj.cn.pfx",
+          "Password": "l8717f1v9q7h"
+        }
+      }
+    }
+  },
   "Videoaddress": {
     "rtmp": "rtmp://192.168.0.24:1935/live/",
     "rtsp": "rtsp://192.168.0.24:8554/live/"
@@ -53,7 +67,9 @@
   },
   "CaseTwenty": {
     "SysAddress": "http://127.0.0.1:5194",
-    "UseOfflineData": "true"
+    "UseOfflineData": "true",
+    "UnitCode": 410503,
+    "UnitName": "北关区院"
   },
   "SyncDataFromJiguang": {
     "enable": "false"

24Hour/build/dockerbuild.txt

@@ -97,7 +97,14 @@ docker run --name mysql -p 3306:3306 \
 
 
 
-
+docker pull mcr.microsoft.com/dotnet/samples:aspnetapp
+
+docker run --rm -it -p 8000:80 -p 8098:443 
+-e ASPNETCORE_URLS="https://+;http://+" 
+-e ASPNETCORE_HTTPS_PORT=8001 
+-e ASPNETCORE_Kestrel__Certificates__Default__Password="<CREDENTIAL_PLACEHOLDER>" 
+-e ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx 
+-v ${HOME}/.aspnet/https:/https/ mcr.microsoft.com/dotnet/samples:aspnetapp
 
 
 

Dto/Dto.csproj

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

Dto/RegisterDto.cs

@@ -21,7 +21,7 @@ namespace Dto
 
 
         /// <summary>
-        /// 单位编码
+        /// 单位名称 北关区院
         /// </summary>
         public string UnitName { get; set; }
 
@@ -37,10 +37,10 @@ namespace Dto
         public string PartyConsignor { get; set; }
 
 
-        /// <summary>
+        ///// <summary>
-        /// 当事人-委托人关系
+        ///// 当事人-委托人关系
-        /// </summary>
+        ///// </summary>
-        public string PartyPrincipalRelationship { get; set; }
+        //public string PartyPrincipalRelationship { get; set; }
 
 
         /// <summary>
@@ -51,6 +51,7 @@ namespace Dto
 
         /// <summary>
         /// 申请人类型
+        /// { "dm":"1403187300001",,"mc":"辩护人"}
         /// </summary>
 
         public string ProposerType { get; set; }
@@ -61,7 +62,7 @@ namespace Dto
         /// </summary>
         public string ProposerTel { get; set; }
 
-
+        //{"code":"0","success":true,"message":"操作成功","data":[{"lbbm":"1404","fldmList":[{"dm":"1404187300003","fdm":"-1","mc":"律师","lbbm":"1404","sm":null,"xh":null},{"dm":"1404187300004","fdm":"-1","mc":"嫌疑人的监护人","lbbm":"1404","sm":null,"xh":null},{ "dm":"1404187300005","fdm":"-1","mc":"嫌疑人亲友","lbbm":"1404","sm":null,"xh":null},{ "dm":"1404187300006","fdm":"-1","mc":"人民团体或者所在单位推荐的人","lbbm":"1404","sm":null,"xh":null}]},{ "lbbm":"1425","fldmList":[{ "dm":"1425000000100","fdm":"-1","mc":"违反电子卷宗保密规定","lbbm":"1425","sm":null,"xh":null},{ "dm":"1425000009900","fdm":"-1","mc":"其他","lbbm":"1425","sm":null,"xh":null}]},{ "lbbm":"1403","fldmList":[{ "dm":"1403187300001","fdm":"-1","mc":"辩护人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300002","fdm":"-1","mc":"诉讼代理人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300010","fdm":"-1","mc":"犯罪嫌疑人(被告人)","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300011","fdm":"-1","mc":"犯罪嫌疑人（被告人)法定代理人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300012","fdm":"-1","mc":"犯罪嫌疑人(被告人)近亲属","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300013","fdm":"-1","mc":"被害人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300014","fdm":"-1","mc":"被害人法定代理人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300015","fdm":"-1","mc":"被害人近亲属","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300016","fdm":"-1","mc":"其他","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300017","fdm":"-1","mc":"其他当事人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300018","fdm":"-1","mc":"其他当事人法定代理人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300019","fdm":"-1","mc":"其他当事人委托代理人","lbbm":"1403","sm":null,"xh":null},{ "dm":"1403187300020","fdm":"-1","mc":"其他当事人近亲属","lbbm":"1403","sm":null,"xh":null}]},{ "lbbm":"1424","fldmList":[{ "dm":"1424000000100","fdm":"-1","mc":"本人","lbbm":"1424","sm":null,"xh":null},{ "dm":"1424000000200","fdm":"-1","mc":"近亲属","lbbm":"1424","sm":null,"xh":null},{ "dm":"1424000000300","fdm":"-1","mc":"监护人","lbbm":"1424","sm":null,"xh":null}]},{ "lbbm":"9910","fldmList":[{ "dm":"9910180300001","fdm":"-1","mc":"居民身份证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300002","fdm":"-1","mc":"军官证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300003","fdm":"-1","mc":"士兵证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300005","fdm":"-1","mc":"警官证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300006","fdm":"-1","mc":"工作证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300007","fdm":"-1","mc":"护照","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300008","fdm":"-1","mc":"户口簿","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300009","fdm":"-1","mc":"其他证件","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300010","fdm":"-1","mc":"律师执业证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300011","fdm":"-1","mc":"无证件","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300012","fdm":"-1","mc":"统一社会信用代码","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300013","fdm":"-1","mc":"组织机构代码","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300014","fdm":"-1","mc":"台湾居民居住证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300017","fdm":"-1","mc":"台湾身份证","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300018","fdm":"-1","mc":"港澳证件","lbbm":"9910","sm":null,"xh":null},{ "dm":"9910180300019","fdm":"-1","mc":"台湾居民来往大陆通行证","lbbm":"9910","sm":null,"xh":null}]}]}
         /// <summary>
         /// 律师事务所统一社会信用代码	
         /// </summary>
@@ -74,6 +75,9 @@ namespace Dto
         public string Wtr { get; set; }
         /// <summary>
         /// 委托人与当事人关系
+        /// { "dm":"1424000000100","mc":"本人",},
+        /// { "dm":"1424000000200","mc":"近亲属"}
+        /// { "dm":"1424000000300","mc":"监护人"}
         /// </summary>
         public string Wtrydsrgxdm { get; set; }
         /// <summary>
@@ -84,10 +88,13 @@ namespace Dto
         /// 值班律师
         /// </summary>
         public string Zbls { get; set; }
-
+        /// <summary>
-
+        /// 律师联系电话
+        /// </summary>
         public string Lxdh { get; set; }
-
+        /// <summary>
+        /// 律师联系地址
+        /// </summary>
         public string Lxdz { get; set; }
     }
 }

Dto/obj/Debug/net6.0/Dto.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f9c18559eda95e06ad72c50817c8719331c1dbf8
+6045bad44ea6ca22bfa9bf856af27786e542aa85

Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs

@@ -12,6 +12,8 @@ namespace Elight.Entity.APPDto.Lawyer
     {
         [DataMember]
         public string? Id { get; set; }
+        [DataMember]
+        public string? lawyerserviceId { get; set; }
         /// <summary>
         /// 卷宗id
         /// </summary>

Elight.Entity/AppMode/Lawyer/LawyerArchives.cs

@@ -17,6 +17,8 @@ namespace Elight.Entity.AppMode.Lawyer
         [SugarColumn(IsPrimaryKey = true)]
         public string? Id { get; set; }
         [DataMember]
+        public string? lawyerserviceId { get; set; }
+        [DataMember]
         public string? unitcode { get; set; }
         [DataMember]
         public string? jzlbxxId { get; set; }

WebApplication1/Controllers/TwentySystemController.cs

@@ -314,7 +314,7 @@ namespace WebApplication1.Controllers
         /// 申请人资格资料
         /// </summary>
         /// <returns></returns>
-        [HttpPost("UploadImage")]
+        [HttpPost]
         public async Task<Result> UploadImage([FromBody] UploadDto dto)
         {
             //   var client = new HttpClient();
@@ -513,7 +513,7 @@ namespace WebApplication1.Controllers
         /// <param name="UnitCode"></param>
         /// <param name="PartyIdCard"></param>
         /// <returns></returns>
-        [HttpGet("DsrList")]
+        [HttpGet]
         public async Task<ResultDataDto<AjgldsrxxDto>> DsrList(string Bmsah, string UnitCode, string PartyIdCard)
         {
             ResultDataDto<AjgldsrxxDto> result = new ResultDataDto<AjgldsrxxDto>();
@@ -545,7 +545,7 @@ namespace WebApplication1.Controllers
         /// </summary>
         /// <param name="ProposerZJHM"></param>
         /// <returns></returns>
-        [HttpGet("LsList")]
+        [HttpGet]
         public async Task<ResultDataDto<FindSqrxxDto>> LsList(string ProposerZJHM)
         {
             ResultDataDto<FindSqrxxDto> result = new ResultDataDto<FindSqrxxDto>();
@@ -573,7 +573,7 @@ namespace WebApplication1.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPost("Register")]
+        [HttpPost]
         public async Task<Result<SaveBhdlDjxxDto>> Register([FromBody] RegisterDto dto)
         {
             Result<SaveBhdlDjxxDto> result = new Result<SaveBhdlDjxxDto>();
@@ -798,7 +798,7 @@ namespace WebApplication1.Controllers
         /// 申请阅卷
         /// </summary>
         /// <returns></returns>
-        [HttpPost("ApplyMarKing")]
+        [HttpPost]
         public async Task<Result<ApplyMarKingBackDto>> ApplyMarKing([FromBody] ApplyMarKingDto dto)
         {
             Result<ApplyMarKingBackDto> result = new Result<ApplyMarKingBackDto>();
@@ -947,7 +947,7 @@ namespace WebApplication1.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPost("Arrange")]
+        [HttpPost]
         public async Task<Result> Arrange([FromBody] ArrangeDto dto)
         {
             Result result = new Result();
@@ -1001,6 +1001,7 @@ namespace WebApplication1.Controllers
                 result.Message = "数据不存在";
                 return result;
             }
+            result.IsSucceed = true;
             return result;
         }
         /// 将 Stream 转成 byte[]

WebApplication1/Program.cs

@@ -9,9 +9,6 @@ builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 builder.Services.AddHttpClient();
 
-#if DEBUG
-//builder.WebHost.UseUrls("http://143.122.26.141:5194", "http://127.0.0.1:5194");
-#endif
 
 var app = builder.Build();
 // Configure the HTTP request pipeline.

WebApplication1/WebApplication1.csproj.user

@@ -4,7 +4,7 @@
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup>
-    <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
+    <ActiveDebugProfile>WebApplication1</ActiveDebugProfile>
     <NameOfLastUsedPublishProfile>C:\Users\callm\source\repos\24Hour.Service\WebApplication1\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

WebApplication1/appsettings.json

@@ -10,5 +10,12 @@
   "Configs": {
     "SystemIp": "143.120.5.25",
     "Port": "8080"
+  },
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://localhost:5194"
+      }
+    }
   }
 }

WebApplication1/bin/Debug/net6.0/appsettings.json

@@ -10,5 +10,12 @@
   "Configs": {
     "SystemIp": "143.120.5.25",
     "Port": "8080"
+  },
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://localhost:5194"
+      }
+    }
   }
 }

WebApplication1/obj/Debug/net6.0/WebApplication1.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-2374669d97bc9eeebd97d909453e867df6a39cf9
+8378dafa38f67d32207740853ec5ef0f4d2b6e14