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

去除warn

Browse Source
This commit is contained in:
周科达
2023-06-19 16:27:13 +08:00
parent 0b492898af
commit aea9e3a9d5
69 changed files with 512 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
EquipMgr/Tnb.EquipMgr/EqpDaqService.cs
View File

@@ -32,30 +32,30 @@ namespace Tnb.EquipMgr
public async Task<dynamic> GetEquipDaqList(EquipQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, string> queryJson = new Dictionary<string, string>();
if (!string.IsNullOrEmpty(input.queryJson))
Dictionary<string, string>? queryJson = new Dictionary<string, string>();
if (input!=null && !string.IsNullOrEmpty(input.queryJson))
{
queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
}
var result = await db.Queryable<EqpDaq>()
.LeftJoin<UserEntity>((a,b)=>a.create_id==b.Id)
.Where(a=>a.equip_id==input.equip_id)
.WhereIF(queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"])
.WhereIF(queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"]))
.WhereIF(queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"]))
.WhereIF(input!=null,a=>a.equip_id==input.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"])
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"]))
.Select((a,b) => new EquipDaqQueryOutput
{
id = a.id,
data_source = a.data_source,
create_id = b.RealName,
create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
create_time = a.create_time==null ? null : a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
data_type = a.data_type,
enabled = a.enabled==1 ? "是" : "否",
equip_id = a.equip_id,
label_name = a.label_name,
label_point = a.label_point,
remark = a.remark
}).ToPagedListAsync(input.currentPage, input.pageSize);
}).ToPagedListAsync((input?.currentPage??1), (input?.pageSize??50));
return PageResult<EquipDaqQueryOutput>.SqlSugarPageResult(result);
}