更新MybatisPlusSaasConfig中的租户ID默认值为1002；在ShiroConfig中添加MES密炼物料管理和系统分类字典的免密接口；在MesMixerMaterialController中实现密炼物料信息的免密增删改查接口，并添加相应的事件广播功能；在SysCategoryController中新增分类字典的免密查询接口；更新前端导航和菜单数据以支持密炼物料信息模块。
This commit is contained in:
geht
@@ -0,0 +1,13 @@
|
||||
namespace YY.Admin.Services.Service.Category.Dto;
|
||||
|
||||
public class JeecgCategoryItemOutput
|
||||
{
|
||||
public string Id { get; set; } = string.Empty;
|
||||
public string? Pid { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public string? Code { get; set; }
|
||||
public string? HasChild { get; set; }
|
||||
public DateTime? CreateTime { get; set; }
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
namespace YY.Admin.Services.Service.Category.Dto;
|
||||
|
||||
public class JeecgCategoryTreeNodeDto
|
||||
{
|
||||
public string Id { get; set; } = string.Empty;
|
||||
public string? Pid { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public string? Code { get; set; }
|
||||
public List<JeecgCategoryTreeNodeDto> Children { get; set; } = [];
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
namespace YY.Admin.Services.Service.Category.Dto;
|
||||
|
||||
public class PageJeecgCategoryItemInput
|
||||
{
|
||||
public int Page { get; set; } = 1;
|
||||
public int PageSize { get; set; } = 20;
|
||||
public string? Name { get; set; }
|
||||
public string? Code { get; set; }
|
||||
public string? Pid { get; set; }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
using YY.Admin.Services.Service.Category.Dto;
|
||||
|
||||
namespace YY.Admin.Services.Service.Category;
|
||||
|
||||
public interface IJeecgCategorySyncService
|
||||
{
|
||||
Task<SqlSugarPagedList<JeecgCategoryItemOutput>> PageAsync(PageJeecgCategoryItemInput input);
|
||||
Task<int> SyncFromJeecgAsync();
|
||||
Task<List<JeecgCategoryTreeNodeDto>> LoadTreeAsync();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,240 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using SqlSugar;
|
||||
using System.Text.Json;
|
||||
using YY.Admin.Core;
|
||||
using YY.Admin.Core.Entity;
|
||||
using YY.Admin.Services.Service.Category.Dto;
|
||||
using YY.Admin.Services.Service.Jeecg;
|
||||
|
||||
namespace YY.Admin.Services.Service.Category;
|
||||
|
||||
public class JeecgCategorySyncService : IJeecgCategorySyncService, ISingletonDependency
|
||||
{
|
||||
private readonly ISqlSugarClient _dbContext;
|
||||
private readonly IConfiguration _configuration;
|
||||
private readonly IJeecgBackendGateway _jeecgGateway;
|
||||
|
||||
public JeecgCategorySyncService(
|
||||
ISqlSugarClient dbContext,
|
||||
IConfiguration configuration,
|
||||
IJeecgBackendGateway jeecgGateway)
|
||||
{
|
||||
_dbContext = dbContext;
|
||||
_configuration = configuration;
|
||||
_jeecgGateway = jeecgGateway;
|
||||
}
|
||||
|
||||
public async Task<SqlSugarPagedList<JeecgCategoryItemOutput>> PageAsync(PageJeecgCategoryItemInput input)
|
||||
{
|
||||
var name = input.Name;
|
||||
var code = input.Code;
|
||||
var pid = input.Pid;
|
||||
var query = _dbContext.Queryable<JeecgSysCategoryItem>().ClearFilter()
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(name), x => x.Name != null && x.Name.Contains(name!))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(code), x => x.Code != null && x.Code.Contains(code!))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(pid), x => x.Pid == pid);
|
||||
|
||||
query = query.OrderBy(x => SqlFunc.IsNull(x.Code, ""))
|
||||
.OrderBy(x => SqlFunc.IsNull(x.Name, ""))
|
||||
.OrderBy(x => SqlFunc.Desc(x.UpdateTime));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var list = await query.ToPageListAsync(input.Page, input.PageSize, total);
|
||||
var items = list.Select(x => new JeecgCategoryItemOutput
|
||||
{
|
||||
Id = x.Id,
|
||||
Pid = x.Pid,
|
||||
Name = x.Name,
|
||||
Code = x.Code,
|
||||
HasChild = x.HasChild,
|
||||
CreateTime = x.CreateTime,
|
||||
UpdateTime = x.UpdateTime
|
||||
}).ToList();
|
||||
|
||||
return new SqlSugarPagedList<JeecgCategoryItemOutput>
|
||||
{
|
||||
Page = input.Page,
|
||||
PageSize = input.PageSize,
|
||||
Total = total,
|
||||
TotalPages = input.PageSize > 0 ? (int)Math.Ceiling(total / (double)input.PageSize) : 0,
|
||||
HasNextPage = input.PageSize > 0 && input.Page < (int)Math.Ceiling(total / (double)input.PageSize),
|
||||
HasPrevPage = input.Page > 1,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<int> SyncFromJeecgAsync()
|
||||
{
|
||||
var baseUrl = _configuration.GetValue<string>("JeecgIntegration:BaseUrl")?.TrimEnd('/');
|
||||
if (string.IsNullOrWhiteSpace(baseUrl))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
var queue = new Queue<string>();
|
||||
var visited = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
|
||||
queue.Enqueue("0");
|
||||
visited.Add("0");
|
||||
var synced = 0;
|
||||
|
||||
while (queue.Count > 0)
|
||||
{
|
||||
var pid = queue.Dequeue();
|
||||
var requestUrl = $"{baseUrl}/sys/category/anon/childList?pid={Uri.EscapeDataString(pid)}";
|
||||
var json = await _jeecgGateway.ExecuteGetStringAsync(requestUrl);
|
||||
if (string.IsNullOrWhiteSpace(json))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
if (!(root.TryGetProperty("success", out var successEl) && successEl.GetBoolean()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!root.TryGetProperty("result", out var listEl) || listEl.ValueKind != JsonValueKind.Array)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach (var row in listEl.EnumerateArray())
|
||||
{
|
||||
var id = GetString(row, "id");
|
||||
if (string.IsNullOrWhiteSpace(id))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var existing = await _dbContext.Queryable<JeecgSysCategoryItem>()
|
||||
.ClearFilter()
|
||||
.Where(x => x.Id == id)
|
||||
.FirstAsync();
|
||||
|
||||
if (existing == null)
|
||||
{
|
||||
existing = new JeecgSysCategoryItem { Id = id };
|
||||
}
|
||||
|
||||
existing.Pid = GetString(row, "pid");
|
||||
existing.Name = GetString(row, "name");
|
||||
existing.Code = GetString(row, "code");
|
||||
existing.HasChild = GetString(row, "hasChild");
|
||||
existing.CreateBy = GetString(row, "createBy");
|
||||
existing.CreateTime = GetDateTime(row, "createTime");
|
||||
existing.UpdateBy = GetString(row, "updateBy");
|
||||
existing.UpdateTime = GetDateTime(row, "updateTime");
|
||||
|
||||
var existsCount = await _dbContext.Queryable<JeecgSysCategoryItem>()
|
||||
.ClearFilter()
|
||||
.Where(x => x.Id == existing.Id)
|
||||
.CountAsync();
|
||||
if (existsCount > 0)
|
||||
{
|
||||
await _dbContext.Updateable(existing).ExecuteCommandAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
await _dbContext.Insertable(existing).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
synced++;
|
||||
|
||||
if (existing.HasChild == "1" && !visited.Contains(existing.Id))
|
||||
{
|
||||
queue.Enqueue(existing.Id);
|
||||
visited.Add(existing.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return synced;
|
||||
}
|
||||
|
||||
public async Task<List<JeecgCategoryTreeNodeDto>> LoadTreeAsync()
|
||||
{
|
||||
return await BuildLocalTreeAsync();
|
||||
}
|
||||
|
||||
private async Task<List<JeecgCategoryTreeNodeDto>> BuildLocalTreeAsync()
|
||||
{
|
||||
var allItems = await _dbContext.Queryable<JeecgSysCategoryItem>()
|
||||
.ClearFilter()
|
||||
.ToListAsync();
|
||||
|
||||
if (allItems == null || allItems.Count == 0)
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
var nodeMap = allItems
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x.Id))
|
||||
.ToDictionary(
|
||||
x => x.Id,
|
||||
x => new JeecgCategoryTreeNodeDto
|
||||
{
|
||||
Id = x.Id,
|
||||
Pid = x.Pid,
|
||||
Name = x.Name,
|
||||
Code = x.Code
|
||||
},
|
||||
StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
var roots = new List<JeecgCategoryTreeNodeDto>();
|
||||
foreach (var node in nodeMap.Values)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(node.Pid) || node.Pid == "0" || !nodeMap.TryGetValue(node.Pid, out var parent))
|
||||
{
|
||||
roots.Add(node);
|
||||
continue;
|
||||
}
|
||||
parent.Children.Add(node);
|
||||
}
|
||||
|
||||
SortTreeNodes(roots);
|
||||
return roots;
|
||||
}
|
||||
|
||||
private static void SortTreeNodes(List<JeecgCategoryTreeNodeDto> nodes)
|
||||
{
|
||||
nodes.Sort((a, b) =>
|
||||
{
|
||||
var codeCompare = string.Compare(a.Code, b.Code, StringComparison.OrdinalIgnoreCase);
|
||||
return codeCompare != 0 ? codeCompare : string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase);
|
||||
});
|
||||
foreach (var node in nodes)
|
||||
{
|
||||
if (node.Children.Count > 0)
|
||||
{
|
||||
SortTreeNodes(node.Children);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static string? GetString(JsonElement row, string propertyName)
|
||||
{
|
||||
if (!row.TryGetProperty(propertyName, out var el))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (el.ValueKind == JsonValueKind.String)
|
||||
{
|
||||
return el.GetString();
|
||||
}
|
||||
return el.ToString();
|
||||
}
|
||||
|
||||
private static DateTime? GetDateTime(JsonElement row, string propertyName)
|
||||
{
|
||||
if (!row.TryGetProperty(propertyName, out var el))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (el.ValueKind == JsonValueKind.String && DateTime.TryParse(el.GetString(), out var dt))
|
||||
{
|
||||
return dt;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user