Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net5.0'

Browse Source
This commit is contained in:
不做码农
2022-05-09 12:28:54 +08:00
parent 6313e802e2 647e725ff9
commit 7e9f9301ff
32 changed files with 854 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
ZR.Service/System/CommonLangService.cs Normal file
View File

@@ -0,0 +1,92 @@
using Infrastructure.Attribute;
using SqlSugar;
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;
namespace ZR.Service.System
{
/// <summary>
/// 多语言配置Service业务层处理
///
/// @author zr
/// @date 2022-05-06
/// </summary>
[AppService(ServiceType = typeof(ICommonLangService), ServiceLifetime = LifeTime.Transient)]
public class CommonLangService : BaseService<CommonLang>, ICommonLangService
{
private readonly CommonLangRepository _CommonLangrepository;
public CommonLangService(CommonLangRepository repository)
{
_CommonLangrepository = repository;
}
#region 业务逻辑代码
/// <summary>
/// 查询多语言配置列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<CommonLang> GetList(CommonLangQueryDto parm)
{
//开始拼装查询条件
var predicate = Expressionable.Create<CommonLang>();
//搜索条件查询语法参考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())
.ToPage(parm);
return response;
}
/// <summary>
/// 行转列
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public dynamic GetListToPivot(CommonLangQueryDto parm)
{
//开始拼装查询条件
var predicate = Expressionable.Create<CommonLang>();
//搜索条件查询语法参考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())
.ToPivotList(it => it.LangCode, it => it.LangKey, it => it.Max(f => f.LangName));
return response;
}
public List<CommonLang> GetLangList(CommonLangQueryDto parm)
{
//开始拼装查询条件
var predicate = Expressionable.Create<CommonLang>();
//搜索条件查询语法参考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;
}
#endregion
}
}

6
ZR.Service/System/GenTableService.cs
View File

@@ -57,7 +57,11 @@ namespace ZR.Service.System
{
var info = GenTableRepository.GetId(tableId);
SetTableFromOptions(info);
if (info != null && !info.SubTableName.IsEmpty())
{
info.SubTable = GenTableRepository.Queryable().Where(f => f.SubTableName == info.TableName).First();
SetTableFromOptions(info?.SubTable);
}
return info;
}

21
ZR.Service/System/ISystemService/ICommonLangService.cs Normal file
View File

@@ -0,0 +1,21 @@
using System;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Model.Models;
using System.Collections.Generic;
namespace ZR.Service.System.ISystemService
{
/// <summary>
/// 多语言配置service接口
///
/// @author zr
/// @date 2022-05-06
/// </summary>
public interface ICommonLangService : IBaseService<CommonLang>
{
PagedInfo<CommonLang> GetList(CommonLangQueryDto parm);
List<CommonLang> GetLangList(CommonLangQueryDto parm);
dynamic GetListToPivot(CommonLangQueryDto parm);
}
}

4
ZR.Service/System/SysMenuService.cs
View File

@@ -272,7 +272,7 @@ namespace ZR.Service
Name = GetRouteName(menu),
Path = GetRoutePath(menu),
Component = GetComponent(menu),
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache))
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
};
List<SysMenu> cMenus = menu.children;
@@ -291,7 +291,7 @@ namespace ZR.Service
Path = menu.path,
Component = menu.component,
Name = string.IsNullOrEmpty(menu.path) ? "" : menu.path.ToLower(),
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache))
Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
};
childrenList.Add(children);
router.Children = childrenList;