diff --git a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs index b735fb2..d604fc0 100644 --- a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs +++ b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/ProtectionDevice/ProtectionDeviceAppService.cs @@ -980,7 +980,7 @@ namespace YunDa.ISAS.Application.GeneralInformation return rst; } /// - /// 从综自后台数据库迁移数据到运维数据库中(保护装置数据) + /// 从综自后台数据库迁移数据到运维数据库中(保护装置网关数据) /// /// [ShowApi] diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/DevicePluginHistoryInfo.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/DevicePluginHistoryInfo.cs new file mode 100644 index 0000000..a996715 --- /dev/null +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/DevicePluginHistoryInfo.cs @@ -0,0 +1,229 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YunDa.SOMS.DataTransferObject.MainStationMaintenanceInfo.DeviceHistoryChange +{ + + // 定义PluginData类来存储插件相关信息 + public class DevicePluginHistoryInfo + { + [JsonProperty("B01插件编号")] + public string B01PluginNumber { get; set; } + + [JsonProperty("B01插件厂家型号")] + public string B01ManufacturerModel { get; set; } + + [JsonProperty("B01插件厂家内部名称")] + public string B01ManufacturerInnerName { get; set; } + + [JsonProperty("B01插件厂家名称")] + public string B01ManufacturerName { get; set; } + + [JsonProperty("B01插件出产日期")] + public DateTime B01ProductionDate { get; set; } + + [JsonProperty("B01插件所属装置编号")] + public string B01DeviceNumber { get; set; } + + [JsonProperty("B01维修记录")] + public string B01MaintenanceRecord { get; set; } + + [JsonProperty("B02插件编号")] + public string B02PluginNumber { get; set; } + + [JsonProperty("B02插件厂家型号")] + public string B02ManufacturerModel { get; set; } + + [JsonProperty("B02插件厂家内部名称")] + public string B02ManufacturerInnerName { get; set; } + + [JsonProperty("B02插件厂家名称")] + public string B02ManufacturerName { get; set; } + + [JsonProperty("B02插件出产日期")] + public DateTime B02ProductionDate { get; set; } + + [JsonProperty("B02插件所属装置编号")] + public string B02DeviceNumber { get; set; } + + [JsonProperty("B02维修记录")] + public string B02MaintenanceRecord { get; set; } + + [JsonProperty("B03插件编号")] + public string B03PluginNumber { get; set; } + + [JsonProperty("B03插件厂家型号")] + public string B03ManufacturerModel { get; set; } + + [JsonProperty("B03插件厂家内部名称")] + public string B03ManufacturerInnerName { get; set; } + + [JsonProperty("B03插件厂家名称")] + public string B03ManufacturerName { get; set; } + + [JsonProperty("B03插件出产日期")] + public DateTime B03ProductionDate { get; set; } + + [JsonProperty("B03插件所属装置编号")] + public string B03DeviceNumber { get; set; } + + [JsonProperty("B03维修记录")] + public string B03MaintenanceRecord { get; set; } + + [JsonProperty("B04插件编号")] + public string B04PluginNumber { get; set; } + + [JsonProperty("B04插件厂家型号")] + public string B04ManufacturerModel { get; set; } + + [JsonProperty("B04插件厂家内部名称")] + public string B04ManufacturerInnerName { get; set; } + + [JsonProperty("B04插件厂家名称")] + public string B04ManufacturerName { get; set; } + + [JsonProperty("B04插件出产日期")] + public DateTime B04ProductionDate { get; set; } + + [JsonProperty("B04插件所属装置编号")] + public string B04DeviceNumber { get; set; } + + [JsonProperty("B04维修记录")] + public string B04MaintenanceRecord { get; set; } + + [JsonProperty("B05插件编号")] + public string B05PluginNumber { get; set; } + + [JsonProperty("B05插件厂家型号")] + public string B05ManufacturerModel { get; set; } + + [JsonProperty("B05插件厂家内部名称")] + public string B05ManufacturerInnerName { get; set; } + + [JsonProperty("B05插件厂家名称")] + public string B05ManufacturerName { get; set; } + + [JsonProperty("B05插件出产日期")] + public DateTime B05ProductionDate { get; set; } + + [JsonProperty("B05插件所属装置编号")] + public string B05DeviceNumber { get; set; } + + [JsonProperty("B05维修记录")] + public string B05MaintenanceRecord { get; set; } + + [JsonProperty("B06插件编号")] + public string B06PluginNumber { get; set; } + + [JsonProperty("B06插件厂家型号")] + public string B06ManufacturerModel { get; set; } + + [JsonProperty("B06插件厂家内部名称")] + public string B06ManufacturerInnerName { get; set; } + + [JsonProperty("B06插件厂家名称")] + public string B06ManufacturerName { get; set; } + + [JsonProperty("B06插件出产日期")] + public DateTime B06ProductionDate { get; set; } + + [JsonProperty("B06插件所属装置编号")] + public string B06DeviceNumber { get; set; } + + [JsonProperty("B06维修记录")] + public string B06MaintenanceRecord { get; set; } + + [JsonProperty("B07插件编号")] + public string B07PluginNumber { get; set; } + + [JsonProperty("B07插件厂家型号")] + public string B07ManufacturerModel { get; set; } + + [JsonProperty("B07插件厂家内部名称")] + public string B07ManufacturerInnerName { get; set; } + + [JsonProperty("B07插件厂家名称")] + public string B07ManufacturerName { get; set; } + + [JsonProperty("B07插件出产日期")] + public DateTime B07ProductionDate { get; set; } + + [JsonProperty("B07插件所属装置编号")] + public string B07DeviceNumber { get; set; } + + [JsonProperty("B07维修记录")] + public string B07MaintenanceRecord { get; set; } + } + + public class DevicePluginHistoryInfoTest + { + public DevicePluginHistoryInfo GetTestData() + { + // 创建PluginData类的实例 + var pluginData = new DevicePluginHistoryInfo + { + B01PluginNumber = "1933CA00300001", + B01ManufacturerModel = "J2CA", + B01ManufacturerInnerName = "CPU插件", + B01ManufacturerName = "交大运达电气", + B01ProductionDate = new DateTime(2019, 8, 13), + B01DeviceNumber = "240531914", + B01MaintenanceRecord = "", + + B02PluginNumber = "1933JA04100001", + B02ManufacturerModel = "J2JA", + B02ManufacturerInnerName = "交流插件", + B02ManufacturerName = "交大运达电气", + B02ProductionDate = new DateTime(2019, 8, 13), + B02DeviceNumber = "240531914", + B02MaintenanceRecord = "", + + B03PluginNumber = "2233IA220V400001", + B03ManufacturerModel = "J2IA", + B03ManufacturerInnerName = "开入插件", + B03ManufacturerName = "交大运达电气", + B03ProductionDate = new DateTime(2022, 8, 13), + B03DeviceNumber = "240531914", + B03MaintenanceRecord = "", + + B04PluginNumber = "2233IA220V400002", + B04ManufacturerModel = "J2IA", + B04ManufacturerInnerName = "开入插件", + B04ManufacturerName = "交大运达电气", + B04ProductionDate = new DateTime(2022, 8, 13), + B04DeviceNumber = "240531914", + B04MaintenanceRecord = "", + + B05PluginNumber = "2233OA0000400001", + B05ManufacturerModel = "J2OA", + B05ManufacturerInnerName = "开出插件", + B05ManufacturerName = "交大运达电气", + B05ProductionDate = new DateTime(2022, 8, 13), + B05DeviceNumber = "240531914", + B05MaintenanceRecord = "", + + B06PluginNumber = "2233OC220V400001", + B06ManufacturerModel = "J2OC", + B06ManufacturerInnerName = "操作插件", + B06ManufacturerName = "交大运达电气", + B06ProductionDate = new DateTime(2022, 8, 13), + B06DeviceNumber = "240531914", + B06MaintenanceRecord = "", + + B07PluginNumber = "1933DA00100001", + B07ManufacturerModel = "J2DA", + B07ManufacturerInnerName = "电源插件", + B07ManufacturerName = "交大运达电气", + B07ProductionDate = new DateTime(2019, 8, 13), + B07DeviceNumber = "240531914", + B07MaintenanceRecord = "" + }; + return pluginData; + } + } +} + diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/DeviceProductionInfo.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/DeviceProductionInfo.cs index e5b2ae8..4bf0580 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/DeviceProductionInfo.cs +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/DeviceProductionInfo.cs @@ -7,6 +7,9 @@ using System.Threading.Tasks; namespace YunDa.SOMS.DataTransferObject.MainStationMaintenanceInfo.DeviceHistoryChange { + /// + /// 装置信息 + /// public class DeviceProductionInfo { [JsonProperty("装置编号")] diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/SoftwareVersionHistoryInfo.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/SoftwareVersionHistoryInfo.cs new file mode 100644 index 0000000..8783053 --- /dev/null +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceHistoryChange/SoftwareVersionHistoryInfo.cs @@ -0,0 +1,46 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YunDa.SOMS.DataTransferObject.MainStationMaintenanceInfo.DeviceHistoryChange +{ + + /// + /// 基线版本 + /// + public class SoftwareVersionHistoryInfo + { + [JsonProperty("基线版本信息")] + public string BaselineVersion { get; set; } + + [JsonProperty("接口程序版本")] + public string InterfaceProgramVersion { get; set; } + + [JsonProperty("接口数据库版本")] + public string InterfaceDatabaseVersion { get; set; } + + [JsonProperty("保护程序版本")] + public string ProtectionProgramVersion { get; set; } + + [JsonProperty("保护数据库版本")] + public string ProtectionDatabaseVersion { get; set; } + + [JsonProperty("BO3插件程序版本")] + public string BO3PluginProgramVersion { get; set; } + + [JsonProperty("BO4插件程序版本")] + public string BO4PluginProgramVersion { get; set; } + + [JsonProperty("BO5插件程序版本")] + public string BO5PluginProgramVersion { get; set; } + + [JsonProperty("BO7插件程序版本")] + public string BO7PluginProgramVersion { get; set; } + + [JsonProperty("液晶程序版本")] + public string LCDProgramVersion { get; set; } + } +} diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceTcpData/CommunicationParameters.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceTcpData/CommunicationParameters.cs index bc8a90c..b933f17 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceTcpData/CommunicationParameters.cs +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/MainStationMaintenanceInfo/DeviceTcpData/CommunicationParameters.cs @@ -1,7 +1,9 @@ namespace YunDa.SOMS.DataTransferObject.MainStationMaintenanceInfo.DeviceTcpData { using Newtonsoft.Json; - + /// + /// 通信参数 + /// public class CommunicationParameters { [JsonProperty("网口1-IP")]