ygb

在保存预约区域时，新增对 CustomCode 的唯一性校验，防止插入重复编码，若已存在则抛出异常提示“编码已存在”。

.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

.editorconfig

@@ -0,0 +1,141 @@
+[*.cs]
+
+# CS1591: 缺少对公共可见类型或成员的 XML 注释
+dotnet_diagnostic.CS1591.severity = none
+
+[*.cs]
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.private_or_internal_field_should_be__field_camel.severity = suggestion
+dotnet_naming_rule.private_or_internal_field_should_be__field_camel.symbols = private_or_internal_field
+dotnet_naming_rule.private_or_internal_field_should_be__field_camel.style = _field_camel
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field
+dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected
+dotnet_naming_symbols.private_or_internal_field.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style._field_camel.required_prefix = _
+dotnet_naming_style._field_camel.required_suffix = 
+dotnet_naming_style._field_camel.word_separator = 
+dotnet_naming_style._field_camel.capitalization = camel_case
+csharp_using_directive_placement = outside_namespace:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = false:silent
+csharp_style_var_elsewhere = false:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = true:silent
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_prefer_static_local_function = true:suggestion
+
+[*.vb]
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_以_i_开始.severity = suggestion
+dotnet_naming_rule.interface_should_be_以_i_开始.symbols = interface
+dotnet_naming_rule.interface_should_be_以_i_开始.style = 以_i_开始
+
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.symbols = 类型
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.symbols = 非字段成员
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.类型.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.类型.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.类型.required_modifiers = 
+
+dotnet_naming_symbols.非字段成员.applicable_kinds = property, event, method
+dotnet_naming_symbols.非字段成员.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.非字段成员.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.以_i_开始.required_prefix = I
+dotnet_naming_style.以_i_开始.required_suffix = 
+dotnet_naming_style.以_i_开始.word_separator = 
+dotnet_naming_style.以_i_开始.capitalization = pascal_case
+
+dotnet_naming_style.帕斯卡拼写法.required_prefix = 
+dotnet_naming_style.帕斯卡拼写法.required_suffix = 
+dotnet_naming_style.帕斯卡拼写法.word_separator = 
+dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
+
+dotnet_naming_style.帕斯卡拼写法.required_prefix = 
+dotnet_naming_style.帕斯卡拼写法.required_suffix = 
+dotnet_naming_style.帕斯卡拼写法.word_separator = 
+dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
+
+[*.{cs,vb}]
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+end_of_line = crlf

.gitignore

@@ -1,4 +1,3 @@
-# ---> VisualStudio
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -131,9 +130,7 @@ $tf/
 *.gpState
 
 # ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
+_ReSharper*
 
 # TeamCity is a build add-in
 _TeamCity*
@@ -155,7 +152,6 @@ coverage*.info
 *.coveragexml
 
 # NCrunch
-_NCrunch_*
 .*crunch*.local.xml
 nCrunchTemp_*
 
@@ -167,7 +163,6 @@ AutoTest.Net/
 .sass-cache/
 
 # Installshield output folder
-[Ee]xpress/
 
 # DocProject is a documentation generator add-in
 DocProject/buildhelp/
@@ -180,44 +175,12 @@ DocProject/Help/Html2
 DocProject/Help/html
 
 # Click-Once directory
-publish/
 
 # Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
 
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
 
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
 *.build.csdef
 
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
 AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
@@ -233,30 +196,10 @@ _pkginfo.txt
 !?*.[Cc]ache/
 
 # Others
-ClientBin/
 ~$*
 *~
 *.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
 
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
@@ -269,134 +212,5 @@ ServiceFabricBackup/
 *.ldf
 *.ndf
 
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio 6 auto-generated project file (contains which files were open etc.)
-*.vbp
-
-# Visual Studio 6 workspace and project file (working project files containing files to include in project)
-*.dsw
-*.dsp
-
-# Visual Studio 6 technical files
-*.ncb
-*.aps
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# Visual Studio History (VSHistory) files
-.vshistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-
-# VS Code files for those working on multiple tools
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
-
-# Local History for Visual Studio Code
-.history/
-
-# Windows Installer files from build outputs
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# JetBrains Rider
-*.sln.iml
-
+/Src/Dlhis.Canteen/App
+/Src/Dlhis.Sys/App

Dlhis.Jinko.Face.slnx

@@ -0,0 +1,33 @@
+<Solution>
+  <Folder Name="/Basic/">
+    <Project Path="Src\Dlhis.Basic.Api\Dlhis.Basic.Api.csproj" />
+    <Project Path="Src\Dlhis.Basic\Dlhis.Basic.csproj" />
+    <Project Path="Src\Dlhis.Dh.Api\Dlhis.Dh.Api.csproj" />
+    <Project Path="Src\Dlhis.InfoCheck.Api\Dlhis.InfoCheck.Api.csproj" />
+    <Project Path="Src\Dlhis.InfoCheck\Dlhis.InfoCheck.csproj" />
+    <Project Path="Src\Dlhis.Jip.Api\Dlhis.Jip.Api.csproj" />
+  </Folder>
+  <Folder Name="/Canteen/">
+    <Project Path="Src\Dlhis.Canteen.Api\Dlhis.Canteen.Api.csproj" />
+    <Project Path="Src\Dlhis.Canteen\Dlhis.Canteen.csproj" />
+  </Folder>
+  <Folder Name="/External/">
+    <Project Path="Src\Dlhis.External\Dlhis.External.csproj" />
+  </Folder>
+  <Folder Name="/Message/">
+    <Project Path="Src\Dlhis.Message\Dlhis.Message.csproj" />
+  </Folder>
+  <Folder Name="/Scheduled/">
+    <Project Path="Src\Dlhis.Dormitory.Api\Dlhis.Dormitory.Api.csproj" />
+    <Project Path="Src\Dlhis.ScheduledTask\Dlhis.ScheduledTask.csproj" />
+  </Folder>
+  <Folder Name="/Sys/">
+    <Project Path="Src\Dlhis.Sys.Api\Dlhis.Sys.Api.csproj" />
+    <Project Path="Src\Dlhis.Sys\Dlhis.Sys.csproj" />
+  </Folder>
+  <Project Path="Src\Dlhis.Constants\Dlhis.Constants.csproj" />
+  <Project Path="Src\Dlhis.DataPermission.Model\Dlhis.DataPermission.Model.csproj" />
+  <Project Path="Src\Dlhis.Entity\Dlhis.Entity.csproj" />
+  <Project Path="Src\Dlhis.ExcelHelper\Dlhis.ExcelHelper.csproj" />
+  <Project Path="Src\Dlhis.Middle\Dlhis.Middle.csproj" />
+</Solution>

Src/Dlhis.Basic.Api/ClientHandler/LongRunClientHandler.cs

@@ -0,0 +1,15 @@
+using Kurisu.RemoteCall.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Dlhis.Basic.Api.ClientHandler;
+
+public class LongRunClientHandler : IHttpRemoteCallPolicyHandler
+{
+    /// <inheritdoc />
+    public IHttpClientBuilder ConfigureHttpClient(IHttpClientBuilder builder)
+    {
+        builder.ConfigureHttpClient(x => { x.Timeout = TimeSpan.FromHours(1); });
+
+        return builder;
+    }
+}

Src/Dlhis.Basic.Api/ContentHandlers/CodeContentHandler.cs

@@ -0,0 +1,22 @@
+using System.Text;
+using Kurisu.RemoteCall;
+using Kurisu.RemoteCall.Abstractions;
+using Newtonsoft.Json;
+
+namespace Dlhis.Basic.Api.ContentHandlers;
+
+public class CodeContentHandler : IContentHandler
+{
+    /// <inheritdoc />
+    public HttpContent Create(List<ParameterValue> values)
+    {
+        var code = values.First(x => x.Parameter.Name == "code").GetValue<string>();
+        var obj = new
+        {
+            code,
+        };
+        var json = JsonConvert.SerializeObject(obj);
+
+        return new StringContent(json, Encoding.UTF8, "application/json");
+    }
+}

Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Kurisu.RemoteCall" Version="0.4.8" />
+  </ItemGroup>
+
+</Project>

Src/Dlhis.Basic.Api/Dto/BusinessPlaceDto.cs

@@ -0,0 +1,7 @@
+namespace Dlhis.Basic.Api.Dto;
+
+public class BusinessPlaceDto
+{
+    public Guid Code { get; set; }
+    public string Name { get; set; }
+}

Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs

@@ -0,0 +1,13 @@
+using Dlhis.Basic.Api.Dto;
+using Kurisu.RemoteCall.Attributes;
+
+namespace Dlhis.Basic.Api;
+
+[RequestResultHandler]
+[EnableRemoteClient(Name = "basic-service", BaseUrl = "${InternalRequest:BasicRequestUrl}")]
+public interface IBusinessPlacePermissionsApi
+{
+    [Auth]
+    [Get("/api/businessplacepermissions/my")]
+    Task<List<BusinessPlaceDto>> GetMyAsync();
+}

Src/Dlhis.Basic.Api/IDingTalkApi.cs

@@ -0,0 +1,20 @@
+using Dlhis.Basic.Api.Requests;
+using Kurisu.RemoteCall.Attributes;
+
+namespace Dlhis.Basic.Api;
+
+[RequestLog]
+[RequestResultHandler]
+[EnableRemoteClient(Name = "message-service", BaseUrl = "${InternalRequest:BasicRequestUrl}")]
+public interface IDingTalkApi
+{
+    [Post("/api/messages/dingtalk/workmessage")]
+    Task SendWorkMessageAsync(JinkoSendWorkMessageRequest request);
+
+    [Post("/api/messages/dingtalk/workgrid/workmessage")]
+    Task SendWorkMessageByWorkGridAsync(JinkoSendWorkMessageRequest request);
+    
+
+    [Post("/api/messages/dingtalk/messageurl")]
+    Task SendMessageUrlAsync(DingTalkMessageUrlRequest request);
+}

Src/Dlhis.Basic.Api/IFactorySettingApi.cs

@@ -0,0 +1,20 @@
+using Kurisu.RemoteCall.Attributes;
+
+namespace Dlhis.Basic.Api;
+
+[RequestResultHandler]
+[EnableRemoteClient(Name = "basic-service", BaseUrl = "${InternalRequest:BasicRequestUrl}")]
+public interface IFactorySettingApi
+{
+    /// <summary>
+    /// <see cref="Vouchers.Controllers.VouchersController.CreateAsync"/> <see cref="VoucherEnumType"/>
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    [Get("/api/factorySetting/enableBirthdayVoucherFactories")]
+    Task<List<string>> GetEnableBirthdayVoucherFactoriesAsync();
+
+
+    [Get("/api/factorySetting/enableUseBirthdayVoucherFactories")]
+    Task<List<string>> GetEnableUseBirthdayVoucherFactoriesAsync(string factory);
+}

Src/Dlhis.Basic.Api/IGainfoPermissionApi.cs

@@ -0,0 +1,12 @@
+using Kurisu.RemoteCall.Attributes;
+
+namespace Dlhis.Basic.Api;
+
+[RequestResultHandler]
+[EnableRemoteClient(Name = "basic-service", BaseUrl = "${InternalRequest:BasicRequestUrl}")]
+public interface IGainfoPermissionApi
+{
+    [Auth]
+    [Get("/api/devicePermissions/userPermissionCodes")]
+    Task<List<Guid>> GetPermissionsDeviceCodesAsync(string userCode);
+}

Src/Dlhis.Basic.Api/ISyncApi.cs

@@ -0,0 +1,66 @@
+using Dlhis.Basic.Api.ClientHandler;
+using Dlhis.Basic.Api.ContentHandlers;
+using Dlhis.Basic.Api.Response;
+using Kurisu.RemoteCall.Attributes;
+
+namespace Dlhis.Basic.Api;
+
+[RequestResultHandler]
+[EnableRemoteClient(Name = "longRun-service", BaseUrl = "${InternalRequest:BasicRequestUrl}", PolicyHandler = typeof(LongRunClientHandler))]
+public interface ISyncApi
+{
+    /// <summary>
+    /// 根据人事范围获取员工信息
+    /// </summary>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    [Post("/api/sync/gainfo/werk")]
+    [RequestContentHandler(typeof(CodeContentHandler))]
+    Task SyncGainfoByWerkAsync(string code);
+
+    /// <summary>
+    /// 根据工号获取员工信息
+    /// </summary>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    [Post("/api/sync/gainfo/user")]
+    [RequestContentHandler(typeof(CodeContentHandler))]
+    Task SyncGainfoByUserCodeAsync(string code);
+
+    /// <summary>
+    /// 获取组织架构数据
+    /// </summary>
+    /// <returns></returns>
+    [Get("/api/sync/orgs")]
+    Task<SapOrganizationResponse> SyncOrganizationsAsync();
+
+    /// <summary>
+    /// 获取职位数据
+    /// </summary>
+    /// <returns></returns>
+    [Get("/api/sync/positions")]
+    Task<SapPositionResponse> GetPositionsAsync();
+
+    /// <summary>
+    /// 差旅数据处理 
+    /// </summary>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    [Post("/api/sync/businessTrips")]
+    [RequestContentHandler(typeof(CodeContentHandler))]
+    Task HandlerBusinessTripsAsync(string code);
+
+    /// <summary>
+    /// 外包自动离职处理
+    /// </summary>
+    /// <returns></returns>
+    [Post("/api/gainfoOutsource/autoResign")]
+    Task OutsourceAutoResignAsync();
+
+    /// <summary>
+    /// 外部人员自动离职处理
+    /// </summary>
+    /// <returns></returns>
+    [Post("/api/appointments/autoResign")]
+    Task ExternalAutoResignAsync();
+}

Src/Dlhis.Basic.Api/Requests/DingTalkMessageUrlRequest.cs

@@ -0,0 +1,10 @@
+namespace Dlhis.Basic.Api.Requests;
+
+public class DingTalkMessageUrlRequest
+{
+    public string UserCode { get; set; }
+    public string Title { get; set; }
+    public string Text { get; set; }
+    public string PicUrl { get; set; }
+    public string MessageUrl { get; set; }
+}

Src/Dlhis.Basic.Api/Requests/JinkoSendWorkMessageRequest.cs

@@ -0,0 +1,14 @@
+namespace Dlhis.Basic.Api.Requests;
+
+public class JinkoSendWorkMessageRequest
+{
+    /// <summary>
+    /// 发送内容
+    /// </summary>
+    public string Content { get; set; }
+
+    /// <summary>
+    /// 工号
+    /// </summary>
+    public List<string> WorkCodes { get; set; }
+}

Src/Dlhis.Basic.Api/Response/SapOrganization.cs

@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+
+namespace Dlhis.Basic.Api.Response;
+
+/// <summary>
+/// sap机构信息
+/// </summary>
+public class SapOrganization
+{
+    /// <summary>
+    /// 机构项
+    /// </summary>
+    [JsonProperty("item")]
+    public List<SapOrganizationItem> Items { get; set; }
+}

Src/Dlhis.Basic.Api/Response/SapOrganizationItem.cs

@@ -0,0 +1,97 @@
+namespace Dlhis.Basic.Api.Response;
+
+public class SapOrganizationItem
+{
+    /// <summary>
+    /// 开始日期
+    /// </summary>
+    public string BEGDA { get; set; }
+
+    /// <summary>
+    /// 结束日期
+    /// </summary>
+    public string ENDDA { get; set; }
+
+    /// <summary>
+    /// 语言
+    /// </summary>
+    public string LANGU { get; set; }
+
+    /// <summary>
+    /// 部门id
+    /// </summary>
+    public string OBJID { get; set; }
+
+    /// <summary>
+    /// 部门名称
+    /// </summary>
+    public string STEXT { get; set; }
+
+    /// <summary>
+    /// 上级部门
+    /// </summary>
+    public string SOBID { get; set; }
+
+    /// <summary>
+    /// 公司
+    /// </summary>
+    public string ORGID01 { get; set; }
+
+    /// <summary>
+    /// 事业部
+    /// </summary>
+    public string ORGID02 { get; set; }
+
+    /// <summary>
+    /// 一级部门
+    /// </summary>
+    public string ORGID03 { get; set; }
+
+    /// <summary>
+    /// 二级部门
+    /// </summary>
+    public string ORGID04 { get; set; }
+
+
+    /// <summary>
+    /// 三级部门 
+    /// </summary>
+    public string ORGID05 { get; set; }
+
+    /// <summary>
+    /// 四级部门 
+    /// </summary>
+    public string ORGID06 { get; set; }
+
+    /// <summary>
+    /// 五级部门 
+    /// </summary>
+    public string ORGID07 { get; set; }
+
+    /// <summary>
+    /// 六级部门
+    /// </summary>
+    public string ORGID08 { get; set; }
+}
+
+
+//public partial class SapOrganizationItem : IEquatable<SapOrganizationItem>
+//{
+//    public bool Equals(SapOrganizationItem other)
+//    {
+//        if (other is null)
+//            return false;
+
+//        return this.BEGDA == other.BEGDA
+//            && this.ENDDA == other.ENDDA
+//            && this.LANGU == other.LANGU
+//            && this.OBJID == other.OBJID
+//            && this.STEXT == other.STEXT
+//            && this.SOBID == other.SOBID
+//            && this.ORGID01 == other.ORGID01
+//            && this.ORGID02 == other.ORGID02;
+//    }
+
+//    public override bool Equals(object obj) => Equals(obj as SapOrganizationItem);
+//    public override int GetHashCode() => (BEGDA, ENDDA, LANGU, OBJID, STEXT, SOBID, ORGID01, ORGID02).GetHashCode();
+//}

Src/Dlhis.Basic.Api/Response/SapOrganizationResponse.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace Dlhis.Basic.Api.Response;
+
+public class SapOrganizationResponse
+{
+    [JsonProperty("T_ORG")]
+    public SapOrganization Org { get; set; }
+}

Src/Dlhis.Basic.Api/Response/SapPersonItem.cs

