cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新 评测前bug修复

Browse Source
This commit is contained in:
dell
2023-03-20 22:54:52 +08:00
parent a3a51fd6e2
commit 02c976e460
28 changed files with 1584 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
HT.Cloud.Service/DevicesManage/MetaTagScopeService.cs Normal file
View File

@ -0,0 +1,107 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using System.Collections.Generic;
using HT.Cloud.Code;
using SqlSugar;
using HT.Cloud.DataBase;
using HT.Cloud.Domain.DevicesManage;
namespace HT.Cloud.Service.DevicesManage
{
/// <summary>
/// 创 建：cdl
/// 日 期：2023-03-16 09:39
/// 描 述：设备报警信息服务类
/// </summary>
public class MetaTagScopeService : BaseService<MetaTagScopeEntity>, IDenpendency
{
public MetaTagScopeService(ISqlSugarClient context) : base(context)
{
}
#region 获取数据
public async Task<List<MetaTagScopeEntity>> GetList(string keyword = "")
{
var data = repository.IQueryable();
if (!string.IsNullOrEmpty(keyword))
{
data = data.Where(a => a.Description.Contains(keyword));
}
return await data.OrderBy(a => a.TagID).ToListAsync();
}
public async Task<List<MetaTagScopeEntity>> GetLookList(string keyword = "")
{
var query = repository.IQueryable();
if (!string.IsNullOrEmpty(keyword))
{
//此处需修改
query = query.Where(a => a.Description.Contains(keyword));
}
//权限过滤
query = GetDataPrivilege("a", "", query);
return await query.OrderBy(a => a.TagID).ToListAsync();
}
public async Task<List<MetaTagScopeEntity>> GetLookList(SoulPage<MetaTagScopeEntity> pagination,string keyword = "",string id="")
{
var query = repository.IQueryable();
if (!string.IsNullOrEmpty(keyword))
{
query = query.Where(a => a.Description.Contains(keyword));
}
if(!string.IsNullOrEmpty(id))
{
query= query.Where(a=>a.TagID==int.Parse(id));
}
//权限过滤
query = GetDataPrivilege("a","",query);
return await query.ToPageListAsync(pagination);
}
public async Task<MetaTagScopeEntity> GetForm(string keyValue)
{
var data = await repository.FindEntity(keyValue);
return data;
}
#endregion
public async Task<MetaTagScopeEntity> GetLookForm(string keyValue)
{
var data = await repository.FindEntity(keyValue);
return GetFieldsFilterData(data);
}
#region 提交数据
public async Task SubmitForm(MetaTagScopeEntity entity, string keyValue)
{
/* 模板代码 TagID报错 暂时不使用！！！
//if(string.IsNullOrEmpty(keyValue))
//{
// //初始值添加
// entity.TagID = Utils.GuId();
// await repository.Insert(entity);
//}
//else
//{
// //此处需修改
// entity.TagID = keyValue;
// await repository.Update(entity);
//}
*/
/* 暂时代码 */
entity.TagID = int.Parse(keyValue);
await repository.Update(entity);
}
public async Task DeleteForm(string keyValue)
{
var ids = keyValue.Split(',');
await repository.Delete(a => ids.Contains(a.TagID.ToString()));
}
#endregion
}
}

95
HT.Cloud.Service/DevicesManage/MetaTagService.cs
View File

@ -100,13 +100,106 @@ namespace HT.Cloud.Service.DevicesManage
return metaTagRedata.ToJson();
}
public class MetaTagRedata
public async Task<string> GetGroupVarTreeTable(int groupId)
{
var reList = new List<Tree_MetaTagEntity>();
var listMetaTag = _context.Queryable<MetaTagEntity>().Where(x => x.GroupID == groupId).ToList();
var treeListMetaTag = new List<Tree_MetaTagEntity>();
foreach (var item in listMetaTag)
{
var tree_MetaTag = PCAutoCopy(item);
treeListMetaTag.Add(tree_MetaTag);
}
var listArray = treeListMetaTag.GroupBy(x=>x.Subsystem).ToList();
int gi = 1;
foreach(var item in listArray)
{
var f_MetaTagEntity = new Tree_MetaTagEntity
{
TreeId = gi,
F_TreeId = 0,
Address = item.First().Address,
Subsystem = item.First().Subsystem,
TagID = gi,
};
reList.Add(f_MetaTagEntity);
foreach(var entity in item)
{
entity.F_TreeId = gi;
entity.TreeId = entity.TagID;
entity.Address = "";
reList.Add(entity);
}
gi++;
}
var tree_MetaTagRedata = new Tree_MetaTagRedata
{
code = 0,
msg = "",
count = reList.Count,
data = reList
};
return tree_MetaTagRedata.ToJson();
}
public class MetaTagRedata
{
public int code { get;set; }
public string msg { get; set; }
public int count { get; set; }
public List<MetaTagEntity> data { get; set; }
}
public class Tree_MetaTagRedata
{
public int code { get; set; }
public string msg { get; set; }
public int count { get; set; }
public List<Tree_MetaTagEntity> data { get; set; }
}
/// <summary>
/// 树组件专用继承类
/// </summary>
public class Tree_MetaTagEntity:MetaTagEntity
{
public int F_TreeId { get; set; }
public int TreeId { get; set; }
}
/// <summary>
/// 父类的value赋值给子类
/// </summary>
/// <param name="parent"></param>
/// <returns></returns>
private Tree_MetaTagEntity PCAutoCopy(MetaTagEntity parent)
{
Tree_MetaTagEntity child = new Tree_MetaTagEntity();
var ParentType = typeof(MetaTagEntity);
var Properties = ParentType.GetProperties();
foreach (var Propertie in Properties)
{
if (Propertie.CanRead && Propertie.CanWrite)
{
Propertie.SetValue(child, Propertie.GetValue(parent, null), null);
}
}
return child;
}
}
}

