diff --git a/Sln.Iot.CFX/CFXConnect/CFXConnect1.cs b/Sln.Iot.CFX/CFXConnect/CFXConnect1.cs index 6c6fd26..f6a6f65 100644 --- a/Sln.Iot.CFX/CFXConnect/CFXConnect1.cs +++ b/Sln.Iot.CFX/CFXConnect/CFXConnect1.cs @@ -40,7 +40,7 @@ namespace Sln.Iot.CFX.CFXConnect CFXEventTools cFXEventTools = CFXEventTools.Instance; - public string CFXHandle { get; set; } = "CFX.A00.SDSHTEST01"; + public string CFXHandle { get; set; } = "CFX.A00.OT00470030"; protected override CFXMessage HandleRequest(CFXEnvelope request) { diff --git a/Sln.Iot.CFX/CFXConnect/CFXConnect2.cs b/Sln.Iot.CFX/CFXConnect/CFXConnect2.cs index be03873..a2504a2 100644 --- a/Sln.Iot.CFX/CFXConnect/CFXConnect2.cs +++ b/Sln.Iot.CFX/CFXConnect/CFXConnect2.cs @@ -42,7 +42,7 @@ namespace Sln.Iot.CFX.CFXConnect CFXEventTools cFXEventTools = CFXEventTools.Instance; - public string CFXHandle { get; set; } = "CFX.A00.SDSHTEST02"; + public string CFXHandle { get; set; } = "CFX.A00.OT00470031"; protected override CFXMessage HandleRequest(CFXEnvelope request) { diff --git a/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived1.cs b/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived1.cs index 756b238..88b9fc6 100644 --- a/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived1.cs +++ b/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived1.cs @@ -52,7 +52,7 @@ public class AreYouThereRequestReceived1 : BaseAreYouThereRequestReceived Message = "", }, - CFXHandle = "CFX.A00.SDSHTEST01", + CFXHandle = "CFX.A00.OT00470030", RequestNetworkUri = "amqp://127.0.0.1:1235/", RequestTargetAddress = "amqp://127.0.0.1:8888/" }; diff --git a/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived2.cs b/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived2.cs index 84e8e9b..1ad2de6 100644 --- a/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived2.cs +++ b/Sln.Iot.CFX/CFXRequestes/AreYouThereRequestReceived2.cs @@ -52,7 +52,7 @@ public class AreYouThereRequestReceived2 : BaseAreYouThereRequestReceived Message = "", }, - CFXHandle = "CFX.A00.SDSHTEST02", + CFXHandle = "CFX.A00.OT00470031", RequestNetworkUri = "amqp://127.0.0.1:1235/", RequestTargetAddress = "amqp://127.0.0.1:8888/" }; diff --git a/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived1.cs b/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived1.cs index 4806672..9651ffe 100644 --- a/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived1.cs +++ b/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived1.cs @@ -55,14 +55,14 @@ public class GetEndpointInformationRequestReceived1 : BaseGetEndpointInformation }, EndpointInformation = new Endpoint() { - CFXHandle = "CFX.A00.SDSHTEST01", + CFXHandle = "CFX.A00.OT00470030", CFXVersion = "2.0", RequestNetworkUri = "amqp://127.0.0.1:1235/", RequestTargetAddress = "amqp://127.0.0.1:8888/", ModelNumber = "双液真空灌胶机", NumberOfLanes = 1, Vendor = "木子贸易中山有限公司", - SerialNumber = "SDSHTEST01", + SerialNumber = "OT00470030", Stages = new List { new StageInformation() diff --git a/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived2.cs b/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived2.cs index 1db1cea..45f0e03 100644 --- a/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived2.cs +++ b/Sln.Iot.CFX/CFXRequestes/GetEndpointInformationRequestReceived2.cs @@ -55,14 +55,14 @@ public class GetEndpointInformationRequestReceived2 : BaseGetEndpointInformation }, EndpointInformation = new Endpoint() { - CFXHandle = "CFX.A00.SDSHTEST02", + CFXHandle = "CFX.A00.OT00470031", CFXVersion = "2.0", RequestNetworkUri = "amqp://127.0.0.1:1235/", RequestTargetAddress = "amqp://127.0.0.1:8888/", ModelNumber = "隧道炉烤箱", NumberOfLanes = 1, Vendor = "木子贸易中山有限公司", - SerialNumber = "SDSHTEST02", + SerialNumber = "OT00470031", Stages = new List { new StageInformation() diff --git a/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived1.cs b/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived1.cs index 2786fca..0c2b007 100644 --- a/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived1.cs +++ b/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived1.cs @@ -55,7 +55,7 @@ public class WhoIsThereRequestReceived1 : BaseWhoIsThereRequestReceived Message = "", }, - CFXHandle = "CFX.A00.SDSHTEST01", + CFXHandle = "CFX.A00.OT00470030", RequestNetworkUri = "amqp://127.0.0.1:1235/", RequestTargetAddress = "amqp://127.0.0.1:8888/" }; diff --git a/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived2.cs b/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived2.cs index e163825..f383c26 100644 --- a/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived2.cs +++ b/Sln.Iot.CFX/CFXRequestes/WhoIsThereRequestReceived2.cs @@ -55,7 +55,7 @@ public class WhoIsThereRequestReceived2 : BaseWhoIsThereRequestReceived Message = "", }, - CFXHandle = "CFX.A00.SDSHTEST02", + CFXHandle = "CFX.A00.OT00470031", RequestNetworkUri = "amqp://127.0.0.1:1235/", RequestTargetAddress = "amqp://127.0.0.1:8888/" }; diff --git a/Sln.Iot.CFX/CFXTest.cs b/Sln.Iot.CFX/CFXTest.cs index 2413176..4c4d9c0 100644 --- a/Sln.Iot.CFX/CFXTest.cs +++ b/Sln.Iot.CFX/CFXTest.cs @@ -53,7 +53,7 @@ namespace Sln.Iot.CFX //// 发布所有事件 ////_cfxHelper.PublishEvent(new CFXEnvelope(heartbeatEvent.Handle("CFX.A00.SDSH000001"))); - _cfxHelper.PublishEvent(new CFXEnvelope(endpointConnectedEvent.Handle("CFX.A00.SDSHTEST01", "amqp://127.0.0.1:1235", "amqp://127.0.0.1:8888"))); + _cfxHelper.PublishEvent(new CFXEnvelope(endpointConnectedEvent.Handle("CFX.A00.OT00470030", "amqp://127.0.0.1:1235", "amqp://127.0.0.1:8888"))); _cfxHelper.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle("01", FaultSeverity.Warning, testGuid, "Error", testGuid))); _cfxHelper.PublishEvent(new CFXEnvelope(faultAcknowledgedEvent.Handle())); _cfxHelper.PublishEvent(new CFXEnvelope(stationStateChangedEvent.Handle(ResourceState.USD_Repair))); @@ -65,34 +65,59 @@ namespace Sln.Iot.CFX _cfxHelper.PublishEvent(new CFXEnvelope(stationOfflineEvent.Handle())); _cfxHelper.PublishEvent(new CFXEnvelope(stationOnlineEvent.Handle())); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "-1", "0", "-1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "0", "1", "0", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "4", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "2", "2", "2", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "3", "2", "3", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "4", "2", "4", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "5", "2", "5", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "6", "1", "6", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "7", "2", "7", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "8", "2", "8", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "9", "2", "9", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "10", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "11", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "12", "2", "12", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "-1", "0", "-1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "0", "1", "0", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "4", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "2", "2", "2", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "3", "2", "3", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "4", "2", "4", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "5", "2", "5", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "6", "1", "6", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "7", "2", "7", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "8", "2", "8", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "9", "2", "9", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "10", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "11", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "12", "2", "12", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "18", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "20", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "21", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "22", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "24", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "61", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "62", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "63", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "68", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "69", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "101", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "102", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "103", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "104", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "105", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "106", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "107", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "108", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "109", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "110", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "111", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "200", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "201", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "202", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "203", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "204", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "205", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "206", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "207", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "208", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "209", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "210", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "211", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "212", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "213", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "112", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "113", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "114", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "115", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "214", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "215", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "216", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "217", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "218", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "219", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "220", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470030", "制程设备", "1", "2", "221", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST01", "制程设备", "1", "2", "70", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); _cfxHelper.PublishEvent(new CFXEnvelope(unitsArrivedEvent.Handle("A123456", new string[1] { "A123" }))); _cfxHelper.PublishEvent(new CFXEnvelope(workStartedEvent.Handle(testGuid, "A123456", new string[]{ "A123" }))); @@ -106,7 +131,7 @@ namespace Sln.Iot.CFX _cfxHelper.PublishEvent(new CFXEnvelope(workCompletedEvent.Handle(testGuid, "A123456", new string[] { "A123" }))); _cfxHelper.PublishEvent(new CFXEnvelope(unitsDepartedEvent.Handle(null, new string[1] { "A123" }))); _cfxHelper.PublishEvent(new CFXEnvelope(unitsProcessedEvent.Handle(testGuid, cFXUnitProcessedDataGet.ProcessDataGetVacuum(new UnitsProcessVacuumEntity())))); - _cfxHelper.PublishEvent(new CFXEnvelope(endpointShuttingDownEvent.Handle("CFX.A00.SDSHTEST01"))); + _cfxHelper.PublishEvent(new CFXEnvelope(endpointShuttingDownEvent.Handle("CFX.A00.OT00470030"))); _cfxHelper.SendValidateUnitsRequest("amqp://127.0.0.1:8888", "A123456", new string[1] { "A123" }); } @@ -119,7 +144,7 @@ namespace Sln.Iot.CFX //// 发布所有事件 ////_cfxHelper2.PublishEvent(new CFXEnvelope(heartbeatEvent.Handle("CFX.A00.SDSH000002"))); - _cfxHelper2.PublishEvent(new CFXEnvelope(endpointConnectedEvent.Handle("CFX.A00.SDSHTEST02", "amqp://127.0.0.1:1235", "amqp://127.0.0.1:8888"))); + _cfxHelper2.PublishEvent(new CFXEnvelope(endpointConnectedEvent.Handle("CFX.A00.OT00470031", "amqp://127.0.0.1:1235", "amqp://127.0.0.1:8888"))); _cfxHelper2.PublishEvent(new CFXEnvelope(faultOccurredEvent.Handle("01", FaultSeverity.Warning, testGuid, "Error", testGuid))); _cfxHelper2.PublishEvent(new CFXEnvelope(faultAcknowledgedEvent.Handle())); _cfxHelper2.PublishEvent(new CFXEnvelope(stationStateChangedEvent.Handle(ResourceState.USD_Repair))); @@ -131,33 +156,26 @@ namespace Sln.Iot.CFX _cfxHelper2.PublishEvent(new CFXEnvelope(stationOfflineEvent.Handle())); _cfxHelper2.PublishEvent(new CFXEnvelope(stationOnlineEvent.Handle())); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "-1", "0", "-1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "0", "1", "0", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "2", "2", "2", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "3", "2", "3", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "4", "2", "4", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "5", "2", "5", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "6", "1", "6", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "7", "2", "7", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "8", "2", "8", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "9", "2", "9", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "10", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "11", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "12", "2", "12", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "-1", "0", "-1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "0", "1", "0", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "1", "4", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "2", "2", "2", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "3", "2", "3", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "4", "2", "4", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "5", "2", "5", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "6", "1", "6", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "7", "2", "7", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "8", "2", "8", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "9", "2", "9", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "10", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "11", "3", "1", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "12", "2", "12", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "12", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "18", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "24", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "25", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "21", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "22", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "40", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "41", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "20", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); - //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("SDSHTEST02", "制程设备", "1", "4", "26", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + //_cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "1", "2", "11", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "1", "2", "12", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "1", "2", "18", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "1", "2", "20", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); + _cfxHelper2.PublishEvent(new CFXEnvelope(stationParametersModifiedEvent.Handle(ParameterSet("OT00470031", "制程设备", "1", "2", "22", "1000", "0", "60", "3600", "4", "1", "5", "0", "0")))); _cfxHelper2.PublishEvent(new CFXEnvelope(unitsArrivedEvent.Handle("A123456", new string[1] { "A123" }))); _cfxHelper2.PublishEvent(new CFXEnvelope(workStartedEvent.Handle(testGuid, "A123456", new string[] { "A123" }))); @@ -170,7 +188,7 @@ namespace Sln.Iot.CFX _cfxHelper2.PublishEvent(new CFXEnvelope(workCompletedEvent.Handle(testGuid, "A123456", new string[] { "A123" }))); _cfxHelper2.PublishEvent(new CFXEnvelope(unitsDepartedEvent.Handle(null, new string[1] { "A123" }))); _cfxHelper2.PublishEvent(new CFXEnvelope(unitsProcessedEvent.Handle(testGuid, cFXUnitProcessedDataGet.ProcessDataGetOven(new UnitsProcessOvenEntity())))); - _cfxHelper2.PublishEvent(new CFXEnvelope(endpointShuttingDownEvent.Handle("CFX.A00.SDSHTEST02"))); + _cfxHelper2.PublishEvent(new CFXEnvelope(endpointShuttingDownEvent.Handle("CFX.A00.OT00470031"))); _cfxHelper2.SendValidateUnitsRequest("amqp://127.0.0.1:8888", "A123456", new string[1] { "A123" }); } diff --git a/Sln.Iot/Program.cs b/Sln.Iot/Program.cs index 88564ac..9317f34 100644 --- a/Sln.Iot/Program.cs +++ b/Sln.Iot/Program.cs @@ -78,15 +78,15 @@ namespace Sln.Iot // new Uri("amqp://127.0.0.1:30031")); - ////CFX接口启动 - ////真空注胶机 - //CFXConnect1.Instance.Init("CFX.A00.SDSHTEST01", - // new Uri("amqp://127.0.0.1:1235"), - // new Uri("amqp://127.0.0.1:8888")); - //////升降回流1 - CFXConnect2.Instance.Init("CFX.A00.SDSHTEST02", + //CFX接口启动 + //真空注胶机 + CFXConnect1.Instance.Init("CFX.A00.OT00470030", new Uri("amqp://127.0.0.1:1235"), new Uri("amqp://127.0.0.1:8888")); + ////烤箱 + //CFXConnect2.Instance.Init("CFX.A00.OT00470031", + // new Uri("amqp://127.0.0.1:1235"), + // new Uri("amqp://127.0.0.1:8888")); //升降回流2 //CFXConnect2.Instance.Init("CFX.A00.OT00470020", // new Uri("amqp://127.0.0.1:1235"), @@ -103,8 +103,8 @@ namespace Sln.Iot log.Info($"系统启动成功,日志存放位置:{appConfig.logPath}"); CFXTest cFXTest = new CFXTest(); - //cFXTest.Test1(); - cFXTest.Test2(); + cFXTest.Test1(); + //cFXTest.Test2(); //cFXTest.Test4(); //cFXTest.Test3();