!1036 钉钉插件优化

Merge pull request !1036 from Hans/SyncDingTalkUserJob2

Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Admin.NET.Plugin.DingTalk.csproj

@@ -25,4 +25,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Job\" />
+  </ItemGroup>
+
 </Project>

Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Job/SyncDingTalkUserJob.cs

@@ -0,0 +1,199 @@
+// 大名科技（天津）有限公司 版权所有
+//
+// 此源代码遵循位于源代码树根目录中的 LICENSE 文件的许可证
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动
+//
+// 任何基于本项目二次开发而产生的一切法律纠纷和责任，均与作者无关
+
+using Admin.NET.Plugin.DingTalk;
+using Furion.Schedule;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Admin.NET.Plugin.Job;
+
+
+/// <summary>
+/// 同步钉钉用户job
+/// </summary>
+[JobDetail("SyncDingTalkUserJob", Description = "同步钉钉用户", GroupName = "default", Concurrent = false)]
+[Daily(TriggerId = "SyncDingTalkUserTrigger", Description = "同步钉钉用户")]
+public class SyncDingTalkUserJob : IJob
+{
+    private readonly IServiceScopeFactory _scopeFactory;
+    private readonly IDingTalkApi _dingTalkApi;
+    private readonly ILogger _logger;
+    public SyncDingTalkUserJob(IServiceScopeFactory scopeFactory, IDingTalkApi dingTalkApi, ILoggerFactory loggerFactory)
+    {
+        _scopeFactory = scopeFactory;
+        _dingTalkApi = dingTalkApi;
+        _logger = loggerFactory.CreateLogger("System.Logging.LoggingMonitor");
+    }
+
+    public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
+    {
+        using var serviceScope = _scopeFactory.CreateScope();
+        var _sysUserRep = serviceScope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysUser>>();
+        var _dingTalkUserRepo = serviceScope.ServiceProvider.GetRequiredService<SqlSugarRepository<DingTalkUser>>();
+        var _dingTalkOptions = serviceScope.ServiceProvider.GetRequiredService<IOptions<DingTalkOptions>>();
+        // 获取token
+        var tokenRes = await _dingTalkApi.GetDingTalkToken(_dingTalkOptions.Value.ClientId, _dingTalkOptions.Value.ClientSecret);
+        if (tokenRes.ErrCode != 0)
+        {
+            throw Oops.Oh(tokenRes.ErrMsg);
+        }
+        var dingTalkUserList = new List<DingTalkEmpRosterFieldVo>();
+        var offset = 0;
+        while (offset >= 0)
+        {
+            // 获取用户id列表
+            var userIdsRes = await _dingTalkApi.GetDingTalkCurrentEmployeesList(tokenRes.AccessToken, new GetDingTalkCurrentEmployeesListInput
+            {
+                StatusList = "2,3,5,-1",
+                Size = 50,
+                Offset = offset
+            });
+            if (!userIdsRes.Success)
+            {
+                _logger.LogError(userIdsRes.ErrMsg);
+                break;
+            }
+            // 根据用户id获取花名册
+            var rosterRes = await _dingTalkApi.GetDingTalkCurrentEmployeesRosterList(tokenRes.AccessToken, new GetDingTalkCurrentEmployeesRosterListInput()
+            {
+                UserIdList = string.Join(",", userIdsRes.Result.DataList),
+                FieldFilterList = $"{DingTalkConst.NameField},{DingTalkConst.JobNumberField},{DingTalkConst.MobileField}",
+                AgentId = _dingTalkOptions.Value.AgentId
+            });
+            if (!rosterRes.Success)
+            {
+                _logger.LogError(rosterRes.ErrMsg);
+                break;
+            }
+            dingTalkUserList.AddRange(rosterRes.Result);
+            if (userIdsRes.Result.NextCursor == null)
+            {
+                break;
+            }
+            // 保存分页游标
+            offset = (int)userIdsRes.Result.NextCursor;
+        }
+
+        // 判断新增还是更新
+        var sysDingTalkUserIdList = await _dingTalkUserRepo.AsQueryable()
+            .Select(x => new
+            {
+                x.Id,
+                x.DingTalkUserId
+            })
+            .ToListAsync();
+        // 需要更新的用户id
+        var uDingTalkUser = dingTalkUserList.Where(x => sysDingTalkUserIdList.Any(d => d.DingTalkUserId == x.UserId));
+        // 需要新增的用户id
+        var iDingTalkUser = dingTalkUserList.Where(u => !sysDingTalkUserIdList.Any(d => d.DingTalkUserId == u.UserId));
+        #region 新增钉钉用户
+        var iUser = iDingTalkUser
+            .Select(res => new DingTalkUser
+            {
+                DingTalkUserId = res.UserId,
+                Name = res.FieldDataList
+                .Where(f => f.FieldCode == DingTalkConst.NameField)
+                .Select(f => f.FieldValueList.Select(v => v.Value).FirstOrDefault())
+                .FirstOrDefault(),
+                Mobile = res.FieldDataList
+                .Where(f => f.FieldCode == DingTalkConst.MobileField)
+                   .Select(f => f.FieldValueList.Select(v => v.Value).FirstOrDefault())
+                .FirstOrDefault(),
+                JobNumber = res.FieldDataList
+                .Where(f => f.FieldCode == DingTalkConst.JobNumberField)
+                  .Select(f => f.FieldValueList.Select(v => v.Value).FirstOrDefault())
+                .FirstOrDefault(),
+            }).ToList();
+        if (iUser.Count > 0)
+        {
+            var iUserRes = await _dingTalkUserRepo.CopyNew().AsInsertable(iUser).ExecuteCommandAsync();
+            if (iUserRes <= 0)
+            {
+                throw Oops.Oh("保存钉钉用户错误");
+            }
+        }
+        #endregion
+
+        #region 更新钉钉用户
+        var uUser = uDingTalkUser
+        .Select(res => new DingTalkUser
+        {
+            Id = sysDingTalkUserIdList.Where(d => d.DingTalkUserId == res.UserId).Select(d => d.Id).FirstOrDefault(),
+            DingTalkUserId = res.UserId,
+            Name = res.FieldDataList
+                .Where(f => f.FieldCode == DingTalkConst.NameField)
+                .Select(f => f.FieldValueList.Select(v => v.Value).FirstOrDefault())
+                .FirstOrDefault(),
+            Mobile = res.FieldDataList
+                .Where(f => f.FieldCode == DingTalkConst.MobileField)
+                   .Select(f => f.FieldValueList.Select(v => v.Value).FirstOrDefault())
+                .FirstOrDefault(),
+            JobNumber = res.FieldDataList
+                .Where(f => f.FieldCode == DingTalkConst.JobNumberField)
+                  .Select(f => f.FieldValueList.Select(v => v.Value).FirstOrDefault())
+                .FirstOrDefault(),
+        }).ToList();
+        if (uUser.Count > 0)
+        {
+            var uUserRes = await _dingTalkUserRepo.CopyNew().AsUpdateable(uUser)
+            .UpdateColumns(d => new
+            {
+                d.DingTalkUserId,
+                d.Name,
+                d.Mobile,
+                d.JobNumber,
+                d.UpdateTime,
+                d.UpdateUserName,
+                d.UpdateUserId,
+            }).ExecuteCommandAsync();
+            if (uUserRes <= 0)
+            {
+                throw Oops.Oh("更新钉钉用户错误");
+            }
+        }
+        #endregion
+        // 通过系统用户账号(工号)，更新钉钉用户表里面的系统用户id
+        var sysUser = await _sysUserRep.AsQueryable().Select(x => new
+        {
+            x.Id,
+            x.Account
+        }).ToListAsync();
+        var sysDingTalkUser = await _dingTalkUserRepo.AsQueryable()
+            .Where(d => sysUser.Any(u => u.Account == d.JobNumber))
+            .Select(x => new
+            {
+                x.Id,
+                x.JobNumber,
+                x.Mobile
+            }).ToListAsync();
+        var uSysDingTalkUser = sysDingTalkUser.Select(d => new DingTalkUser
+        {
+            Id = d.Id,
+            SysUserId = sysUser.Where(u => u.Account == d.JobNumber).Select(u => u.Id).FirstOrDefault(),
+        }).ToList();
+        var uSysDingTalkUserRes = await _dingTalkUserRepo.CopyNew().AsUpdateable(uSysDingTalkUser)
+        .UpdateColumns(d => new
+        {
+            d.SysUserId,
+            d.UpdateTime,
+            d.UpdateUserName,
+            d.UpdateUserId,
+        }).ExecuteCommandAsync();
+        if (uSysDingTalkUserRes <= 0)
+        {
+            _logger.LogError("同步钉钉用户错误");
+            return;
+        }
+        var originColor = Console.ForegroundColor;
+        Console.ForegroundColor = ConsoleColor.Yellow;
+        Console.WriteLine("【" + DateTime.Now + "】同步钉钉用户");
+        Console.ForegroundColor = originColor;
+    }
+
+}

Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs

