fix 解决合并冲突1

Src/Dlhis.Basic/Organization/Controllers/GainfoPermissionsController.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using Dlhis.Basic.BusinessPlace.Response;
+using Dlhis.Basic.BusinessPlace.Response;
 using Dlhis.Basic.Device.Response;
 using Dlhis.Basic.Device.Services;
 using Dlhis.Basic.Organization.Request;
@@ -45,7 +44,7 @@ public class GainfoPermissionsController : ControllerBase
     /// <param name="deviceGroupCode"></param>
     /// <returns></returns>
     [HttpGet("devicesUnderGroupByUserNo")]
-    public async Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, string deviceGroupCode)
+    public async Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, Guid deviceGroupCode)
     {
         return await _gainfoPermissions.GetDevicesUnderGroupByUserNoAsync(userNo, deviceGroupCode);
     }

Src/Dlhis.Basic/Organization/Services/IGainfoPermissions.cs

@@ -10,7 +10,7 @@ public interface IGainfoPermissions : IScopeDependency
 {
     Task<Pagination<BusinessPlaceResponse>> GetPlaceByGainfoAsync(DeviceAssRequest request);
 
-    Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, string deviceGroupCode);
+    Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, Guid deviceGroupCode);
 
     Task<Pagination<DevicePageResponse>> GetAssignDeviceCodesAsync(DeviceAssRequest request);
 

Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissions.cs

@@ -14,8 +14,6 @@ using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
-using Org.BouncyCastle.Asn1.Ocsp;
-using Org.BouncyCastle.Crypto;
 using SqlSugar;
 
 namespace Dlhis.Basic.Organization.Services.Implements;
@@ -50,8 +48,8 @@ public class GainfoPermissions : IGainfoPermissions
         return await _dbContext.Queryable<DeviceEntity>()
             .LeftJoin<DeviceRegistryEntity>((x, dr) => x.UniqueNo == dr.DeviceUniqueNo)
             .LeftJoin<BusinessPlaceEntity>((x, dr, place) => dr.BusinessPlaceCode == place.Code)
-             .LeftJoin<BusinessPlaceShiftRelationshipEntity>((x,dr,place, ps) => x.Code == ps.PlaceCode)
-             .LeftJoin<BusinessShiftEntity>((x, dr, place, ps,s) => s.Code == ps.ShiftCode)
+             .LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, dr, place, ps) => x.Code == ps.PlaceCode)
+             .LeftJoin<BusinessShiftEntity>((x, dr, place, ps, s) => s.Code == ps.ShiftCode)
             .Where(x => x.Type == DeviceTypeEnumType.Meal)
             .Where(x => deviceCodes.Contains(x.Code))
             .Where((x, dr) => !string.IsNullOrEmpty(dr.BusinessPlaceCustomCode))
@@ -72,11 +70,14 @@ public class GainfoPermissions : IGainfoPermissions
              .ToPageListAsync(request);
     }
 
