From bc812a30b9f3a7c3b5019838c9b7ab24b4b6a7e7 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 23 Feb 2024 18:07:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs | 5 +++++ .../Services/Implements/BusinessPlaceShiftService.cs | 3 +++ .../Organization/Services/Implements/GainfoService.cs | 1 - Src/Dlhis.Basic/appsettings.Development.json | 4 ++++ Src/Dlhis.Basic/appsettings.json | 2 +- 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs b/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs index 1e01e9db..908425b3 100644 --- a/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs +++ b/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs @@ -2,6 +2,11 @@ public class BusinessPlaceShiftTinyResponse { + /// + /// 无用字段,暂时不删除 //todo + /// + public string CustomCode { get; set; } + /// /// 餐次名称 /// diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index 69b4a0dd..b0df1e36 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -159,6 +159,7 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService .ToListAsync(); var list = new List(); + foreach (BusinessShiftMealRelationshipEntity shiftinfo in shifts) { var name = _dbContext.Queryable() @@ -168,10 +169,12 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService var shift = new BusinessPlaceShiftTinyResponse { + CustomCode = shiftinfo.Id.ToString(), Name = name, Start = shiftinfo.Start, End = shiftinfo.End }; + list.Add(shift); } return new BusinessPlaceWithShiftResponse diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index 61a8dc16..42e5dd4a 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -204,7 +204,6 @@ public class GainfoService : IGainfoService return new NotFoundResult(); } - var limit = configuration.GetSection("FaceUrlOptions:Limit").Get(); await _redisCache.HashSetAsync("faces", userCode, face.Face); return new FileContentResult(Convert.FromBase64String(face.Face), "image/png"); } diff --git a/Src/Dlhis.Basic/appsettings.Development.json b/Src/Dlhis.Basic/appsettings.Development.json index ae653872..7b943fd9 100644 --- a/Src/Dlhis.Basic/appsettings.Development.json +++ b/Src/Dlhis.Basic/appsettings.Development.json @@ -9,6 +9,10 @@ "CommonRequestUrl": "http://localhost:5001", "SysRequestUrl": "http://localhost:5003" }, + "FaceUrlOptions": { + "Url": "http://localhost:5002/api/gainfos/face?token=", + "Limit": 7200 + }, "SwaggerOptions": { "Enable": true, "Authority": "https://yikatong.isawesome.cn/oauth2", diff --git a/Src/Dlhis.Basic/appsettings.json b/Src/Dlhis.Basic/appsettings.json index 307752e9..6e58507c 100644 --- a/Src/Dlhis.Basic/appsettings.json +++ b/Src/Dlhis.Basic/appsettings.json @@ -11,7 +11,7 @@ "SysRequestUrl": "http://sys" }, "FaceUrlOptions": { - "Url": "https://face.jinkosolar.com/api/basic/gainfos/face?token=", + "Url": "https://yikatong.isawesome.cn/api/basic/gainfos/face?token=", "Limit": 7200 }, "SqlSugarOptions": {