diff --git a/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs index f9a7f12a..a36e18c7 100644 --- a/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs +++ b/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs @@ -1,4 +1,6 @@ using Dlhis.Entity.Device.Enums; +using Kurisu.AspNetCore.Utils.Extensions; +using Newtonsoft.Json; namespace Dlhis.Basic.Device.Response; @@ -32,9 +34,20 @@ public class DeviceResponse public string Supplier { get; set; } /// - /// 设备功能 + /// 设备功能 DeviceFuncEnumType /// - public List Funcs { get; set; } + public List Funcs + { + get + { + if (FuncsStr.IsEmpty()) FuncsStr = "[]"; + + return FuncsStr.ToObject>(); + } + } + + [JsonIgnore] + public string FuncsStr { get; set; } /// /// 部署点 diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index a8363c7c..27496c9f 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -24,7 +24,11 @@ public class DeviceService : IDeviceService public async Task> GetPageAsync(DevicePageRequest request) { var page = await _dbContext.Queryable() - .Select() + .Select(device => new DeviceResponse + { + FuncsStr = device.Funcs.ToString() + + }, true) .ToPageListAsync(request); return page; diff --git a/Src/Dlhis.User/Dockerfile b/Src/Dlhis.User/Dockerfile new file mode 100644 index 00000000..f8459494 --- /dev/null +++ b/Src/Dlhis.User/Dockerfile @@ -0,0 +1,22 @@ +#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +WORKDIR /app +EXPOSE 80 + +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +WORKDIR /src +COPY ["Src/Dlhis.User/Dlhis.User.csproj", "Src/Dlhis.User/"] +COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"] +RUN dotnet restore "Src/Dlhis.User/Dlhis.User.csproj" +COPY . . +WORKDIR "/src/Src/Dlhis.User" +RUN dotnet build "Dlhis.User.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "Dlhis.User.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Dlhis.User.dll"] \ No newline at end of file