修改

IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs

@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Application.Service
     /// 快捷键服务
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Reading")]
-	public class ShortcutKeyService: BaseService
+    public class ShortcutKeyService : BaseService
     {
         private readonly IRepository<Dictionary> _dictionaryRepository;
         private readonly IRepository<ShortcutKey> _shortcutKeyRepository;
@@ -38,7 +38,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<DefaultShortcutKeyView>> GetDoctorShortcutKey(DefaultShortcutKeyQuery inQuery)
         {
             var shortcutKeyList = await _shortcutKeyRepository.Where(x => x.ImageToolType == inQuery.ImageToolType)
-				.Where(x=>x.UserId==_userInfo.Id)
+                .Where(x => x.UserId == _userInfo.Id)
                 .ToListAsync();
 
             var defaultshortcutKeyList = this.GetDefaultShortcutKey();
@@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application.Service
             shortcutKeydic.OrderBy(x => x.ShowOrder).ForEach(x =>
             {
                 var key = shortcutKeyList.Where(y => y.ShortcutKeyEnum == int.Parse(x.Code)).FirstOrDefault();
-				var defaultkey= defaultshortcutKeyList.Where(y => y.ShortcutKeyEnum == int.Parse(x.Code)).FirstOrDefault();
+                var defaultkey = defaultshortcutKeyList.Where(y => y.ShortcutKeyEnum == int.Parse(x.Code)).FirstOrDefault();
                 var isnull = key == null;
 
                 result.Add(new DefaultShortcutKeyView()
@@ -83,31 +83,213 @@ namespace IRaCIS.Core.Application.Service
         private List<ShortcutKey> GetDefaultShortcutKey()
         {
             List<ShortcutKey> shortcutKeys = new List<ShortcutKey>() {
-			new ShortcutKey (){ ShortcutKeyEnum=1,Keyboardkey="right",Text="right" },
+            new ShortcutKey (){
-			new ShortcutKey (){ ShortcutKeyEnum=2,Keyboardkey="left",Text="left"},
+
-			new ShortcutKey (){ ShortcutKeyEnum=3,Keyboardkey="PageUp",Text="PageUp"},
+        Keyboardkey= "ArrowLeft",
-			new ShortcutKey (){ ShortcutKeyEnum=4,Keyboardkey="pageDown",Text="pageDown"},
+        ShortcutKeyEnum = 1,
-			new ShortcutKey (){ ShortcutKeyEnum=5,Keyboardkey="Up",Text="Up"},
+        ImageToolType= 0,
-			new ShortcutKey (){ ShortcutKeyEnum=6,Keyboardkey="Down",Text="Down"},
+        AltKey = false,
-			new ShortcutKey (){ ShortcutKeyEnum=7,Keyboardkey="L",Text="L"},
+        CtrlKey = false,
-			new ShortcutKey (){ ShortcutKeyEnum=8,Keyboardkey="R",Text="R"},
+        ShiftKey = false,
-			new ShortcutKey (){ ShortcutKeyEnum=9,Keyboardkey="H",Text="H"},
+        MetaKey = false,
-			new ShortcutKey (){ ShortcutKeyEnum=10,Keyboardkey="V" ,Text="V"},
+        Text= "←",
-			new ShortcutKey (){ ShortcutKeyEnum=11,Keyboardkey="+" ,Text="+"},
+        Code= "ArrowLeft"
-			new ShortcutKey (){ ShortcutKeyEnum=12,Keyboardkey="-" ,Text="-"},
+    }, new ShortcutKey (){
-			new ShortcutKey (){ ShortcutKeyEnum=13,Keyboardkey="=" ,Text="="},
+
-			new ShortcutKey (){ ShortcutKeyEnum=14,Keyboardkey="F" ,Text="F"},
+        Keyboardkey= "ArrowRight",
-			new ShortcutKey (){ ShortcutKeyEnum=15,Keyboardkey="S" ,Text="S"},
+        ShortcutKeyEnum = 2,
-			new ShortcutKey (){ ShortcutKeyEnum=16,Keyboardkey="I" ,Text="I"},
+        ImageToolType= 0,
-			new ShortcutKey (){ ShortcutKeyEnum=17,Keyboardkey="C" ,Text="C"},
+        AltKey = false,
-			new ShortcutKey (){ ShortcutKeyEnum=18,Keyboardkey="Space" ,Text="Space"},
+        CtrlKey = false,
-			};
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "→",
+        Code= "ArrowRight"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "PageUp",
+        ShortcutKeyEnum = 3,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "PageUp",
+        Code= "PageUp"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "PageDown",
+        ShortcutKeyEnum = 4,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "PageDown",
+        Code= "PageDown"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "ArrowUp",
+        ShortcutKeyEnum = 5,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "↑",
+        Code= "ArrowUp"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "ArrowDown",
+        ShortcutKeyEnum = 6,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "↓",
+        Code= "ArrowDown"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "l",
+        ShortcutKeyEnum = 7,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "L",
+        Code= "KeyL"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "r",
+        ShortcutKeyEnum = 8,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "R",
+        Code= "KeyR"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "h",
+        ShortcutKeyEnum = 9,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "H",
+        Code= "KeyH"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "v",
+        ShortcutKeyEnum = 10,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "V",
+        Code= "KeyV"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "+",
+        ShortcutKeyEnum = 11,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = true,
+        MetaKey = false,
+        Text= "+",
+        Code= "Equal"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "-",
+        ShortcutKeyEnum = 12,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "-",
+        Code= "Minus"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "=",
+        ShortcutKeyEnum = 13,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "=",
+        Code= "Equal"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "f",
+        ShortcutKeyEnum = 14,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "F",
+        Code= "KeyF"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "s",
+        ShortcutKeyEnum = 15,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "S",
+        Code= "KeyS"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "i",
+        ShortcutKeyEnum = 16,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "I",
+        Code= "KeyI"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "c",
+        ShortcutKeyEnum = 17,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "C",
+        Code= "KeyC"
+         }, new ShortcutKey (){
+
+        Keyboardkey= "",
+        ShortcutKeyEnum = 18,
+        ImageToolType= 0,
+        AltKey = false,
+        CtrlKey = false,
+        ShiftKey = false,
+        MetaKey = false,
+        Text= "Space",
+        Code= "Space"
+         }, };
+
 
             return shortcutKeys;
 
 
         }
 
+
         /// <summary>
         /// 重置为默认快捷键
         /// </summary>
@@ -116,7 +298,8 @@ namespace IRaCIS.Core.Application.Service
         public async Task<bool> RestoreDefaultShortcutKey(RestoreDefaultShortcutKeyInDto inDto)
         {
             var shortcutKeys = GetDefaultShortcutKey();
-			shortcutKeys.ForEach(x => {
+            shortcutKeys.ForEach(x =>
+            {
                 x.UserId = _userInfo.Id;
             });
 
@@ -133,7 +316,7 @@ namespace IRaCIS.Core.Application.Service
                 MetaKey = x.MetaKey,
                 ShiftKey = x.ShiftKey,
                 Text = x.Text,
-				Code=x.Code,
+                Code = x.Code,
             }));
 
             return await _shortcutKeyRepository.SaveChangesAsync();
@@ -147,20 +330,20 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<bool> SetShortcutKey(SetDefaultShortcutKey inDto)
         {
-			await _shortcutKeyRepository.BatchDeleteNoTrackingAsync(x => x.ImageToolType == inDto.ImageToolType&&x.UserId==_userInfo.Id);
+            await _shortcutKeyRepository.BatchDeleteNoTrackingAsync(x => x.ImageToolType == inDto.ImageToolType && x.UserId == _userInfo.Id);
 
             await _shortcutKeyRepository.AddRangeAsync(inDto.ShortcutKeyList.Select(x => new ShortcutKey()
             {
                 ImageToolType = inDto.ImageToolType,
                 Keyboardkey = x.Keyboardkey,
                 ShortcutKeyEnum = x.ShortcutKeyEnum,
-				UserId=_userInfo.Id,
+                UserId = _userInfo.Id,
-				AltKey=x.AltKey,
+                AltKey = x.AltKey,
-				CtrlKey=x.CtrlKey,
+                CtrlKey = x.CtrlKey,
-				MetaKey=x.MetaKey,
+                MetaKey = x.MetaKey,
-				ShiftKey=x.ShiftKey,
+                ShiftKey = x.ShiftKey,
-				Text=x.Text,
+                Text = x.Text,
-				Code=x.Code,
+                Code = x.Code,
             }));
 
             return await _shortcutKeyRepository.SaveChangesAsync();