@@ -1,4 +1,4 @@
-// 大名科技（天津）有限公司 版权所有
+// 大名科技（天津）有限公司 版权所有
 //
 // 此源代码遵循位于源代码树根目录中的 LICENSE 文件的许可证
 //
@@ -31,144 +31,18 @@ public class DingTalkService : IDynamicApiController, IScoped
     }
 
     /// <summary>
-    /// 同步钉钉用户 🔖
+    /// 获取企业内部应用的access_token
     /// </summary>
     /// <returns></returns>
-    [DisplayName("同步钉钉用户")]
-    public async Task SyncDingTalkUser()
+    [DisplayName("获取企业内部应用的access_token")]
+    public async Task<GetDingTalkTokenOutput> GetDingTalkToken()
     {
-        var param = new GetDingTalkTokenInput()
-        {
-            AppKey = _dingTalkOptions.ClientId,
-            AppSecret = _dingTalkOptions.ClientSecret
-        };
-        var tokenRes = await _dingTalkApi.GetDingTalkToken(param);
+        var tokenRes = await _dingTalkApi.GetDingTalkToken(_dingTalkOptions.ClientId, _dingTalkOptions.ClientSecret);
         if (tokenRes.ErrCode != 0)
-            throw Oops.Oh(tokenRes.ErrMsg);
-
-        var offset = 0;
-        while (offset >= 0)
         {
-            // 获取用户Id列表
-            var userIdsRes = await _dingTalkApi.GetDingTalkCurrentEmployeesList(tokenRes.AccessToken, new GetDingTalkCurrentEmployeesListInput
-            {
-                StatusList = "2,3,5,-1",
-                Size = 50,
-                Offset = offset
-            });
-            if (!userIdsRes.Success)
-                throw Oops.Oh(userIdsRes.ErrMsg);
-
-            // 根据用户Id获取花名册
-            var rosterRes = await _dingTalkApi.GetDingTalkCurrentEmployeesRosterList(tokenRes.AccessToken, new GetDingTalkCurrentEmployeesRosterListInput()
-            {
-                UserIdList = string.Join(",", userIdsRes.Result.DataList),
-                FieldFilterList = $"{DingTalkConst.NameField},{DingTalkConst.JobNumberField},{DingTalkConst.MobileField}",
-                AgentId = _dingTalkOptions.AgentId
-            });
-            if (!rosterRes.Success)
-                throw Oops.Oh(rosterRes.ErrMsg);
-
-            // 判断新增还是更新
-            var userIds = rosterRes.Result.Select(u => u.UserId).ToList();
-            var uDingTalkUser = await _dingTalkUserRepo.AsQueryable()
-                .Where(u => userIds.Contains(u.DingTalkUserId))
-                .ToListAsync();
-
-            var uUserIds = uDingTalkUser.Select(u => u.DingTalkUserId); // 需要更新的用户Id
-            var iUserIds = userIds.Where(u => !uUserIds.Contains(u)); // 需要新增的用户Id
-
-            // 保存钉钉用户
-            var iUsers = rosterRes.Result
-                .Where(u => iUserIds.Contains(u.UserId))
-                .Select(u => new DingTalkUser
-                {
-                    DingTalkUserId = u.UserId,
-                    Name = u.FieldDataList.Where(m => m.FieldCode == DingTalkConst.NameField).Select(m => m.FieldValueList.Select(n => n.Value).FirstOrDefault()).FirstOrDefault(),
-                    Mobile = u.FieldDataList.Where(m => m.FieldCode == DingTalkConst.MobileField).Select(m => m.FieldValueList.Select(n => n.Value).FirstOrDefault()).FirstOrDefault(),
-                    JobNumber = u.FieldDataList.Where(m => m.FieldCode == DingTalkConst.JobNumberField).Select(m => m.FieldValueList.Select(n => n.Value).FirstOrDefault()).FirstOrDefault(),
-                }).ToList();
-            if (iUsers.Count > 0)
-            {
-                await _dingTalkUserRepo.AsInsertable(iUsers).ExecuteCommandAsync();
-            }
-
-            // 更新钉钉用户
-            var uUsers = rosterRes.Result
-                .Where(u => uUserIds.Contains(u.UserId))
-                .Select(u => new DingTalkUser
-                {
-                    Id = uDingTalkUser.Where(m => m.DingTalkUserId == u.UserId).Select(m => m.Id).FirstOrDefault(),
-                    DingTalkUserId = u.UserId,
-                    Name = u.FieldDataList.Where(m => m.FieldCode == DingTalkConst.NameField).Select(m => m.FieldValueList.Select(n => n.Value).FirstOrDefault()).FirstOrDefault(),
-                    Mobile = u.FieldDataList.Where(m => m.FieldCode == DingTalkConst.MobileField).Select(m => m.FieldValueList.Select(n => n.Value).FirstOrDefault()).FirstOrDefault(),
-                    JobNumber = u.FieldDataList.Where(m => m.FieldCode == DingTalkConst.JobNumberField).Select(m => m.FieldValueList.Select(n => n.Value).FirstOrDefault()).FirstOrDefault(),
-                }).ToList();
-            if (uUsers.Count > 0)
-            {
-                await _dingTalkUserRepo.AsUpdateable(uUsers).UpdateColumns(u => new
-                {
-                    u.DingTalkUserId,
-                    u.Name,
-                    u.Mobile,
-                    u.JobNumber,
-                    u.UpdateTime,
-                    u.UpdateUserName,
-                    u.UpdateUserId,
-                }).ExecuteCommandAsync();
-            }
-
-            // 保存分页游标
-            if (userIdsRes.Result.NextCursor == null)
-                break;
-            offset = (int)userIdsRes.Result.NextCursor;
-        }
-
-        var sysUser = await _sysUserRep.AsQueryable()
-            .Select(u => new
-            {
-                u.Id,
-                u.Account,
-                u.Phone
-            }).ToListAsync();
-        var dingTalkUser = await _dingTalkUserRepo.AsQueryable()
-            .Where(u => sysUser.Any(m => m.Account == u.JobNumber))
-            .Select(u => new
-            {
-                u.Id,
-                u.JobNumber,
-                u.Mobile
-            }).ToListAsync();
-
-        // 更新钉钉用户中系统用户Id
-        var uDingTalkUsers = dingTalkUser.Select(u => new DingTalkUser
-        {
-            Id = u.Id,
-            SysUserId = sysUser.Where(m => m.Account == u.JobNumber).Select(m => m.Id).FirstOrDefault(),
-        }).ToList();
-        if (uDingTalkUsers.Count > 0)
-        {
-            await _dingTalkUserRepo.AsUpdateable(uDingTalkUsers).UpdateColumns(u => new
-            {
-                u.SysUserId,
-                u.UpdateTime,
-                u.UpdateUserName,
-                u.UpdateUserId,
-            }).ExecuteCommandAsync();
+            throw Oops.Oh(tokenRes.ErrMsg);
         }
-
-        return;
-    }
-
-    /// <summary>
-    /// 获取企业内部应用的access_token 🔖
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [DisplayName("获取企业内部应用的access_token")]
-    public async Task<GetDingTalkTokenOutput> GetDingTalkToken([FromQuery] GetDingTalkTokenInput input)
-    {
-        return await _dingTalkApi.GetDingTalkToken(input);
+        return tokenRes;
     }
 
     /// <summary>

Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/Dto/GetDingTalkToken.cs

