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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
DEVICE8\12494
2023-05-28 21:17:58 +08:00
parent c6522831b4 26de55ce0a
commit 43d080690e
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs
View File

@@ -1,7 +1,14 @@
namespace Tnb.EquipMgr.Interfaces using Tnb.EquipMgr.Entities;
namespace Tnb.EquipMgr.Interfaces
{ {
public interface IEquipmentService public interface IEquipmentService
{ {
/// <summary>
/// 根据id查设备
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
public Task<EqpEquipment> GetEntityById(Dictionary<string, string> dic);
} }
} }

8
EquipMgr/Tnb.EquipMgr/EquipmentService.cs
View File

@@ -30,7 +30,6 @@ namespace Tnb.EquipMgr
public EquipmentService(ISqlSugarRepository<EqpEquipment> repository) public EquipmentService(ISqlSugarRepository<EqpEquipment> repository)
{ {
_repository = repository; _repository = repository;
OverideFuncs.GetListAsync = GetList;
} }
/// <summary> /// <summary>
/// 在线开发-获取设备列表 /// 在线开发-获取设备列表
@@ -63,5 +62,12 @@ namespace Tnb.EquipMgr
.ToPagedListAsync(input.currentPage, input.pageSize); .ToPagedListAsync(input.currentPage, input.pageSize);
return pagedList; return pagedList;
} }
[HttpPost]
public async Task<EqpEquipment> GetEntityById(Dictionary<string,string> dic)
{
string id = dic["id"];
return await _repository.GetSingleAsync(x => x.id == id);
}
} }
} }

6
visualdev/Tnb.VisualDev/VisualDevService.cs
View File

@@ -595,9 +595,9 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans
moduleModel.ModuleId = input.id; moduleModel.ModuleId = input.id;
moduleModel.ParentId = oldWebModule != null ? oldWebModule.ParentId : (input.pcModuleParentId.Equals(input.pcSystemId) ? "-1" : input.pcModuleParentId); // 父级菜单节点 moduleModel.ParentId = oldWebModule != null ? oldWebModule.ParentId : (input.pcModuleParentId.Equals(input.pcSystemId) ? "-1" : input.pcModuleParentId); // 父级菜单节点
moduleModel.Category = "Web"; moduleModel.Category = "Web";
moduleModel.FullName = entity.FullName; moduleModel.FullName = oldWebModule!=null ? oldWebModule.FullName : entity.FullName; //modifyby zhoukeda 发布功能不更新名称排序图标
moduleModel.EnCode = entity.EnCode; moduleModel.EnCode = entity.EnCode;
moduleModel.Icon = "icon-ym icon-ym-webForm"; moduleModel.Icon = oldWebModule!=null ? oldWebModule.Icon : "icon-ym icon-ym-webForm"; //modifyby zhoukeda 发布功能不更新名称排序图标
moduleModel.UrlAddress = oldWebModule != null ? oldWebModule.UrlAddress : "model/" + entity.EnCode; moduleModel.UrlAddress = oldWebModule != null ? oldWebModule.UrlAddress : "model/" + entity.EnCode;
moduleModel.Type = 3; moduleModel.Type = 3;
moduleModel.EnabledMark = 1; moduleModel.EnabledMark = 1;
@@ -605,7 +605,7 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans
moduleModel.IsButtonAuthorize = 1; moduleModel.IsButtonAuthorize = 1;
moduleModel.IsFormAuthorize = 1; moduleModel.IsFormAuthorize = 1;
moduleModel.IsDataAuthorize = 1; moduleModel.IsDataAuthorize = 1;
moduleModel.SortCode = 999; moduleModel.SortCode = oldWebModule != null ? oldWebModule.SortCode : 999; //modifyby zhoukeda 发布功能不更新名称排序图标
moduleModel.CreatorTime = DateTime.Now; moduleModel.CreatorTime = DateTime.Now;
moduleModel.PropertyJson = (new { moduleId = input.id, iconBackgroundColor = string.Empty, isTree = 0, isAutoRelease = true }).ToJsonString(); moduleModel.PropertyJson = (new { moduleId = input.id, iconBackgroundColor = string.Empty, isTree = 0, isAutoRelease = true }).ToJsonString();
moduleModel.SystemId = oldWebModule != null ? oldWebModule.SystemId : input.pcSystemId; moduleModel.SystemId = oldWebModule != null ? oldWebModule.SystemId : input.pcSystemId;