wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-05-18 17:18:35 +08:00
parent c19a2c13dc 82c94d9707
commit 59769a91d5
12 changed files with 390 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRuleMoldListOutput.cs Normal file
View File

@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 保养规则关联模具列表输出参数
/// </summary>
public class MaintainRuleMoldListOutput
{
/// <summary>
/// 模具Id
/// </summary>
public string mold_id { get; set; }
/// <summary>
/// 模具编码
/// </summary>
public string mold_code { get; set; }
/// <summary>
/// 模具名称
/// </summary>
public string mold_name { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/MoldMaintenance.cs
View File

@@ -8,7 +8,7 @@ namespace Tnb.EquipMgr.Entities
///<summary>
///模具保养
///</summary>
[SugarTable("tool_mold_maintenance")]
[SugarTable("tool_mold_maintain_item")]
public partial class MoldMaintenance
{
/// <summary>

42
EquipMgr/Tnb.EquipMgr/BaseMoldMaintainService.cs
View File

@@ -12,6 +12,7 @@ using Tnb.Common.Contracts;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Utils;
using Mapster;
namespace Tnb.EquipMgr
{
@@ -22,13 +23,21 @@ namespace Tnb.EquipMgr
{
_db = db;
}
protected async Task Relevance<TSrc, TDest>(TSrc input,string masterTableName, string name, Expression<Func<TDest, bool>> deleleExp) where TDest : BaseEntity<string>, new()
/// <summary>
/// 关联
/// </summary>
/// <typeparam name="TSrc">输入参数类型</typeparam>
/// <typeparam name="TDest">目标数据库表类型</typeparam>
/// <param name="input">输入参数</param>
/// <param name="mColumnName">主表属性名称</param>
/// <param name="name">次表属性名称</param>
/// <param name="deleleExp">删除条件</param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
protected async Task Relevance<TSrc, TDest>(TSrc input, string mColumnName, string name, Expression<Func<TDest, bool>> deleleExp) where TDest : BaseEntity<string>, new()
where TSrc : BaseMoldMaintainInput
{
await _db.Deleteable<TDest>().Where(deleleExp).ExecuteCommandAsync();
//var itemGroupId = nameof(ToolMoldMaintainGroupRelation.item_group_id);
if (input == null) throw new ArgumentNullException(nameof(input));
var entities = new List<TDest>();
if (input.ids?.Count > 0)
@@ -38,10 +47,10 @@ namespace Tnb.EquipMgr
var pk = id;
TDest entity = new();
entity.id = SnowflakeIdHelper.NextId();
if (!PropertySet<TDest>.ValueFactories.TryGetValue(masterTableName, out Action<object, object>? setGroupIdAction))
if (!PropertySet<TDest>.ValueFactories.TryGetValue(mColumnName, out Action<object, object>? setGroupIdAction))
{
setGroupIdAction = PropertySet<TDest>.CreateSetPropertyValueAction(masterTableName);
PropertySet<TDest>.ValueFactories.Add(masterTableName, setGroupIdAction);
setGroupIdAction = PropertySet<TDest>.CreateSetPropertyValueAction(mColumnName);
PropertySet<TDest>.ValueFactories.Add(mColumnName, setGroupIdAction);
}
setGroupIdAction(entity, input.item_group_id);
if (!PropertySet<TDest>.ValueFactories.TryGetValue(name, out Action<object, object>? setAction))
@@ -56,5 +65,24 @@ namespace Tnb.EquipMgr
var row = await _db.Insertable(entities).ExecuteCommandAsync();
if (row < 1) throw Oops.Oh(ErrorCode.COM1000);
}
protected async Task<dynamic> GetListByMasterId<TRelaction, TDest, TOutput>(string masterId,
Expression<Func<TRelaction, bool>> masterFilterExp,
Expression<Func<TRelaction, string>> masterSelector,
Expression<Func<TDest, bool>> relactionFilterExp)
{
var config = new TypeAdapterConfig();
config.ForType<TDest, TOutput>();
var list = new List<TOutput>();
var itemIds = await _db.Queryable<TRelaction>().Where(masterFilterExp).Select(masterSelector).ToListAsync();
if (itemIds?.Count > 0)
{
var items = await _db.Queryable<TDest>().Where(relactionFilterExp).ToListAsync();
list = items.Adapt<List<TOutput>>();
}
return list;
}
}
}

33
EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRuleService.cs
View File

@@ -26,10 +26,29 @@ namespace Tnb.EquipMgr
public class ToolMoldMaintainRuleService : BaseMoldMaintainService, IToolMoldMaintainRuleService, IDynamicApiController, ITransient
{
private readonly ISqlSugarClient _db;
public ToolMoldMaintainRuleService(ISqlSugarRepository<ToolMoldMaintainRule> repository, IUserManager userManager) : base(repository.AsSugarClient())
public ToolMoldMaintainRuleService(ISqlSugarRepository<ToolMoldMaintainRule> repository) : base(repository.AsSugarClient())
{
_db = repository.AsSugarClient();
}
/// <summary>
/// 根据规则Id获取匹配的模具列表
/// </summary>
/// <param name="ruleId">规则Id</param>
/// <returns></returns>
[HttpGet]
public async Task<dynamic> GetListById([FromRoute] string ruleId)
{
var result = new List<MaintainRuleMoldListOutput>();
var list = await _db.Queryable<ToolMoldMaintainRuleRelation>().Where(it => it.rule_id == ruleId).ToListAsync();
if (list?.Count > 0)
{
var ids = list.Select(it => it.mold_id).ToList();
result = await _db.Queryable<ToolMolds>().Where(it => ids.Contains(it.id))
.Select(it => new MaintainRuleMoldListOutput { mold_id = it.id }, true).ToListAsync();
}
return result;
}
/// <summary>
/// 关联模具
/// </summary>
@@ -39,6 +58,16 @@ namespace Tnb.EquipMgr
[HttpPost]
public async Task RelevanceMold(RelevanceMoldInput input) =>
await Relevance<RelevanceMoldInput, ToolMoldMaintainRuleRelation>(input, nameof(ToolMoldMaintainRuleRelation.rule_id), nameof(ToolMoldMaintainRuleRelation.mold_id), it => it.rule_id == input.rule_id);
/// <summary>
/// 删除模具信息
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
public async Task DeleteMoldRelevance(RelevanceMoldInput input)
{
var row = await _db.Deleteable<ToolMoldMaintainRuleRelation>().Where(it => it.rule_id == input.rule_id && input.ids.Contains(it.mold_id)).ExecuteCommandAsync();
if (row < 1) throw Oops.Oh(ErrorCode.COM1002);
}
}
}