From d4a59e882a1dcababffd6d41e637838ff8811d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=BD=87=E9=98=B3?= Date: Fri, 2 Feb 2024 14:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8D=B7=E5=AE=97=E7=9A=84=E5=BE=8B=E5=B8=88=E7=9A=84?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/24Hour.csproj | 4 +-- .../LawyerArchivesUnAuthorizeController.cs | 30 ++++++++++++++++++- 24Hour/appsettings.json | 2 +- 24Hour/build/dockerbuild.txt | 8 ++--- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj index e88f844..e7147b3 100644 --- a/24Hour/24Hour.csproj +++ b/24Hour/24Hour.csproj @@ -8,8 +8,8 @@ True e485308c-2f05-470b-b0a4-68f1ec2b3412 Linux - 1.0.3.14 - 1.0.3.14 + 1.0.3.15 + 1.0.3.15 diff --git a/24Hour/Controllers/Common/LawyerArchivesUnAuthorizeController.cs b/24Hour/Controllers/Common/LawyerArchivesUnAuthorizeController.cs index 077b2b1..b79d223 100644 --- a/24Hour/Controllers/Common/LawyerArchivesUnAuthorizeController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesUnAuthorizeController.cs @@ -11,6 +11,7 @@ using java.util; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SqlSugar; +using SqlSugar.Extensions; using System.Text; using static _24Hour.Controllers.Common.LawyerArchivesController; @@ -55,6 +56,31 @@ namespace _24Hour.Controllers.Common res.IsSucceed = true; return res; } + [HttpGet("GetLawyerCardIdByArchivesId")] + public async Task> GetLawyerCardIdByArchivesId(string jzid) + { + var res = new Result(); + try + { + + var lawyerid = await _db.Queryable() + .Where(x => x.jzlbxxId == jzid).Select(x => x.lawyerId) + .FirstAsync(); + + var lawyer = await _db.Queryable() + .Where(x => x.Id == lawyerid) + .FirstAsync(); + + res.result = lawyer.cardId; + res.IsSucceed = true; + return res; + } + catch + { + res.result = string.Empty; + return res; + } + } /// /// 获取卷宗下所有的文件信息 /// @@ -83,7 +109,8 @@ namespace _24Hour.Controllers.Common return jzinfo.jzml.Where(ml => ml.fmlbh == juan.mlbh) .OrderBy(sx => sx.mlsxh) .SelectMany(x => x.jzwj.OrderBy(q => q.wjsxh).ToList()) - .Select(r=>new { + .Select(r => new + { order = r.wjsxh, fileid = r.Id, filepath = r.jpgwjlj @@ -92,6 +119,7 @@ namespace _24Hour.Controllers.Common }); var resultdata = data.Select(e => new { + jzid = e.id, files = e?.files?.SelectMany(q => q).ToList() }).ToList(); diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index df4852f..562e245 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "ConnectionStrings": { "DBType": "MySQL", - "MySQLConnString": "6ThNXFEBPVFN1FYh3Yz5mgwoFXMcVagR9nq4caRpxJq0KH9BmPIki5AAvs/3fb0zVFsROC6SZHTsYuebhero4mNA61EF4tfvH1FDuiiq4JVkwRlgFmNyQLnW5EzkM8Ib39kcHL9n6H6j1lMkx8myr7TY7tY7sjoiLYNaJSDeVsHG81WOu7HGhGZzUXDjq83rQZirQIFIfCE6HIK8QErXyA==" + "MySQLConnString": "6ThNXFEBPVFN1FYh3Yz5mgwoFXMcVagR9nq4caRpxJrhTnx25XmuwFFelLMb/9FWaeaOAHGCMHnFw+sT0DhbOeroL/SF0vNZlfBdBZXy4nUP3gy9TNbwZDi0cCV36AmYirKTv3ZksZNt4xhJDtF58V9e6rciz0JLapFo3Dz9zIwj0GMsHDRIQfHl8buVyhpx" }, //JwtConfig "JwtConfiguration": { diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt index fefdd26..4254bd9 100644 --- a/24Hour/build/dockerbuild.txt +++ b/24Hour/build/dockerbuild.txt @@ -1,6 +1,6 @@ create images -docker build -t twentyfoursvc:1.0.3.11 . -docker save -o d://twentyfoursvc.1.0.3.11.tar twentyfoursvc:1.0.3.11 +docker build -t twentyfoursvc:1.0.3.15 . +docker save -o /home/twentyfoursvc.1.0.3.15.tar twentyfoursvc:1.0.3.15 docker on windows for fake data create container docker run --name twentyfoursvc -p 8098:8098 -v D://dockerconfigs/24hourconfig/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime -d twentyfoursvc:1.0.1.5 @@ -12,7 +12,7 @@ docker network create -d bridge twentytotwneyfour for 24hourserver docker run \ ---name twentyfoursvc1.0.3.11 \ +--name twentyfoursvc1.0.3.15 \ -p 8098:8098 \ -v /home/24hour/logs:/app/logs \ -v /home/24hour/wwwroot:/app/wwwroot \ @@ -22,7 +22,7 @@ docker run \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ --d twentyfoursvc:1.0.3.11 +-d twentyfoursvc:1.0.3.15