Merge branch 'master' of http://git.fwt.com/CallCenter/callcenter

src/CallCenter.Api/StartupExtensions.cs

@@ -35,7 +35,7 @@ internal static class StartupExtensions
         services.AddHttpContextAccessor();
 
 #if DEBUG
-        builder.WebHost.UseUrls("http://192.168.100.62:50001", "http://localhost:50001");
+        builder.WebHost.UseUrls("http://192.168.100.36:50001", "http://localhost:50001");
 #endif
 
         services.Configure<DeviceConfigs>(d => configuration.GetSection("DeviceConfigs").Bind(d));

src/CallCenter.NewRock/DeviceManager.cs

@@ -319,6 +319,7 @@ namespace CallCenter.NewRock
                 cancellationToken);
         }
 
+
         /// <summary>
         /// 更新分机组
         /// </summary>
@@ -327,7 +328,7 @@ namespace CallCenter.NewRock
         /// <param name="cancellationToken"></param>
         /// <param name="isAdd"></param>
         /// <returns></returns>
-        public async Task ModifyGroupExtAsync(string groupId, List<string> ext,string voicefile="",bool isAdd=true,CancellationToken cancellationToken = default)
+        public async Task ModifyGroupExtAsync(string groupId,string ext,string voicefile="",bool isAdd=true,CancellationToken cancellationToken = default)
         {
             if (!int.TryParse(groupId, out int mId))
                 throw new UserFriendlyException("请输入数字");
@@ -352,17 +353,11 @@ namespace CallCenter.NewRock
 
             if (isAdd)
             {
-                for (int i = 0; i < ext.Count; i++)
-                {
-                    exts.Add(new QueryExtGroupExt(){ Id = ext[i] });
-                }
+                exts.Add(new QueryExtGroupExt(){ Id = ext });
             }
             else
             {
-                for (int i = 0; i < ext.Count; i++)
-                {
-                    exts.Remove(exts.First(x=>x.Id == ext.First()));
-                }
+                exts.Remove(exts.First(x=>x.Id == ext));
             }
 
             groupModel.Ext = exts.Select(x=>x.Id).ToList();

src/CallCenter/Devices/IDeviceManager.cs

@@ -112,7 +112,7 @@ namespace CallCenter.Devices
         /// <param name="cancellationToken"></param>
         /// <param name="isAdd"></param>
         /// <returns></returns>
-        Task ModifyGroupExtAsync(string groupId, List<string> ext, string voicefile = "",bool isAdd= true, CancellationToken cancellationToken = default);
+        Task ModifyGroupExtAsync(string groupId, string ext, string voicefile = "",bool isAdd= true, CancellationToken cancellationToken = default);
         #endregion
 
         #region 通话控制

src/CallCenter/Users/UserDomainService.cs

@@ -67,7 +67,7 @@ namespace CallCenter.Users
             //更新分机组
             foreach (var group in tel.Groups)
             {
-                await _deviceManager.ModifyGroupExtAsync(group.No, new List<string> { tel.No },group.Voice,true, cancellationToken);
+                await _deviceManager.ModifyGroupExtAsync(group.No,tel.No,group.Voice,true, cancellationToken);
             }
         }
 
@@ -87,10 +87,10 @@ namespace CallCenter.Users
             _cacheWork.Remove(work.GetKey(KeyMode.UserId));
             _cacheWork.Remove(work.GetKey(KeyMode.TelNo));
 
-            foreach (var group in tel.Groups)
-            {
-                await _deviceManager.ModifyGroupExtAsync(group.No, new List<string>() { tel.No }, group.Voice,false, cancellationToken);
-            }
+            //foreach (var group in tel.Groups)
+            //{
+            //    await _deviceManager.ModifyGroupExtAsync(group.No, tel.No, group.Voice,false, cancellationToken);
+            //}
 
             return _mapper.Map<WorkDto>(work);
         }