版本更新

src/YSAI.DAQ/YSAI.Beckhoff/BeckhoffData.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using YSAI.Core.attribute;
 using YSAI.Unility;
 
 namespace YSAI.Beckhoff
@@ -17,30 +18,39 @@ namespace YSAI.Beckhoff
             /// 唯一标识符
             /// </summary>
             [Description("唯一标识符")]
+            [Display(false, true, Core.data.ParamStructure.subset.propertie.dataCate.text)]
             public string? SN { get; set; } = Guid.NewGuid().ToUpperNString();
 
             /// <summary>
             /// 设备的网络ID
             /// </summary>
             [Description("设备的网络ID")]
+            [Verify(@"^(25[0-4]|2[0-4]\d]|[01]?\d{2}|[1-9])\.(25[0-5]|2[0-4]\d]|[01]?\d?\d)\.(25[0-5]|2[0-4]\d]|[01]?\d?\d)\.(25[0-4]|2[0-4]\d]|[01]?\d{2}|[1-9])$", "输入有误")]
+            [Display(true, true, Core.data.ParamStructure.subset.propertie.dataCate.text)]
             public string AmsNetID { get; set; } = "192.168.66.130.1.1";
 
             /// <summary>
             /// 端口
             /// </summary>
             [Description("端口")]
+            [Verify(@"^[0-9]*[1-9][0-9]*$", "输入有误")]
+            [Display(true, true, Core.data.ParamStructure.subset.propertie.dataCate.unmber)]
             public int Port { get; set; } = 851;
 
             /// <summary>
             /// 任务数量
             /// </summary>
             [Description("任务数量")]
+            [Verify(@"^[0-9]*[1-9][0-9]*$", "输入有误")]
+            [Display(true, true, Core.data.ParamStructure.subset.propertie.dataCate.unmber)]
             public int TaskNumber { get; set; } = 5;
 
             /// <summary>
             /// 任务处理间隔(毫秒)
             /// </summary>
-            [Description("任务处理间隔(毫秒)")]
+            [Description("任务处理间隔(ms)")]
+            [Verify(@"^[0-9]*[1-9][0-9]*$", "输入有误")]
+            [Display(true, true, Core.data.ParamStructure.subset.propertie.dataCate.unmber)]
             public int TaskHandleInterval { get; set; } = 100;
         }
     }

src/YSAI.DAQ/YSAI.Beckhoff/BeckhoffOperate.cs

@@ -734,34 +734,34 @@ namespace YSAI.Beckhoff
                 string message = TAG.Replace("Operate", string.Empty);
                 string nameSpace = "YSAI.Beckhoff.BeckhoffOperate";
                 BeckhoffData.Basics beckhoffData = new BeckhoffData.Basics();
-                LibParamStructure? libParamStructure = new LibParamStructure()
+                ParamStructure? ParamStructure = new ParamStructure()
                 {
-                    Code = message,
                     Name = message,
                     Description = message,
-                    Subset = new List<LibParamStructure.subset>
+                    Subset = new List<ParamStructure.subset>
                         {
-                            new LibParamStructure.subset
+                            new ParamStructure.subset
                             {
                                 Description = message,
                                 Name = message,
-                                Propertie = new List<LibParamStructure.subset.propertie>()
+                                Propertie = new List<ParamStructure.subset.propertie>()
                             }
                         }
                 };