-    public async Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, string deviceGroupCode)
+    public async Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, Guid deviceGroupCode)
     {
         var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>().ToListAsync();
-        var currentGroup = deviceGroups.Where(x => x.Code.ToString() == deviceGroupCode).FirstOrDefault();
-        currentGroup.ThrowIfNull($"{deviceGroupCode}在设备组中不存在");
+        var currentGroup = deviceGroups.Where(x => x.Code == deviceGroupCode).FirstOrDefault();
+        if (currentGroup == null)
+        {
+            return new List<GetDevicesUnderGroupByUserNoResponse>();
+        }
 
         var groups = RecursionGetNext(currentGroup, deviceGroups).ToList();
 
@@ -98,21 +99,21 @@ public class GainfoPermissions : IGainfoPermissions
               .LeftJoin<BusinessPlaceEntity>((d, dt, dr, bp) => dr.BusinessPlaceCode == bp.Code)
               .Where(d => nos.Contains(d.UniqueNo))
               .Select((d, dt, dr, bp) => new DevicePageResponse
-               {
-                   FuncsStr = d.Funcs.ToString(),
-                   Brand = dt.Brand,
-                   Type = d.Type,
-                   BusinessPlaceCode = bp.Code,
-                   BusinessPlaceName = bp.Name,
-                   LastHeartbeatTime = dr.LastHeartbeatTime,
-                   UniqueNo = d.UniqueNo,
-                   Supplier = d.Supplier,
-                   DeployPlace = d.DeployPlace,
-                   DeployPosition = d.DeployPosition,
-                   DeployDirection = d.DeployDirection,
-                   TemplateCode = dt.Code,
-                   ConnectionInfo = d.ConnectionInfo,
-                   Enable = d.Enable,
+              {
+                  FuncsStr = d.Funcs.ToString(),
+                  Brand = dt.Brand,
+                  Type = d.Type,
+                  BusinessPlaceCode = bp.Code,
+                  BusinessPlaceName = bp.Name,
+                  LastHeartbeatTime = dr.LastHeartbeatTime,
+                  UniqueNo = d.UniqueNo,
+                  Supplier = d.Supplier,
+                  DeployPlace = d.DeployPlace,
+                  DeployPosition = d.DeployPosition,
+                  DeployDirection = d.DeployDirection,
+                  TemplateCode = dt.Code,
+                  ConnectionInfo = d.ConnectionInfo,
+                  Enable = d.Enable,
               })
               .ToListAsync();
             var deviceUniqueNos = page.Select(x => x.UniqueNo).ToList();
@@ -148,9 +149,9 @@ public class GainfoPermissions : IGainfoPermissions
         return lst;
     }
 
-    public  async Task<Pagination<DevicePageResponse>> GetAssignDeviceCodesAsync(DeviceAssRequest request)
+    public async Task<Pagination<DevicePageResponse>> GetAssignDeviceCodesAsync(DeviceAssRequest request)
     {
-       var ids = await  _devicePermissionService.GetAssignDeviceCodesAsync(request.UserNo);
+        var ids = await _devicePermissionService.GetAssignDeviceCodesAsync(request.UserNo);
 
         var page = await _dbContext.Queryable<DeviceEntity>()
               .LeftJoin<DeviceTemplateEntity>((d, dt) => d.TemplateCode == dt.Code)

Src/Dlhis.Entity/Basic/Entity/MealSupplementRecordEntity.cs

@@ -0,0 +1,60 @@
+using Dlhis.Entity.Basic.Enums;
+using Kurisu.SqlSugar;
+using SqlSugar;
+using SqlSugar.DbConvert;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+/// <summary>
+/// 餐补记录
+/// </summary>
+[SugarTable(TableName = "MealSupplementRecord", TableDescription = "餐补记录")]
+public class MealSupplementRecordEntity : SugarBaseEntity
+{
+    /// <summary>
+    /// 唯一号
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "唯一号", UniqueGroupNameList = new[] { "idx_MealSupplementRecord_UniqueId" })]
+    public string UniqueId { get; set; }
+
+    /// <summary>
+    /// 工号
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "工号")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 考勤日期
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "考勤日期")]
+    public DateTime Date { get; set; }
+
+    /// <summary>
+    /// 工作地
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "工作地")]
+    public string Workplace { get; set; }
+
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "厂区")]
+    public string Factory { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 餐补
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "餐补")]
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// 餐补状态
+    /// </summary>
+    [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public MealSupplementStatusEnumtype Status { get; set; }
+}

Src/Dlhis.Entity/Basic/Enums/MealSupplementStatusEnumtype.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel;
+
+namespace Dlhis.Entity.Basic.Enums;
+
+/// <summary>
+/// 餐补状态
+/// </summary>
+[Description("餐补状态")]
+public enum MealSupplementStatusEnumtype
+{
+    /// <summary>
+    /// 待核算
+    /// </summary>
+    [Description("待核算")]
+    Wait = 0,
+
+
+    /// <summary>
+    /// 成功
+    /// </summary>
+    [Description("成功")]
+    Sucess = 1,
+
+    /// <summary>
+    /// 处理异常
+    /// </summary>
+    [Description("处理异常")]
+    Error = 99
+}

Src/Dlhis.External/Dlhis.External.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..</DockerfileContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Kurisu.AspNetCore" Version="0.7.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="MealSupplement\Response\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Dlhis.Entity\Dlhis.Entity.csproj" />
+  </ItemGroup>
+
+</Project>

