wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 9d7e8d0106ea7b4cef56664230fdf016c8736721
Former-commit-id: 024e51a15d8152ff4bf57690b43ba9d588a4743f
1.0
wanggang 5 years ago
parent 331155f2f2
commit 6a42c223b3
14 changed files with 6 additions and 169 deletions
Show Stats Download Patch File Download Diff File

21
projects/IoT.Shared/Application/Models/DisplayCommandModel.cs
Unescape View File

@ -1,21 +0,0 @@
using Infrastructure.Application;
using System.ComponentModel.DataAnnotations;
namespace IoT.Shared.Application.Models
{
[Display(Name = "命令")]
public class DisplayCommandModel : EditModel
{
[Display(Name = "网关")]
public string IoTGatewayId { get; set; }
[Display(Name = "设备")]
public string DeviceId { get; set; }
[Display(Name = "Api")]
public string ApiId { get; set; }
[Display(Name = "参数")]
public string QueryString { get; set; }
}
}

1
projects/IoT.Shared/Application/Models/EditIoTParameterModel.cs
Unescape View File

@ -44,6 +44,7 @@ namespace IoT.Shared.Application.Models
[ReadOnlyForEdit]
public string Maxinum { get; set; }
[SkipSearch]
[Display(Name = "最小值")]
[ReadOnlyForEdit]
public string Minimum { get; set; }

1
projects/IoT.Shared/Application/Models/EditIoTProductModel.cs
Unescape View File

@ -25,6 +25,7 @@ namespace IoT.Shared.Application.Models
[ReadOnlyForEdit]
public string Path { get; set; }
[SkipSearch]
[SkipList]
[Display(Name = "ApiJson")]
[DataType(DataType.MultilineText)]

25
projects/IoT.Shared/Application/Models/EditSceneCommandModel.cs
Unescape View File

@ -1,25 +0,0 @@
using Infrastructure.Application;
using System;
using System.ComponentModel.DataAnnotations;
namespace IoT.Shared.Application.Models
{
[Display(Name = "场景命令")]
public class EditSceneCommandModel : EditModel
{
[Display(Name = "网关")]
[SelectList]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? IoTGatewayId { get; set; }
[Display(Name = "场景")]
[SelectList]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? SceneId { get; set; }
[Display(Name = "命令")]
[SelectList]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? CommandId { get; set; }
}
}

31
projects/IoT.Shared/Application/Models/EditSceneModel.cs
Unescape View File

@ -1,31 +0,0 @@
using Infrastructure.Application;
using System;
using System.ComponentModel.DataAnnotations;
namespace IoT.Shared.Application.Models
{
[Display(Name = "场景")]
public class EditSceneModel : EditModel
{
[SelectList]
[Display(Name = "网关")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? IoTGatewayId { get; set; }
[Display(Name = "名称")]
[MaxLength(24, ErrorMessage = "{0}最大长度为{1}")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Name { get; set; }
[Display(Name = "图标")]
[DataType(DataType.ImageUrl)]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Image { get; set; } = "/images/button.svg";
[Display(Name = "隐藏")]
public bool? Hidden { get; set; }
[Display(Name = "序号")]
public int DisplayOrder { get; set; }
}
}

45
projects/IoT.Shared/Application/Models/EditSceneTiggerModel.cs
Unescape View File

@ -1,45 +0,0 @@
using Infrastructure.Application;
using Microsoft.AspNetCore.Mvc;
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace IoT.Shared.Application.Models
{
[Display(Name = "触发器")]
public class EditSceneTiggerModel : EditModel
{
[SelectList]
[Display(Name = "网关")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? IoTGatewayId { get; set; }
[SelectList]
[Display(Name = "场景")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? SceneId { get; set; }
[SelectList]
[Display(Name = "设备")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? DeviceId { get; set; }
[SelectList]
[Display(Name = "数据")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? DataId { get; set; }
[Display(Name = "触发规则")]
[Description("javascript逻辑运算表达式：如value>250或value==\"开\"")]
[Remote("ConditionValid", "Ajax", "IoTCenter", AdditionalFields = "DataId")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Condition { get; set; }
[Display(Name = "触发器名称")]
[MaxLength(24, ErrorMessage = "{0}最大长度为{1}")]
public string Name { get; set; }
[Display(Name = "禁用")]
public bool? Disabled { get; set; }
}
}

34
projects/IoT.Shared/Application/Models/EditSceneTimerModel.cs
Unescape View File

@ -1,34 +0,0 @@
using Infrastructure.Application;
using Microsoft.AspNetCore.Mvc;
using System;
using System.ComponentModel.DataAnnotations;
namespace IoT.Shared.Application.Models
{
[Display(Name = "定时器")]
public class EditSceneTimerModel : EditModel
{
[SelectList]
[Display(Name = "网关")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? IoTGatewayId { get; set; }
[SelectList]
[Display(Name = "场景")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public Guid? SceneId { get; set; }
[Display(Name = "定时器名称")]
[MaxLength(24, ErrorMessage = "{0}最大长度为{1}")]
public string Name { get; set; }
[Display(Name = "定时器规则")]
[UIHint("Cron")]
[Remote("CronValid", "Ajax", "IoTCenter")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Cron { get; set; }
[Display(Name = "禁用")]
public bool? Disabled { get; set; }
}
}

4
projects/IoTNode/Areas/IoTCenter/Controllers/IoTParameterController.cs
Unescape View File

@ -39,9 +39,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
.WhereIf(model.Query.ApiId.HasValue, o => o.IoTApiId == model.Query.ApiId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Type), o => o.Type.Contains(model.Query.Type))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description))
.WhereIf(!string.IsNullOrEmpty(model.Query.Minimum), o => o.Minimum == model.Query.Minimum)
.WhereIf(!string.IsNullOrEmpty(model.Query.Maxinum), o => o.Maxinum == model.Query.Maxinum);
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description));
}
public override void ToDisplayModel(IoTParameter entity, EditIoTParameterModel model)

3
projects/IoTNode/Areas/IoTCenter/Controllers/IoTProductController.cs
Unescape View File

@ -26,10 +26,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
return base.Query(model, query)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path))
.WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.ApiJson.Contains(model.Query.ApiJson))
.OrderBy(o => o.Number);
}
}

