From ed2b05b28977418904ba5d88458b1c4a7d4e8512 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Fri, 26 May 2023 16:27:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E5=90=8D=E7=A7=B0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- visualdev/Tnb.VisualDev/VisualDevService.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/visualdev/Tnb.VisualDev/VisualDevService.cs b/visualdev/Tnb.VisualDev/VisualDevService.cs index b58d68df..86b4fe92 100644 --- a/visualdev/Tnb.VisualDev/VisualDevService.cs +++ b/visualdev/Tnb.VisualDev/VisualDevService.cs @@ -595,9 +595,11 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans moduleModel.ModuleId = input.id; moduleModel.ParentId = oldWebModule != null ? oldWebModule.ParentId : (input.pcModuleParentId.Equals(input.pcSystemId) ? "-1" : input.pcModuleParentId); // 父级菜单节点 moduleModel.Category = "Web"; - moduleModel.FullName = entity.FullName; + // moduleModel.FullName = entity.FullName; //modifyby zhoukeda 发布功能不更新名称排序图标 + moduleModel.FullName = oldWebModule.FullName; moduleModel.EnCode = entity.EnCode; - moduleModel.Icon = "icon-ym icon-ym-webForm"; + // moduleModel.Icon = "icon-ym icon-ym-webForm"; //modifyby zhoukeda 发布功能不更新名称排序图标 + moduleModel.Icon = oldWebModule.Icon; moduleModel.UrlAddress = oldWebModule != null ? oldWebModule.UrlAddress : "model/" + entity.EnCode; moduleModel.Type = 3; moduleModel.EnabledMark = 1; @@ -605,7 +607,8 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans moduleModel.IsButtonAuthorize = 1; moduleModel.IsFormAuthorize = 1; moduleModel.IsDataAuthorize = 1; - moduleModel.SortCode = 999; + // moduleModel.SortCode = 999; //modifyby zhoukeda 发布功能不更新名称排序图标 + moduleModel.SortCode = oldWebModule.SortCode; moduleModel.CreatorTime = DateTime.Now; moduleModel.PropertyJson = (new { moduleId = input.id, iconBackgroundColor = string.Empty, isTree = 0, isAutoRelease = true }).ToJsonString(); moduleModel.SystemId = oldWebModule != null ? oldWebModule.SystemId : input.pcSystemId; From a0d611931e41d31a5697c64f318956a4f25d2515 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Fri, 26 May 2023 16:51:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- visualdev/Tnb.VisualDev/VisualDevService.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/visualdev/Tnb.VisualDev/VisualDevService.cs b/visualdev/Tnb.VisualDev/VisualDevService.cs index 86b4fe92..242d3198 100644 --- a/visualdev/Tnb.VisualDev/VisualDevService.cs +++ b/visualdev/Tnb.VisualDev/VisualDevService.cs @@ -595,11 +595,9 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans moduleModel.ModuleId = input.id; moduleModel.ParentId = oldWebModule != null ? oldWebModule.ParentId : (input.pcModuleParentId.Equals(input.pcSystemId) ? "-1" : input.pcModuleParentId); // 父级菜单节点 moduleModel.Category = "Web"; - // moduleModel.FullName = entity.FullName; //modifyby zhoukeda 发布功能不更新名称排序图标 - moduleModel.FullName = oldWebModule.FullName; + moduleModel.FullName = oldWebModule!=null ? oldWebModule.FullName : entity.FullName; //modifyby zhoukeda 发布功能不更新名称排序图标 moduleModel.EnCode = entity.EnCode; - // moduleModel.Icon = "icon-ym icon-ym-webForm"; //modifyby zhoukeda 发布功能不更新名称排序图标 - moduleModel.Icon = oldWebModule.Icon; + moduleModel.Icon = oldWebModule!=null ? oldWebModule.Icon : "icon-ym icon-ym-webForm"; //modifyby zhoukeda 发布功能不更新名称排序图标 moduleModel.UrlAddress = oldWebModule != null ? oldWebModule.UrlAddress : "model/" + entity.EnCode; moduleModel.Type = 3; moduleModel.EnabledMark = 1; @@ -607,8 +605,7 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans moduleModel.IsButtonAuthorize = 1; moduleModel.IsFormAuthorize = 1; moduleModel.IsDataAuthorize = 1; - // moduleModel.SortCode = 999; //modifyby zhoukeda 发布功能不更新名称排序图标 - moduleModel.SortCode = oldWebModule.SortCode; + moduleModel.SortCode = oldWebModule != null ? oldWebModule.SortCode : 999; //modifyby zhoukeda 发布功能不更新名称排序图标 moduleModel.CreatorTime = DateTime.Now; moduleModel.PropertyJson = (new { moduleId = input.id, iconBackgroundColor = string.Empty, isTree = 0, isAutoRelease = true }).ToJsonString(); moduleModel.SystemId = oldWebModule != null ? oldWebModule.SystemId : input.pcSystemId; From 26de55ce0aed30576c07b46bc07d1aafef445ff9 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Fri, 26 May 2023 17:30:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs | 11 +++++++++-- EquipMgr/Tnb.EquipMgr/EquipmentService.cs | 8 +++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs index 26d6b24e..13e35519 100644 --- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs @@ -1,7 +1,14 @@ -namespace Tnb.EquipMgr.Interfaces +using Tnb.EquipMgr.Entities; + +namespace Tnb.EquipMgr.Interfaces { public interface IEquipmentService { - + /// + /// 根据id查设备 + /// + /// + /// + public Task GetEntityById(Dictionary dic); } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs index 03d1183f..c059dbda 100644 --- a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs @@ -30,7 +30,6 @@ namespace Tnb.EquipMgr public EquipmentService(ISqlSugarRepository repository) { _repository = repository; - OverideFuncs.GetListAsync = GetList; } /// /// 在线开发-获取设备列表 @@ -63,5 +62,12 @@ namespace Tnb.EquipMgr .ToPagedListAsync(input.currentPage, input.pageSize); return pagedList; } + + [HttpPost] + public async Task GetEntityById(Dictionary dic) + { + string id = dic["id"]; + return await _repository.GetSingleAsync(x => x.id == id); + } } } \ No newline at end of file