Src/Dlhis.External/Dockerfile

@@ -0,0 +1,24 @@
+#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
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["Src/Dlhis.External/Dlhis.External.csproj", "Src/Dlhis.External/"]
+COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"]
+RUN dotnet restore "./Src/Dlhis.External/./Dlhis.External.csproj"
+COPY . .
+WORKDIR "/src/Src/Dlhis.External"
+RUN dotnet build "./Dlhis.External.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./Dlhis.External.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "Dlhis.External.dll"]

Src/Dlhis.External/MealSupplement/Channel/MealSupplementHandler.cs

@@ -0,0 +1,37 @@
+using Dlhis.Entity.Basic.Entity;
+using Dlhis.External.MealSupplement.Request;
+using Kurisu.AspNetCore.EventBus.Abstractions;
+using Kurisu.AspNetCore.EventBus.Abstractions.Handler;
+using Kurisu.SqlSugar.Services;
+using Mapster;
+
+namespace Dlhis.External.MealSupplement.Channel;
+
+public class MealSupplementHandler : IAsyncChannelHandler<MealSupplementMessage>
+{
+    private readonly IServiceProvider _serviceProvider;
+
+    public MealSupplementHandler(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public async Task InvokeAsync(MealSupplementMessage message)
+    {
+        using (var scope = _serviceProvider.CreateScope())
+        {
+            var db = scope.ServiceProvider.GetService<IDbContext>();
+
+            var existsIds = await db.Queryable<MealSupplementRecordEntity>().Select(x => x.UniqueId).ToListAsync();
+            var items = message.Items.Where(x => !existsIds.Contains(x.UniqueId)).ToList();
+
+            var entities = items.Adapt<List<MealSupplementRecordEntity>>();
+            await db.InsertAsync(entities);
+        }
+    }
+}
+
+public class MealSupplementMessage : IAsyncChannelMessage
+{
+    public List<MealSupplementReceiveReuqest> Items { get; set; }
+}

Src/Dlhis.External/MealSupplement/Controller/MealSupplementsController.cs

@@ -0,0 +1,27 @@
+using Dlhis.External.MealSupplement.Request;
+using Dlhis.External.MealSupplement.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.External.MealSupplement.Controller;
+
+[Route("api/[controller]")]
+[ApiController]
+public class MealSupplementsController : ControllerBase
+{
+    private readonly IMealSupplementService _mealSupplementService;
+
+    public MealSupplementsController(IMealSupplementService mealSupplementService)
+    {
+        _mealSupplementService = mealSupplementService;
+    }
+
+    /// <summary>
+    /// 接受餐补
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("receive")]
+    public async Task DoSupplements(List<MealSupplementReceiveReuqest> reuqests)
+    {
+        await _mealSupplementService.DoSupplementsAsync(reuqests);
+    }
+}

Src/Dlhis.External/MealSupplement/Request/MealSupplementReceiveReuqest.cs