@@ -8,18 +8,6 @@
 
 namespace Admin.NET.Plugin.DingTalk;
 
-public class GetDingTalkTokenInput
-{
-    /// <summary>
-    /// 应用的唯一标识key
-    /// </summary>
-    public string AppKey { get; set; }
-
-    /// <summary>
-    /// 应用的密钥。AppKey和AppSecret可在钉钉开发者后台的应用详情页面获取。
-    /// </summary>
-    public string AppSecret { get; set; }
-}
 
 public class GetDingTalkTokenOutput
 {

Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/IDingTalkApi.cs

@@ -6,8 +6,6 @@
 //
 // 任何基于本项目二次开发而产生的一切法律纠纷和责任，均与作者无关
 
-using Furion.RemoteRequest;
-
 namespace Admin.NET.Plugin.DingTalk;
 
 public interface IDingTalkApi : IHttpDispatchProxy
@@ -15,9 +13,11 @@ public interface IDingTalkApi : IHttpDispatchProxy
     /// <summary>
     /// 获取企业内部应用的access_token
     /// </summary>
+    /// <param name="appkey">应用的唯一标识key</param>
+    /// <param name="appsecret"> 应用的密钥。AppKey和AppSecret可在钉钉开发者后台的应用详情页面获取。</param>
     /// <returns></returns>
     [Get("https://oapi.dingtalk.com/gettoken")]
-    Task<GetDingTalkTokenOutput> GetDingTalkToken([QueryString] GetDingTalkTokenInput input);
+    Task<GetDingTalkTokenOutput> GetDingTalkToken([QueryString] string appkey, [QueryString] string appsecret);
 
     /// <summary>
     /// 获取在职员工列表