perf：优化翻译查询

ZR.Admin.WebApi/Controllers/System/CommonLangController.cs

@@ -6,14 +6,13 @@ using Infrastructure.Model;
 using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System;
 using System.Collections.Generic;
 using ZR.Admin.WebApi.Filters;
 using ZR.Common;
 using ZR.Model;
 using ZR.Model.Dto;
 using ZR.Model.Models;
-using ZR.Service.System.ISystemService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -45,8 +44,10 @@ namespace ZR.Admin.WebApi.Controllers
         {
             if (parm.ShowMode == 2)
             {
-                PagedInfo<dynamic> pagedInfo = new();
+                PagedInfo<dynamic> pagedInfo = new()
-                pagedInfo.Result = _CommonLangService.GetListToPivot(parm);
+                {
+                    Result = _CommonLangService.GetListToPivot(parm)
+                };
 
                 return SUCCESS(pagedInfo);
             }
@@ -60,34 +61,11 @@ namespace ZR.Admin.WebApi.Controllers
         /// <returns></returns>
         [HttpGet("list/{lang}")]
         [AllowAnonymous]
-        public IActionResult QueryCommonLangs()
+        public IActionResult QueryCommonLangs(string lang)
         {
-            var msgList = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = "zh-cn" });
+            var msgList = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = lang });
-            var msgListEn = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = "en" });
-            var msgListTw = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = "zh-tw" });
-            Dictionary<string, object> dic = new();
-            Dictionary<string, object> dicEn = new();
-            Dictionary<string, object> dicTw = new();
-            SetLang(msgList, dic);
-            SetLang(msgListEn, dicEn);
-            SetLang(msgListTw, dicTw);
-            return SUCCESS(new
-            {
-                en = dicEn,
-                cn = dic,
-                tw = dicTw
-            });
-        }
 
-        private static void SetLang(List<CommonLang> msgList, Dictionary<string, object> dic)
+            return SUCCESS(_CommonLangService.SetLang(msgList));
-        {
-            foreach (var item in msgList)
-            {
-                if (!dic.ContainsKey(item.LangKey))
-                {
-                    dic.Add(item.LangKey, item.LangName);
-                }
-            }
         }
 
         /// <summary>
@@ -137,17 +115,9 @@ namespace ZR.Admin.WebApi.Controllers
                 throw new CustomException("请求实体不能为空");
             }
 
-            List<CommonLang> langs = new();
+            _CommonLangService.StorageCommonLang(parm);
-            foreach (var item in parm.LangList)
-            {
-                langs.Add(new CommonLang() { Addtime = DateTime.Now, LangKey = parm.LangKey, LangCode = item.LangCode, LangName = item.LangName });
-            }
-            var storage = _CommonLangService.Storageable(langs).WhereColumns(it => new { it.LangKey, it.LangCode }).ToStorage();
 
-            long r = storage.AsInsertable.ExecuteReturnSnowflakeId();//执行插入
+            return ToResponse(1);
-            storage.AsUpdateable.UpdateColumns(it => new { it.LangName }).ExecuteCommand();//执行修改
-
-            return ToResponse(r);
         }
 
         /// <summary>

ZR.Service/System/CommonLangService.cs

@@ -1,12 +1,13 @@
 using Infrastructure.Attribute;
 using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using ZR.Model;
 using ZR.Model.Dto;
 using ZR.Model.Models;
 using ZR.Repository;
-using ZR.Service.System.ISystemService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {
@@ -40,7 +41,6 @@ namespace ZR.Service.System
             //搜索条件查询语法参考Sqlsugar
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode);
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey));
-            //predicate = predicate.AndIF(parm.BeginAddtime == null, it => it.Addtime >= DateTime.Now.AddDays(-1));
             predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime);
             var response = _CommonLangrepository
                 .Queryable()
@@ -62,7 +62,6 @@ namespace ZR.Service.System
             //搜索条件查询语法参考Sqlsugar
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode);
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey));
-            //predicate = predicate.AndIF(parm.BeginAddtime == null, it => it.Addtime >= DateTime.Now.AddDays(-1));
             predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime);
             var response = _CommonLangrepository
                 .Queryable()
@@ -79,14 +78,47 @@ namespace ZR.Service.System
             //搜索条件查询语法参考Sqlsugar
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode);
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey));
-            //predicate = predicate.AndIF(parm.BeginAddtime == null, it => it.Addtime >= DateTime.Now.AddDays(-1));
-            //predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime);
             var response = _CommonLangrepository
                 .Queryable()
                 .Where(predicate.ToExpression())
                 .ToList();
             return response;
         }
+
+        public void StorageCommonLang(CommonLangDto parm)
+        {
+            List<CommonLang> langs = new();
+            foreach (var item in parm.LangList)
+            {
+                langs.Add(new CommonLang()
+                {
+                    Addtime = DateTime.Now,
+                    LangKey = parm.LangKey,
+                    LangCode = item.LangCode,
+                    LangName = item.LangName,
+                });
+            }
+            var storage = _CommonLangrepository.Storageable(langs)
+                .WhereColumns(it => new { it.LangKey, it.LangCode })
+                .ToStorage();
+
+            storage.AsInsertable.ExecuteReturnSnowflakeIdList();//执行插入
+            storage.AsUpdateable.UpdateColumns(it => new { it.LangName }).ExecuteCommand();//执行修改
+        }
+
+        public Dictionary<string, object> SetLang(List<CommonLang> msgList)
+        {
+            Dictionary<string, object> dic = new();
+
+            foreach (var item in msgList)
+            {
+                if (!dic.ContainsKey(item.LangKey))
+                {
+                    dic.Add(item.LangKey, item.LangName);
+                }
+            }
+            return dic;
+        }
         #endregion
     }
 }

ZR.Service/System/IService/ICommonLangService.cs

@@ -4,7 +4,7 @@ using ZR.Model.Dto;
 using ZR.Model.Models;
 using System.Collections.Generic;
 
-namespace ZR.Service.System.ISystemService
+namespace ZR.Service.System.IService
 {
     /// <summary>
     /// 多语言配置service接口
@@ -17,5 +17,7 @@ namespace ZR.Service.System.ISystemService
         PagedInfo<CommonLang> GetList(CommonLangQueryDto parm);
         List<CommonLang> GetLangList(CommonLangQueryDto parm);
         dynamic GetListToPivot(CommonLangQueryDto parm);
+        void StorageCommonLang(CommonLangDto parm);
+        Dictionary<string, object> SetLang(List<CommonLang> msgList);
     }
 }