124
HT.Cloud.Service/ReportManage/MetaTagAlarmService.cs Normal file
View File

@ -0,0 +1,124 @@
using HT.Cloud.Code;
using HT.Cloud.Domain.DevicesManage;
using HT.Cloud.Domain.ReportManage;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HT.Cloud.Service.ReportManage
{
public class MetaTagAlarmService : BaseService<MetaTagAlarmEntity>, IDenpendency
{
public MetaTagAlarmService(ISqlSugarClient context) : base(context)
{
}
public async Task<string> GetAllSubsystemTag()
{
List<SubsysytemNameList> subsystems = new List<SubsysytemNameList>();
var grouped = repository.IQueryable().ToList();
List<string> list_name_two = grouped.Select(t => t.Subsystem).GroupBy(c => c).Select(c => c.First()).ToList();
int i = 0;
foreach (var Meta_Tag in list_name_two)
{
subsystems.Add(new SubsysytemNameList() { Lable = "a" + i, Value = Meta_Tag });
i++;
}
return subsystems.ToJson();
}
public async Task<string> GetSubsystemAllTag(string subsysytemName)
{
var subsysname = subsysytemName;
var response = repository.IQueryable().Where(x => x.Subsystem == subsysname).Select(x => new { x.TagID, x.Description, x.Units }).ToList();
var reList = new List<SubAllTagReturn>();
foreach (var subsystem in response)
{
reList.Add(
new SubAllTagReturn()
{
TagID = (short)subsystem.TagID,
Description = subsystem.Description + $"({subsystem.Units})",
Units = subsystem.Units
}
);
}
return reList.ToJson();
}
public async Task<string> GetAlarmRecord(short tagid, string startdt, string enddt)
{
SugarParameter[] sqlParameters =
{
new SugarParameter("@Henddt",enddt),
new SugarParameter("@Hstartdt",startdt),
new SugarParameter("@Htagid",tagid)
};
var dt = _context.Ado.UseStoredProcedure().GetDataTable("Query_Tag_Alarm", sqlParameters);
var valuelist = DataTableConvertModel<AlarmValue>.ConvertDataTableToList(dt);
return valuelist.ToJson();
// var testdata = new List<AlarmValue>
// {
// new AlarmValue() {
// Description= "测试标题",
// StartTime = "08点37分",
// EndTime = "08点38分"
// },
// new AlarmValue() {
// Description= "测试标题",
// StartTime = "08点37分",
// EndTime = "08点38分"
// },
// new AlarmValue() {
// Description= "测试标题",
// StartTime = "08点37分",
// EndTime = "08点38分"
// },
// new AlarmValue() {
// Description= "测试标题",
// StartTime = "08点37分",
// EndTime = "08点38分"
// }
//};
// return testdata.ToJson();
//var resultlist = new List<ChartData>();
//foreach (var value in valuelist)
//{
// resultlist.Add(new ChartData()
// {
// name = value.HDATETIME,
// value = value.VALUE
// });
//}
//return resultlist.ToJson();
}
private class AlarmValue
{
public string Description { get; set; }
public string startdt { get; set; }
public string enddt { get; set; }
}
private class SubsysytemNameList
{
public string Lable { get; set; }
public string Value { get; set; }
}
private class SubAllTagReturn
{
//x.TagID, x.Description, x.Units
public short TagID { get; set; }
public string Description { get; set; }
public string Units { get; set; }
}
}
}