@@ -0,0 +1,211 @@
+namespace Dlhis.Jip.Api.Dto;
+
+public class SapPersonItem
+{
+    public string KOSTL { get; set; }
+
+    /// <summary>
+    /// 离职日期
+    /// </summary>
+    public DateTime? ZLZRQ { get; set; }
+
+    public string ZZ_SFZH { get; set; }
+
+    public string STELL { get; set; }
+
+    public string STELL_NM { get; set; }
+
+    public string ZZ_KLX { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string PERNR { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZWORKCODE { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string MASSN { get; set; }
+    /// <summary>
+    /// 数据变更
+    /// </summary>
+    public string MNTXT { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string MASSG { get; set; }
+    /// <summary>
+    /// 数据变更
+    /// </summary>
+    public string MGTXT { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZSTATUS { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string STAT2 { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string BEGDA { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ENDDA { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string WERKS { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string PERSG { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string PERSK { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string BTRTL { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ANSVH { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string MOABW { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ORGEH { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string PLANS { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_ZYSF { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_AQJB { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_ZD { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_SJGH { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_BGZT { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Z_ZJ { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_XSQY { get; set; }
+    /// <summary>
+    /// 上海
+    /// </summary>
+    public string ZZ_LOC { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_COUN { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_CITY { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string NACHN { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string VORNA { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string NAME { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string GESCH { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime GBDAT { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string NATIO { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_QFRQ { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZMOBILE { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZEMAIL { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZADZH { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime ZRZRQ { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string DAT01 { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZCJRQ { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZZRQ { get; set; }
+    /// <summary>
+    /// 本科
+    /// </summary>
+    public string ZXUELI { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string ZZ_ZPQD { get; set; }
+
+    /// <summary>
+    /// 国家
+    /// </summary>
+    public string ZZ_COUNNM { get; set; }
+
+    /// <summary>
+    /// 基地
+    /// </summary>
+    public string ZZ_GZDJDNM { get; set; }
+
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string ZZ_GZDCQNM { get; set; }
+}

Src/Dlhis.Basic.Api/Response/SapPosition.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace Dlhis.Basic.Api.Response;
+
+public class SapPosition
+{
+
+    [JsonProperty("item")]
+    public List<SapPositionItem> Items { get; set; }
+}

Src/Dlhis.Basic.Api/Response/SapPositionItem.cs

@@ -0,0 +1,40 @@
+namespace Dlhis.Basic.Api.Response
+{
+    public class SapPositionItem
+    {
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string BEGDA { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string ENDDA { get; set; }
+
+        /// <summary>
+        /// 语言代码
+        /// </summary>
+        public string LANGU { get; set; }
+
+        /// <summary>
+        /// 岗位编码
+        /// </summary>
+        public string ZJOBID { get; set; }
+
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string ZJOBNAME { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ZZWID { get; set; }
+
+        /// <summary>
+        /// 所属部门ID
+        /// </summary>
+        public string ZDEPID { get; set; }
+    }
+}

Src/Dlhis.Basic.Api/Response/SapPositionResponse.cs

@@ -0,0 +1,10 @@
+using Dlhis.Jip.Api.Dto;
+using Newtonsoft.Json;
+
+namespace Dlhis.Basic.Api.Response;
+
+public class SapPositionResponse
+{
+    [JsonProperty("T_POST")]
+    public SapPosition Position { get; set; }
+}

Src/Dlhis.Basic/Appointment/Controllers/AppointmentAreasController.cs

@@ -0,0 +1,70 @@
+using Dlhis.Basic.Appointment.Request;
+using Dlhis.Basic.Appointment.Response;
+using Dlhis.Basic.Appointment.Services;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Appointment.Controllers;
+
+/// <summary>
+/// 预约区域                                                                                                                                                                                                                                                                                                                                                                                                                               
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class AppointmentAreasController : ControllerBase
+{
+    private readonly IAppointmentAreaService _appointmentAreaService;
+
+    public AppointmentAreasController(IAppointmentAreaService appointmentAreaService)
+    {
+        _appointmentAreaService = appointmentAreaService;
+    }
+
+    /// <summary>
+    /// 保存
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("save")]
+    public async Task SaveAsync(AppointmentAreaSaveRequest request)
+    {
+        await _appointmentAreaService.SaveAsync(request);
+    }
+
+    /// <summary>
+    /// 预约区域分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("page")]
+    public async Task<Pagination<AppointmentAreaPageResponse>> GetPageAsync([FromQuery] AppointmentAreaPageRequest request)
+    {
+        return await _appointmentAreaService.GetPageAsync(request);
+    }
+
+    /// <summary>
+    /// 分配设备
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("assign")]
+    [Transactional]
+    public async Task AssignAsync(AppointmentAreaAssignRequest request)
+    {
+        await _appointmentAreaService.AssignAsync(request);
+    }
+
+    /// <summary>
+    /// 获取当前分配
+    /// </summary>
+    /// <param name="customCode"></param>
+    /// <returns></returns>
+    [HttpGet("assignments")]
+    [Transactional]
+    public async Task<List<Guid>> GetAssignmentsAsync(string customCode)
+    {
+        return await _appointmentAreaService.GetAssignmentsAsync(customCode);
+    }
+}

Src/Dlhis.Basic/Appointment/Controllers/AppointmentsController.cs

@@ -0,0 +1,170 @@
+using Dlhis.Basic.Appointment.Request;
+using Dlhis.Basic.Appointment.Response;
+using Dlhis.Basic.Appointment.Services;
+using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Appointment.Controllers;
+
+/// <summary>
+/// 预约
+/// </summary>
+[Authorize]
+[ApiController]
+[Route("api/[controller]")]
+public class AppointmentsController : ControllerBase
+{
+    private readonly IAppointmentService _appointmentService;
+
+    public AppointmentsController(IAppointmentService appointmentService)
+    {
+        _appointmentService = appointmentService;
+    }
+
+    /// <summary>
+    /// 预约申请分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("page")]
+    public async Task<Pagination<AppointmentPageResponse>> GetPageAsync([FromQuery] AppointmentPageRequest request)
+    {
+        return await _appointmentService.GetPageAsync(request);
+    }
+
+    /// <summary>
+    /// 获取预约明细
+    /// </summary>
+    /// <param name="no"></param>
+    /// <returns></returns>
+    [HttpGet("details")]
+    public async Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(string no)
+    {
+        return await _appointmentService.GetAppointmentDetailsByIdAsync(no);
+    }
+
+    /// <summary>
+    /// 确认到达
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpPost("confirm")]
+    [Transactional]
+    [IgnoreTenant]
+    public async Task ConfirmAsync(AppointmentConfirmRequest request)
+    {
+        await _appointmentService.ConfirmAsync(request);
+    }
+
+    /// <summary>
+    /// 强制离场
+    /// </summary>
+    /// <param name="request"></param>
+    [HttpPost("focusleave")]
+    [Transactional]
+    public async Task FocusLeaveAsync(AppointmentFocusLeaveRequest request)
+    {
+        await _appointmentService.FocusLeaveAsync(request.Id, request.Reason);
+    }
+
+    /// <summary>
+    /// 人脸更新
+    /// </summary>
+    /// <param name="request"></param>
+    [AllowAnonymous]
+    [HttpPost("face/update")]
+    [Transactional]
+    [IgnoreTenant]
+    public async Task UpdateFaceAsync(AppointmentConfirmRequest request)
+    {
+        await _appointmentService.UpdateFaceAsync(request.Id, request.Base64Image);
+    }
+
+    /// <summary>
+    /// 根据身份证获取当天预约信息
+    /// </summary>
+    /// <param name="idNo"></param>
+    /// <param name="factory"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpGet("today")]
+    public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(string idNo, string factory)
+    {
+        return await _appointmentService.GetTodayByIdNoAsync(idNo, factory);
+    }
+
+    /// <summary>
+    /// 门禁预约
+    /// </summary>
+    /// <param name="factory"></param>
+    /// <param name="search"></param>
+    /// <param name="status"></param>
+    /// <param name="start"></param>
+    /// <param name="end"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpGet("door/list")]
+    public async Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, string search, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end)
+    {
+        return await _appointmentService.GetRecordListAsync(factory, search, status, start, end);
+    }
+
+    /// <summary>
+    /// 根据身份证获取预约信息分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpGet("idno/page")]
+    public async Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync([FromQuery] AppointmentIdNoPageRequest request)
+    {
+        return await _appointmentService.GetRecordPageByIdNoAsync(request);
+    }
+
+    /// <summary>
+    /// 数据明细
+    /// </summary>
+    /// <param name="factory"></param>
+    /// <param name="start"></param>
+    /// <param name="end"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpGet("summary")]
+    public async Task<AppointmentSummaryResponse> GetSummaryAsync(string factory, DateTime start, DateTime end)
+    {
+        end = start.Date.AddDays(1).AddMilliseconds(-1);
+        return await _appointmentService.GetSummaryAsync(factory, start, end);
+    }
+
+
+    /// <summary>
+    /// 自动离职处理
+    /// </summary>
+    [AllowAnonymous]
+    [HttpPost("autoResign")]
+    [IgnoreTenant]
+    public async Task AutoResignAsync()
+    {
+        await _appointmentService.AutoResignAsync();
+    }
+
+    [AllowAnonymous]
+    [HttpPost("recover")]
+    [IgnoreTenant]
+    public async Task RecoverAsync()
+    {
+        await _appointmentService.RecoverAsync();
+    }
+
+    [AllowAnonymous]
+    [IgnoreTenant]
+    [HttpGet("visitor-devices")]
+    public async Task<List<string>> GetVisitorDevicesAsync(long detailId)
+    {
+        return await _appointmentService.GetVisitorDevicesAsync(detailId);
+    }
+}

Src/Dlhis.Basic/Appointment/Dto/AppointmentReceiveItemDto.cs

@@ -0,0 +1,31 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.Appointment.Dto;
+
+public class AppointmentReceiveItemDto
+{
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    [Required(ErrorMessage = "姓名必填")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 手机号
+    /// </summary>
+    [StringLength(11, MinimumLength = 11)]
+    [Required(ErrorMessage = "手机号必填")]
+    public string Phone { get; set; }
+
+    /// <summary>
+    /// 身份证
+    /// </summary>
+    [StringLength(18, MinimumLength = 18)]
+    [Required(ErrorMessage = "身份证必填")]
+    public string IdNo { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentAreaAssignRequest.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentAreaAssignRequest
+{
+    /// <summary>
+    /// 预约区域编码
+    /// </summary>
+    [Required]
+    public string CustomCode { get; set; }
+
+    /// <summary>
+    /// 设备分组
+    /// </summary>
+    public IEnumerable<Guid> DeviceGroupCodes { get; set; }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentAreaPageRequest.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentAreaPageRequest : PageDto
+{
+    /// <summary>
+    /// 区域类型
+    /// </summary>
+    [EnumDataType(typeof(AppointmentAreaEnumType))]
+    public AppointmentAreaEnumType? Type { get; set; }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentAreaSaveRequest.cs

@@ -0,0 +1,35 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Visitor.Enums;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentAreaSaveRequest
+{
+    /// <summary>
+    /// 数据id
+    /// </summary>
+    public long? Id { get; set; }
+
+    /// <summary>
+    /// 区域 AppointmentAreaEnumType
+    /// </summary>
+    [EnumDataType(typeof(AppointmentAreaEnumType))]
+    public AppointmentAreaEnumType Type { get; set; }
+
+    /// <summary>
+    /// 编码
+    /// </summary>
+    [Required(ErrorMessage = "编码不能为空")]
+    public string CustomCode { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    [Required]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentConfirmRequest.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentConfirmRequest
+{
+    /// <summary>
+    /// 预约明细id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// base64 image
+    /// </summary>
+    [Required]
+    public string Base64Image { get; set; }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentFocusLeaveRequest.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentFocusLeaveRequest
+{
+    public long Id { get; set; }
+
+    [Required(ErrorMessage = "原因不可为空")]
+    public string Reason { get; set; }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentIdNoPageRequest.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentIdNoPageRequest : PageDto
+{
+    /// <summary>
+    /// 身份证
+    /// </summary>
+    [StringLength(18, MinimumLength = 18, ErrorMessage = "身份证错误")]
+    [Required(ErrorMessage = "身份证不可为空")]
+    public string IdNo { get; set; }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentPageRequest.cs

@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentPageRequest : PageDto, IValidatableObject
+{
+    public DateTimePeriod SearchDateTimePeriod { get; set; }
+
+    /// <inheritdoc />
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (SearchDateTimePeriod.HasValue())
+        {
+            SearchDateTimePeriod.End = SearchDateTimePeriod.End!.Value.AddDays(1).AddSeconds(-1);
+        }
+
+        yield break;
+    }
+}

Src/Dlhis.Basic/Appointment/Request/AppointmentReceiveRequest.cs

@@ -0,0 +1,83 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Basic.Appointment.Dto;
+
+namespace Dlhis.Basic.Appointment.Request;
+
+public class AppointmentReceiveRequest : IValidatableObject
+{
+    /// <summary>
+    /// 流水号
+    /// </summary>
+    [Required(ErrorMessage = "流水号必填")]
+    public string FlowId { get; set; }
+
+    /// <summary>
+    /// 标题
+    /// </summary>
+    [Required(ErrorMessage = "标题必填")]
+    public string Title { get; set; }
+
+    /// <summary>
+    /// 对接人工号
+    /// </summary>
+    [Required(ErrorMessage = "对接人工号必填")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 对接人姓名
+    /// </summary>
+    [Required(ErrorMessage = "对接人姓名必填")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 申请时间
+    /// </summary>
+    [Required(ErrorMessage = "申请时间必填")]
+    public DateTime ApplyTime { get; set; }
+
+    /// <summary>
+    /// 预约区域
+    /// </summary>
+    [Required(ErrorMessage = "申请预约区域必填")]
+    public string ApplyArea { get; set; }
+
+    /// <summary>
+    /// 来源公司
+    /// </summary>
+    [Required(ErrorMessage = "来源公司")]
+    public string Company { get; set; }
+
+    /// <summary>
+    /// 来访时间
+    /// </summary>
+    public DateTime Start { get; set; }
+
+    /// <summary>
+    /// 离开时间
+    /// </summary>
+    public DateTime End { get; set; }
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string Factory { get; set; }
+
+    /// <summary>
+    /// 明细
+    /// </summary>
+    [MinLength(1, ErrorMessage = "明细必填")]
+    public List<AppointmentReceiveItemDto> Items { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (Start >= End)
+        {
+            yield return new ValidationResult("来访时间不能大于等于离开时间", new[] { nameof(Start), nameof(End) });
+        }
+    }
+}

Src/Dlhis.Basic/Appointment/Response/AppointmentAreaPageResponse.cs

@@ -0,0 +1,34 @@
+using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Basic.Appointment.Response;
+
+public class AppointmentAreaPageResponse
+{
+    public long Id { get; set; }
+    
+    /// <summary>
+    /// 区域类型
+    /// </summary>
+    public AppointmentAreaEnumType Type { get; set; }
+    
+    /// <summary>
+    /// 区域类型
+    /// </summary>
+    public string TypeDesc => Type.GetDescription();
+
+    /// <summary>
+    /// 自定义编码
+    /// </summary>
+    public string CustomCode { get; set; }
+    
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+}

Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs

@@ -0,0 +1,110 @@
+using Dlhis.Basic.Utils;
+using Dlhis.Entity.Visitor.Enums;
+using Newtonsoft.Json;
+
+namespace Dlhis.Basic.Appointment.Response;
+
+public class AppointmentDetailResponse
+{
+    public long Id { get; set; }
+
+    public AppointmentPageResponse Mst { get; set; }
+
+    /// <summary>
+    /// 流水号
+    /// </summary>
+    public string No { get; set; }
+
+    /// <summary>
+    /// no
+    /// </summary>
+    public string UserNo { get; set; }
+
+    /// <summary>
+    /// 证件类型
+    /// </summary>
+    public string IdType { get; set; }
+
+    /// <summary>
+    /// 证件号
+    /// </summary>
+    [JsonConverter(typeof(ObfuscateProviderOnlyAdminJsonConverter), 0)]
+    public string IdNo { get; set; }
+
+    /// <summary>
+    /// 访客名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 手机号
+    /// </summary>
+    [JsonConverter(typeof(ObfuscateProviderOnlyAdminJsonConverter), 0)]
+    public string Phone { get; set; }
+
+    /// <summary>
+    /// 车牌
+    /// </summary>
+    public string LicensePlate { get; set; }
+
+    /// <summary>
+    /// 进入门岗
+    /// </summary>
+    public bool IsEnterDoorArea { get; set; }
+
+    /// <summary>
+    /// 预约门禁区域
+    /// </summary>
+    public string ApplyDoorArea { get; set; }
+
+    /// <summary>
+    /// 访客开始
+    /// </summary>
+    public DateTime? DoorStart { get; set; }
+
+    /// <summary>
+    /// 访问结束
+    /// </summary>
+    public DateTime? DoorEnd { get; set; }
+
+    /// <summary>
+    /// 是否进入车间
+    /// </summary>
+    public bool IsEnterWorkplace { get; set; }
+
+    /// <summary>
+    /// 申请车间区域
+    /// </summary>
+    public List<string> ApplyWorkplaceAreas { get; set; }
+
+    /// <summary>
+    /// 车间访问开始
+    /// </summary>
+    public DateTime? WorkplaceStart { get; set; }
+
+    /// <summary>
+    /// 车间访问结束
+    /// </summary>
+    public DateTime? WorkplaceEnd { get; set; }
+
+    /// <summary>
+    /// 社保照片url
+    /// </summary>
+    public string ImageUrl { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
+
+    /// <summary>
+    /// 门禁状态
+    /// </summary>
+    public VisitorAppointmentDetailStatusEnumType DoorStatus { get; set; }
+
+    /// <summary>
+    /// 车间状态
+    /// </summary>
+    public VisitorAppointmentDetailStatusEnumType WorkplaceStatus { get; set; }
+}

Src/Dlhis.Basic/Appointment/Response/AppointmentPageResponse.cs

@@ -0,0 +1,46 @@
+namespace Dlhis.Basic.Appointment.Response;
+
+public class AppointmentPageResponse
+{
+    public string No { get; set; }
+
+    /// <summary>
+    /// 标题
+    /// </summary>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// 对接人工号
+    /// </summary>
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 对接人姓名
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 来访人来源/公司
+    /// </summary>
+    public string Source { get; set; }
+
+    /// <summary>
+    /// 申请时间
+    /// </summary>
+    public DateTime Date { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 预约厂区
+    /// </summary>
+    public string Factory { get; set; }
+
+    /// <summary>
+    /// 申请事由
+    /// </summary>
+    public string Reason { get; set; }
+}

Src/Dlhis.Basic/Appointment/Response/AppointmentSummaryResponse.cs

@@ -0,0 +1,11 @@
+namespace Dlhis.Basic.Appointment.Response;
+
+public class AppointmentSummaryResponse
+{
+    public int Total { get; set; }
+    public int In { get; set; }
+    public int NotIn { get; set; }
+    public int Leave { get; set; }
+
+    public int NotLeave { get; set; }
+}

Src/Dlhis.Basic/Appointment/Services/IAppointmentAreaService.cs

@@ -0,0 +1,36 @@
+using Dlhis.Basic.Appointment.Request;
+using Dlhis.Basic.Appointment.Response;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Appointment.Services;
+
+public interface IAppointmentAreaService : IScopeDependency
+{
+    /// <summary>
+    /// 区域分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<Pagination<AppointmentAreaPageResponse>> GetPageAsync(AppointmentAreaPageRequest request);
+
+    /// <summary>
+    /// 保存区域
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task SaveAsync(AppointmentAreaSaveRequest request);
+
+    /// <summary>
+    /// 分配设备组到区域
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task AssignAsync(AppointmentAreaAssignRequest request);
+
+    /// <summary>
+    /// 获取分配
+    /// </summary>
+    /// <param name="customCode"></param>
+    /// <returns></returns>
+    Task<List<Guid>> GetAssignmentsAsync(string customCode);
+}

Src/Dlhis.Basic/Appointment/Services/IAppointmentService.cs

@@ -0,0 +1,79 @@
+using Dlhis.Basic.Appointment.Request;
+using Dlhis.Basic.Appointment.Response;
+using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Appointment.Services;
+
+public interface IAppointmentService : IScopeDependency
+{
+    /// <summary>
+    /// 预约分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<Pagination<AppointmentPageResponse>> GetPageAsync(AppointmentPageRequest request);
+
+    /// <summary>
+    /// 查看明细
+    /// </summary>
+    /// <param name="no"></param>
+    /// <returns></returns>
+    Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(string no);
+
+    /// <summary>
+    /// 确认到达
+    /// </summary>
+    /// <returns></returns>
+    Task ConfirmAsync(AppointmentConfirmRequest request);
+
+
+    /// <summary>
+    /// 根据身份证获取最新访客预约
+    /// </summary>
+    /// <param name="idNo"></param>
+    /// <param name="factory"></param>
+    /// <returns></returns>
+    Task<AppointmentDetailResponse> GetTodayByIdNoAsync(string idNo, string factory);
+
+    /// <summary>
+    /// 强制离开
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="reason"></param>
+    /// <returns></returns>
+    Task FocusLeaveAsync(long id, string reason);
+
+    /// <summary>
+    /// 获取记录列表
+    /// </summary>
+    /// <param name="factory"></param>
+    /// <param name="search"></param>
+    /// <param name="status"></param>
+    /// <param name="start"></param>
+    /// <param name="end"></param>
+    /// <returns></returns>
+    Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, string search, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end);
+
+    Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync(AppointmentIdNoPageRequest request);
+
+    Task<AppointmentSummaryResponse> GetSummaryAsync(string factory, DateTime start, DateTime end);
+
+    /// <summary>
+    /// 更新人脸
+    /// </summary>
+    /// <param name="detailId"></param>
+    /// <param name="base64"></param>
+    /// <returns></returns>
+    Task UpdateFaceAsync(long detailId, string base64);
+
+    /// <summary>
+    /// 自动离职
+    /// </summary>
+    /// <returns></returns>
+    Task AutoResignAsync();
+
+    Task<List<string>> GetVisitorDevicesAsync(long detailId);
+
+    Task RecoverAsync();
+}

Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentAreaService.cs

@@ -0,0 +1,206 @@
+using Dlhis.Basic.Appointment.Request;
+using Dlhis.Basic.Appointment.Response;
+using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Device.Entities;
+using Dlhis.Entity.Device.Enums;
+using Dlhis.Entity.Visitor.Entity;
+using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Mapster;
+
+namespace Dlhis.Basic.Appointment.Services.Implements;
+
+public class AppointmentAreaService : IAppointmentAreaService
+{
+    private readonly IDbContext _dbContext;
+
+    public AppointmentAreaService(IDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task SaveAsync(AppointmentAreaSaveRequest request)
+    {
+        if (!request.Id.HasValue)
+        {
+
+            var exists = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => x.CustomCode == request.CustomCode).AnyAsync();
+            exists.ThrowIfTrue("编码已存在");
+
+            var entity = request.Adapt<AppointmentAreaEntity>();
+            entity.CustomCode = request.CustomCode;
+            entity.Type = request.Type;
+            await _dbContext.InsertAsync(entity);
+        }
+        else
+        {
+            var entity = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => x.Id == request.Id).SingleAsync();
+            entity.ThrowIfNull("预约区域不存在");
+            request.Adapt(entity);
+            await _dbContext.UpdateAsync(entity);
+        }
+    }
+
+    public async Task<Pagination<AppointmentAreaPageResponse>> GetPageAsync(AppointmentAreaPageRequest request)
+    {
+        return await _dbContext.Queryable<AppointmentAreaEntity>()
+            .WhereIF(request.Type.HasValue, x => x.Type == request.Type)
+            .WhereIF(request.Search.IsPresent(), x => x.CustomCode == request.Search || x.Name.Contains(request.Search))
+            .Select<AppointmentAreaPageResponse>()
+            .ToPageListAsync(request);
+    }
+
+    public async Task AssignAsync(AppointmentAreaAssignRequest request)
+    {
+        (await _dbContext.Queryable<AppointmentAreaEntity>()
+                .Where(x => x.CustomCode == request.CustomCode)
+                .AnyAsync()
+            ).ThrowIfFalse("区域不存在");
+
+        (await _dbContext.Queryable<DeviceGroupEntity>()
+                .Where(x => request.DeviceGroupCodes.Contains(x.Code))
+                .Where(x => x.AsAppointment == false)
+                .AnyAsync())
+            .ThrowIfTrue("存在非可设置访客预约的分组");
+
+        var userBeforePermissions = await GetMyPermissionsAsync(request.CustomCode);
+        var userNos = userBeforePermissions.Select(x => x.Key).ToList();
+
+        //删除原来的配置
+        await _dbContext.Client.Deleteable<AppointmentAreaAssignmentEntity>()
+            .Where(x => x.CustomCode == request.CustomCode)
+            .ExecuteCommandAsync();
+
+        //添加当前区域的设置
+        var data = request.DeviceGroupCodes.Select(x => new AppointmentAreaAssignmentEntity
+        {
+            CustomCode = request.CustomCode,
+            DeviceGroupCode = x
+        }).ToList();
+
+        await _dbContext.InsertAsync(data);
+
+        var userCurrentPermissions = await GetMyPermissionsAsync(request.CustomCode);
+
+        var allDeviceCodes = userCurrentPermissions.SelectMany(x => x.Value);
+        var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => allDeviceCodes.Contains(x.Code)).ToListAsync();
+
+        var tasks = new List<DeviceTaskEntity>();
+        foreach (var userNo in userNos)
+        {
+            var before = userBeforePermissions[userNo];
+            var current = userCurrentPermissions[userNo];
+
+            //被删除
+            var deletedItems = before.Where(x => !current.Contains(x)).ToList();
+            //新增
+            var addItems = current.Where(x => !before.Contains(x)).ToList();
+
+            if (!deletedItems.Any() && !addItems.Any())
+            {
+                continue;
+            }
+
+            tasks.AddRange(deletedItems.Select(x => new DeviceTaskEntity
+            {
+                Type = DeviceTaskEnumType.Delete,
+                DeviceType = DeviceTypeEnumType.Door,
+                UserNo = userNo,
+                DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
+                Status = DeviceTaskStatusEnumType.Wait,
+                Version = 0,
+                Source = "预约区域和设备组关系变更生成",
+                Priority = 99
+            }));
+
+            tasks.AddRange(addItems.Select(x => new DeviceTaskEntity
+            {
+                Type = DeviceTaskEnumType.Add,
+                DeviceType = DeviceTypeEnumType.Door,
+                UserNo = userNo,
+                DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
+                Status = DeviceTaskStatusEnumType.Wait,
+                Version = 0,
+                Source = "预约区域和设备组关系变更生成",
+                Priority = 99
+            }));
+        }
+
+        await _dbContext.InsertAsync(tasks);
+    }
+
+    /// <inheritdoc />
+    public async Task<List<Guid>> GetAssignmentsAsync(string customCode)
+    {
+        return await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
+            .LeftJoin<DeviceGroupEntity>((x, dg) => x.DeviceGroupCode == dg.Code)
+            .Where((x, dg) => x.CustomCode == customCode && dg.AsAppointment)
+            .Select(x => x.DeviceGroupCode)
+            .ToListAsync();
+    }
+
+
+    //********************************************************* help methods ***************************************************************
+
+
+    private async Task<Dictionary<string, List<Guid>>> GetMyPermissionsAsync(string areaCode)
+    {
+        //获取已经到达的数据
+        var arrivedInfos = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .Where(x => x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived || x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+            .Select(x => new
+            {
+                x.UserNo,
+                x.DoorStatus,
+                x.WorkplaceStatus,
+                x.IsEnterDoorArea,
+                x.ApplyDoorArea,
+                x.IsEnterWorkplace,
+                x.ApplyWorkplaceAreas
+            })
+            .ToListAsync();
+
+        var userAreaCodes = arrivedInfos.GroupBy(x => x.UserNo).ToDictionary(p => p.Key, ls =>
+        {
+            return ls.SelectMany(x =>
+            {
+                var list = new List<string>();
+                if (x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+                {
+                    list.Add(x.ApplyDoorArea);
+                }
+
+                if (x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+                {
+                    list.AddRange(x.ApplyWorkplaceAreas);
+                }
+
+                return list;
+            });
+        });
+
+        userAreaCodes = userAreaCodes.Where(x => x.Value.Contains(areaCode)).ToDictionary(x => x.Key, x => x.Value);
+
+        var userBeforePermissions = new Dictionary<string, List<Guid>>(userAreaCodes.Count);
+        foreach ((string currentUserNo, IEnumerable<string> currentUseAreaCode) in userAreaCodes)
+        {
+            var deviceGroupCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
+                .Where(x => currentUseAreaCode.Contains(x.CustomCode))
+                .Select(x => x.DeviceGroupCode)
+                .ToListAsync();
+
+            var deviceCodes = await _dbContext.Queryable<DeviceGroupRelationshipEntity>()
+                .Where(x => deviceGroupCodes.Contains(x.GroupCode))
+                .Select(x => x.DeviceCode)
+                .Distinct()
+                .ToListAsync();
+
+            userBeforePermissions.Add(currentUserNo, deviceCodes);
+        }
+
+        return userBeforePermissions;
+    }
+}

Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs

@@ -0,0 +1,606 @@
+using System.Linq.Expressions;
+using Dlhis.Basic.Appointment.Request;
+using Dlhis.Basic.Appointment.Response;
+using Dlhis.Basic.Common.Message.Requests;
+using Dlhis.Basic.Common.Message.Services;
+using Dlhis.Basic.Organization.Request;
+using Dlhis.Basic.Organization.Response;
+using Dlhis.Basic.Organization.Services;
+using Dlhis.Dh.Api;
+using Dlhis.Dh.Api.Requests;
+using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Basic.Enums;
+using Dlhis.Entity.Device.Entities;
+using Dlhis.Entity.Device.Enums;
+using Dlhis.Entity.Visitor.Entity;
+using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Mapster;
+using Microsoft.AspNetCore.DataProtection;
+using SqlSugar;
+
+namespace Dlhis.Basic.Appointment.Services.Implements;
+
+public class AppointmentService : IAppointmentService
+{
+    private readonly IDbContext _dbContext;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ICurrentUser _currentUser;
+    private readonly IDhApi _dhApi;
+    private readonly IJinkoApiService _jinkoApiService;
+    private readonly IFactorySettingService _factorySettingService;
+    private readonly ILogger<AppointmentService> _logger;
+    private readonly IGainfoFaceService _gainfoFaceService;
+    private readonly IServiceProvider _serviceProvider;
+
+    public AppointmentService(IDbContext dbContext,
+        IDataProtectionProvider dataProtectionProvider,
+        ICurrentUser currentUser,
+        IDhApi dhApi,
+        IJinkoApiService jinkoApiService,
+        IFactorySettingService factorySettingService,
+        IGainfoFaceService gainfoFaceService,
+        IServiceProvider serviceProvider,
+
+        ILogger<AppointmentService> logger)
+    {
+        _dbContext = dbContext;
+        _dataProtectionProvider = dataProtectionProvider;
+        _currentUser = currentUser;
+        _dhApi = dhApi;
+        _jinkoApiService = jinkoApiService;
+        _factorySettingService = factorySettingService;
+        _logger = logger;
+        _gainfoFaceService = gainfoFaceService;
+        _serviceProvider = serviceProvider;
+    }
+
+    public async Task<Pagination<AppointmentPageResponse>> GetPageAsync(AppointmentPageRequest request)
+    {
+        var factory = _currentUser.GetStringTenantId();
+
+        return await _dbContext.Queryable<VisitorAppointmentEntity>()
+            .WhereIF(request.SearchDateTimePeriod.HasValue(),
+                x => x.Date >= request.SearchDateTimePeriod.Start && x.Date <= request.SearchDateTimePeriod.End)
+            .WhereIF(request.Search.IsPresent(), x => x.Code == request.Search ||
+                                                      SqlFunc.Subqueryable<VisitorAppointmentDetailEntity>()
+                                                          .Where(p => p.No == x.No)
+                                                          .Where(p => p.IdNo == request.Search || p.Name == request.Search).Any()
+            )
+            .Where(x => x.Factory == factory)
+            .Select<AppointmentPageResponse>()
+            .ToPageListAsync(request);
+    }
+
+    public async Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(string no)
+    {
+        return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .Where(x => x.No == no)
+            .Select(x => new AppointmentDetailResponse
+            {
+                Id = x.Id,
+                No = x.No,
+                UserNo = x.UserNo,
+                IdType = x.IdType,
+                IdNo = x.IdNo,
+                Name = x.Name,
+                Phone = x.Phone,
+                LicensePlate = x.LicensePlate,
+                IsEnterDoorArea = x.IsEnterDoorArea,
+                ApplyDoorArea = SqlFunc.Subqueryable<AppointmentAreaEntity>().Where(p => p.CustomCode == x.ApplyDoorArea).Select(p => p.Name),
+                DoorStart = x.DoorStart,
+                DoorEnd = x.DoorEnd,
+                IsEnterWorkplace = x.IsEnterWorkplace,
+                ApplyWorkplaceAreas = SqlFunc.Subqueryable<AppointmentAreaEntity>().Where(p => x.ApplyWorkplaceAreas.ToString().Contains(p.CustomCode)).ToList(p => p.Name),
+                WorkplaceStart = x.WorkplaceStart,
+                WorkplaceEnd = x.WorkplaceEnd,
+                ImageUrl = x.ImageUrl,
+                Remark = x.Remark,
+                DoorStatus = x.DoorStatus,
+                WorkplaceStatus = x.WorkplaceStatus,
+            })
+            .ToListAsync();
+    }
+
+    public async Task ConfirmAsync(AppointmentConfirmRequest request)
+    {
+        var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == request.Id).SingleAsync();
+        detail.ThrowIfNull("预约信息不存在");
+
+        //提前传
+        await UploadFaceToDhAsync(detail.IdNo, request.Base64Image);
+
+        if (detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait)
+        {
+            detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Arrived;
+        }
+        else
+        {
+            true.ThrowIfTrue($"数据有误:{detail.DoorStatus.GetDescription()}");
+        }
+
+        detail.ArrivedTime = DateTime.Now;
+        await _dbContext.UpdateAsync(detail);
+
+        await _gainfoFaceService.UploadExternalFaceAsync(new GainfoUploadFaceRequest
+        {
+            UserNo = detail.IdNo,
+            Face = request.Base64Image
+        });
+
+        await GenerateDeviceTasksAsync(detail, false, DeviceTaskEnumType.Add, "访客门岗认证生成");
+    }
+
+    public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(string idNo, string factory)
+    {
+        var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
+        try
+        {
+            idNo = protector.Unprotect(idNo);
+        }
+        catch (Exception)
+        {
+            //ignore
+        }
+
+        var now = DateTime.Now;
+        return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == x.IdNo)
+            .Where((x, ga) => ga.IdNo == idNo)
+            .Where(x => x.IsEnterDoorArea && now >= x.DoorStart && now <= x.DoorEnd && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait)
+            .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
+            .Select(x => new AppointmentDetailResponse
+            {
+                No = x.No,
+                Mst = SqlFunc.Subqueryable<VisitorAppointmentEntity>()
+                    .LeftJoin<GainfoEntity>((p, ga) => p.Code == ga.Code)
+                    .Where((p, ga) => p.No == x.No)
+                    .First((p, ga) => new AppointmentPageResponse
+                    {
+                        No = p.No,
+                        Title = p.Title,
+                        Code = p.Code,
+                        Name = ga.Name,
+                        Source = p.Source,
+                        Date = p.Date,
+                        Remark = p.Remark,
+                        Factory = p.Factory,
+                        Reason = p.Reason
+                    }, false)
+            }, true)
+            .FirstAsync();
+    }
+
+    public async Task FocusLeaveAsync(long id, string reason)
+    {
+        // 根据访客预约详情ID获取记录，若不存在则抛出异常
+        var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == id).SingleAsync();
+        detail.ThrowIfNull("数据不存在");
+
+        // 如果已进入门区且门区状态为“已到达”，则将门区状态更新为“强制离场”
+        if (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+            detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave;
+
+        // 如果已进入门区且门区状态为“待到达”，则将门区状态更新为“作废”
+        if (detail.IsEnterDoorArea && detail.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait)
+            detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Obsolete;
+
+        // 如果已进入工作区且工作区状态为“已到达”，则将工作区状态更新为“强制离场”
+        if (detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+            detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.FocusLeave;
+
+        // 如果已进入工作区且工作区状态为“待到达”，则将工作区状态更新为“作废”
+        if (detail.IsEnterWorkplace && detail.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait)
+            detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Obsolete;
+
+        // 记录强制离场时间和原因
+        detail.FocusLeaveDateTime = DateTime.Now;
+        detail.Remark += "强制离场:" + reason;
+
+        // 生成设备任务并更新数据库
+        await GenerateDeviceTasksAsync(detail, true, DeviceTaskEnumType.Delete, $"强制离场:{reason}");
+        await _dbContext.UpdateAsync(detail);
+
+        try
+        {
+            var appointment = await _dbContext.Queryable<VisitorAppointmentEntity>().Where(x => x.No == detail.No).SingleAsync();
+            await _jinkoApiService.SendWorkMessageAsync(new DingTalkWorkMessageRequest
+            {
+                WorkCodes = new List<string> { appointment.Code },
+                Content = $"您的访客预约《{appointment.Title}》中的访客{detail.Name}已被强制离场，原因：{reason}。"
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "发送访客离场通知失败:{msg}", ex.Message);
+        }
+    }
+
+    public async Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync(AppointmentIdNoPageRequest request)
+    {
+        var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
+        try
+        {
+            request.IdNo = protector.Unprotect(request.IdNo);
+        }
+        catch (Exception)
+        {
+            //ignore
+        }
+
+        var page = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
+            .Where((x, ga) => ga.IdNo == request.IdNo)
+            .OrderBy(x => x.CreateTime)
+            .Select<AppointmentDetailResponse>()
+            .ToPageListAsync(request);
+
+        return page;
+    }
+
+
+    public async Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, string search, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end)
+    {
+        var now = DateTime.Now;
+        var currentDateTime = start.Date.AddHours(now.Hour).AddMinutes(now.Minute);
+
+        return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == x.IdNo)
+            .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>()
+                .Where(p => p.No == x.No)
+                .Where(p => p.Factory == factory).Any()
+            )
+            .Where(x => x.IsEnterDoorArea)
+            .WhereIF(status.HasValue, x => x.DoorStatus == status)
+            .WhereIF(status.HasValue && status == VisitorAppointmentDetailStatusEnumType.Wait, x => currentDateTime >= x.DoorStart && currentDateTime <= x.DoorEnd)
+            .WhereIF(status.HasValue && status == VisitorAppointmentDetailStatusEnumType.Arrived, x => currentDateTime >= x.DoorStart && currentDateTime <= x.DoorEnd)
+            .WhereIF(!status.HasValue, x => x.DoorStart >= start && x.DoorEnd <= end)
+            .WhereIF(search.IsPresent(), x => x.Name.Contains(search) || x.No == search || x.IdNo == search)
+            .Select(x => new AppointmentDetailResponse
+            {   
+                Id = x.Id,
+                No = x.No,
+                Mst = SqlFunc.Subqueryable<VisitorAppointmentEntity>()
+                    .LeftJoin<GainfoEntity>((p, ga) => p.Code == ga.Code)
+                    .Where((p, ga) => p.No == x.No)
+                    .First((p, ga) => new AppointmentPageResponse
+                    {
+                        No = p.No,
+                        Title = p.Title,
+                        Code = p.Code,
+                        Name = ga.Name,
+                        Source = p.Source,
+                        Date = p.Date,
+                        Remark = p.Remark,
+                        Factory = p.Factory,
+                        Reason = p.Reason
+                    }, false)
+            }, true)
+            .ToListAsync();
+    }
+
+
+    public async Task<AppointmentSummaryResponse> GetSummaryAsync(string factory, DateTime start, DateTime end)
+    {
+        start = start.Date;
+
+        var total = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .Where(x => x.IsEnterDoorArea && x.DoorStart >= start && x.DoorStart <= end)
+            .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
+            .CountAsync();
+
+        var @in = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .Where(x => x.IsEnterDoorArea && x.ArrivedTime >= start && x.ArrivedTime <= end && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+            .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
+            .CountAsync();
+
+        var notIn = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .Where(x => x.IsEnterDoorArea && x.DoorStart >= start && x.DoorStart <= end)
+            .Where(x => x.IsEnterDoorArea && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait)
+            .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
+            .CountAsync();
+
+        var leave = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .Where(x => x.IsEnterDoorArea && x.DoorEnd >= start && x.DoorEnd <= end)
+            .Where(x => x.IsEnterDoorArea && (x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Leave || x.DoorStatus == VisitorAppointmentDetailStatusEnumType.FocusLeave))
+            .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
+            .CountAsync();
+
+        var notLeave = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
+            .Where(x => x.IsEnterDoorArea && x.DoorEnd >= start && x.DoorEnd <= end && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+            .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
+            .CountAsync();
+
+        return new AppointmentSummaryResponse
+        {
+            Total = total,
+            In = @in,
+            NotIn = notIn,
+            Leave = leave,
+            NotLeave = notLeave
+        };
+    }
+
+
+    public async Task UpdateFaceAsync(long detailId, string base64)
+    {
+        var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == detailId).SingleAsync();
+        detail.ThrowIfNull("数据不存在");
+
+        await UploadFaceToDhAsync(detail.IdNo, base64);
+
+        await _gainfoFaceService.UploadExternalFaceAsync(new GainfoUploadFaceRequest
+        {
+            UserNo = detail.IdNo,
+            Face = base64
+        });
+
+        await GenerateDeviceTasksAsync(detail, true, DeviceTaskEnumType.Update, "访客手动上传照片");
+    }
+
+    public async Task RecoverAsync()
+    {
+        var day = new DateTime(2025, 12, 19);
+        var gainfoLeaves = await _dbContext.Queryable<GainfoLeaveEntity>()
+               .Where(x => x.Type == GainfoUserTypeEnumType.External)
+               .Where(x => SqlFunc.DateIsSame(x.ResignationDate, day))
+               .Where(x => SqlFunc.Subqueryable<GainfoEntity>().Where(p => p.No == x.No).NotAny())
+               .ToListAsync();
+
+        foreach (var gainfoLeave in gainfoLeaves)
+        {
+            await _dbContext.Client.Ado.BeginTranAsync();
+            try
+            {
+                var gainfo = gainfoLeave.Adapt<GainfoEntity>();
+                gainfo.Id = gainfo.IdentityUserId;
+                await _dbContext.InsertAsync(gainfo);
+                await _dbContext.DeleteReallyAsync(gainfoLeave);
+
+                var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.UserNo == gainfo.No).OrderByDescending(x => x.Id).FirstAsync();
+                detail.ThrowIfNull("数据不存在");
+                if (detail.IsEnterDoorArea)
+                {
+                    detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Arrived;
+                }
+                if (detail.IsEnterWorkplace)
+                {
+                    detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Arrived;
+                }
+                await _dbContext.UpdateAsync(detail);
+                await GenerateDeviceTasksAsync(detail, true, DeviceTaskEnumType.Update, "数据恢复");
+
+                await _dbContext.Client.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "恢复外部人员失败:{userNo}", gainfoLeave.No);
+                await _dbContext.Client.Ado.RollbackTranAsync();
+            }
+        }
+    }
+
+    public async Task<List<string>> GetVisitorDevicesAsync(long detailId)
+    {
+        var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == detailId).SingleAsync();
+        detail.ThrowIfNull("数据不存在");
+
+        var areaCodes = GetValidAreaCodes(detail, true).ToList();
+        if (areaCodes.IsEmpty()) return new List<string>();
+
+        var existsAreaCodes = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => areaCodes.Contains(x.CustomCode)).Select(x => x.CustomCode).ToListAsync();
+
+        //当前分配的设备组code
+        var deviceGroupCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
+            .Where(x => existsAreaCodes.Contains(x.CustomCode))
+            .Select(x => x.DeviceGroupCode)
+            .ToListAsync();
+
+        var deviceCodes = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().Where(x => deviceGroupCodes.Contains(x.GroupCode)).Select(x => x.DeviceCode).ToListAsync();
+        var deviceUniqueNos = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).Select(x => x.UniqueNo).ToListAsync();
+
+        return deviceUniqueNos;
+    }
+
+    /// <inheritdoc />
+    public async Task AutoResignAsync()
+    {
+        //获取外部人员
+        var externals = await _dbContext.Queryable<GainfoEntity>()
+            .Where(x => x.Type == GainfoUserTypeEnumType.External)
+            .ToListAsync();
+
+        var gainfoService = _serviceProvider.GetService<IGainfoService>();
+
+        await AutoResignBySettingAsync(externals,
+           (settings, factory) =>
+           {
+               var setting = settings.First(x => x.Factory == factory);
+               return setting.NoRecordAutoResignExternalDays;
+           },
+           async (g, l) =>
+           {
+               await gainfoService.ResignAsync(new GainfoResignRequest
+               {
+                   Id = g.Id,
+                   Reason = $"{l}天无通行记录",
+                   Date = DateTime.Now
+               });
+           },
+           null, "自动归档外部人员异常");
+
+    }
+
+    private async Task AutoResignBySettingAsync(List<GainfoEntity> gainfos
+        , Func<List<FactorySettingResponse>, string, int> getleaveDay
+        , Func<GainfoEntity, int, Task> todo
+        , Expression<Func<DeviceUploadLogEntity, bool>> uploadLogAdditionalExp
+        , string errorMsgPrefix)
+    {
+        var settings = await _factorySettingService.GetListAsync(false);
+        var holidaies = await _dbContext.Queryable<HolidayEntity>()
+            .Select(x => new
+            {
+                x.Type,
+                x.Start,
+                x.End
+            })
+            .ToListAsync();
+
+        var weekends = new List<DayOfWeek>() { DayOfWeek.Saturday, DayOfWeek.Sunday };
+        //人员分组,key为factory
+        foreach (var todoGainfos in gainfos.GroupBy(x => x.Factory))
+        {
+            //设置为0则不处理
+            var leaveDay = getleaveDay(settings, todoGainfos.Key);
+            if (leaveDay == 0)
+            {
+                continue;
+            }
+
+            foreach (var gainfo in todoGainfos)
+            {
+                //获取最近一次通行记录的时间,如果没有则取创建时间
+                DateTime raiseDateTime = await _dbContext.Queryable<DeviceUploadLogEntity>()
+                    .Where(x => x.UserUniqueNo == gainfo.Code)
+                    .WhereIF(uploadLogAdditionalExp != null, uploadLogAdditionalExp)
+                    .Select(x => SqlFunc.IsNull(SqlFunc.AggregateMax(x.RaiseDateTime), gainfo.CreateTime))
+                    .SingleAsync();
+
+                var checkDates = GetDaysUntilToday(raiseDateTime);
+                var days = checkDates.Count;
+                foreach (var date in checkDates)
+                {
+                    //date.DayOfWeek
+                    foreach (var holiday in holidaies)
+                    {
+                        var isPresent = date >= holiday.Start && date <= holiday.Start;
+                        if (isPresent)
+                        {
+                            if (holiday.Type == HolidayEnumType.Rest)
+                            {
+                                days--;
+                            }
+                        }
+                    }
+                    if (weekends.Contains(date.DayOfWeek))
+                    {
+                        days--;
+                    }
+                }
+
+                if (days >= leaveDay)
+                {
+                    try
+                    {
+                        await todo(gainfo, leaveDay);
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.LogError(e, $"{errorMsgPrefix}:{e.Message}");
+                    }
+                }
+
+            }
+        }
+    }
+
+
+    //*********************************************************************************************************************
+
+    private List<DateOnly> GetDaysUntilToday(DateTime begin)
+    {
+        var start = DateOnly.FromDateTime(begin.Date);
+        var today = DateOnly.FromDateTime(DateTime.Today);
+        if (start > today) return new List<DateOnly>();
+
+        var days = new List<DateOnly>();
+        for (var d = start; d < today; d = d.AddDays(1))
+        {
+            days.Add(d);
+        }
+
+        days.Remove(DateOnly.FromDateTime(begin.Date));
+        return days;
+    }
+
+
+    private async Task GenerateDeviceTasksAsync(VisitorAppointmentDetailEntity detail, bool withWorkplace, DeviceTaskEnumType deviceTaskType, string source)
+    {
+        var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == detail.IdNo || x.Code == detail.IdNo).SingleAsync();
+        gainfo.ThrowIfNull("人员信息不存在");
+
+        var areaCodes = GetValidAreaCodes(detail, withWorkplace).ToList();
+        if (areaCodes.IsEmpty()) return;
+
+        var existsAreaCodes = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => areaCodes.Contains(x.CustomCode)).Select(x => x.CustomCode).ToListAsync();
+
+        //当前分配的设备组code
+        var deviceGroupCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
+            .Where(x => existsAreaCodes.Contains(x.CustomCode))
+            .Select(x => x.DeviceGroupCode)
+            .ToListAsync();
+
+        var deviceCodes = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().Where(x => deviceGroupCodes.Contains(x.GroupCode)).Select(x => x.DeviceCode).ToListAsync();
+        var deviceUniqueNos = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).Select(x => new { x.UniqueNo, x.TenantId }).ToListAsync();
+
+        await _dbContext.InsertAsync(deviceUniqueNos.Select(x => new DeviceTaskEntity
+        {
+            DeviceType = DeviceTypeEnumType.Door,
+            DeviceUniqueNo = x.UniqueNo,
+            Status = DeviceTaskStatusEnumType.Wait,
+            UserNo = gainfo.No,
+            Type = deviceTaskType,
+            Priority = 100,
+            TenantId = x.TenantId,
+            Source = source,
+            Version = 0
+        }).ToList());
+    }
+
+    /// <summary>
+    /// 获取有效的区域编码
+    /// </summary>
+    /// <param name="detail"></param>
+    /// <param name="withWorkplace"></param>
+    /// <returns></returns>
+    private static IEnumerable<string> GetValidAreaCodes(VisitorAppointmentDetailEntity detail, bool withWorkplace)
+    {
+        if (detail.IsEnterDoorArea)
+        {
+            yield return detail.ApplyDoorArea;
+        }
+
+        if (withWorkplace && detail.IsEnterWorkplace)
+        {
+            foreach (var item in detail.ApplyWorkplaceAreas)
+            {
+                yield return item;
+            }
+        }
+    }
+
+
+    private async Task UploadFaceToDhAsync(string idNo, string base64Image)
+    {
+        try
+        {
+            var r = await _dhApi.SendFaceAsync(new FaceRequest
+            {
+                IdNo = idNo,
+                Face = base64Image
+            });
+
+            _logger.LogInformation("上传face数据到大华成功: {idNo} . {json}", idNo, r.ToJson());
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "上传face数据到大华失败:{msg}", e.Message);
+        }
+    }
+}

Src/Dlhis.Basic/BusinessShift/Controllers/BusinessShiftsController.cs

@@ -0,0 +1,69 @@
+using Dlhis.Basic.BusinessShift.Request;
+using Dlhis.Basic.BusinessShift.Response;
+using Dlhis.Basic.BusinessShift.Services;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.BusinessShift.Controllers;
+
+/// <summary>
+/// 餐次
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class BusinessShiftsController : ControllerBase
+{
+    private readonly IBusinessPlaceShiftService _businessPlaceShiftService;
+
+    public BusinessShiftsController(IBusinessPlaceShiftService businessPlaceShiftService)
+    {
+        _businessPlaceShiftService = businessPlaceShiftService;
+    }
+
+    /// <summary>
+    /// 餐别分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("page")]
+    public async Task<Pagination<BusinessPlaceShiftResponse>> GetPageAsync([FromQuery] BusinessPlaceShiftPageRequest request)
+    {
+        return await _businessPlaceShiftService.GetPageAsync(request);
+    }
+
+    /// <summary>
+    /// 餐别列表
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("list")]
+    public async Task<List<BusinessPlaceShiftResponse>> GetListAsync()
+    {
+        return await _businessPlaceShiftService.GetListAsync();
+    }
+
+    /// <summary>
+    /// 餐别保存
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("save")]
+    public async Task<Guid> SaveAsync(BusinessPlaceShiftSaveRequest request)
+    {
+        return await _businessPlaceShiftService.SaveAsync(request);
+    }
+
+    /// <summary>
+    /// 保存餐次段
+    /// </summary>
+    /// <param name="requests"></param>
+    /// <returns></returns>
+    [HttpPost("meal/save")]
+    [Transactional]
+    public async Task SaveMealShiftsAsync(List<BusinessPlaceShiftSaveMealShiftRequest> requests)
+    {
+        await _businessPlaceShiftService.SaveMealShiftsAsync(requests);
+    }
+}

Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftPageRequest.cs

@@ -0,0 +1,8 @@
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.BusinessShift.Request;
+
+public class BusinessPlaceShiftPageRequest : PageDto
+{
+
+}

Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveMealShiftRequest.cs

@@ -0,0 +1,46 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore.CustomClass;
+
+namespace Dlhis.Basic.BusinessShift.Request;
+
+public class BusinessPlaceShiftSaveMealShiftRequest : IValidatableObject
+{
+    public long? Id { get; set; }
+
+    /// <summary>
+    /// 餐别Code
+    /// </summary>
+    public Guid ShiftCode { get; set; }
+
+    /// <summary>
+    /// 餐次 ShiftEnumType
+    /// </summary>
+    [EnumDataType(typeof(ShiftEnumType))]
+    public ShiftEnumType ShiftType { get; set; }
+
+    /// <summary>
+    /// 序号
+    /// </summary>
+    public int Sequence { get; set; } = 100;
+
+    /// <summary>
+    /// 时间段
+    /// </summary>
+    [Required(ErrorMessage = "时间段不可为空")]
+    public TimePeriod TimePeriod { get; set; }
+
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (TimePeriod == null)
+        {
+            yield return new ValidationResult("时间段配置错误", new[] { nameof(TimePeriod) });
+        }
+
+        if (TimePeriod!.Start == TimePeriod.End)
+        {
+            yield return new ValidationResult("时间段设置区间有误,开始时段不能等于结束时段.", new[] { nameof(TimePeriod) });
+        }
+    }
+}

Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveRequest.cs

@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.BusinessShift.Request;
+
+public class BusinessPlaceShiftSaveRequest
+{
+    public long? Id { get; set; }
+
+    /// <summary>
+    /// 自定义代号 mealshift
+    /// </summary>
+    [Required(ErrorMessage = "餐次手工号不能为空")]
+    public string CustomCode { get; set; }
+
+    /// <summary>
+    /// 餐次名称
+    /// </summary>
+    [Required(ErrorMessage = "餐次名称")]
+    public string Name { get; set; }
+}

Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftResponse.cs

@@ -0,0 +1,26 @@
+namespace Dlhis.Basic.BusinessShift.Response;
+
+public class BusinessPlaceShiftResponse
+{
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 代号
+    /// </summary>
+    public Guid Code { get; set; }
+
+    /// <summary>
+    /// 自定义代号
+    /// </summary>
+    public string CustomCode { get; set; }
+
+    /// <summary>
+    /// 餐次名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 就餐时间段
+    /// </summary>
+    public List<MealShiftResponse> MealShifts { get; set; }
+}

Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs

@@ -0,0 +1,31 @@
+namespace Dlhis.Basic.BusinessShift.Response;
+
+public class BusinessPlaceShiftTinyResponse
+{
+    /// <summary>
+    /// 无用字段,暂时不删除
+    /// </summary>
+    public string CustomCode { get; set; }
+
+    /// <summary>
+    /// 餐次名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 经营开始时间
+    /// </summary>
+    public TimeOnly Start { get; set; }
+
+    /// <summary>
+    /// 经营结束时间
+    /// </summary>
+    public TimeOnly End { get; set; }
+
+    public int Sequence { get; set; }
+
+    /// <summary>
+    /// 时间段描述
+    /// </summary>
+    public string TimePeriodDesc => $"{Start}--{End}";
+}

Src/Dlhis.Basic/BusinessShift/Response/MealShiftResponse.cs

@@ -0,0 +1,20 @@
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Basic.BusinessShift.Response
+{
+    public class MealShiftResponse
+    {
+        public long Id { get; set; }
+
+        public Guid ShiftCode { get; set; }
+
+        public ShiftEnumType ShiftType { get; set; }
+
+        public string Name => ShiftType.GetDescription();
+
+        public TimeOnly Start { get; set; }
+
+        public TimeOnly End { get; set; }
+    }
+}

Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs

@@ -0,0 +1,24 @@
+using Dlhis.Basic.Places.Request;
+using Dlhis.Basic.BusinessShift.Request;
+using Dlhis.Basic.BusinessShift.Response;
+using Dlhis.Basic.Places.Response;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.BusinessShift.Services;
+
+public interface IBusinessPlaceShiftService : IScopeDependency
+{
+    Task<Pagination<BusinessPlaceShiftResponse>> GetPageAsync(BusinessPlaceShiftPageRequest request);
+
+    Task<List<BusinessPlaceShiftResponse>> GetListAsync();
+
+    Task<Guid> SaveAsync(BusinessPlaceShiftSaveRequest request);
+
+    Task SaveMealShiftsAsync(List<BusinessPlaceShiftSaveMealShiftRequest> requests);
+
+    Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeAsync(string placeCustomCode);
+
+    Task<List<DeviceCodeNameDetail>> GetAssignmentsAsync(Guid code);
+
+    Task AssignAsync(DispositionDeviceRequest request);
+}

Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs

@@ -0,0 +1,276 @@
+using Dlhis.Basic.Places.Request;
+using Dlhis.Basic.BusinessShift.Request;
+using Dlhis.Basic.BusinessShift.Response;
+using Dlhis.Basic.Places.Response;
+using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Device.Entities;
+using Dlhis.Sys.Api;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Mapster;
+
+namespace Dlhis.Basic.BusinessShift.Services.Implements;
+
+public class BusinessPlaceShiftService : IBusinessPlaceShiftService
+{
+    private readonly IDbContext _dbContext;
+    private readonly ITenantApi _tenantApi;
+
+    public BusinessPlaceShiftService(IDbContext dbContext, ITenantApi tenantApi)
+    {
+        _dbContext = dbContext;
+        _tenantApi = tenantApi;
+    }
+
+    public async Task<Pagination<BusinessPlaceShiftResponse>> GetPageAsync(BusinessPlaceShiftPageRequest request)
+    {
+        var page = await _dbContext.Queryable<BusinessShiftEntity>()
+            .WhereIF(request.Search.IsPresent(), shift => shift.CustomCode.Contains(request.Search) || shift.Name.Contains(request.Search))
+            .Select<BusinessPlaceShiftResponse>()
+            .ToPageListAsync(request);
+
+        var shiftCodes = page.Data.Select(x => x.Code).ToList();
+
+        //下级就餐时间段
+        var mealShifts = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+            .Where(x => shiftCodes.Contains(x.ShiftCode))
+            .Select((x) => new MealShiftResponse
+            {
+                Id = x.Id,
+                ShiftCode = x.ShiftCode,
+                ShiftType = x.ShiftType,
+                Start = x.Start,
+                End = x.End,
+            })
+            .ToListAsync();
+
+        page.Data.ForEach(x => { x.MealShifts = mealShifts.Where(item => item.ShiftCode == x.Code).ToList(); });
+
+        return page;
+    }
+
+    public async Task<List<BusinessPlaceShiftResponse>> GetListAsync()
+    {
+        var result = await _dbContext.Queryable<BusinessShiftEntity>()
+            .Select<BusinessPlaceShiftResponse>()
+            .ToListAsync();
+
+        return result;
+    }
+
+    public async Task<Guid> SaveAsync(BusinessPlaceShiftSaveRequest request)
+    {
+        await CheckExistsAsync(request);
+
+        if (!request.Id.HasValue)
+        {
+            var entity = request.Adapt<BusinessShiftEntity>();
+            entity.CustomCode = request.CustomCode;
+            entity.Code = Guid.NewGuid();
+            await _dbContext.InsertAsync(entity);
+
+            return entity.Code;
+        }
+        else
+        {
+            var entity = await _dbContext.Queryable<BusinessShiftEntity>().FirstAsync(x => x.Id == request.Id);
+            entity.ThrowIfNull("餐别不存在");
+
+            request.Adapt(entity);
+            await _dbContext.UpdateAsync(entity);
+
+            return entity.Code;
+        }
+    }
+
+    public async Task SaveMealShiftsAsync(List<BusinessPlaceShiftSaveMealShiftRequest> requests)
+    {
+        var shiftCode = requests[0].ShiftCode;
+        var shift = await CheckExistsShiftAsync(shiftCode);
+
+        await _dbContext.Deleteable<BusinessShiftMealRelationshipEntity>().Where(x => x.ShiftCode == shiftCode).ExecuteCommandAsync();
+        
+        foreach (var request in requests)
+        {
+            request.Id = null;
+            
+            await CheckExistsMealShiftAsync(request);
+            await DuplicateTimePeriodAsync(request);
+
+            if (!request.Id.HasValue)
+            {
+                var entity = request.Adapt<BusinessShiftMealRelationshipEntity>();
+
+                entity.ShiftCode = shift.Code;
+                entity.ShiftCustomCode = shift.CustomCode;
+                entity.Start = request.TimePeriod.Start;
+                entity.End = request.TimePeriod.End;
+
+                await _dbContext.InsertAsync(entity);
+            }
+            else
+            {
+                var entity = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+                    .Where(x => x.ShiftCode == shiftCode)
+                    .SingleAsync(x => x.Id == request.Id);
+
+                entity.ThrowIfNull("餐次段不存在");
+
+                entity.Start = request.TimePeriod.Start;
+                entity.End = request.TimePeriod.End;
+
+                request.Adapt(entity);
+                await _dbContext.UpdateAsync(entity);
+            }
+        }
+    }
+
+
+    public async Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeAsync(string placeCustomCode)
+    {
+        var place = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == placeCustomCode).FirstAsync();
+        if (place == null)
+        {
+            return new BusinessPlaceWithShiftResponse()
+            {
+                Shifts = new List<BusinessPlaceShiftTinyResponse>()
+            };
+        }
+
+        var tenant = await _tenantApi.GetTenantByCodeAsync(place.TenantId);
+
+        var relationship = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>().Where(x => x.PlaceCode == place.Code).FirstAsync();
+        if (relationship == null)
+        {
+            return new BusinessPlaceWithShiftResponse()
+            {
+                CustomCode = placeCustomCode,
+                Name = place.Name,
+                TenantCode = tenant.Code,
+                TenantName = tenant.Name,
+                Shifts = new List<BusinessPlaceShiftTinyResponse>()
+            };
+        }
+
+        var shifts = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+            .Where(x => x.ShiftCode == relationship.ShiftCode)
+            .OrderBy(x => x.Sequence) //排序
+            .ToListAsync();
+
+        var list = new List<BusinessPlaceShiftTinyResponse>();
+
+        foreach (BusinessShiftMealRelationshipEntity shiftinfo in shifts)
+        {
+            var shift = new BusinessPlaceShiftTinyResponse
+            {
+                CustomCode = shiftinfo.Id.ToString(),
+                Name = shiftinfo.ShiftType.GetDescription(),
+                Start = shiftinfo.Start,
+                End = shiftinfo.End,
+                Sequence = shiftinfo.Sequence
+            };
+
+            list.Add(shift);
+        }
+
+        return new BusinessPlaceWithShiftResponse
+        {
+            CustomCode = placeCustomCode,
+            Name = place.Name,
+            TenantCode = tenant.Code,
+            TenantName = tenant.Name,
+            Shifts = list.OrderBy(x => x.Sequence).ToList()
+        };
+    }
+
+    public async Task<List<DeviceCodeNameDetail>> GetAssignmentsAsync(Guid code)
+    {
+        return await _dbContext.Queryable<DeviceRegistryEntity>()
+            .LeftJoin<DeviceEntity>((x, d) => x.DeviceUniqueNo == d.UniqueNo)
+            .Where(x => x.BusinessPlaceCode == code)
+            .Select((x, d) => new DeviceCodeNameDetail
+            {
+                UniqueNo = x.DeviceUniqueNo,
+                UniqueName = d.DeployPlace
+            })
+            .ToListAsync();
+    }
+
+
+    public async Task AssignAsync(DispositionDeviceRequest request)
+    {
+        var place = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.Code == request.PlaceCode).SingleAsync();
+        place.ThrowIfNull("营业点不存在");
+
+        var registries = await _dbContext.Queryable<DeviceRegistryEntity>()
+            .Where(x => x.BusinessPlaceCode == request.PlaceCode || request.UniqueNos.Contains(x.DeviceUniqueNo))
+            .ToListAsync();
+
+        registries.ForEach(item => { item.BusinessPlaceCode = request.UniqueNos.Contains(item.DeviceUniqueNo) ? request.PlaceCode : null; });
+
+        await _dbContext.UpdateAsync(registries);
+    }
+
+    //*********************************************** help methods ***************************************************//
+
+    /// <summary>
+    /// 时间段重合检查
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    private async Task DuplicateTimePeriodAsync(BusinessPlaceShiftSaveMealShiftRequest request)
+    {
+        var periods = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+            .Where(x => x.ShiftCode == request.ShiftCode)
+            .WhereIF(request.Id.HasValue, x => x.Id != request.Id)
+            .Select(x => new TimePeriod
+            {
+                Start = x.Start,
+                End = x.End
+            })
+            .ToListAsync();
+
+        foreach (var period in periods)
+        {
+            period.IsDuplicate(request.TimePeriod).ThrowIfTrue($"存在时间段重合[{period.Start}-{period.End}]");
+        }
+    }
+
+
+    /// <summary>
+    /// 检查重复
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    private async Task CheckExistsAsync(BusinessPlaceShiftSaveRequest request)
+    {
+        var existsSameCustomCode = await _dbContext.Queryable<BusinessShiftEntity>()
+            .Where(x => x.CustomCode == request.CustomCode || x.Name == request.Name)
+            .WhereIF(request.Id.HasValue, x => x.Id != request.Id)
+            .AnyAsync();
+
+        existsSameCustomCode.ThrowIfTrue($"自定义手工号或者名称存在重复,请检查.");
+    }
+
+    private async Task<BusinessShiftEntity> CheckExistsShiftAsync(Guid shiftCode)
+    {
+        var shift = await _dbContext.Queryable<BusinessShiftEntity>().Where(x => x.Code == shiftCode).SingleAsync();
+        shift.ThrowIfNull("餐次不存在");
+
+        return shift;
+    }
+
+    private async Task CheckExistsMealShiftAsync(BusinessPlaceShiftSaveMealShiftRequest request)
+    {
+        var exists = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+            .Where(x => x.ShiftCode == request.ShiftCode)
+            .Where(x => x.ShiftType == request.ShiftType)
+            .WhereIF(request.Id.HasValue, x => x.Id != request.Id)
+            .AnyAsync();
+
+        exists.ThrowIfTrue("重复设置!");
+    }
+}

Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs

@@ -0,0 +1,36 @@
+using Dlhis.Basic.Common.ApiLog.Request;
+using Dlhis.Basic.Common.ApiLog.Response;
+using Dlhis.Basic.Common.ApiLog.Services.Implements;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.ApiLog.Controller;
+
+/// <summary>
+/// API日志控制器
+/// </summary>
+[Authorize(Roles = "admin")]
+[Route("api/[controller]")]
+[ApiController]
+public class ApiLogController : ControllerBase
+{
+    private readonly IApiLogService _apiLogService;
+
+    public ApiLogController(IApiLogService apiLogService)
+    {
+        _apiLogService = apiLogService;
+    }
+
+    /// <summary>
+    /// 获取api日志
+    /// </summary>
+    /// <returns></returns>
+    [DisableApiLog]
+    [HttpGet("logs")]
+    public async Task<Pagination<ApiLogResponse>> GetLogsAsync([FromQuery] ApiLogRequest request)
+    {
+        return await _apiLogService.GetLogsAsync(request);
+    }
+}

Src/Dlhis.Basic/Common/ApiLog/Controller/OperateLogsController.cs

@@ -0,0 +1,36 @@
+using Dlhis.Basic.Common.ApiLog.Request;
+using Dlhis.Basic.Common.ApiLog.Response;
+using Dlhis.Basic.Common.ApiLog.Services;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.ApiLog.Controller;
+
+/// <summary>
+/// API日志控制器
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class OperateLogsController : ControllerBase
+{
+    private readonly IOperateLog _operateLog;
+
+    public OperateLogsController(IOperateLog operateLog)
+    {
+        _operateLog = operateLog;
+    }
+
+    /// <summary>
+    /// 获取操作日志
+    /// </summary>
+    /// <returns></returns>
+    [DisableApiLog]
+    [HttpGet("page")]
+    public async Task<Pagination<OperateLogResponse>> GetOperateLogPageAsync([FromQuery] OperateLogPageRequest request)
+    {
+        return await _operateLog.GetOperateLogPageAsync(request);
+    }
+}

Src/Dlhis.Basic/Common/ApiLog/Request/ApiLogRequest.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Common.ApiLog.Request;
+
+public class ApiLogRequest : PageDto, IValidatableObject
+{
+    /// <summary>
+    /// 日志级别 LogLevel
+    /// </summary>
+    [EnumDataType(typeof(LogLevel))]
+    public LogLevel? Level { get; set; }
+
+
+    public DateTimePeriod SearchDateTimePeriod { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (SearchDateTimePeriod is { End: not null })
+        {
+            SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
+        }
+
+        yield break;
+    }
+}

Src/Dlhis.Basic/Common/ApiLog/Request/OperateLogPageRequest.cs

@@ -0,0 +1,9 @@
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Common.ApiLog.Request
+{
+    public class OperateLogPageRequest : PageDto
+    {
+        
+    }
+}

Src/Dlhis.Basic/Common/ApiLog/Response/ApiLogResponse.cs

@@ -0,0 +1,54 @@
+using Newtonsoft.Json;
+
+namespace Dlhis.Basic.Common.ApiLog.Response
+{
+    public class ApiLogResponse
+    {
+        /// <summary>
+        /// 时间UTC
+        /// </summary>
+        [JsonIgnore]
+        public string Timestamp { get; set; }
+
+        /// <summary>
+        /// 产生时间
+        /// </summary>
+        public DateTime RaiseTime
+        {
+            get { return DateTime.Parse(Timestamp).ToLocalTime(); }
+        }
+
+        /// <summary>
+        /// 级别
+        /// </summary>
+        public string Level { get; set; }
+
+        /// <summary>
+        /// 模板
+        /// </summary>
+        [JsonIgnore]
+        public string Template { get; set; }
+
+        /// <summary>
+        /// 消息内容
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// 异常内容
+        /// </summary>
+        public string Exception { get; set; }
+
+        /// <summary>
+        /// 属性
+        /// </summary>
+        [JsonIgnore]
+        public string Properties { get; set; }
+
+        /// <summary>
+        /// 时间
+        /// </summary>
+        [JsonIgnore]
+        public DateTime _TS { get; set; }
+    }
+}

Src/Dlhis.Basic/Common/ApiLog/Response/OperateLogResponse.cs

@@ -0,0 +1,10 @@
+namespace Dlhis.Basic.Common.ApiLog.Response;
+
+public class OperateLogResponse
+{
+    public string Content { get; set; }
+
+    public string Operator { get; set; }
+
+    public DateTime CreateTime { get; set; }
+}

Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs

@@ -0,0 +1,40 @@
+using Dlhis.Basic.Common.ApiLog.Request;
+using Dlhis.Basic.Common.ApiLog.Response;
+using Dlhis.Basic.Common.ApiLog.Services.Implements;
+using Dlhis.Entity.Common.Entities;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.Utils.Extensions;
+using SqlSugar;
+
+namespace Dlhis.Basic.Common.ApiLog.Services;
+
+public class ApiLogService : IApiLogService
+{
+    private readonly IDbContext _dbContext;
+
+    public ApiLogService(IDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<Pagination<ApiLogResponse>> GetLogsAsync(ApiLogRequest request)
+    {
+        var logs = await _dbContext.ChangeDb("log").Queryable<ApiLogEntity>()
+            .WhereIF(request.SearchDateTimePeriod.HasValue(), x => x._ts >= request.SearchDateTimePeriod.Start && x._ts <= request.SearchDateTimePeriod.End)
+            .WhereIF(request.Level.HasValue, x => x.Level == request.Level)
+            .WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
+            .OrderBy(x => x._ts, OrderByType.Desc)
+            .Select<ApiLogResponse>()
+            .ToPageListAsync(request.PageIndex, request.PageSize);
+
+        return new Pagination<ApiLogResponse>
+        {
+            PageIndex = request.PageIndex,
+            PageSize = request.PageSize,
+            Total = 0,
+            Data = logs
+        };
+    }
+}

Src/Dlhis.Basic/Common/ApiLog/Services/IOperateLog.cs

@@ -0,0 +1,14 @@
+using Dlhis.Basic.Common.ApiLog.Request;
+using Dlhis.Basic.Common.ApiLog.Response;
+using Dlhis.Entity.Common.Enums;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Common.ApiLog.Services;
+
+public interface IOperateLog : IScopeDependency
+{
+    Task LogAsync(OperateLogType type, string content);
+    
+    Task<Pagination<OperateLogResponse>> GetOperateLogPageAsync(OperateLogPageRequest request);
+}
+

Src/Dlhis.Basic/Common/ApiLog/Services/Implements/IApiLogService.cs

@@ -0,0 +1,10 @@
+using Dlhis.Basic.Common.ApiLog.Request;
+using Dlhis.Basic.Common.ApiLog.Response;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Common.ApiLog.Services.Implements;
+
+public interface IApiLogService : IScopeDependency
+{
+    Task<Pagination<ApiLogResponse>> GetLogsAsync(ApiLogRequest request);
+}

Src/Dlhis.Basic/Common/ApiLog/Services/Implements/OperateLogService.cs

@@ -0,0 +1,70 @@
+using Dlhis.Basic.Common.ApiLog.Request;
+using Dlhis.Basic.Common.ApiLog.Response;
+using Dlhis.Entity.Common.Entities;
+using Dlhis.Entity.Common.Enums;
+using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using SqlSugar;
+
+namespace Dlhis.Basic.Common.ApiLog.Services.Implements;
+
+public class OperateLogService : IOperateLog
+{
+    private readonly ICurrentUser _currentUser;
+    private readonly ILogger<OperateLogService> _logger;
+    private readonly IDbContext _dbContext;
+
+    public OperateLogService(IDbContext dbContext, ICurrentUser currentUser, ILogger<OperateLogService> logger)
+    {
+        _currentUser = currentUser;
+        _logger = logger;
+        _dbContext = dbContext.ChangeDb("log");
+    }
+
+    /// <inheritdoc />
+    public async Task LogAsync(OperateLogType type, string content)
+    {
+        var now = DateTime.Now;
+        var userId = _currentUser.GetIntSubjectId();
+        var userName = _currentUser.GetName();
+        var tenantId = _currentUser.GetStringTenantId();
+
+        try
+        {
+            await _dbContext.InsertAsync(new OperateLogEntity
+            {
+                Type = type,
+                Content = content,
+                Operator = userName,
+                CreateTime = now,
+                ModifiedTime = now,
+                CreatedBy = userId,
+                ModifiedBy = userId,
+                TenantId = tenantId
+            });
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "记录操作日志失败:{error}", e.Message);
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<Pagination<OperateLogResponse>> GetOperateLogPageAsync(OperateLogPageRequest request)
+    {
+        var tenantId = _currentUser.GetStringTenantId();
+
+        return await _dbContext.Queryable<OperateLogEntity>()
+            .Where(x => x.TenantId == tenantId)
+            .Select(x => new OperateLogResponse
+            {
+                Content = x.Content,
+                Operator = x.Operator,
+                CreateTime = x.CreateTime
+            })
+            .OrderBy(x => x.CreateTime, OrderByType.Desc)
+            .ToPageListAsync(request);
+    }
+}

Src/Dlhis.Basic/Common/BusinessEvents/UserBusinessEventController.cs

@@ -0,0 +1,44 @@
+using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Common.Entities;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.BusinessEvents;
+
+
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class UserBusinessEventController : ControllerBase
+{
+    private readonly IDbContext _dbContext;
+
+    public UserBusinessEventController(IDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    /// <summary>
+    /// 获取用户业务事件分页数据
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("page")]
+    public async Task<Pagination<UserBusinessEventResponse>> GetUserBusinessEventPageAsync([FromQuery] UserBusinessEventPageRequest request)
+    {
+        return await _dbContext.Queryable<UserBusinessEventEntity>()
+              .LeftJoin<GainfoEntity>((x, ga) => x.UserCode == ga.Code)
+              .WhereIF(request.Search.IsPresent(), (x, ga) => x.UserCode == request.Search || ga.Name.Contains(request.Search))
+              .Select((x, ga) => new UserBusinessEventResponse
+              {
+                  UserCode = x.UserCode,
+                  EventType = x.EventType,
+                  UserName = ga.Name,
+                  Content = x.Content
+              })
+              .ToPageListAsync(request);
+    }
+}

Src/Dlhis.Basic/Common/BusinessEvents/UserBusinessEventPageRequest.cs

@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Common.BusinessEvents;
+
+public class UserBusinessEventPageRequest : PageDto
+{
+    /// <summary>
+    /// 事件类型
+    /// </summary>
+    [Required(ErrorMessage = "事件类型不能为空")]
+    public string EventType { get; set; }
+}

Src/Dlhis.Basic/Common/BusinessEvents/UserBusinessEventResponse.cs

@@ -0,0 +1,24 @@
+namespace Dlhis.Basic.Common.BusinessEvents;
+
+public class UserBusinessEventResponse
+{
+    /// <summary>
+    /// 工号
+    /// </summary>
+    public string UserCode { get; set; }
+
+    /// <summary>
+    /// 事件类型
+    /// </summary>
+    public string EventType { get; set; }
+
+    /// <summary>
+    /// 用户名称
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// 事件内容
+    /// </summary>
+    public string Content { get; set; }
+}

Src/Dlhis.Basic/Common/EnumSetting/EnumsController.cs

@@ -0,0 +1,110 @@
+using System.Reflection;
+using Dlhis.Basic.Common.FileOperation.Response;
+using Dlhis.Entity.Basic.Entity;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.EnumSetting;
+
+/// <summary>
+/// 枚举
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class EnumsController : ControllerBase
+{
+    private readonly IDbContext _dbContext;
+
+    public EnumsController(IDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    /// <summary>
+    /// 获取所有枚举/基础类型
+    /// </summary>
+    /// <param name="code">code</param>
+    /// <returns></returns>
+    [DisableApiLog]
+    [HttpGet]
+    public List<CommonEnumResponse> GetEnums(string code)
+    {
+        var types = Assembly.Load("Dlhis.Entity")
+            .GetTypes()
+            .Where(x => x.IsEnum);
+
+        var result = types.Select(x =>
+            {
+                var d = x.GetDescription();
+                return new CommonEnumResponse
+                {
+                    Code = x.Name,
+                    Name = d,
+                    Data = x.GetFields(BindingFlags.Public | BindingFlags.Static).Select(item =>
+                        {
+                            var e = (Enum)Enum.Parse(item.FieldType, item.GetValue(null).ToString());
+                            var fd = e.GetDescription();
+                            return new KeyValueDto<string, object>
+                            {
+                                Key = fd,
+                                Value = (int)item.GetValue(null)
+                            };
+                        })
+                        .OrderBy(x => x.Value)
+                        .ToList()
+                };
+            })
+            .ToList();
+
+        var dbTypes = _dbContext.Queryable<BasicTypeEntity>().OrderBy(x => x.Sequence).ToList();
+        var dbResult = dbTypes.GroupBy(x => x.Type).Select(g =>
+        {
+            var type = g.Key;
+            return new CommonEnumResponse
+            {
+                Code = type,
+                Name = type,
+                Data = g.AsEnumerable().Select(x => new KeyValueDto<string, object>
+                    {
+                        Key = x.Display,
+                        Value = x.Code
+                    })
+                    .OrderBy(x => x.Value)
+                    .ToList()
+            };
+        });
+
+        result.AddRange(dbResult);
+
+        result.Add(GetCurrentEnums("LogLevel", "日志级别", typeof(LogLevel)));
+
+        return result.WhereIf(code.IsPresent(), x => x.Code == code).ToList();
+    }
+
+
+    private static CommonEnumResponse GetCurrentEnums(string code, string name, Type enumType)
+    {
+        return new CommonEnumResponse
+        {
+            Code = code,
+            Name = name,
+            Data = enumType.GetFields(BindingFlags.Public | BindingFlags.Static).Select(item =>
+                {
+                    var e = (Enum)Enum.Parse(item.FieldType, item.GetValue(null).ToString());
+                    var fd = e.GetDescription();
+                    return new KeyValueDto<string, object>
+                    {
+                        Key = fd,
+                        Value = (int)item.GetValue(null)
+                    };
+                })
+                .OrderBy(x => x.Value)
+                .ToList()
+        };
+    }
+}

Src/Dlhis.Basic/Common/FileOperation/Configurations/MinIOOptions.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+using Kurisu.AspNetCore.ConfigurableOptions.Attributes;
+
+namespace Dlhis.Basic.Common.FileOperation.Configurations;
+
+
+[Configuration("MinIO")]
+public class MinIOOptions
+{
+    [Required]
+    public string Endpoint { get; set; }
+
+    [Required]
+    public string AccessKey { get; set; }
+
+    [Required]
+    public string SecretKey { get; set; }
+}

Src/Dlhis.Basic/Common/FileOperation/Constants/FileBucketConstants.cs

@@ -0,0 +1,13 @@
+namespace Dlhis.Basic.Common.FileOperation.Constants;
+
+public static class FileBucketConstants
+{
+    /// <summary>
+    /// 文件buckets
+    /// </summary>
+    public static List<string> Buckets { get; } = new()
+    {
+        "restaurant",
+        "apk"
+    };
+}

Src/Dlhis.Basic/Common/FileOperation/Controllers/FileController.cs

@@ -0,0 +1,86 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Basic.Common.FileOperation.Request;
+using Dlhis.Basic.Common.FileOperation.Response;
+using Dlhis.Basic.Common.FileOperation.Services;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.FileOperation.Controllers;
+
+/// <summary>
+/// 文件操作
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class FileController : ControllerBase
+{
+    private readonly IMinioService _minioService;
+    private readonly IFileVersionService _fileVersionService;
+
+    public FileController(IMinioService minioService, IFileVersionService fileVersionService)
+    {
+        _minioService = minioService;
+        _fileVersionService = fileVersionService;
+    }
+
+    /// <summary>
+    /// 文件上传
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns>相对路径</returns>
+    [HttpPost("{Bucket}/upload")]
+    public async Task<string> UploadFileAsync([FromForm] UploadFileRequest request)
+    {
+        return await _minioService.UploadFileAsync(request.Bucket, request.File);
+    }
+
+
+    /// <summary>
+    /// 文件上传(版本)
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [Authorize]
+    [HttpPost("{Bucket}/version/upload")]
+    [RequestFormLimits(MultipartBodyLengthLimit = int.MaxValue)]
+    [RequestSizeLimit(int.MaxValue)]
+    public async Task<string> UploadFileAsync([FromForm] FileVersionUploadRequest request)
+    {
+        return await _fileVersionService.UploadFileAsync(request);
+    }
+
+    /// <summary>
+    /// 文件版本分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("version/page")]
+    public async Task<Pagination<FileVersionResponse>> GetPageAsync([FromQuery] PageDto request)
+    {
+        return await _fileVersionService.GetPageAsync(request);
+    }
+
+    /// <summary>
+    /// 文件版本列表
+    /// </summary>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    [HttpGet("version/list")]
+    public async Task<List<FileVersionResponse>> GetListByCodeAsync([Required] string code)
+    {
+        return await _fileVersionService.GetListByCodeAsync(code);
+    }
+
+    /// <summary>
+    /// 文件版本最新
+    /// </summary>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    [HttpGet("version/last")]
+    public async Task<FileVersionResponse> GetLastByCodeAsync([Required] string code)
+    {
+        return await _fileVersionService.GetLastByCodeAsync(code);
+    }
+}

Src/Dlhis.Basic/Common/FileOperation/Request/FileVersionUploadRequest.cs

@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Basic.Common.FileOperation.Constants;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.FileOperation.Request;
+
+public class FileVersionUploadRequest : IValidatableObject
+{
+    /// <summary>
+    /// bucket
+    /// </summary>
+    [FromRoute]
+    public string Bucket { get; set; }
+
+    /// <summary>
+    /// 文件
+    /// </summary>
+    [FromForm]
+    public IFormFile File { get; set; }
+
+    /// <summary>
+    /// 文件名称
+    /// </summary>
+    [Required]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// code
+    /// </summary>
+    [Required]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 描述信息
+    /// </summary>
+    public string Description { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (!FileBucketConstants.Buckets.Contains(Bucket))
+        {
+            yield return new ValidationResult($"不支持{Bucket}", new[] { nameof(Bucket) });
+        }
+    }
+}

Src/Dlhis.Basic/Common/FileOperation/Request/UploadFileRequest.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Basic.Common.FileOperation.Constants;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.FileOperation.Request;
+
+public class UploadFileRequest : IValidatableObject
+{
+    /// <summary>
+    /// bucket
+    /// </summary>
+    [FromRoute]
+    public string Bucket { get; set; }
+
+    /// <summary>
+    /// 文件
+    /// </summary>
+    public IFormFile File { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (!FileBucketConstants.Buckets.Contains(Bucket))
+        {
+            yield return new ValidationResult($"不支持{Bucket}", new[] { nameof(Bucket) });
+        }
+    }
+}

Src/Dlhis.Basic/Common/FileOperation/Response/CommonEnumResponse.cs

@@ -0,0 +1,12 @@
+using Kurisu.AspNetCore.CustomClass;
+
+namespace Dlhis.Basic.Common.FileOperation.Response;
+
+public class CommonEnumResponse
+{
+    public string Code { get; set; }
+
+    public string Name { get; set; }
+
+    public List<KeyValueDto<string, object>> Data { get; set; }
+}

Src/Dlhis.Basic/Common/FileOperation/Response/FileVersionResponse.cs

@@ -0,0 +1,31 @@
+namespace Dlhis.Basic.Common.FileOperation.Response;
+
+public class FileVersionResponse
+{
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 文件名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 文件code
+    /// </summary>
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    public int Version { get; set; }
+
+    /// <summary>
+    /// 描述信息
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// 文件地址
+    /// </summary>
+    public string Url { get; set; }
+}

Src/Dlhis.Basic/Common/FileOperation/Services/IFileVersionService.cs

@@ -0,0 +1,16 @@
+using Dlhis.Basic.Common.FileOperation.Request;
+using Dlhis.Basic.Common.FileOperation.Response;
+using Kurisu.AspNetCore.DataAccess.Dto;
+
+namespace Dlhis.Basic.Common.FileOperation.Services;
+
+public interface IFileVersionService : IScopeDependency
+{
+    Task<string> UploadFileAsync(FileVersionUploadRequest request);
+
+    Task<Pagination<FileVersionResponse>> GetPageAsync(PageDto request);
+
+    Task<List<FileVersionResponse>> GetListByCodeAsync(string code);
+
+    Task<FileVersionResponse> GetLastByCodeAsync(string code);
+}

Src/Dlhis.Basic/Common/FileOperation/Services/IMinioService.cs

@@ -0,0 +1,35 @@
+namespace Dlhis.Basic.Common.FileOperation.Services;
+
+public interface IMinioService : ISingletonDependency
+{
+    /// <summary>
+    /// bucket不存在即创建
+    /// </summary>
+    /// <param name="bucket"></param>
+    /// <returns></returns>
+    Task CreateBucketIfNotExistsAsync(string bucket);
+
+    /// <summary>
+    /// 判断是否存在bucket
+    /// </summary>
+    /// <param name="bucket"></param>
+    /// <returns></returns>
+    Task<bool> ExistsBucketAsync(string bucket);
+
+    /// <summary>
+    /// 判断文件是否存在
+    /// </summary>
+    /// <param name="bucket"></param>
+    /// <param name="objectName"></param>
+    /// <returns></returns>
+    Task<bool> ExistsFileAsync(string bucket, string objectName);
+
+    /// <summary>
+    /// 上传文件
+    /// </summary>
+    /// <param name="bucket"></param>
+    /// <param name="formFile"></param>
+    /// <returns></returns>
+    Task<string> UploadFileAsync(string bucket, IFormFile formFile);
+
+}

Src/Dlhis.Basic/Common/FileOperation/Services/Implements/FileVersionService.cs

@@ -0,0 +1,74 @@
+using Dlhis.Basic.Common.FileOperation.Request;
+using Dlhis.Basic.Common.FileOperation.Response;
+using Dlhis.Entity.Common.Entities;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+
+namespace Dlhis.Basic.Common.FileOperation.Services.Implements;
+
+public class FileVersionService : IFileVersionService
+{
+    private readonly IMinioService _minioService;
+    private readonly IDbContext _dbContext;
+
+    public FileVersionService(IMinioService minioService, IDbContext dbContext)
+    {
+        _minioService = minioService;
+        _dbContext = dbContext;
+    }
+
+    public async Task<string> UploadFileAsync(FileVersionUploadRequest request)
+    {
+        var url = await _minioService.UploadFileAsync(request.Bucket, request.File);
+
+        var version = (await GetLastVersionAsync(request.Code)) + 1;
+        await _dbContext.InsertAsync(new FileVersionEntity
+        {
+            Name = request.Name,
+            Url = url,
+            Description = request.Description,
+            Code = request.Code,
+            Version = version,
+        });
+
+        return url;
+    }
+
+    public async Task<Pagination<FileVersionResponse>> GetPageAsync(PageDto request)
+    {
+        return await _dbContext.Queryable<FileVersionEntity>()
+            .OrderByDescending(x => x.CreateTime)
+            .Select<FileVersionResponse>()
+            .ToPageListAsync(request);
+    }
+
+    public async Task<List<FileVersionResponse>> GetListByCodeAsync(string code)
+    {
+        return await _dbContext.Queryable<FileVersionEntity>()
+            .Where(x => x.Code == code)
+            .OrderByDescending(x => x.CreateTime)
+            .Select<FileVersionResponse>()
+            .ToListAsync();
+    }
+
+    public async Task<FileVersionResponse> GetLastByCodeAsync(string code)
+    {
+        return await _dbContext.Queryable<FileVersionEntity>()
+            .Where(x => x.Code == code)
+            .OrderByDescending(x => x.Version)
+            .Select<FileVersionResponse>()
+            .FirstAsync();
+    }
+
+    //************************************************************* help methods ***************************************************************
+
+    private async Task<int> GetLastVersionAsync(string code)
+    {
+        return await _dbContext.Queryable<FileVersionEntity>()
+            .Where(x => x.Code == code)
+            .OrderByDescending(x => x.Version)
+            .Select(x => x.Version)
+            .FirstAsync();
+    }
+}

Src/Dlhis.Basic/Common/FileOperation/Services/Implements/MinioService.cs

@@ -0,0 +1,72 @@
+using Dlhis.Basic.Common.FileOperation.Configurations;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Microsoft.Extensions.Options;
+using Minio;
+using Minio.DataModel.Args;
+
+namespace Dlhis.Basic.Common.FileOperation.Services.Implements;
+
+public class MinioService : IMinioService
+{
+    private readonly IMinioClient _client;
+
+    public MinioService(IMinioClient client, IOptions<MinIOOptions> options)
+    {
+        _client = client;
+    }
+
+    public async Task<bool> ExistsBucketAsync(string bucket)
+    {
+        var args = new BucketExistsArgs().WithBucket(bucket);
+        return await _client.BucketExistsAsync(args);
+    }
+
+
+    public async Task CreateBucketIfNotExistsAsync(string bucket)
+    {
+        if (!await ExistsBucketAsync(bucket))
+        {
+            var policy = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":[\"*\"]},\"Action\":[\"s3:GetBucketLocation\",\"s3:ListBucket\"],\"Resource\":[\"arn:aws:s3:::BUCKETNAME\"]},{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":[\"*\"]},\"Action\":[\"s3:GetObject\"],\"Resource\":[\"arn:aws:s3:::BUCKETNAME/*\"]}]}".Replace("BUCKETNAME", bucket);
+
+            await _client.MakeBucketAsync(new MakeBucketArgs().WithBucket(bucket));
+            await _client.SetPolicyAsync(new SetPolicyArgs().WithBucket(bucket).WithPolicy(policy));
+        }
+    }
+
+
+    public async Task<bool> ExistsFileAsync(string bucket, string objectName)
+    {
+        try
+        {
+            var obj = new StatObjectArgs().WithBucket(bucket).WithObject(objectName);
+            var objStat = await _client.StatObjectAsync(obj);
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public async Task<string> UploadFileAsync(string bucket, IFormFile formFile)
+    {
+        formFile.ThrowIfNull("请选择文件上传!");
+
+        await CreateBucketIfNotExistsAsync(bucket);
+
+        var ms = DateTime.Now.ToString("yyyyMMddHHmmssfff");
+        var fileName = Path.GetFileNameWithoutExtension(formFile.FileName) + "_" + ms + Path.GetExtension(formFile.FileName);
+        fileName = $"{DateTime.Now.Year}/{DateTime.Now.Month}/{fileName}";
+
+        var response = await _client.PutObjectAsync(new PutObjectArgs().WithBucket(bucket)
+            .WithObject(fileName)
+            .WithObjectSize(formFile.Length)
+            .WithStreamData(formFile.OpenReadStream())
+            .WithContentType(formFile.ContentType)
+            .WithVersionId(bucket)
+            );
+
+        return $"/{bucket}/{response.ObjectName}";
+    }
+}

Src/Dlhis.Basic/Common/Holiday/Controller/HolidaysController.cs

@@ -0,0 +1,57 @@
+using Dlhis.Basic.Common.Holiday.Requests;
+using Dlhis.Basic.Common.Holiday.Responses;
+using Dlhis.Basic.Common.Holiday.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.Holiday.Controller;
+
+[Authorize(Roles = "admin")]
+[ApiController]
+[Route("api/[controller]")]
+public class HolidaysController : ControllerBase
+{
+    private readonly IHolidayService _holidayService;
+
+    public HolidaysController(IHolidayService holidayService)
+    {
+        _holidayService = holidayService;
+    }
+
+    /// <summary>
+    /// 保存节假日信息。
+    /// </summary>
+    /// <param name="req">节假日请求参数。</param>
+    [HttpPost("save")]
+    public async Task SaveAsync(HolidayRequest req)
+    {
+        await _holidayService.SaveAsync(req);
+    }
+
+    /// <summary>
+    /// 获取所有节假日信息。
+    /// </summary>
+    /// <returns>节假日响应列表。</returns>
+    [HttpGet("list")]
+    public async Task<List<HolidayResponse>> GetAllHolidaysAsync()
+    {
+        return await _holidayService.GetAllHolidaysAsync();
+    }
+
+    /// <summary>
+    /// 删除指定ID的节假日信息。
+    /// </summary>
+    /// <param name="id">节假日ID。</param>
+    [HttpPost("delete/{id}")]
+    public async Task DeleteAsync(long id)
+    {
+        await _holidayService.DeleteAsync(id);
+    }
+
+    [AllowAnonymous]
+    [HttpGet("remote-ip")]
+    public string GetRemoteIp()
+    {
+        return HttpContext.Connection.RemoteIpAddress?.ToString();
+    }
+}

Src/Dlhis.Basic/Common/Holiday/Requests/HolidayRequest.cs

@@ -0,0 +1,35 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Basic.Enums;
+
+namespace Dlhis.Basic.Common.Holiday.Requests;
+
+public class HolidayRequest
+{
+    public long? Id { get; set; }
+
+    /// <summary>
+    /// 年份
+    /// </summary>
+    public int Year { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 开始日期
+    /// </summary>
+    public DateOnly Start { get; set; }
+
+    /// <summary>
+    /// 结束日期
+    /// </summary>
+    public DateOnly End { get; set; }
+
+    /// <summary>
+    /// 节假日类型 HolidayEnumType
+    /// </summary>
+    [EnumDataType(typeof(HolidayEnumType))]
+    public HolidayEnumType Type { get; set; }
+}

Src/Dlhis.Basic/Common/Holiday/Responses/HolidayResponse.cs

@@ -0,0 +1,39 @@
+using Dlhis.Entity.Basic.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Basic.Common.Holiday.Responses;
+
+public class HolidayResponse
+{
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 假日类型
+    /// </summary>
+    public HolidayEnumType Type { get; set; }
+
+    /// <summary>
+    /// 假日类型描述
+    /// </summary>
+    public string TypeDesc => Type.GetDescription();
+
+    /// <summary>
+    /// 年份
+    /// </summary>
+    public int Year { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 开始日期
+    /// </summary>
+    public DateOnly Start { get; set; }
+
+    /// <summary>
+    /// 结束日期
+    /// </summary>
+    public DateOnly End { get; set; }
+}

Src/Dlhis.Basic/Common/Holiday/Services/IHolidayService.cs

@@ -0,0 +1,28 @@
+using Dlhis.Basic.Common.Holiday.Requests;
+using Dlhis.Basic.Common.Holiday.Responses;
+
+namespace Dlhis.Basic.Common.Holiday.Services;
+
+/// <summary>
+/// 节假日服务接口，定义节假日相关的操作。
+/// </summary>
+public interface IHolidayService : IScopeDependency
+{
+    /// <summary>
+    /// 异步获取所有节假日信息。
+    /// </summary>
+    /// <returns>节假日响应列表。</returns>
+    Task<List<HolidayResponse>> GetAllHolidaysAsync();
+
+    /// <summary>
+    /// 异步保存节假日信息。
+    /// </summary>
+    /// <param name="req">节假日请求参数。</param>
+    Task SaveAsync(HolidayRequest req);
+
+    /// <summary>
+    /// 异步删除指定ID的节假日信息。
+    /// </summary>
+    /// <param name="id">节假日ID。</param>
+    Task DeleteAsync(long id);
+}

Src/Dlhis.Basic/Common/Holiday/Services/Implements/HolidayService.cs

@@ -0,0 +1,57 @@
+using Dlhis.Basic.Common.Holiday.Requests;
+using Dlhis.Basic.Common.Holiday.Responses;
+using Dlhis.Entity.Basic.Entity;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Mapster;
+
+namespace Dlhis.Basic.Common.Holiday.Services.Implements;
+
+public class HolidayService : IHolidayService
+{
+    private readonly IDbContext _dbContext;
+
+    public HolidayService(IDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<List<HolidayResponse>> GetAllHolidaysAsync()
+    {
+        return await _dbContext.Queryable<HolidayEntity>()
+            .Select<HolidayResponse>()
+            .ToListAsync();
+    }
+
+    public async Task SaveAsync(HolidayRequest req)
+    {
+        var exists = await _dbContext.Queryable<HolidayEntity>()
+            .WhereIF(req.Id.HasValue, x => x.Id != req.Id)
+            .Where(x => x.Year == req.Year)
+            .Where(x => x.Start <= req.End && req.Start <= x.End)
+            .Where(x => x.Type != req.Type)
+            .AnyAsync();
+
+        exists.ThrowIfTrue("节假日时间冲突，请检查开始和结束时间,或节假日类型是否正确");
+
+        if (!req.Id.HasValue)
+        {
+            var holiday = req.Adapt<HolidayEntity>();
+            await _dbContext.InsertAsync(holiday);
+        }
+        else
+        {
+            var holiday = await _dbContext.Queryable<HolidayEntity>().SingleAsync(x => x.Id == req.Id);
+            holiday.ThrowIfNull("节假日数据不存在");
+
+            req.Adapt(holiday);
+            await _dbContext.UpdateAsync(holiday);
+        }
+    }
+
+    public async Task DeleteAsync(long id)
+    {
+        var holiday = await _dbContext.Queryable<HolidayEntity>().Where(x => x.Id == id).SingleAsync();
+        await _dbContext.DeleteReallyAsync(holiday);
+    }
+}

Src/Dlhis.Basic/Common/Message/Controller/MessagesController.cs

@@ -0,0 +1,37 @@
+using Dlhis.Basic.Common.Message.Requests;
+using Dlhis.Basic.Common.Message.Services;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.Message.Controller;
+
+
+[Route("api/[controller]")]
+[ApiController]
+public class MessagesController : ControllerBase
+{
+    private readonly IJinkoApiService _jinkoApiService;
+
+    public MessagesController(IJinkoApiService jinkoApiService)
+    {
+        _jinkoApiService = jinkoApiService;
+    }
+
+
+    [HttpPost("dingtalk/workmessage")]
+    public async Task SendWorkMessageAsync(DingTalkWorkMessageRequest request)
+    {
+        await _jinkoApiService.SendWorkMessageAsync(request);
+    }
+
+    [HttpPost("dingtalk/workgrid/workmessage")]
+    public async Task SendWorkMessageByWorkGridAsync(DingTalkWorkMessageRequest request)
+    {
+        await _jinkoApiService.SendWorkMessageByWorkGridAsync(request);
+    }
+
+    [HttpPost("dingtalk/messageurl")]
+    public async Task SendMessageUrlAsync(DingTalkMessageUrlRequest request)
+    {
+        await _jinkoApiService.SendMessageUrlAsync(request);
+    }
+}

Src/Dlhis.Basic/Common/Message/Requests/DingTalkMessageUrlRequest.cs

@@ -0,0 +1,10 @@
+namespace Dlhis.Basic.Common.Message.Requests;
+
+public class DingTalkMessageUrlRequest
+{
+    public string UserCode { get; set; }
+    public string Title { get; set; }
+    public string Text { get; set; }
+    public string PicUrl { get; set; }
+    public string MessageUrl { get; set; }
+}

Src/Dlhis.Basic/Common/Message/Requests/DingTalkWorkMessageRequest.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.Common.Message.Requests;
+
+public class DingTalkWorkMessageRequest
+{
+    /// <summary>
+    /// 工号
+    /// </summary>
+    [MinLength(1, ErrorMessage = "{0}不能为空")]
+    public List<string> WorkCodes { get; set; }
+
+    /// <summary>
+    /// 发送内容
+    /// </summary>
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string Content { get; set; }
+}

Src/Dlhis.Basic/Common/Message/Responses/JinkoOaResponse.cs

@@ -0,0 +1,21 @@
+namespace Dlhis.Basic.Common.Message.Responses
+{
+    public class JinkoOaResponse<T>
+    {
+        public int Code { get; set; }
+        public string Message { get; set; }
+        public T Result { get; set; }
+    }
+
+    public class JinkoData<T>
+    {
+        public T Data { get; set; }
+    }
+
+    public class JinkoOaInfo
+    {
+        public int Id { get; set; }
+        public string Email { get; set; }
+        public string Lastname { get; set; }
+    }
+}

Src/Dlhis.Basic/Common/Message/Services/IJinkoApiService.cs

@@ -0,0 +1,11 @@
+using Dlhis.Basic.Common.Message.Requests;
+
+namespace Dlhis.Basic.Common.Message.Services;
+
+public interface IJinkoApiService : ISingletonDependency
+{
+    Task SendWorkMessageAsync(DingTalkWorkMessageRequest request);
+    Task SendWorkMessageByWorkGridAsync(DingTalkWorkMessageRequest request);
+
+    Task SendMessageUrlAsync(DingTalkMessageUrlRequest request);
+}

Src/Dlhis.Basic/Common/Message/Services/Implements/JinkoApiService.cs

@@ -0,0 +1,156 @@
+using System.Text;
+using Dlhis.Basic.Common.ApiLog.Services;
+using Dlhis.Basic.Common.Message.Requests;
+using Dlhis.Basic.Common.Message.Responses;
+using Dlhis.Entity.Common.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Dlhis.Basic.Common.Message.Services.Implements;
+
+public class JinkoApiService : IJinkoApiService
+{
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IServiceProvider _serviceProvider;
+    private const string _agentId = "2984453842";
+    private const string _appKey = "dingppvj6wvtgbagwpsw";
+    private const string _appSecret = "k9mxYwilZgQiuhV_RVYRueoIAWHCQWrUdhbj6DAmiEiqMzSQE4igt0kAj97rmLaS";
+
+    public JinkoApiService(IHttpClientFactory httpClientFactory, IServiceProvider serviceProvider)
+    {
+        _httpClientFactory = httpClientFactory;
+        _serviceProvider = serviceProvider;
+    }
+
+
+    public async Task SendWorkMessageAsync(DingTalkWorkMessageRequest request)
+    {
+        request.Content.IsEmpty().ThrowIfTrue("发送内容不能为空");
+
+        var users = await GetJinkoOaInfoByWorkCodes(request.WorkCodes);
+        var userIds = users.Select(x => x.Id).Join(",");
+        (userIds.Length > 100).ThrowIfTrue("超出消息接受人数,length > 100");
+
+        var body = new
+        {
+            agent_id = _agentId,
+            userid_list = userIds,
+            msg = new
+            {
+                msgtype = "text",
+                text = new
+                {
+                    content = request.Content
+                }
+            }
+        }.ToJson();
+
+        await CommonRequestAsync(body);
+    }
+
+    public async Task SendWorkMessageByWorkGridAsync(DingTalkWorkMessageRequest request)
+    {
+        await SendWorkMessageAsync(request);
+
+        using var scope = _serviceProvider.CreateScope();
+        var ol = scope.ServiceProvider.GetService<IOperateLog>();
+        await ol.LogAsync(OperateLogType.WorkGrid, $"dingtalk消息推送:{request.ToJson()}");
+    }
+
+    public async Task SendMessageUrlAsync(DingTalkMessageUrlRequest request)
+    {
+        request.Title.IsEmpty().ThrowIfTrue("发送标题不能为空");
+        request.Text.IsEmpty().ThrowIfTrue("发送内容不能为空");
+        request.UserCode.IsEmpty().ThrowIfTrue("发送用户不能为空");
+        request.MessageUrl.IsEmpty().ThrowIfTrue("消息链接不能为空");
+        request.PicUrl.IsEmpty().ThrowIfTrue("图片链接不能为空");
+
+
+        var users = await GetJinkoOaInfoByWorkCodes(new List<string> { request.UserCode });
+        var userIds = users.Select(x => x.Id).Join(",");
+        var body = new
+        {
+            agent_id = _agentId,
+            userid_list = userIds,
+            msg = new
+            {
+                msgtype = "link",
+                link = new
+                {
+                    messageUrl = request.MessageUrl,
+                    picUrl = request.PicUrl,
+                    title = request.Title,
+                    text = request.Text
+                }
+            }
+        }.ToJson();
+
+        await CommonRequestAsync(body);
+    }
+
+    private async Task CommonRequestAsync(string body)
+    {
+#if !DEBUG
+        var token = await GetTokenAsync();
+        var httpClient = _httpClientFactory.CreateClient("jinko.httpclient");
+        var url = $"/topapi/message/corpconversation/asyncsend_v2?access_token={token}";
+        var content = new StringContent(body, Encoding.UTF8, "application/json");
+
+        var response = await httpClient.PostAsync(url, content);
+        var jsonResponse = await response.Content.ReadAsStringAsync();
+
+        var jObject = JObject.Parse(jsonResponse);
+        (jObject.Value<string>("errcode") == "0").ThrowIfFalse(jObject.Value<string>("errmsg"));
+#endif
+    }
+
+
+    private async Task<string> GetTokenAsync()
+    {
+        var token = string.Empty;
+        if (!token.IsEmpty())
+        {
+            return token;
+        }
+
+        var httpClient = _httpClientFactory.CreateClient("jinko.httpclient");
+
+        var form = new FormUrlEncodedContent(new Dictionary<string, string>
+        {
+            { "appkey", _appKey },
+            { "appsecret", _appSecret }
+        });
+
+        //eg: appkey=dingumelppews6rah7x9&appsecret=nsWfJTVjYesHVzrLiP-t1TQqMQvC1L_kZNfXfnIyzcXK4pCTfKprkjZcxAbsDR_l
+        var response = await httpClient.GetStringAsync($"/gettoken?{await form.ReadAsStringAsync()}");
+        var jObj = JObject.Parse(response);
+        (jObj.Value<string>("errcode") == "0").ThrowIfFalse(jObj.Value<string>("errmsg"));
+
+        token = jObj.Value<string>("access_token");
+
+        return token;
+    }
+
+    private async Task<List<JinkoOaInfo>> GetJinkoOaInfoByWorkCodes(List<string> codes)
+    {
+        var httpClient = _httpClientFactory.CreateClient("jinko.oa");
+
+        var body = new
+        {
+            token = "TTMlaplWIEjmJHiVShWybekyyNnJXDHD",
+            type = "workCode",
+            workCode = string.Join(",", codes)
+        }.ToJson();
+
+        var content = new StringContent(body, Encoding.UTF8, "application/json");
+        var response = await httpClient.PostAsync("http://oa.jinkosolar.com/api/commonRequestService/getUserByWorkCode/v2", content);
+        var responseJson = await response.Content.ReadAsStringAsync();
+
+        var oaInfo = JsonConvert.DeserializeObject<JinkoOaResponse<JinkoData<List<JinkoOaInfo>>>>(responseJson);
+        (oaInfo.Code == 200).ThrowIfFalse(oaInfo.Message);
+
+        return oaInfo.Result.Data;
+    }
+
+}

Src/Dlhis.Basic/Common/Packs/MessagePack.cs

@@ -0,0 +1,50 @@
+using Kurisu.AspNetCore.Startup;
+
+namespace Dlhis.Basic.Common.Packs;
+
+public class MessagePack : BaseAppPack
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddHttpClient("jinko.oa", (_, _) => { })
+            .ConfigurePrimaryHttpMessageHandler(() =>
+            {
+                var handler = new HttpClientHandler
+                {
+                    ClientCertificateOptions = ClientCertificateOption.Manual,
+                    ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+                };
+
+                return handler;
+            });
+
+        services.AddHttpClient("jinko.httpclient", (sp, httpClient) =>
+            {
+                // "BaseUrl": "https://oapi.dingtalk.com",
+                // "AgentId": "2768073678",
+                // "AppId": "dingumelppews6rah7x9",
+                // "AppSecret": "nsWfJTVjYesHVzrLiP-t1TQqMQvC1L_kZNfXfnIyzcXK4pCTfKprkjZcxAbsDR_l",
+
+                httpClient.BaseAddress = new Uri("https://oapi.dingtalk.com");
+                httpClient.Timeout = TimeSpan.FromSeconds(30);
+            })
+            // .SetHandlerLifetime(TimeSpan.FromMinutes(5))
+            // .addd((res) =>
+            // {
+            //     return HttpPolicyExtensions
+            //         .HandleTransientHttpError()
+            //         .OrResult(msg => msg.StatusCode != HttpStatusCode.OK)
+            //         .WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
+            // })
+            .ConfigurePrimaryHttpMessageHandler(() =>
+            {
+                var handler = new HttpClientHandler
+                {
+                    ClientCertificateOptions = ClientCertificateOption.Manual,
+                    ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+                };
+
+                return handler;
+            });
+    }  
+}

Src/Dlhis.Basic/Common/Packs/MinioPack.cs

@@ -0,0 +1,21 @@
+using Dlhis.Basic.Common.FileOperation.Configurations;
+using Kurisu.AspNetCore.Startup;
+using Microsoft.Extensions.Options;
+using Minio;
+
+namespace Dlhis.Basic.Common.Packs;
+
+public class MinioPack : BaseAppPack
+{
+
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSingleton(sp =>
+        {
+            var config = sp.GetService<IOptions<MinIOOptions>>().Value;
+            return new MinioClient().WithEndpoint(new Uri(config.Endpoint))
+                .WithCredentials(config.AccessKey, config.SecretKey)
+                .Build();
+        });
+    }
+}

Src/Dlhis.Basic/Common/SysData/Controller/MiddlesController.cs

@@ -0,0 +1,31 @@
+using Dlhis.Basic.Common.SysData.Request;
+using Dlhis.Basic.Common.SysData.Services;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.SysData.Controller;
+
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class MiddlesController : ControllerBase
+{
+    private readonly IHealthCheckService _healthCheckService;
+
+    public MiddlesController(IHealthCheckService healthCheckService)
+    {
+        _healthCheckService = healthCheckService;
+    }
+
+    /// <summary>
+    /// 健康检查
+    /// </summary>
+    /// <param name="request"></param>
+    [DisableApiLog]
+    [HttpPost("healthz")]
+    public async Task CheckAsync(MiddleHealthCheckRequest request)
+    {
+        await _healthCheckService.CheckAsync(request.Factories);
+    }
+}

Src/Dlhis.Basic/Common/SysData/Controller/SysDataController.cs

@@ -0,0 +1,26 @@
+using Dlhis.Basic.Common.SysData.Services;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Common.SysData.Controller;
+
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class SysDataController : ControllerBase
+{
+    private readonly ISysDataService _sysDataService;
+
+    public SysDataController(ISysDataService sysDataService)
+    {
+        _sysDataService = sysDataService;
+    }
+
+    [IgnoreTenant]
+    [HttpGet("download")]
+    public async Task<List<object>> DownloadAsync(string factory, string tableName)
+    {
+        return await _sysDataService.DownloadAsync(factory, tableName);
+    }
+}

Src/Dlhis.Basic/Common/SysData/Request/HealthCheckRequest.cs

@@ -0,0 +1,9 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.Common.SysData.Request;
+
+public class HealthCheckRequest
+{
+    [MinLength(1)]
+    public List<string> Factories { get; set; }
+}

Src/Dlhis.Basic/Common/SysData/Request/MiddleHealthCheckRequest.cs

@@ -0,0 +1,6 @@
+namespace Dlhis.Basic.Common.SysData.Request;
+
+public class MiddleHealthCheckRequest
+{
+    public List<string> Factories { get; set; }
+}

Src/Dlhis.Basic/Common/SysData/Services/IHealthCheckService.cs

@@ -0,0 +1,6 @@
+namespace Dlhis.Basic.Common.SysData.Services;
+
+public interface IHealthCheckService : IScopeDependency
+{
+    Task CheckAsync(List<string> factories);
+}

Src/Dlhis.Basic/Common/SysData/Services/ISysDataService.cs

@@ -0,0 +1,6 @@
+namespace Dlhis.Basic.Common.SysData.Services;
+
+public interface ISysDataService : IScopeDependency
+{
+    Task<List<object>> DownloadAsync(string factory, string tableName);
+}

Src/Dlhis.Basic/Common/SysData/Services/Implements/HealthCheckService.cs

@@ -0,0 +1,10 @@
+namespace Dlhis.Basic.Common.SysData.Services.Implements;
+
+public class HealthCheckService : IHealthCheckService
+{
+    public async Task CheckAsync(List<string> factories)
+    {
+        //todo 状态显示
+        await Task.CompletedTask;
+    }
+}

Src/Dlhis.Basic/Common/SysData/Services/Implements/SysDataService.cs

@@ -0,0 +1,79 @@
+using System.Reflection;
+using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Basic.Enums;
+using Dlhis.Entity.Canteen.Entities;
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore;
+using Kurisu.AspNetCore.DataAccess.Entity;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using SqlSugar;
+
+namespace Dlhis.Basic.Common.SysData.Services.Implements;
+
+public class SysDataService : ISysDataService
+{
+    private readonly IDbContext _dbContext;
+
+    public SysDataService(IDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    /// <inheritdoc />
+    public async Task<List<object>> DownloadAsync(string factory, string tableName)
+    {
+        var type = App.ActiveTypes
+            .Where(x => x.IsDefined(typeof(SugarTable), false))
+            .Where(x => !x.IsDefined(typeof(SkipScanAttribute), false))
+            .FirstOrDefault(x => x.GetCustomAttribute<SugarTable>()!.TableName == tableName);
+
+        var table = type?.GetCustomAttribute<SugarTable>()!.TableName;
+        var sql = $"select * from {table}";
+
+        if (type == null)
+        {
+            table = tableName;
+        }
+        else
+        {
+            if (type.IsAssignableTo(typeof(ITenantId)))
+            {
+                sql += $" where tenantId = '{factory}'";
+            }
+        }
+
+        switch (table)
+        {
+            case "Gainfo":
+                return await _dbContext.Queryable<GainfoEntity>().Where(x => x.Type == GainfoUserTypeEnumType.Normal || x.Type == GainfoUserTypeEnumType.SecurityWhite).Where(x => x.Factory == factory).Select(x => (object)x).ToListAsync();
+            case "GainfoMeal":
+            {
+                var r = await _dbContext.Queryable<GainfoEntity>()
+                    .Where(x => x.Factory == factory)
+                    .GroupBy(x => x.Code)
+                    .Select(x => new
+                    {
+                        UserCode = x.Code,
+                        Balance = SqlFunc.Subqueryable<BalanceRecordEntity>().Where(p => p.UserCode == x.Code)
+                            .Where(p => !BalanceRecordSourceConstants.IgnoreSources.Contains(p.Source)
+                                        && p.Status == BalanceRecordStatusEnumType.Valid
+                                        && p.IsDeleted == false)
+                            .Sum(p => p.Amount)
+                    })
+                    .ToListAsync();
+
+                return r.Select(x => (object)x).ToList();
+            }
+            default:
+                return await _dbContext.Client.SqlQueryable<object>(sql).ToListAsync();
+        }
+    }
+
+    public async Task<List<string>> GetWalletFactoriesAsync(string factory)
+    {
+        var wallets = await _dbContext.Queryable<WalletEntity>().ToListAsync();
+        var code = wallets.First(x => x.Factory == factory).Code;
+
+        return wallets.Where(x => x.Code == code).Select(x => x.Factory).ToList();
+    }
+}

Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs

@@ -0,0 +1,148 @@
+using Dlhis.Basic.Utils;
+using Dlhis.DataPermission.Model;
+using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Device.Entities;
+using Dlhis.Entity.Sys.Entities;
+using Dlhis.Entity.Sys.Enums;
+using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.DataAccess.Entity;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Attributes;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+
+namespace Dlhis.Basic.DataPermissions;
+
+public class GetDataPermissionService : IGetDataPermissions, ISingletonDependency
+{
+    private readonly ICurrentUser _currentUser;
+    private readonly IServiceProvider _serviceProvider;
+
+    public GetDataPermissionService(ICurrentUser currentUser, IServiceProvider serviceProvider)
+    {
+        _currentUser = currentUser;
+        _serviceProvider = serviceProvider;
+    }
+
+
+    public Dictionary<string, List<Guid>> GetData<T>()
+    {
+        var dict = new Dictionary<string, List<Guid>>(2);
+        var currentRole = _currentUser.GetRole();
+        if (currentRole is "admin" or "tenant-admin")
+        {
+            return dict;
+        }
+
+        using var scope = _serviceProvider.CreateScope();
+
+        var db = scope.ServiceProvider.GetService<IDbContext>();
+        db.Ignore<ITenantId>(() =>
+        {
+            var userDataPermissions = db.Queryable<DataPermissionEntity>()
+                .Where(x => x.AssignValue == _currentUser.GetStringSubjectId())
+                .ToList();
+
+            var deviceCodeProperty = typeof(T)
+                .GetProperties()
+                .FirstOrDefault(x => x.IsDefined(typeof(DeviceCodeAttribute), false));
+
+            var deviceGroupCodeProperty = typeof(T)
+                .GetProperties()
+                .FirstOrDefault(x => x.IsDefined(typeof(DeviceGroupCodeAttribute), false));
+
+            var userGroupCodeProperty = typeof(T)
+                .GetProperties()
+                .FirstOrDefault(x => x.IsDefined(typeof(UserGroupCodeAttribute), false));
+
+            if (userGroupCodeProperty != null)
+            {
+                var userGroupCodes = userDataPermissions.Where(x => x.UniqueType == DataPermissionAssignmentEnumType.UserGroup).Select(x => x.UniqueValue).Distinct().ToList();
+                dict.Add(userGroupCodeProperty.Name, userGroupCodes);
+            }
+            else
+            {
+                var deviceCodes = new List<Guid>();
+
+                //先计算分组权限下的设备
+                var deviceGroupCodes = userDataPermissions.Where(x => x.UniqueType == DataPermissionAssignmentEnumType.Group).Select(x => x.UniqueValue).ToList();
+                if (deviceGroupCodes.Any())
+                {
+                    var data = db.Queryable<DeviceGroupEntity>().ToList();
+
+                    var myCodes = new List<Guid>();
+                    foreach (Guid deviceGroupCode in deviceGroupCodes)
+                    {
+                        myCodes.AddRange(RecursionHelper.HandlerDeviceGroupNextCodes(deviceGroupCode, data));
+                    }
+
+                    myCodes = myCodes.Distinct().ToList();
+
+                    if (deviceCodeProperty != null)
+                    {
+                        deviceCodes = db.Queryable<DeviceGroupRelationshipEntity>().Where(x => myCodes.Contains(x.GroupCode)).Select(x => x.DeviceCode).ToList();
+                    }
+                }
+
+                if (deviceGroupCodeProperty != null)
+                {
+                    dict.Add(deviceGroupCodeProperty.Name, deviceGroupCodes);
+                }
+
+                if (deviceCodeProperty != null)
+                {
+                    var currentDeviceCodes = userDataPermissions.Where(x => x.UniqueType == DataPermissionAssignmentEnumType.Device).Select(x => x.UniqueValue).ToList();
+                    deviceCodes.AddRange(currentDeviceCodes);
+                    dict.Add(deviceCodeProperty.Name, deviceCodes.Distinct().ToList());
+                }
+            }
+        });
+
+        return dict;
+    }
+}
+
+public interface IDataPermissionService : IScopeDependency
+{
+    (bool, List<Guid>) GetMyDeviceCodes();
+    (bool, List<Guid>) GetMyDeviceGroupCodes();
+}
+
+public class MyDataPermissionService : IDataPermissionService
+{
+    private readonly IGetDataPermissions _getDataPermissions;
+    private readonly ICurrentUser _currentUser;
+
+    public MyDataPermissionService(IGetDataPermissions getDataPermissions, ICurrentUser currentUser)
+    {
+        _getDataPermissions = getDataPermissions;
+        _currentUser = currentUser;
+    }
+
+    /// <inheritdoc />
+    public (bool, List<Guid>) GetMyDeviceCodes()
+    {
+        var codes = new List<Guid>();
+
+        var hasAllPermission = _currentUser.GetRole() is "admin" or "tenant-admin";
+
+        if (!hasAllPermission)
+        {
+            codes = _getDataPermissions.GetData<DeviceEntity>().FirstOrDefault().Value ?? new List<Guid>();
+        }
+
+        return (!hasAllPermission, codes);
+    }
+
+    /// <inheritdoc />
+    public (bool, List<Guid>) GetMyDeviceGroupCodes()
+    {
+        var codes = new List<Guid>();
+
+        var hasAllPermission = _currentUser.GetRole() is "admin" or "tenant-admin";
+        if (!hasAllPermission)
+        {
+            codes = _getDataPermissions.GetData<DeviceGroupEntity>().FirstOrDefault().Value ?? new List<Guid>();
+        }
+
+        return (!hasAllPermission, codes);
+    }
+}

Src/Dlhis.Basic/Device/Controllers/DeviceGroupsController.cs

@@ -0,0 +1,88 @@
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Basic.Device.Request;
+using Dlhis.Basic.Device.Response;
+using Dlhis.Basic.Device.Services;
+using Dlhis.Entity.Device.Enums;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Device.Controllers;
+
+/// <summary>
+/// 设备分组
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class DeviceGroupsController : ControllerBase
+{
+    private readonly IDeviceGroupService _deviceGroupService;
+
+    public DeviceGroupsController(IDeviceGroupService deviceGroupService)
+    {
+        _deviceGroupService = deviceGroupService;
+    }
+
+    /// <summary>
+    /// 获取设备组树
+    /// </summary>
+    /// <param name="type">分组类型</param>
+    /// <returns></returns>
+    [HttpGet("tree")]
+    [IgnoreTenant]
+    [DataPermission]
+    public async Task<List<DeviceGroupTreeResponse>> GetTreeAsync(
+        [EnumDataType(typeof(DeviceTypeEnumType), ErrorMessage = "请选择正确的类型")]
+        DeviceTypeEnumType type)
+    {
+        return await _deviceGroupService.GetTreeAsync(type);
+    }
+
+    /// <summary>
+    /// 设备分组保存
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("save")]
+    [IgnoreTenant]
+    public async Task SaveAsync(DeviceGroupSaveRequest request)
+    {
+        await _deviceGroupService.SaveAsync(request);
+    }
+
+    /// <summary>
+    /// 获取分组下的设备
+    /// </summary>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    [HttpGet("devices")]
+    [CrossTenant]
+    public async Task<List<DeviceUnderGroupResponse>> GetDevicesByGroupCodeAsync(Guid code)
+    {
+        return await _deviceGroupService.GetDevicesByGroupCodeAsync(code);
+    }
+
+    /// <summary>
+    /// 分配设备
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("assign")]
+    [Transactional]
+    [CrossTenant]
+    public async Task<DevicePermissionAssignResponse> AssignDevicesAsync(DeviceAssignRequest request)
+    {
+        return await _deviceGroupService.AssignDevicesAsync(request);
+    }
+
+    /// <summary>
+    /// 获取用于预约的设备组
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("type/appointment")]
+    public async Task<List<DeviceGroupResponse>> GetAppointmentGroupsAsync()
+    {
+        return await _deviceGroupService.GetAppointmentGroupsAsync();
+    }
+}

Src/Dlhis.Basic/Device/Controllers/DevicePermissionManuallyController.cs

@@ -0,0 +1,74 @@
+using Dlhis.Basic.Device.Request;
+using Dlhis.Basic.Device.Response;
+using Dlhis.Basic.Device.Services;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Device.Controllers;
+
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class DevicePermissionManuallyController : ControllerBase
+{
+    private readonly IDevicePermissionManuallyService _devicePermissionService;
+
+    public DevicePermissionManuallyController(IDevicePermissionManuallyService devicePermissionService)
+    {
+        _devicePermissionService = devicePermissionService;
+    }
+
+    /// <summary>
+    /// 数据分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("page")]
+    [DataPermission]
+    public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync([FromQuery] DevicePermissionManuallyRequest request)
+    {
+        return await _devicePermissionService.GetPageAsync(request);
+    }
+
+    /// <summary>
+    /// 添加权限
+    /// </summary>
+    /// <param name="request"></param>
+    [HttpPost("add")]
+    [Transactional]
+    public async Task AddAsync(DevicePermissionManuallyAddRequest request)
+    {
+        await _devicePermissionService.AddAsync(request);
+    }
+
+    /// <summary>
+    /// 删除权限
+    /// </summary>
+    /// <param name="id"></param>
+    [HttpGet("{id:long}")]
+    [Transactional]
+    public async Task DeleteAsync(long id)
+    {
+        await _devicePermissionService.DeleteAsync(id);
+    }
+
+    /// <summary>
+    /// 删除权限
+    /// </summary>
+    /// <param name="ids"></param>
+    [HttpPost("batchDelete")]
+    [Transactional]
+    public async Task DeleteAsync(List<long> ids)
+    {
+        await _devicePermissionService.DeleteAsync(ids);
+    }
+
+    [HttpPost("{factory}/clear/{userCode}")]
+    [IgnoreTenant]
+    public async Task ClearAllDevicePermissions(string factory, string userCode)
+    {
+        await _devicePermissionService.ClearAllDevicePermissions(factory, userCode);
+    }
+}

Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs

@@ -0,0 +1,182 @@
+using Dlhis.Basic.Device.Dtos;
+using Dlhis.Basic.Device.Request;
+using Dlhis.Basic.Device.Response;
+using Dlhis.Basic.Device.Services;
+using Dlhis.Basic.Organization.Dto;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.Basic.Device.Controllers;
+
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class DevicePermissionsController : ControllerBase
+{
+    private readonly IDevicePermissionService _devicePermissionService;
+    private readonly IDevicePermissionAnalyzeService _devicePermissionAnalyzeService;
+
+    public DevicePermissionsController(IDevicePermissionService devicePermissionService, IDevicePermissionAnalyzeService devicePermissionAnalyzeService)
+    {
+        _devicePermissionService = devicePermissionService;
+        _devicePermissionAnalyzeService = devicePermissionAnalyzeService;
+    }
+
+    /// <summary>
+    /// 分配权限
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("assign")]
+    [Transactional]
+    [DataPermission]
+    [CrossTenant]
+    public async Task<DevicePermissionAssignResponse> AssignAsync(DevicePermissionSaveRequest request)
+    {
+        return await _devicePermissionService.AssignAsync(request);
+    }
+
+    /// <summary>
+    /// 分配权限到设备
+    /// </summary>
+    /// <param name="request"></param>
+    [HttpPost("assign-unique")]
+    [Transactional]
+    [CrossTenant]
+    public async Task<DevicePermissionAssignResponse> AssignToUniqueAsync(DevicePermissionsAssignToDeviceRequest request)
+    {
+        return await _devicePermissionService.AssignToUniqueAsync(request);
+    }
+
+    // [AllowAnonymous]
+    // [HttpPost("assign-unique-import")]
+    // [Transactional]
+    // [IgnoreTenant]
+    // public async Task AssignToUniqueImportAsync(IFormFile file)
+    // {
+    //     await _devicePermissionService.AssignToUniqueImportAsync(file);
+    // }
+
+    /// <summary>
+    /// 当前类型的权限分配
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("assignments")]
+    public async Task<List<Guid>> GetAssignmentsAsync([FromQuery] DeviceGetAssignmentsRequest request)
+    {
+        return await _devicePermissionAnalyzeService.GetAssignmentsAsync(request);
+    }
+
+    /// <summary>
+    /// 当前类型的权限分配
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("assignments-unique")]
+    public async Task<List<GainfoDto>> GetAssignmentUniqueAsync([FromQuery] DeviceGetAssignmentUniquesRequest request)
+    {
+        return await _devicePermissionAnalyzeService.GetAssignmentUniqueAsync(request);
+    }
+
+    /// <summary>
+    /// 获取设备下人员分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("gainfos/page")]
+    [CrossTenant]
+    public async Task<Pagination<DeviceGainfoResponse>> GetGainfoPageByDeviceAsync([FromQuery] DeviceWithGainfoRequest request)
+    {
+        return await _devicePermissionService.GetGainfoPageByDeviceAsync(request);
+    }
+
+    /// <summary>
+    /// 设备人员下发重置
+    /// </summary>
+    /// <param name="request"></param>
+    [HttpPost("gainfos/reset")]
+    [CrossTenant]
+    public async Task ResetGainfoPageByDeviceAsync(DeviceGainfoReset request)
+    {
+        await _devicePermissionService.ResetGainfoPageByDeviceAsync(request.Code, request.Search, request.UserType);
+    }
+
+    /// <summary>
+    /// 获取设备下所有人员
+    /// </summary>
+    /// <param name="deviceUniqueNo"></param>
+    [HttpGet("gainfo-all")]
+    [IgnoreTenant]
+    public async Task<List<string>> GetDeviceUserCodesAsync(string deviceUniqueNo)
+    {
+        return await _devicePermissionService.GetDeviceUserCodesAsync(deviceUniqueNo);
+    }
+
+    /// <summary>
+    /// 设备其他类型人员
+    /// </summary>
+    /// <param name="deviceUniqueNo"></param>
+    /// <returns></returns>
+    [HttpGet("gainfo/others")]
+    [IgnoreTenant]
+    public async Task<DeviceOtherUserCountResponse> ExternalAndManuallyUserNoAsync(string deviceUniqueNo)
+    {
+        return await _devicePermissionService.ExternalAndManuallyUserNoAsync(deviceUniqueNo);
+    }
+
+    [HttpGet("userPermissionCodes")]
+    [IgnoreTenant]
+    public async Task<List<Guid>> GetAssignDeviceCodesAsync(string userCode)
+    {
+        return await _devicePermissionService.GetUserDeviceCodesByNoOrCodeAsync(userCode);
+    }
+
+
+    [HttpPost("temp-userPermissionCodes")]
+    [IgnoreTenant]
+    public async Task<List<TempC>> GetAssignDeviceCodesAsync(List<string> userCodes)
+    {
+        return await _devicePermissionService.GetUserDeviceCodesByNoAsync(userCodes);
+    }
+
+
+    [HttpGet("test-userPermissionCodes")]
+    [IgnoreTenant]
+    public async Task<Dictionary<string, List<TenantAssignTypeDeviceCode>>> GetTestAssignDeviceCodesAsync(string userNo)
+    {
+        return await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(new List<string> { userNo });
+    }
+
+    [HttpGet("reset-visitors")]
+    [IgnoreTenant]
+    public async Task<int> ResetVisitorsByDeviceAsync(string deviceUniqueNo)
+    {
+        return await _devicePermissionService.ResetVisitorsByDeviceAsync(deviceUniqueNo);
+    }
+
+    [HttpGet("exceptUsers")]
+    [IgnoreTenant]
+    public async Task<List<string>> GetDeviceExceptUsersAsync(string deviceUniqueNo)
+    {
+        return await _devicePermissionService.GetDeviceExceptUsersAsync(deviceUniqueNo);
+    }
+
+    [HttpGet("notInDeviceUsers")]
+    [IgnoreTenant]
+    public async Task<List<string>> GetDeviceNotInUsersAsync(string deviceUniqueNo)
+    {
+        return await _devicePermissionService.GetDeviceNotInUsersAsync(deviceUniqueNo);
+    }
+
+
+    [HttpPost("removeExceptUsers")]
+    [Transactional]
+    [IgnoreTenant]
+    public async Task<int> GenerateDeleteDeviceTasksAsync(DeviceRemoveExceptUserRequest request)
+    {
+        return await _devicePermissionService.GenerateDeleteDeviceTasksAsync(request.DeviceUniqueNo);
+    }
+}