1

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

@@ -25,7 +25,7 @@ namespace YSAI.Core.data
         /// <summary>
         /// 创建时间
         /// </summary>
-        public DateTime CreationTime { get; set; } = DateTime.Now;
+        public DateTime CreationTime { get; set; } = DateTime.Now.ToLocalTime();
         /// <summary>
         /// 获取地址信息
         /// </summary>

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

@@ -26,7 +26,7 @@ namespace YSAI.Core.data
         /// <summary>
         /// 获取或更新的时间
         /// </summary>
-        public DateTime Time { get; set; } = DateTime.Now;
+        public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
 
         /// <summary>
         /// 设置父类的参数

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

@@ -54,7 +54,7 @@ namespace YSAI.Core.data
                 addressValue.AddressName = addressDetails.AddressName;
                 addressValue.Value = value;
                 addressValue.OriginalValue = originalValue;
-                addressValue.Time = DateTime.Now;
+                addressValue.Time = DateTime.Now.ToLocalTime();
                 addressValue.Quality = 1;
 
                 return addressValue;

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

@@ -37,7 +37,7 @@ namespace YSAI.Core.data
         /// <summary>
         /// 创建时间
         /// </summary>
-        public string DateCreated { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+        public string CreatedTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
         /// <summary>
         /// 结果数据
         /// </summary>

src/YSAI.DAQ/YSAI.Core/interface/only/IManage.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using YSAI.Core.data;
 
 namespace YSAI.Core.@interface.only
 {
@@ -17,7 +18,7 @@ namespace YSAI.Core.@interface.only
         /// 示例
         /// </summary>
         /// <returns>配置文件</returns>
-        IActionResult Sample();
+        Task<IActionResult> Sample();
 
         /// <summary>
         /// 设置配置
@@ -39,5 +40,59 @@ namespace YSAI.Core.@interface.only
         /// <returns>统一出参</returns>
         Task<IActionResult> Init();
 
+        /// <summary>
+        /// 打开
+        /// </summary>
+        /// <param name="Name">库名称</param>
+        /// <param name="SN">库实例SN</param>
+        /// <returns>统一返回结果</returns>
+        Task<IActionResult> On(string Name, string SN);
+
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <param name="Name">库名称</param>
+        /// <param name="SN">库实例SN</param>
+        /// <returns>统一返回结果</returns>
+        Task<IActionResult> Off(string Name, string SN);
+
+        /// <summary>
+        /// 读取
+        /// </summary>
+        /// <param name="Name">库名称</param>
+        /// <param name="SN">库实例SN</param> 
+        /// <param name="AddressName">地址</param>
+        /// <returns>统一返回结果</returns>
+        IActionResult Read(string Name, string SN, string AddressName);
+
+        /// <summary>
+        /// 写入
+        /// </summary>
+        /// <param name="Name">库名称</param>
+        /// <param name="SN">库实例SN</param>
+        /// <param name="AddressName">地址</param>
+        /// <param name="Value">值</param>
+        /// <returns>统一返回结果</returns>
+        IActionResult Write(string Name, string SN, string AddressName, string Value);
+
+    }
+
+    /// <summary>
+    /// 统一管理信息接口
+    /// </summary>
+    public interface IManageInfo
+    {
+        /// <summary>
+        /// 获取数采库文件集合
+        /// </summary>
+        /// <returns>rData:库文件名集合</returns>
+        Task<OperateResult> Array();
+
+        /// <summary>
+        /// 获取数采库文件实例参数
+        /// </summary>
+        /// <param name="Name">库文件名</param>
+        /// <returns>rData:库文件所需实例参数集合</returns>
+        Task<OperateResult> Param(string Name);
     }
 }

src/YSAI.DAQ/YSAI.Core/serialport/SerialPortData.cs

@@ -144,7 +144,7 @@ namespace YSAI.Core.serialport
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 步骤枚举

src/YSAI.DAQ/YSAI.Core/socket/tcp/client/SocketTcpClientData.cs

@@ -97,7 +97,7 @@ namespace YSAI.Core.socket.tcp.client
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 步骤枚举

src/YSAI.DAQ/YSAI.Core/socket/tcp/service/SocketTcpServiceData.cs

@@ -96,7 +96,7 @@ namespace YSAI.Core.socket.tcp.service
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 步骤枚举

src/YSAI.DAQ/YSAI.Core/socket/udp/SocketUdpData.cs

@@ -91,7 +91,7 @@ namespace YSAI.Core.socket.udp
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
     }
 }

src/YSAI.DAQ/YSAI.Core/subscribe/SubscribeData.cs

@@ -94,7 +94,7 @@ namespace YSAI.Core.subscription
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 事件响应数据带参

src/YSAI.DAQ/YSAI.Kafka/KafkaConsumerData.cs

@@ -86,7 +86,7 @@ namespace YSAI.Kafka
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
     
     }

src/YSAI.DAQ/YSAI.Manage/Controllers/DaqLibInfoController.cs