-                libParamStructure.Subset[0].Propertie.Add(new LibParamStructure.subset.propertie
+                ParamStructure.Subset[0].Propertie.Add(new ParamStructure.subset.propertie
                 {
                     PropertyName = "ServiceName",
                     Description = "实现类名",
-                    IsShow = false,
-                    IsMust = false,
-                    Value = nameSpace,
-                    DataCate = LibParamStructure.subset.propertie.dataCate.text
+                    Show = false,
+                    Use = false,
+                    Initial = nameSpace,
+                    Default = nameSpace,
+                    DataCate = ParamStructure.subset.propertie.dataCate.text
                 });
                 foreach (var lib in libInstanceParams)
                 {
                     string param = ReflexTool.GetModelValue(lib.Name, beckhoffData);
-                    LibParamStructure.subset.propertie propertie = new LibParamStructure.subset.propertie
+                    ParamStructure.subset.propertie propertie = new ParamStructure.subset.propertie
                     {
                         PropertyName = lib.Name,
                         Description = lib.Describe,
@@ -773,8 +773,8 @@ namespace YSAI.Beckhoff
                     switch (lib.ParamType)
                     {
                         case "Enum":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.select;
-                            propertie.Options = new List<LibParamStructure.subset.propertie.options>();
+                            propertie.DataCate = ParamStructure.subset.propertie.dataCate.select;
+                            propertie.Options = new List<ParamStructure.subset.propertie.options>();
                             foreach (var val in lib.EnumArray as List<dynamic>)
                             {
                                 string des = val.Describe;
@@ -782,7 +782,7 @@ namespace YSAI.Beckhoff
                                 {
                                     des = $"({val.Describe})";
                                 }
-                                propertie.Options.Add(new LibParamStructure.subset.propertie.options
+                                propertie.Options.Add(new ParamStructure.subset.propertie.options
                                 {
                                     Key = val.Name + des,
                                     Value = val.Value,
@@ -791,31 +791,31 @@ namespace YSAI.Beckhoff
                             break;
 
                         case "Int32":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.unmber;
+                            propertie.DataCate = ParamStructure.subset.propertie.dataCate.unmber;
                             break;
 
                         case "String":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.text;
+                            propertie.DataCate = ParamStructure.subset.propertie.dataCate.text;
                             break;
 
                         case "Boolean":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.radio;
-                            propertie.Options = new List<LibParamStructure.subset.propertie.options>();
-                            propertie.Options.Add(new LibParamStructure.subset.propertie.options
+                            propertie.DataCate = ParamStructure.subset.propertie.dataCate.radio;
+                            propertie.Options = new List<ParamStructure.subset.propertie.options>();
+                            propertie.Options.Add(new ParamStructure.subset.propertie.options
                             {
                                 Key = "是",
                                 Value = true,
                             });
-                            propertie.Options.Add(new LibParamStructure.subset.propertie.options
+                            propertie.Options.Add(new ParamStructure.subset.propertie.options
                             {
                                 Key = "否",
                                 Value = false,
                             });
                             break;
                     }
-                    libParamStructure.Subset[0].Propertie.Add(propertie);
+                    ParamStructure.Subset[0].Propertie.Add(propertie);
                 }
-                return Break(SN, true, libParamStructure.ToJson().JsonFormatting(), libParamStructure, Core.@enum.ResultType.Object);
+                return Break(SN, true, ParamStructure.ToJson().JsonFormatting(), ParamStructure, Core.@enum.ResultType.Object);
             }
             catch (Exception ex)
             {

src/YSAI.DAQ/YSAI.Beckhoff/YSAI.Beckhoff.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Beckhoff.TwinCAT.Ads" Version="6.1.86" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.74" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Can/CanOperator.cs

@@ -460,101 +460,7 @@ namespace YSAI.Can
 
         public OperateResult GetParam()
         {
-            string SN = Depart("GetParam");
-            try
-            {
-                //通过反射得到参数信息
-                List<LibInstanceParam>? libInstanceParams = ReflexTool.GetClassAllPropertyData<CanData.Basics>();
-                string message = TAG.Replace("Operate", string.Empty);
-                string nameSpace = "YSAI.Beckhoff.CanOperate";
-                CanData.Basics beckhoffData = new CanData.Basics();
-                LibParamStructure? libParamStructure = new LibParamStructure()
-                {
-                    Code = message,
-                    Name = message,
-                    Description = message,
-                    Subset = new List<LibParamStructure.subset>
-                        {
-                            new LibParamStructure.subset
-                            {
-                                Description = message,
-                                Name = message,
-                                Propertie = new List<LibParamStructure.subset.propertie>()
-                            }
-                        }
-                };
-                libParamStructure.Subset[0].Propertie.Add(new LibParamStructure.subset.propertie
-                {
-                    PropertyName = "ServiceName",
-                    Description = "实现类名",
-                    IsShow = false,
-                    IsMust = false,
-                    Value = nameSpace,
-                    DataCate = LibParamStructure.subset.propertie.dataCate.text
-                });
-                foreach (var lib in libInstanceParams)
-                {
-                    string param = ReflexTool.GetModelValue(lib.Name, beckhoffData);
-                    LibParamStructure.subset.propertie propertie = new LibParamStructure.subset.propertie
-                    {
-                        PropertyName = lib.Name,
-                        Description = lib.Describe,
-                        IsShow = true,
-                        Default = param,
-                        Value = param
-                    };
-
-                    switch (lib.ParamType)
-                    {
-                        case "Enum":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.select;
-                            propertie.Options = new List<LibParamStructure.subset.propertie.options>();
-                            foreach (var val in lib.EnumArray as List<dynamic>)
-                            {
-                                string des = val.Describe;
-                                if (!string.IsNullOrEmpty(des))
-                                {
-                                    des = $"({val.Describe})";
-                                }
-                                propertie.Options.Add(new LibParamStructure.subset.propertie.options
-                                {
-                                    Key = val.Name + des,
-                                    Value = val.Value,
-                                });
-                            }
-                            break;
-
-                        case "Int32":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.unmber;
-                            break;
-
-                        case "String":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.text;
-                            break;
-
-                        case "Boolean":
-                            propertie.DataCate = LibParamStructure.subset.propertie.dataCate.radio;
-                            propertie.Options = new List<LibParamStructure.subset.propertie.options>();
-                            propertie.Options.Add(new LibParamStructure.subset.propertie.options
-                            {
-                                Key = "是",
-                                Value = true,
-                            });
-                            propertie.Options.Add(new LibParamStructure.subset.propertie.options
-                            {
-                                Key = "否",
-                                Value = false,
-                            });
-                            break;
-                    }
-                    libParamStructure.Subset[0].Propertie.Add(propertie);
-                }
-                return Break(SN, true, libParamStructure.ToJson().JsonFormatting(), libParamStructure, Core.@enum.ResultType.Object);
-            }
-            catch (Exception ex)
-            {
-                return Break(SN, false, ex.Message, Exception: ex);
-            }
+            throw new NotImplementedException();
         }
 
         public Task<OperateResult> GetParamAsync()

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.74</Version>
+    <Version>1.0.0.75</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Core/attribute/DisplayAttribute.cs

@@ -1,5 +1,5 @@
 using YSAI.Core.data;
-using static YSAI.Core.data.ParamStructure.subset.propertie;
+using static YSAI.Core.data.ParamStructure;
 
 namespace YSAI.Core.attribute
 {
@@ -15,7 +15,7 @@ namespace YSAI.Core.attribute
         /// <param name="Use">是否使用</param>
         /// <param name="Show">是否显示</param>
         /// <param name="DataCate">数据类型</param>
-        public DisplayAttribute(bool Use, bool Show, ParamStructure.subset.propertie.dataCate DataCate)
+        public DisplayAttribute(bool Use, bool Show, ParamStructure.dataCate DataCate)
         {
             this.Use = Use;
             this.Show = Show;

src/YSAI.DAQ/YSAI.Core/data/ParamStructure.cs

@@ -10,16 +10,37 @@ namespace YSAI.Core.data
     public class ParamStructure
     {
         /// <summary>
-        /// 代码
+        /// 前端使用的数据类别
         /// </summary>
-        public string Code
+        public enum dataCate
         {
-            get
-            {
-                return Name;
-            }
+            /// <summary>
+            /// 文本框
+            /// </summary>
+            text,
+
+            /// <summary>
+            /// 下拉框
+            /// </summary>
+            select,
+
+            /// <summary>
+            /// 单选框
+            /// </summary>
+            radio,
+
+            /// <summary>
+            /// 数字框
+            /// </summary>
+            unmber
         }
 
+        /// <summary>
+        /// 代码
+        /// </summary>
+        public string Code
+        { get { return Name; } }
+
         /// <summary>
         /// 名称
         /// </summary>
@@ -66,32 +87,6 @@ namespace YSAI.Core.data
                 [JsonConverter(typeof(StringEnumConverter))]
                 public dataCate DataCate { get; set; }
 
-                /// <summary>
-                /// 数据类别
-                /// </summary>
-                public enum dataCate
-                {
-                    /// <summary>
-                    /// 文本框
-                    /// </summary>
-                    text,
-
-                    /// <summary>
-                    /// 下拉框
-                    /// </summary>
-                    select,
-
-                    /// <summary>
-                    /// 单选框
-                    /// </summary>
-                    radio,
-
-                    /// <summary>
-                    /// 数字框
-                    /// </summary>
-                    unmber
-                }
-
                 /// <summary>
                 /// 默认值
                 /// </summary>
@@ -100,7 +95,8 @@ namespace YSAI.Core.data
                 /// <summary>
                 /// 初始值
                 /// </summary>
-                public object? Initial { get; set; }
+                public object? Initial
+                { get { return Default; } }
 
                 /// <summary>
                 /// 描述

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -18,7 +18,7 @@
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.74" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.74" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -15,7 +15,7 @@
 	<ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.81" />
     <PackageReference Include="NModbus.Serial" Version="3.0.81" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Netty/YSAI.Netty.csproj

@@ -14,6 +14,6 @@
 	<ItemGroup>
 		<PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
 		<PackageReference Include="DotNetty.Transport" Version="0.7.5" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.74" />
 	</ItemGroup>
 </Project>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.76" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.74" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
     <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.71" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.74" />
   </ItemGroup>
 
   <ItemGroup>