@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.External.MealSupplement.Request;
+
+public class MealSupplementReceiveReuqest
+{
+    /// <summary>
+    /// 唯一号
+    /// </summary>
+    [Required(ErrorMessage = "唯一号必填")]
+    public string UniqueId { get; set; }
+
+    /// <summary>
+    /// 工号
+    /// </summary>
+    [Required(ErrorMessage = "工号必填")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 考勤日期
+    /// </summary>
+    public DateTime Date { get; set; }
+
+    /// <summary>
+    /// 工作地
+    /// </summary>
+    [Required(ErrorMessage = "工作地")]
+    public string Workplace { get; set; }
+
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    [Required(ErrorMessage = "厂区")]
+    public string Factory { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 餐补
+    /// </summary>
+    public decimal Amount { get; set; }
+}

Src/Dlhis.External/MealSupplement/Services/IMealSupplementService.cs

@@ -0,0 +1,8 @@
+using Dlhis.External.MealSupplement.Request;
+
+namespace Dlhis.External.MealSupplement.Services;
+
+public interface IMealSupplementService : IScopeDependency
+{
+    Task DoSupplementsAsync(List<MealSupplementReceiveReuqest> reuqests);
+}

Src/Dlhis.External/MealSupplement/Services/Implements/MealSupplementService.cs

@@ -0,0 +1,23 @@
+using Dlhis.External.MealSupplement.Channel;
+using Dlhis.External.MealSupplement.Request;
+using Kurisu.AspNetCore.EventBus.Abstractions;
+using Kurisu.SqlSugar.Services;
+
+namespace Dlhis.External.MealSupplement.Services.Implements;
+
+public class MealSupplementService : IMealSupplementService
+{
+    private readonly IEventBus _eventBus;
+    private readonly IDbContext _dbContext;
+
+    public MealSupplementService(IEventBus eventBus , IDbContext dbContext)
+    {
+        _eventBus = eventBus;
+        _dbContext = dbContext;
+    }
+
+    public async Task DoSupplementsAsync(List<MealSupplementReceiveReuqest> reuqests)
+    {
+        await _eventBus.PublishAsync(new MealSupplementMessage { Items = reuqests });
+    }
+}

Src/Dlhis.External/Program.cs

@@ -0,0 +1,29 @@
+using Kurisu.AspNetCore.EventBus.Extensions;
+using Kurisu.AspNetCore.Startup;
+using Kurisu.SqlSugar.Extensions;
+using Kurisu.Startup;
+using Microsoft.IdentityModel.Logging;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        KurisuHost.Run<Startup>(true, args);
+    }
+}
+
+public class Startup : DefaultStartup
+{
+    public Startup(IConfiguration configuration) : base(configuration)
+    {
+        IdentityModelEventSource.ShowPII = true;
+    }
+
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        base.ConfigureServices(services);
+
+        services.AddSqlSugar();
+        services.AddEventBus();
+    }
+}

Src/Dlhis.External/Properties/launchSettings.json

@@ -0,0 +1,13 @@
+{
+  "profiles": {
+    "Dlhis.External": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5020"
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json"
+}

Src/Dlhis.External/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

Src/Dlhis.External/appsettings.json

@@ -0,0 +1,72 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "SqlSugarOptions": {
+    "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;",
+    "SlaveConnectionString": [],
+    "Timeout": 30,
+    "SlowSqlTime": 1,
+    "EnableSqlLog": false
+  },
+  "SwaggerOptions": {
+    "Enable": true,
+    "Authority": "http://identity.oauth.svc.cluster.local",
+    "ClientId": "4fb184324eac4180",
+    "ClientSecret": "8ac8f235152f1524",
+    "Scopes": {
+      "openid": "openid",
+      "profile": "profile",
+      "yikatong": "yikatong"
+    }
+  },
+  "IdentityServerOptions": {
+    "Authority": "http://identity.oauth.svc.cluster.local",
+    "RequireHttpsMetadata": false,
+    "Issuer": "identity.isawesome.cn",
+    "Audience": "",
+    "Pat": {
+      "Enable": false,
+      "Scheme": "token",
+      "ClientId": "reference",
+      "ClientSecret": "123456"
+    }
+  },
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "System": "Warning",
+        "Microsoft": "Warning",
+        "Microsoft.Hosting.Lifetime": "Information"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Async",
+        "Args": {
+          "configure": [
+            {
+              "Name": "Console",
+              "Args": {
+                "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}"
+              }
+            },
+            {
+              "Name": "MySQL",
+              "Args": {
+                "connectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;",
+                "tableName": "Logs",
+                "autoCreateSqlTable": true
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs

@@ -7,7 +7,7 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Request;
 public class DeviceTaskAssignmentRequest : PageDto
 {
     /// <summary>
-    /// 设备类型
+    /// 设备类型 DeviceTypeEnumType
     /// </summary>
     [EnumDataType(typeof(DeviceTypeEnumType))]
     public DeviceTypeEnumType? Type { get; set; }
@@ -20,7 +20,7 @@ public class DeviceTaskAssignmentRequest : PageDto
     public DeviceTaskEnumType? TaskType { get; set; }
 
     /// <summary>
-    /// 任务下发状态
+    /// 任务下发状态 DeviceTaskStatusEnumType
     /// </summary>
     [EnumDataType(typeof(DeviceTaskStatusEnumType))]
     public DeviceTaskStatusEnumType? Status { get; set; }