fix 注释,下发任务状态分页

Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs

@@ -8,6 +8,4 @@ public class DevicePageRequest : PageDto
     /// 平台
     /// </summary>
     public string Brand { get; set; }
-
-    public string MyProperty { get; set; }
 }

Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs

@@ -14,6 +14,8 @@ public class DeviceUnderGroupResponse
     /// </summary>
     public string Brand { get; set; }
 
-
+    /// <summary>
+    /// 是否启用
+    /// </summary>
     public bool Enable { get; set; }
 }

Src/Dlhis.Entity/Device/Entities/DeviceTask.cs

@@ -1,5 +1,7 @@
-using Kurisu.SqlSugar;
+using Dlhis.Entity.Device.Enums;
+using Kurisu.SqlSugar;
 using SqlSugar;
+using SqlSugar.DbConvert;
 
 namespace Dlhis.Entity.Device.Entities;
 
@@ -9,10 +11,16 @@ namespace Dlhis.Entity.Device.Entities;
 [SugarTable(TableName = "DeviceTask")]
 public class DeviceTaskEntity : SugarBaseEntity
 {
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public DeviceTaskEnumType Type { get; set; }
+
     /// <summary>
     /// 用户档案号
     /// </summary>
-    public string UserId { get; set; }
+    public string UserNo { get; set; }
 
     /// <summary>
     /// 用户学工号
@@ -34,6 +42,11 @@ public class DeviceTaskEntity : SugarBaseEntity
     /// </summary>
     public int RetryCount { get; set; }
 
+    /// <summary>
+    /// 任务下发状态
+    /// </summary>
+    [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public DeviceTaskStatusEnumType Status { get; set; }
 
     /// <summary>
     /// 处理结果

Src/Dlhis.Entity/Device/Enums/DeviceTaskEnumType.cs

@@ -0,0 +1,30 @@
+using System.ComponentModel;
+
+namespace Dlhis.Entity.Device.Enums;
+
+/// <summary>
+/// 设备任务类型
+/// </summary>
+[Description("设备任务类型")]
+public enum DeviceTaskEnumType
+{
+    // 状态:ADD-准备下发;ADDOK-下发成功;DEL-准备删除;DELOK-删除成功;AERR-下发错误;DERR-删除错误;UUU-先删除后下发;
+
+    /// <summary>
+    /// 添加
+    /// </summary>
+    [Description("添加")]
+    Add = 1,
+
+    /// <summary>
+    /// 删除
+    /// </summary>
+    [Description("删除")]
+    Delete = 2,
+
+    /// <summary>
+    /// 删除后添加
+    /// </summary>
+    [Description("删除后添加")]
+    AddAfterDelete = 3,
+}

Src/Dlhis.Entity/Device/Enums/DeviceTaskStatusEnumType.cs

@@ -0,0 +1,34 @@
+using System.ComponentModel;
+
+namespace Dlhis.Entity.Device.Enums;
+
+/// <summary>
+/// 设备任务下发状态
+/// </summary>
+[Description("设备任务下发状态")]
+public enum DeviceTaskStatusEnumType
+{
+    /// <summary>
+    /// 待下发
+    /// </summary>
+    [Description("待下发")]
+    Wait = 0,
+
+    /// <summary>
+    /// 处理中
+    /// </summary>
+    [Description("处理中")]
+    Process = 5,
+
+    /// <summary>
+    /// 下发完成
+    /// </summary>
+    [Description("下发完成")]
+    Success = 10,
+
+    /// <summary>
+    /// 异常
+    /// </summary>
+    [Description("异常")]
+    Error = 99,
+}

Src/Dlhis.ScheduledTask/App.config

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <!--接口服务器地址  后面不要带 "/"-->
-    <add key="ServerUrl" value="http://172.16.7.58:8125"/>
-    <!--接口登录用户名-->
-    <add key="UserName" value="admin_ws"/>
-    <!--接口登录密码-->
-    <add key="Password" value="jinkohr@2017"/>
-    <!--同步人事信息时间-->
-    <add key="SyncTime" value="00:00"/>
-    <!--考勤记录上传间隔-->
-    <add key="AttendanceUploadInterval" value="30"/>
-    <!--考勤记录上传间隔-->
-    <add key="AttendanceUploadUrl" value="http://172.16.7.110:8121/sap/bc/srt/wsdl/flv_10002A111AD1/bndg_url/sap/bc/srt/rfc/sap/zhrf_swipe_data_saven/210/zhrf_swipe_data_save/zhrf_swipe_data_save?sap-client=210"/>
-    <!--迪联数据库连接-->
-    <add key="DlhisDatabase" value="server=192.168.199.124,32634;uid=sa;pwd=@Z!123456;database=test;"/>
-    <add key="Werks" value="aaa,bbb"/>
-    <!--人事信息开始同步日期-->
-    <add key="BeginSyncDate" value="2020-5-1"/>
-    <!--HTTP api 监听端口-->
-    <add key="ApiPort" value="8099"/>
-    <add key="EHRWebServiceUserName" value="mes_wsuser"/>
-    <add key="EHRWebServicePassword" value="pid12345"/>
-    <add key="EHRInsertRecordApiUrl" value="http://172.16.7.70:50000/dir/wsdl?p=ic/0dba887338dd39cebd17fdf55f2f8430"/>
-    <add key="EHRDeleteRecordApiUrl" value="http://172.16.7.70:50000/dir/wsdl?p=ic/d8b0cfae38313211a93cb5d813ea0062"/>
-    <add key="EHRSavePhotoApiUrl" value="http://172.16.7.70:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=DLDM&amp;receiverParty=&amp;receiverService=&amp;interface=SI_DLDM2EHR_InsertRecord_Out&amp;interfaceNamespace=urn%3Ajinkosolar.com%3Adldm%3Aehr_insert_record"/>
-    <add key="EHR_GET_WORK_CARD_INFOApiUrl" value="http://sappipap01.jinkosolar.cn:50100/RESTAdapter/Rest/EHR_GET_WORK_CARD_INFO/"/>
-    <!--获取员工卡片信息-->
-    <add key="RestUserName" value="DL_USER"/>
-    <add key="RestPassword" value="MWLnaIbGtI9Q4N"/>
-    <!--RESULT 账号与密码-->
-  </appSettings>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
-  </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
-<!--
-PERNR			NUMC			人员号 			
-WERKS			CHAR			人事范围			
-ORGEH			NUMC			组织单位			
-PLANS			NUMC			岗位			
-ZZ_SJGH		CHAR			直接上级工号			
-ZZ_AQJB		CHAR			安全级别			
-NAME			CHAR			姓名			
-GESCH			CHAR			性别代码			
-GBDAT			DATS			出生日期			
-ZZ_SFZH		CHAR			身份证号码 			
-ZTELE			CHAR			座机号 			
-ZWORKCODE	CHAR			OA工号			
-ZMOBILE		CHAR			手机			
-ZEMAIL		CHAR			电子邮件			
-ZSTATUS		CHAR			状态 			
-
--->

Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Nullable>enable</Nullable>
+        <Nullable>disable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerfileContext>..\..</DockerfileContext>

Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs

@@ -10,19 +10,18 @@ using System.Text;
 using Dlhis.ScheduledTask.Configurations;
 using Kurisu.SqlSugar.Services;
 using Dlhis.Entity.Basic.Entity;
-using Dlhis.ScheduledTask.Wsproxy.Dlhis.JinkoHr.WsProxy;
 using Dlhis.Entity.Basic.Enums;
 
 namespace Dlhis.ScheduledTask.Job
 {
-    public class SyncPersonJob
+    public class SyncPersonJob 
     {
 
         private List<PersonDetail> lastUpdatedPersonList = new List<PersonDetail>();
         private List<ZHRS_ORG> lastUpdatedOrgList = new List<ZHRS_ORG>();
         private List<ZHRS_POST> lastUpdatedPositionList = new List<ZHRS_POST>();
         private readonly ServiceSettings serviceSettings;
-        private readonly ZHRS_WERKS[] werks;
+        
         private readonly IDbContext _dbContext;
         public SyncPersonJob(IDbContext dbContext)
         {
@@ -242,58 +241,58 @@ namespace Dlhis.ScheduledTask.Job
             var headerValue = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials));
             httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", headerValue);
 
-            List<PersonDetail> persons = new List<PersonDetail>();
+            List<PersonDetail> persons = new();
-            foreach (var item in werks)
+            //foreach (var item in werks)
-            {
+            //{
-                try
+            //    try
-                {
+            //    {
-                    var body = new
+            //        var body = new
-                    {
+            //        {
-                        T_WERKS = new
+            //            T_WERKS = new
-                        {
+            //            {
-                            item = new List<object>
+            //                item = new List<object>
-                            {
+            //                {
-                                new
+            //                    new
-                                {
+            //                    {
-                                    item.WERKS
+            //                        item.WERKS
-                                }
+            //                    }
-                            }
+            //                }
-                        },
+            //            },
-                        T_PERSON = Array.Empty<string>(),
+            //            T_PERSON = Array.Empty<string>(),
-                        T_PNO = Array.Empty<string>(),
+            //            T_PNO = Array.Empty<string>(),
-                    };
+            //        };
-                    var content = new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
+            //        var content = new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
 
-                    var response = httpClient.PostAsync("http://sappipap01.jinkosolar.cn:50100/RESTAdapter/Rest/EHR_PERSONNEL/", content).Result;
+            //        var response = httpClient.PostAsync("http://sappipap01.jinkosolar.cn:50100/RESTAdapter/Rest/EHR_PERSONNEL/", content).Result;
 
-                    var jsonResponse = response.Content.ReadAsStringAsync().Result;
+            //        var jsonResponse = response.Content.ReadAsStringAsync().Result;
-                    if (response.IsSuccessStatusCode)
+            //        if (response.IsSuccessStatusCode)
-                    {
+            //        {
-                        PersonResult personResp = JsonConvert.DeserializeObject<PersonResult>(jsonResponse);
+            //            PersonResult personResp = JsonConvert.DeserializeObject<PersonResult>(jsonResponse);
-                        if (personResp?.T_PERSON?.item?.Any() == true)
+            //            if (personResp?.T_PERSON?.item?.Any() == true)
-                        {
+            //            {
-                            persons.AddRange(personResp.T_PERSON.item);
+            //                persons.AddRange(personResp.T_PERSON.item);
-                            //log.Info($"人事范围[{item.WERKS}]获取{personResp.T_PERSON.item.Count}条数据");
+            //                //log.Info($"人事范围[{item.WERKS}]获取{personResp.T_PERSON.item.Count}条数据");
-                        }
+            //            }
-                    }
+            //        }
-                    else
+            //        else
-                    {
+            //        {
-                        throw new Exception($"请求异常:{response.StatusCode}:" + jsonResponse);
+            //            throw new Exception($"请求异常:{response.StatusCode}:" + jsonResponse);
-                    }
+            //        }
-                    // this is webservice call
+            //        // this is webservice call
-                    //var personResp = archivesClient.ZHRF_SYN_03(new ZHRF_SYN_03()
+            //        //var personResp = archivesClient.ZHRF_SYN_03(new ZHRF_SYN_03()
-                    //{
+            //        //{
-                    //    //I_DATE = Settings.BeginSyncDate.ToString("yyy-MM-dd"),
+            //        //    //I_DATE = Settings.BeginSyncDate.ToString("yyy-MM-dd"),
-                    //    T_PERSON = Array.Empty<ZHRS_PERSON>(),
+            //        //    T_PERSON = Array.Empty<ZHRS_PERSON>(),
-                    //    T_PNO = Array.Empty<ZHRS_PNO>(),
+            //        //    T_PNO = Array.Empty<ZHRS_PNO>(),
-                    //    T_WERKS = new ZHRS_WERKS[] { item },
+            //        //    T_WERKS = new ZHRS_WERKS[] { item },
-                    //});
+            //        //});
-                }
+            //    }
-                catch (Exception ex)
+            //    catch (Exception ex)
-                {
+            //    {
-                    //log.Error($"人事范围[{item.WERKS}]获取失败:{ex.Message}", ex);
+            //        //log.Error($"人事范围[{item.WERKS}]获取失败:{ex.Message}", ex);
-                }
+            //    }
-            }
+            //}
 
             return new PersonResult()
             {

Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/DeviceTaskAssignmentsController.cs

@@ -0,0 +1,35 @@
+using Dlhis.ScheduledTask.TaskAssignment.Request;
+using Dlhis.ScheduledTask.TaskAssignment.Response;
+using Dlhis.ScheduledTask.TaskAssignment.Services;
+using Kurisu.Core.DataAccess.Dto;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Controllers;
+
+/// <summary>
+/// 设备任务下发
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class DeviceTaskAssignmentsController : ControllerBase
+{
+    private readonly IDeviceTaskAssignmentService _deviceTaskAssignmentService;
+
+    public DeviceTaskAssignmentsController(IDeviceTaskAssignmentService deviceTaskAssignmentService)
+    {
+        _deviceTaskAssignmentService = deviceTaskAssignmentService;
+    }
+
+    /// <summary>
+    /// 设备任务下发分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("page")]
+    public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync([FromQuery] DeviceTaskAssignmentRequest request)
+    {
+        return await _deviceTaskAssignmentService.GetPageAsync(request);
+    }
+}

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

@@ -0,0 +1,7 @@
+using Kurisu.Core.DataAccess.Dto;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Request;
+
+public class DeviceTaskAssignmentRequest : PageDto
+{
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs

@@ -0,0 +1,62 @@
+using Dlhis.Entity.Device.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Response;
+
+public class DeviceTaskAssignmentResponse
+{
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public DeviceTaskEnumType Type { get; set; }
+
+    /// <summary>
+    /// 任务类型描述
+    /// </summary>
+    public string TypeDesc => Type.GetDescription();
+
+    /// <summary>
+    /// 用户档案号
+    /// </summary>
+    public string UserNo { get; set; }
+
+    /// <summary>
+    /// 用户学工号
+    /// </summary>
+    public string UserCode { get; set; }
+
+    /// <summary>
+    /// 用户名
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// 设备唯一号
+    /// </summary>
+    public string DeviceUniqueNo { get; set; }
+
+    /// <summary>
+    /// 重试次数
+    /// </summary>
+    public int RetryCount { get; set; }
+
+    /// <summary>
+    /// 任务下发状态
+    /// </summary>
+    public DeviceTaskStatusEnumType Status { get; set; }
+
+    /// <summary>
+    /// 任务下发状态描述
+    /// </summary>
+    public string StatusDesc => Status.GetDescription();
+
+    /// <summary>
+    /// 处理结果
+    /// </summary>
+    public string ResultMessage { get; set; }
+
+    /// <summary>
+    /// 数据状态最新修改时间
+    /// </summary>
+    public DateTime LastUpdateTime { get; set; }
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Services/IDeviceTaskAssignmentService.cs

@@ -0,0 +1,10 @@
+using Dlhis.ScheduledTask.TaskAssignment.Request;
+using Dlhis.ScheduledTask.TaskAssignment.Response;
+using Kurisu.Core.DataAccess.Dto;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Services;
+
+public interface IDeviceTaskAssignmentService : IScopeDependency
+{
+    Task<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync(DeviceTaskAssignmentRequest request);
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs

@@ -0,0 +1,38 @@
+using Dlhis.Entity.Device.Entities;
+using Dlhis.ScheduledTask.TaskAssignment.Request;
+using Dlhis.ScheduledTask.TaskAssignment.Response;
+using Kurisu.Core.DataAccess.Dto;
+using Kurisu.SqlSugar.Extensions;
+using Kurisu.SqlSugar.Services;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Services.Implements;
+
+public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
+{
+    private readonly IDbContext _dbContext;
+
+    public DeviceTaskAssignmentService(IDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync(DeviceTaskAssignmentRequest request)
+    {
+        var page = await _dbContext.Queryable<DeviceTaskEntity>()
+              .Select((deviceTask) => new DeviceTaskAssignmentResponse
+              {
+                  DeviceUniqueNo = deviceTask.DeviceUniqueNo,
+                  ResultMessage = deviceTask.ResultMessage,
+                  RetryCount = deviceTask.RetryCount,
+                  Status = deviceTask.Status,
+                  UserNo = deviceTask.UserNo,
+                  UserName = deviceTask.UserName,
+                  UserCode = deviceTask.UserCode,
+                  Type = deviceTask.Type,
+                  LastUpdateTime = deviceTask.ModifiedTime
+              })
+              .ToPageListAsync(request);
+
+        return page;
+    }
+}

Src/Dlhis.ScheduledTask/WsProxy/ZHRF_SYN_03N.cs

@@ -1,851 +0,0 @@
-namespace Dlhis.ScheduledTask.Wsproxy
-{
-    //------------------------------------------------------------------------------
-    // <auto-generated>
-    //     This code was generated by a tool.
-    //     Runtime Version:4.0.30319.42000
-    //
-    //     Changes to this file may cause incorrect behavior and will be lost if
-    //     the code is regenerated.
-    // </auto-generated>
-    //------------------------------------------------------------------------------
-
-    // 
-    // This source code was auto-generated by wsdl, Version=4.6.1055.0.
-    // 
-    namespace Dlhis.JinkoHr.WsProxy
-    {
-
-        /// <remarks/>
-        // CODEGEN: The optional WSDL extension element 'Policy' from namespace 'http://schemas.xmlsoap.org/ws/2004/09/policy' was not handled.
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        [System.Diagnostics.DebuggerStepThroughAttribute()]
-        [System.ComponentModel.DesignerCategoryAttribute("code")]
-        //[System.Web.Services.WebServiceBindingAttribute(Name = "ZHRF_SYN_03N", Namespace = "urn:sap-com:document:sap:rfc:functions")]
-        /*public partial class ZHRF_SYN_03N : System.Web.Services.Protocols.SoapHttpClientProtocol
-        {
-
-            private System.Threading.SendOrPostCallback ZHRF_SYN_03OperationCompleted;
-
-            /// <remarks/>
-            public ZHRF_SYN_03N()
-            {
-                this.Url = "http://172.16.7.58:8125/sap/bc/srt/rfc/sap/zhrf_syn_03n/800/zhrf_syn" +
-                    "_03n/zhrf_syn_03n";
-            }
-
-            /// <remarks/>
-            public event ZHRF_SYN_03CompletedEventHandler ZHRF_SYN_03Completed;
-
-            /// <remarks/>
-            [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:sap-com:document:sap:rfc:functions:ZHRF_SYN_03N:ZHRF_SYN_03Request", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Bare)]
-            [return: System.Xml.Serialization.XmlElementAttribute("ZHRF_SYN_03Response", Namespace = "urn:sap-com:document:sap:rfc:functions")]
-            public ZHRF_SYN_03Response ZHRF_SYN_03([System.Xml.Serialization.XmlElementAttribute("ZHRF_SYN_03", Namespace = "urn:sap-com:document:sap:rfc:functions")] ZHRF_SYN_03 ZHRF_SYN_031)
-            {
-                object[] results = this.Invoke("ZHRF_SYN_03", new object[] {
-                    ZHRF_SYN_031});
-                return ((ZHRF_SYN_03Response)(results[0]));
-            }
-
-            /// <remarks/>
-            public System.IAsyncResult BeginZHRF_SYN_03(ZHRF_SYN_03 ZHRF_SYN_031, System.AsyncCallback callback, object asyncState)
-            {
-                return this.BeginInvoke("ZHRF_SYN_03", new object[] {
-                    ZHRF_SYN_031}, callback, asyncState);
-            }
-
-            /// <remarks/>
-            public ZHRF_SYN_03Response EndZHRF_SYN_03(System.IAsyncResult asyncResult)
-            {
-                object[] results = this.EndInvoke(asyncResult);
-                return ((ZHRF_SYN_03Response)(results[0]));
-            }
-
-            /// <remarks/>
-            public void ZHRF_SYN_03Async(ZHRF_SYN_03 ZHRF_SYN_031)
-            {
-                this.ZHRF_SYN_03Async(ZHRF_SYN_031, null);
-            }
-
-            /// <remarks/>
-            public void ZHRF_SYN_03Async(ZHRF_SYN_03 ZHRF_SYN_031, object userState)
-            {
-                if ((this.ZHRF_SYN_03OperationCompleted == null))
-                {
-                    this.ZHRF_SYN_03OperationCompleted = new System.Threading.SendOrPostCallback(this.OnZHRF_SYN_03OperationCompleted);
-                }
-                this.InvokeAsync("ZHRF_SYN_03", new object[] {
-                    ZHRF_SYN_031}, this.ZHRF_SYN_03OperationCompleted, userState);
-            }
-
-            private void OnZHRF_SYN_03OperationCompleted(object arg)
-            {
-                if ((this.ZHRF_SYN_03Completed != null))
-                {
-                    System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                    this.ZHRF_SYN_03Completed(this, new ZHRF_SYN_03CompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-                }
-            }
-
-            /// <remarks/>
-            public new void CancelAsync(object userState)
-            {
-                base.CancelAsync(userState);
-            }
-        }*/
-
-      /*  /// <remarks/>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        [System.SerializableAttribute()]
-        [System.Diagnostics.DebuggerStepThroughAttribute()]
-        [System.ComponentModel.DesignerCategoryAttribute("code")]*/
-        [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:rfc:functions")]
-        public partial class ZHRF_SYN_03
-        {
-
-            private string i_DATEField;
-
-            private ZHRS_PERSON[] t_PERSONField;
-
-            private ZHRS_PNO[] t_PNOField;
-
-            private ZHRS_WERKS[] t_WERKSField;
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string I_DATE
-            {
-                get
-                {
-                    return this.i_DATEField;
-                }
-                set
-                {
-                    this.i_DATEField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlArrayAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            [System.Xml.Serialization.XmlArrayItemAttribute("item", Form = System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable = false)]
-            public ZHRS_PERSON[] T_PERSON
-            {
-                get
-                {
-                    return this.t_PERSONField;
-                }
-                set
-                {
-                    this.t_PERSONField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlArrayAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            [System.Xml.Serialization.XmlArrayItemAttribute("item", Form = System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable = false)]
-            public ZHRS_PNO[] T_PNO
-            {
-                get
-                {
-                    return this.t_PNOField;
-                }
-                set
-                {
-                    this.t_PNOField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlArrayAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            [System.Xml.Serialization.XmlArrayItemAttribute("item", Form = System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable = false)]
-            public ZHRS_WERKS[] T_WERKS
-            {
-                get
-                {
-                    return this.t_WERKSField;
-                }
-                set
-                {
-                    this.t_WERKSField = value;
-                }
-            }
-        }
-
-        /// <remarks/>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        [System.SerializableAttribute()]
-        [System.Diagnostics.DebuggerStepThroughAttribute()]
-        [System.ComponentModel.DesignerCategoryAttribute("code")]
-        [System.Xml.Serialization.XmlTypeAttribute(Namespace = "urn:sap-com:document:sap:rfc:functions")]
-        public partial class ZHRS_PERSON
-        {
-
-            private string pERNRField;
-
-            private string wERKSField;
-
-            private string oRGEHField;
-
-            private string pLANSField;
-
-            private string zZ_SJGHField;
-
-            private string zZ_AQJBField;
-
-            private string nAMEField;
-
-            private string gESCHField;
-
-            private string gBDATField;
-
-            private string zZ_SFZHField;
-
-            private string zTELEField;
-
-            private string zWORKCODEField;
-
-            private string zMOBILEField;
-
-            private string zEMAILField;
-
-            private string zSTATUSField;
-            private string zZZ_XSQYField;
-            private string zKOSTLField;
-            private string zZZ_ZDField;
-            private string zZ_ZJField;
-            private string zZRZRQField;
-            private string zZLZRQField;
-            private string zMASSGField;
-            private string zMGTXTField;
-
-            private string zBEGDAField;
-
-            private string zENDDAField;
-
-            private string zSTELLField;
-
-            private string zSTELL_NMField;
-
-            private string zZADZHField;
-
-            private string zSTAT2Field;
-
-            private string zZCJRQField;
-
-            private string zZZZRQField;
-
-            private string zMASSNField;
-
-            private string zMNTXTField;
-
-            private string zXUELIField;
-
-            private string zZ_KLXField;
-
-
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string PERNR
-            {
-                get
-                {
-                    return this.pERNRField;
-                }
-                set
-                {
-                    this.pERNRField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string WERKS
-            {
-                get
-                {
-                    return this.wERKSField;
-                }
-                set
-                {
-                    this.wERKSField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ORGEH
-            {
-                get
-                {
-                    return this.oRGEHField;
-                }
-                set
-                {
-                    this.oRGEHField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string PLANS
-            {
-                get
-                {
-                    return this.pLANSField;
-                }
-                set
-                {
-                    this.pLANSField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZZ_SJGH
-            {
-                get
-                {
-                    return this.zZ_SJGHField;
-                }
-                set
-                {
-                    this.zZ_SJGHField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZZ_AQJB
-            {
-                get
-                {
-                    return this.zZ_AQJBField;
-                }
-                set
-                {
-                    this.zZ_AQJBField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string NAME
-            {
-                get
-                {
-                    return this.nAMEField;
-                }
-                set
-                {
-                    this.nAMEField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string GESCH
-            {
-                get
-                {
-                    return this.gESCHField;
-                }
-                set
-                {
-                    this.gESCHField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string GBDAT
-            {
-                get
-                {
-                    return this.gBDATField;
-                }
-                set
-                {
-                    this.gBDATField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZZ_SFZH
-            {
-                get
-                {
-                    return this.zZ_SFZHField;
-                }
-                set
-                {
-                    this.zZ_SFZHField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZTELE
-            {
-                get
-                {
-                    return this.zTELEField;
-                }
-                set
-                {
-                    this.zTELEField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZWORKCODE
-            {
-                get
-                {
-                    return this.zWORKCODEField;
-                }
-                set
-                {
-                    this.zWORKCODEField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZMOBILE
-            {
-                get
-                {
-                    return this.zMOBILEField;
-                }
-                set
-                {
-                    this.zMOBILEField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZEMAIL
-            {
-                get
-                {
-                    return this.zEMAILField;
-                }
-                set
-                {
-                    this.zEMAILField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZSTATUS
-            {
-                get
-                {
-                    return this.zSTATUSField;
-                }
-                set
-                {
-                    this.zSTATUSField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZZ_XSQY
-            {
-                get
-                {
-                    return this.zZZ_XSQYField;
-                }
-                set
-                {
-                    this.zZZ_XSQYField = value;
-                }
-            }
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string KOSTL
-            {
-                get
-                {
-                    return this.zKOSTLField;
-                }
-                set
-                {
-                    this.zKOSTLField = value;
-                }
-            }
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZZ_ZD
-            {
-                get
-                {
-                    return this.zZZ_ZDField;
-                }
-                set
-                {
-                    this.zZZ_ZDField = value;
-                }
-            }
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            /// <remarks/>
-            public string Z_ZJ
-            {
-                get
-                {
-                    return this.zZ_ZJField;
-                }
-                set
-                {
-                    this.zZ_ZJField = value;
-                }
-            }
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZRZRQ
-            {
-                get
-                {
-                    return this.zZRZRQField;
-                }
-                set
-                {
-                    this.zZRZRQField = value;
-                }
-            }
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZLZRQ
-            {
-                get
-                {
-                    return this.zZLZRQField;
-                }
-                set
-                {
-                    this.zZLZRQField = value;
-                }
-            }
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string MASSG
-            {
-                get
-                {
-                    return this.zMASSGField;
-                }
-                set
-                {
-                    this.zMASSGField = value;
-                }
-            }
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string MGTXT
-            {
-                get
-                {
-                    return this.zMGTXTField;
-                }
-                set
-                {
-                    this.zMGTXTField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string BEGDA
-            {
-                get
-                {
-                    return zBEGDAField;
-                }
-                set
-                {
-                    zBEGDAField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ENDDA
-            {
-                get
-                {
-                    return zENDDAField;
-                }
-                set
-                {
-                    zENDDAField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string STELL
-            {
-                get
-                {
-                    return zSTELLField;
-                }
-                set
-                {
-                    zSTELLField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string STELL_NM
-            {
-                get
-                {
-                    return zSTELL_NMField;
-                }
-                set
-                {
-                    zSTELL_NMField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZADZH
-            {
-                get
-                {
-                    return zZADZHField;
-                }
-                set
-                {
-                    zZADZHField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string STAT2
-            {
-                get
-                {
-                    return zSTAT2Field;
-                }
-                set
-                {
-                    zSTAT2Field = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZCJRQ
-            {
-                get
-                {
-                    return zZCJRQField;
-                }
-                set
-                {
-                    zZCJRQField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZZZRQ
-            {
-                get
-                {
-                    return zZZZRQField;
-                }
-                set
-                {
-                    zZZZRQField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string MASSN
-            {
-                get
-                {
-                    return zMASSNField;
-                }
-                set
-                {
-                    zMASSNField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string MNTXT
-            {
-                get
-                {
-                    return zMNTXTField;
-                }
-                set
-                {
-                    zMNTXTField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZXUELI
-            {
-                get
-                {
-                    return zXUELIField;
-                }
-                set
-                {
-                    zXUELIField = value;
-                }
-            }
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZZ_KLX
-            {
-                get
-                {
-                    return zZ_KLXField;
-                }
-                set
-                {
-                    zZ_KLXField = value;
-                }
-            }
-        }
-
-        /// <remarks/>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        [System.SerializableAttribute()]
-        [System.Diagnostics.DebuggerStepThroughAttribute()]
-        [System.ComponentModel.DesignerCategoryAttribute("code")]
-        [System.Xml.Serialization.XmlTypeAttribute(Namespace = "urn:sap-com:document:sap:rfc:functions")]
-        public partial class ZHRS_WERKS
-        {
-
-            private string wERKSField;
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string WERKS
-            {
-                get
-                {
-                    return this.wERKSField;
-                }
-                set
-                {
-                    this.wERKSField = value;
-                }
-            }
-        }
-
-        /// <remarks/>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        [System.SerializableAttribute()]
-        [System.Diagnostics.DebuggerStepThroughAttribute()]
-        [System.ComponentModel.DesignerCategoryAttribute("code")]
-        [System.Xml.Serialization.XmlTypeAttribute(Namespace = "urn:sap-com:document:sap:rfc:functions")]
-        public partial class ZHRS_PNO
-        {
-
-            private string zWORKCODEField;
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            public string ZWORKCODE
-            {
-                get
-                {
-                    return this.zWORKCODEField;
-                }
-                set
-                {
-                    this.zWORKCODEField = value;
-                }
-            }
-        }
-
-        /// <remarks/>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        [System.SerializableAttribute()]
-        [System.Diagnostics.DebuggerStepThroughAttribute()]
-        [System.ComponentModel.DesignerCategoryAttribute("code")]
-        [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "urn:sap-com:document:sap:rfc:functions")]
-        public partial class ZHRF_SYN_03Response
-        {
-
-            private ZHRS_PERSON[] t_PERSONField;
-
-            private ZHRS_PNO[] t_PNOField;
-
-            private ZHRS_WERKS[] t_WERKSField;
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlArrayAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            [System.Xml.Serialization.XmlArrayItemAttribute("item", Form = System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable = false)]
-            public ZHRS_PERSON[] T_PERSON
-            {
-                get
-                {
-                    return this.t_PERSONField;
-                }
-                set
-                {
-                    this.t_PERSONField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlArrayAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            [System.Xml.Serialization.XmlArrayItemAttribute("item", Form = System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable = false)]
-            public ZHRS_PNO[] T_PNO
-            {
-                get
-                {
-                    return this.t_PNOField;
-                }
-                set
-                {
-                    this.t_PNOField = value;
-                }
-            }
-
-            /// <remarks/>
-            [System.Xml.Serialization.XmlArrayAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-            [System.Xml.Serialization.XmlArrayItemAttribute("item", Form = System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable = false)]
-            public ZHRS_WERKS[] T_WERKS
-            {
-                get
-                {
-                    return this.t_WERKSField;
-                }
-                set
-                {
-                    this.t_WERKSField = value;
-                }
-            }
-        }
-
-        /// <remarks/>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        public delegate void ZHRF_SYN_03CompletedEventHandler(object sender, ZHRF_SYN_03CompletedEventArgs e);
-
-        /// <remarks/>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "4.6.1055.0")]
-        [System.Diagnostics.DebuggerStepThroughAttribute()]
-        [System.ComponentModel.DesignerCategoryAttribute("code")]
-        public partial class ZHRF_SYN_03CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-        {
-
-            private object[] results;
-
-            internal ZHRF_SYN_03CompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-                    base(exception, cancelled, userState)
-            {
-                this.results = results;
-            }
-
-            /// <remarks/>
-            public ZHRF_SYN_03Response Result
-            {
-                get
-                {
-                    this.RaiseExceptionIfNecessary();
-                    return ((ZHRF_SYN_03Response)(this.results[0]));
-                }
-            }
-        }
-    }
-}

Src/Dlhis.ScheduledTask/appsettings.Development.json

@@ -4,5 +4,28 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "SwaggerOptions": {
+    "Enable": true,
+    "Authority": "https://yikatong.isawesome.cn/oauth2",
+    "ClientId": "4fb184324eac4180",
+    "ClientSecret": "8ac8f235152f1524",
+    "Scopes": {
+      "openid": "openid",
+      "profile": "profile",
+      "yikatong": "yikatong"
+    }
+  },
+  "IdentityServerOptions": {
+    "Authority": "https://yikatong.isawesome.cn/oauth2",
+    "RequireHttpsMetadata": true,
+    "Issuer": "identity.isawesome.cn",
+    "Audience": "",
+    "Pat": {
+      "Enable": false,
+      "Scheme": "token",
+      "ClientId": "reference",
+      "ClientSecret": "123456"
+    }
   }
 }

Src/Dlhis.ScheduledTask/appsettings.json

@@ -15,6 +15,29 @@
   "ConnectionStrings": {
     "HangfireConnection": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=HangFire;charset=utf8mb4;Allow User Variables=true;"
   },
+  "SwaggerOptions": {
+    "Enable": true,
+    "Authority": "http://identity.oauth.svc.cluster.local",
+    "ClientId": "4fb184324eac4180",
+    "ClientSecret": "8ac8f235152f1524",
+    "Scopes": {
+      "openid": "openid",
+      "profile": "profile",
+      "yikatong": "yikatong"
+    }
+  },
+  "IdentityServerOptions": {
+    "Authority": "http://identity.oauth.svc.cluster.local",
+    "RequireHttpsMetadata": false,
+    "Issuer": "identity.isawesome.cn",
+    "Audience": "",
+    "Pat": {
+      "Enable": false,
+      "Scheme": "token",
+      "ClientId": "reference",
+      "ClientSecret": "123456"
+    }
+  },
   "ServiceSettings": {
     "ServerUrl": "http://172.16.7.58:8125",
     "UserName": "admin_ws",