@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Reflection.Metadata.Ecma335;
 using YSAI.Core.data;
 using YSAI.Core.@enum;
+using YSAI.Core.@interface.only;
 using YSAI.Core.@interface.unify;
 using YSAI.DB;
 using YSAI.Kafka;
@@ -24,7 +25,7 @@ namespace YSAI.Manage.Controllers
    
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class DaqLibInfoController : Controller
+    public class DaqLibInfoController : Controller,IManageInfo
     {
         /// <summary>
         /// 配置
@@ -50,11 +51,11 @@ namespace YSAI.Manage.Controllers
         /// </summary>
         /// <returns>rData:库文件名集合</returns>
         [HttpGet]
-        public IActionResult Array()
+        public async Task<OperateResult> Array()
         {
             //开始记录运行时间
             operateResult.Depart("Array");
-            return Ok(operateResult.Break("Array", true,RData:EnumTool.EnumToList<DaqType>(), RType:ResultType.Json));
+            return operateResult.Break("Array", true,RData:EnumTool.EnumToList<DaqType>(), RType:ResultType.Json);
         }
 
         /// <summary>
@@ -63,7 +64,7 @@ namespace YSAI.Manage.Controllers
         /// <param name="Name">库文件名</param>
         /// <returns>rData:库文件所需实例参数集合</returns>
         [HttpGet]
-        public IActionResult Param(string Name)
+        public async Task<OperateResult> Param(string Name)
         {
             //开始记录运行时间
             operateResult.Depart("Param");
@@ -73,19 +74,19 @@ namespace YSAI.Manage.Controllers
             switch (daqType)
             {
                 case DaqType.DB:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<DBData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<DBData.Basics>(), RType: ResultType.Json);
                 case DaqType.Modbus:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<ModbusClientData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<ModbusClientData.Basics>(), RType: ResultType.Json);
                 case DaqType.OpcUa:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<OpcUaClientData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<OpcUaClientData.Basics>(), RType: ResultType.Json);
                 case DaqType.OpcDa:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<OpcDaClientData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<OpcDaClientData.Basics>(), RType: ResultType.Json);
                 case DaqType.OpcDaHttp:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<OpcDaHttpData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<OpcDaHttpData.Basics>(), RType: ResultType.Json);
                 case DaqType.S7:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<S7ClientData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<S7ClientData.Basics>(), RType: ResultType.Json);
                 default:
-                    return Ok(operateResult.Break("Param", false, "输入有误"));
+                    return operateResult.Break("Param", false, "输入有误");
             }
 
 

src/YSAI.DAQ/YSAI.Manage/Controllers/DaqLibOperateController.cs

@@ -54,7 +54,7 @@ namespace YSAI.Manage.Controllers
             AddressManage addressManage = new AddressManage();
             addressManage.SN = address.SN;
             addressManage.AddressArray = address.AddressArray;
-            addressManage.CreationTime = DateTime.Now;
+            addressManage.CreationTime = DateTime.Now.ToLocalTime();
             addressManage.DaqType = Core.@enum.DaqType.OpcUa;
             addressManage.InstanceParam = new OpcUaClientData.Basics() { Name = $"YSAI-OpcUa", UserName = "123", Password = "123", ServerUrl = "opc.tcp://127.0.0.1:4840", SamplingInterval = 100 };
             return File(System.Text.Encoding.Default.GetBytes(new List<AddressManage> { addressManage, addressManage, addressManage, addressManage, addressManage, addressManage }.ToJson().JsonFormatting()), "application/octet-stream");
@@ -133,6 +133,7 @@ namespace YSAI.Manage.Controllers
         /// 通过上传的配置进行初始化
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public IActionResult Init()
         {
             //开始记录运行时间
@@ -198,10 +199,11 @@ namespace YSAI.Manage.Controllers
             return Ok();
         }
 
-        [HttpPost]
+        [HttpGet]
         public OperateResult Test()
         {
-            return operateResult.Break("Test",true,"测试成功");
+            operateResult.Depart("Test");
+            return operateResult.Break("Test", true, "测试成功");
         }
     }
 }

src/YSAI.DAQ/YSAI.Manage/Controllers/RelayLibInfoController.cs

@@ -4,6 +4,8 @@ using YSAI.Mqtt.client;
 using YSAI.RabbitMQ;
 using YSAI.Unility;
 using YSAI.Core.@enum;