1
projects/Platform/Application/Models/EditIoTTiggerModel.cs
Unescape View File

@ -61,6 +61,7 @@ namespace Platform.Application.Models
[Required(ErrorMessage = nameof(RequiredAttribute))]
public IoTOperationType? Type { get; set; }
[SkipSearch]
[Display(Name = "触发规则")]
[Remote(nameof(AjaxController.ConditionValid), "Ajax", "", AdditionalFields = "IoTDataId,Type")]
[Required(ErrorMessage = nameof(RequiredAttribute))]

1
projects/Platform/Application/Models/IoTCenter/EditIoTCommandModel.cs
Unescape View File

@ -49,6 +49,7 @@ namespace IoT.Shared.Application.Models
[Display(Name = "延迟")]
public int? Delay { get; set; }
[SkipSearch]
[DisplayOnly]
[Display(Name = "参数")]
public string QueryString { get; set; }

4
projects/Platform/Areas/IoTCenter/Controllers/IoTParameterController.cs
Unescape View File

@ -44,9 +44,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
.WhereIf(model.Query.Required.HasValue, o => o.Required == model.Query.Required.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Type), o => o.Type.Contains(model.Query.Type))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description))
.WhereIf(!string.IsNullOrEmpty(model.Query.Minimum), o => o.Minimum == model.Query.Minimum)
.WhereIf(!string.IsNullOrEmpty(model.Query.Maxinum), o => o.Maxinum == model.Query.Maxinum);
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description));
}
public override void EntityToModel(IoTParameter entity, EditPlatformIoTParameterModel model)
{

3
projects/Platform/Areas/IoTCenter/Controllers/IoTProductController.cs
Unescape View File

@ -35,10 +35,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
.WhereIf(model.Query.CategoryId.HasValue, o => o.IoTProductCategoryId == model.Query.CategoryId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path))
.WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.ApiJson.Contains(model.Query.ApiJson))
.OrderBy(o => o.Number);
}

1
projects/Platform/Areas/IoTCenter/Controllers/IoTTiggerController.cs
Unescape View File

@ -56,7 +56,6 @@ namespace Platform.Areas.IoTCenter.Controllers
.WhereIf(model.Query.IoTGatewayId.HasValue, o => o.IoTData.IoTDevice.IoTGatewayId == model.Query.IoTGatewayId.Value)
.WhereIf(model.Query.IoTDeviceId.HasValue, o => o.IoTData.IoTDeviceId == model.Query.IoTDeviceId.Value)
.WhereIf(model.Query.IoTDataId.HasValue, o => o.IoTDataId == model.Query.IoTDataId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Condition), o => o.Condition.Contains(model.Query.Condition))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value)
.OrderBy(o => o.IoTSceneId);

Write Preview
Loading…
Cancel
Save