+using YSAI.Core.@interface.only;
+using YSAI.Core.data;
 
 namespace YSAI.Manage.Controllers
 {
@@ -12,7 +14,7 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class RelayLibInfoController : Controller
+    public class RelayLibInfoController : Controller,IManageInfo
     {
         /// <summary>
         /// 配置
@@ -38,11 +40,11 @@ namespace YSAI.Manage.Controllers
         /// </summary>
         /// <returns>rData:库文件名集合</returns>
         [HttpGet]
-        public IActionResult Array()
+        public async Task<OperateResult> Array()
         {
             //开始记录运行时间
             operateResult.Depart("Array");
-            return Ok(operateResult.Break("Array", true, RData: EnumTool.EnumToList<RelayType>(), RType: ResultType.Json));
+            return operateResult.Break("Array", true, RData: EnumTool.EnumToList<RelayType>(), RType: ResultType.Json);
         }
 
         /// <summary>
@@ -51,7 +53,7 @@ namespace YSAI.Manage.Controllers
         /// <param name="Name">库文件名</param>
         /// <returns>rData:库文件所需实例参数集合</returns>
         [HttpGet]
-        public IActionResult Param(string Name)
+        public async Task<OperateResult> Param(string Name)
         {
             //开始记录运行时间
             operateResult.Depart("Param");
@@ -61,13 +63,13 @@ namespace YSAI.Manage.Controllers
             switch (daqType)
             {
                 case RelayType.Kafka:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<KafkaProducerData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<KafkaProducerData.Basics>(), RType: ResultType.Json);
                 case RelayType.Mqtt:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<MqttClientData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<MqttClientData.Basics>(), RType: ResultType.Json);
                 case RelayType.RabbitMQ:
-                    return Ok(operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<RabbitMQData.Basics>(), RType: ResultType.Json));
+                    return operateResult.Break("Param", true, RData: ReflexTool.GetClassAllPropertyData<RabbitMQData.Basics>(), RType: ResultType.Json);
                 default:
-                    return Ok(operateResult.Break("Param", false, "输入有误"));
+                    return operateResult.Break("Param", false, "输入有误");
             }
 
             

src/YSAI.DAQ/YSAI.Manage/Properties/launchSettings.json

@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://127.0.0.1:1899;http://127.0.0.1:1900",
+      "applicationUrl": "https://192.168.2.38:19876;http://192.168.2.38:19875",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/YSAI.DAQ/YSAI.Manage/YSAI.Manage.csproj

@@ -7,10 +7,6 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Controllers\DaqLibOperateController.cs~RF139cf15.TMP" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/client/MqttClientData.cs

@@ -124,7 +124,7 @@ namespace YSAI.Mqtt.client
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 状态

src/YSAI.DAQ/YSAI.Mqtt/service/MqttServiceData.cs

@@ -112,7 +112,7 @@ namespace YSAI.Mqtt.service
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 哪一个步骤

src/YSAI.DAQ/YSAI.Mqtt/service/websocket/MqttWebSocketServiceData.cs

@@ -113,7 +113,7 @@ namespace YSAI.Mqtt.service.websocket
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 哪一个步骤

src/YSAI.DAQ/YSAI.Opc/da/client/OpcDaClientData.cs

@@ -76,7 +76,7 @@ namespace YSAI.Opc.da.client
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime? Time { get; set; } = DateTime.Now;
+            public DateTime? Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 事件响应数据带参

src/YSAI.DAQ/YSAI.Opc/da/http/OpcDaHttpData.cs

@@ -96,7 +96,7 @@ namespace YSAI.Opc.da.http
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 请求方法

src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientData.cs

@@ -127,7 +127,7 @@ namespace YSAI.Opc.ua.client
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
         /// <summary>
         /// 事件响应数据带参

src/YSAI.DAQ/YSAI.Opc/ua/service/OpcUaServiceData.cs

@@ -81,7 +81,7 @@ namespace YSAI.Opc.ua.service
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
     }
 }

src/YSAI.DAQ/YSAI.RabbitMQ/RabbitMQData.cs

@@ -88,7 +88,7 @@ namespace YSAI.RabbitMQ
             /// <summary>
             /// 时间
             /// </summary>
-            public DateTime Time { get; set; } = DateTime.Now;
+            public DateTime Time { get; set; } = DateTime.Now.ToLocalTime();
         }
     }
 }

src/YSAI.DAQ/YSAI.Test/TestAll.cs

@@ -182,7 +182,7 @@ namespace YSAI.Test
 
                 Address address = new Address();
                 address.SN = Guid.NewGuid().ToString();
-                address.CreationTime = DateTime.Now;
+                address.CreationTime = DateTime.Now.ToLocalTime();
                 address.AddressArray = new List<AddressDetails>();
                 foreach (var item in node)
                 {
@@ -279,7 +279,7 @@ namespace YSAI.Test
 
             Address address = new Address();
             address.SN = Guid.NewGuid().ToString();
-            address.CreationTime = DateTime.Now;
+            address.CreationTime = DateTime.Now.ToLocalTime();
             address.AddressArray = new List<AddressDetails>();
             address.AddressArray.Add(new AddressDetails
             {

src/YSAI.DAQ/YSAI.TestConsole/Program.cs

@@ -23,7 +23,6 @@ namespace YSAI.TestConsole
     {
         static void Main(string[] args)
         {
-
             while (true)
             {
                 Console.ReadKey();