diff --git a/Sln.Iot.CFX/CFXBusiness/CFXUnitProcessedDataGet.cs b/Sln.Iot.CFX/CFXBusiness/CFXUnitProcessedDataGet.cs
index ed9050f..4c9d8ce 100644
--- a/Sln.Iot.CFX/CFXBusiness/CFXUnitProcessedDataGet.cs
+++ b/Sln.Iot.CFX/CFXBusiness/CFXUnitProcessedDataGet.cs
@@ -21,9 +21,9 @@ namespace Sln.Iot.CFX.CFXBusiness
         /// 真空点胶数据
         /// </summary>
         /// <returns></returns>
-        public CommonProcessData ProcessDataGet1(UnitsProcess1Entity entity)
+        public CommonProcessData ProcessDataGetVacuum(UnitsProcessVacuumEntity entity)
         {
-            entity = new UnitsProcess1Entity()
+            entity = new UnitsProcessVacuumEntity()
             {
                 GlueAmountSetValue1 = 123.4f,
                 GluePushSpeedSetValue1 = 10.1f,
@@ -46,7 +46,7 @@ namespace Sln.Iot.CFX.CFXBusiness
                 VacuumDegreeActValue2 = 3000.4f,
                 PressureHoldTimeSetValue2 = 100,
             };
-
+            
             CommonProcessData processData = new CommonProcessData()
             {
                 ZoneData = new List<CommonUseZoneData>
@@ -55,73 +55,16 @@ namespace Sln.Iot.CFX.CFXBusiness
                     {
                         Setpoints = new List<CommonUseSetpoint>()
                         {
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.GluePushSpeedSetValue,
+                                SetpointName = "GluePushSpeedSetValue"
+                            },
                             new CommonUseSetpoint()
                             {
                                 Setpoint = entity.GlueAmountSetValue1,
                                 SetpointName = "GlueAmountSetValue1"
                             },
-                            new CommonUseSetpoint()
-                            {
-                                Setpoint = entity.GluePushSpeedSetValue1,
-                                SetpointName = "GluePushSpeedSetValue1"
-                            },
-                            new CommonUseSetpoint()
-                            {
-                                Setpoint = entity.PressureHoldTimeSetValue1,
-                                SetpointName = "PressureHoldTimeSetValue1"
-                            },
-                        },
-                        Readings = new List<CommonUseReading>()
-                        {
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.BarrelA1TempActValue1,
-                                ReadingName = "BarrelA1TempActValue1",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.BarrelA2TempActValue1,
-                                ReadingName = "BarrelA2TempActValue1",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.BarrelB1TempActValue1,
-                                ReadingName = "BarrelB1TempActValue1",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.BarrelB2TempActValue1,
-                                ReadingName = "BarrelB2TempActValue1",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PumpAPressureActValue1,
-                                ReadingName = "PumpAPressureActValue1",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PumpBPressureActValue1,
-                                ReadingName = "PumpBPressureActValue1",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.VacuumDegreeActValue1,
-                                ReadingName = "VacuumDegreeActValue1",
-                            },
-
-                        },
-                        Zone = new CommonUseZone()
-                        {
-                            ZoneName = "Zone1",
-                            StageSequence = 1,
-                            StageName = "VacuumInjection1"
-
-                        },
-                    },
-                    new CommonUseZoneData()
-                    {
-                        Setpoints = new List<CommonUseSetpoint>()
-                        {
                             new CommonUseSetpoint()
                             {
                                 Setpoint = entity.GlueAmountSetValue2,
@@ -129,128 +72,88 @@ namespace Sln.Iot.CFX.CFXBusiness
                             },
                             new CommonUseSetpoint()
                             {
-                                Setpoint = entity.GluePushSpeedSetValue2,
-                                SetpointName = "GluePushSpeedSetValue2"
+                                Setpoint = entity.GlueAmountSetValue3,
+                                SetpointName = "GlueAmountSetValue3"
                             },
                             new CommonUseSetpoint()
                             {
-                                Setpoint = entity.PressureHoldTimeSetValue2,
-                                SetpointName = "PressureHoldTimeSetValue2"
+                                Setpoint = entity.GlueAmountSetValue4,
+                                SetpointName = "GlueAmountSetValue4"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.GlueAmountSetValue5,
+                                SetpointName = "GlueAmountSetValue5"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.GlueAmountSetValue6,
+                                SetpointName = "GlueAmountSetValue6"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.GlueAmountSetValue7,
+                                SetpointName = "GlueAmountSetValue7"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.GlueAmountSetValue8,
+                                SetpointName = "GlueAmountSetValue8"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.GlueAmountSetValue9,
+                                SetpointName = "GlueAmountSetValue9"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.GlueAmountSetValue10,
+                                SetpointName = "GlueAmountSetValue10"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.VacuumDegreeSetValue,
+                                SetpointName = "VacuumDegreeSetValue"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.PressureHoldTimeSetValue,
+                                SetpointName = "PressureHoldTimeSetValue"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.VacuumIsUseSetValue,
+                                SetpointName = "VacuumIsUseSetValue"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.TotalGlueAmountSetValue,
+                                SetpointName = "TotalGlueAmountSetValue"
                             },
                         },
                         Readings = new List<CommonUseReading>()
                         {
                             new CommonUseReading()
                             {
-                                ReadingValue = entity.BarrelA1TempActValue2,
-                                ReadingName = "BarrelA1TempActValue2",
+                                ReadingValue = entity.PumpAPressureActValue,
+                                ReadingName = "PumpAPressureActValue",
                             },
                             new CommonUseReading()
                             {
-                                ReadingValue = entity.BarrelA2TempActValue2,
-                                ReadingName = "BarrelA2TempActValue2",
+                                ReadingValue = entity.PumpBPressureActValue,
+                                ReadingName = "PumpBPressureActValue",
                             },
                             new CommonUseReading()
                             {
-                                ReadingValue = entity.BarrelB1TempActValue2,
-                                ReadingName = "BarrelB1TempActValue2",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.BarrelB2TempActValue2,
-                                ReadingName = "BarrelB2TempActValue2",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PumpAPressureActValue2,
-                                ReadingName = "PumpAPressureActValue2",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PumpBPressureActValue2,
-                                ReadingName = "PumpBPressureActValue2",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.VacuumDegreeActValue2,
-                                ReadingName = "VacuumDegreeActValue2",
-                            },
+                                ReadingValue = entity.VacuumDegreeActValue,
+                                ReadingName = "VacuumDegreeActValue",
+                            }
                         },
                         Zone = new CommonUseZone()
                         {
-                            ZoneName = "Zone2",
-                            StageSequence = 2,
-                            StageName = "VacuumInjection2"
-                        },
-                    }
-                }
-            };
-
-            return processData;
-        }
-
-        /// <summary>
-        /// 升降回流数据
-        /// </summary>
-        /// <returns></returns>
-        public CommonProcessData ProcessDataGet2()
-        {
-            CommonProcessData processData = new CommonProcessData()
-            {
-                ZoneData = new List<CommonUseZoneData>
-                {
-                    new CommonUseZoneData()
-                    {
-                        Zone = new CommonUseZone()
-                        {
-                            ZoneName = "Zone",
+                            ZoneName = "Zone1",
                             StageSequence = 1,
-                            StageName = "Conveyor1"
-
-                        },
-                    },
-                    //new CommonUseZoneData()
-                    //{
-                    //    Zone = new CommonUseZone()
-                    //    {
-                    //        ZoneName = "Zone2",
-                    //        StageSequence = 2,
-                    //        StageName = "Conveyor2"
-                    //    },
-                    //}
-                }
-            };
-
-            return processData;
-        }
-
-        /// <summary>
-        /// 升降回流数据
-        /// </summary>
-        /// <returns></returns>
-        public CommonProcessData ProcessDataGet4()
-        {
-            CommonProcessData processData = new CommonProcessData()
-            {
-                ZoneData = new List<CommonUseZoneData>
-                {
-                    //new CommonUseZoneData()
-                    //{
-                    //    Zone = new CommonUseZone()
-                    //    {
-                    //        ZoneName = "Zone1",
-                    //        StageSequence = 1,
-                    //        StageName = "Conveyor1"
-
-                    //    },
-                    //},
-                    new CommonUseZoneData()
-                    {
-                        Zone = new CommonUseZone()
-                        {
-                            ZoneName = "Zone",
-                            StageSequence = 1,
-                            StageName = "Conveyor2"
+                            StageName = "Vacuum"
                         },
                     }
                 }
@@ -263,20 +166,20 @@ namespace Sln.Iot.CFX.CFXBusiness
         /// 隧道烤箱数据
         /// </summary>
         /// <returns></returns>
-        public CommonProcessData ProcessDataGet3(UnitsProcess3Entity entity)
+        public CommonProcessData ProcessDataGetOven(UnitsProcessOvenEntity entity)
         {
-            entity = new UnitsProcess3Entity()
-            {
-                PreheatOvenTempActValue = 800,
-                PreCureOven1TempActValue = 800,
-                PreCureOven2TempActValue = 800,
-                PreCureOven3TempActValue = 800,
-                PreCureOven4TempActValue = 800,
-                CureOven1TempActValue = 800,
-                CureOven2TempActValue = 800,
-                CureOven3TempActValue = 800,
-                CureOven4TempActValue = 800,
-            };
+            //entity = new UnitsProcessOvenEntity()
+            //{
+            //    PreheatOvenTempActValue = 800,
+            //    PreCureOven1TempActValue = 800,
+            //    PreCureOven2TempActValue = 800,
+            //    PreCureOven3TempActValue = 800,
+            //    PreCureOven4TempActValue = 800,
+            //    CureOven1TempActValue = 800,
+            //    CureOven2TempActValue = 800,
+            //    CureOven3TempActValue = 800,
+            //    CureOven4TempActValue = 800,
+            //};
 
             CommonProcessData processData = new CommonProcessData()
             {
@@ -284,86 +187,41 @@ namespace Sln.Iot.CFX.CFXBusiness
                 {
                     new CommonUseZoneData()
                     {
+                        Setpoints = new List<CommonUseSetpoint>()
+                        {
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.CureOven1SetValue,
+                                SetpointName = "CureOven1SetValue"
+                            },
+                            new CommonUseSetpoint()
+                            {
+                                Setpoint = entity.CureOven2SetValue,
+                                SetpointName = "CureOven2SetValue"
+                            },
+                        },
                         Readings = new List<CommonUseReading>()
                         {
                             new CommonUseReading()
                             {
-                                ReadingValue = entity.PreheatOvenTempActValue,
-                                ReadingName = "PreheatOvenTempActValue",
+                                ReadingValue = entity.CureOven1ActValue,
+                                ReadingName = "CureOven1ActValue",
+                            },
+                            new CommonUseReading()
+                            {
+                                ReadingValue = entity.CureOven2ActValue,
+                                ReadingName = "CureOven2ActValue",
                             }
                         },
                         Zone = new CommonUseZone()
                         {
                             ZoneName = "Zone1",
                             StageSequence = 1,
-                            StageName = "PreHeatOvem"
+                            StageName = "Oven"
 
                         },
                     },
-                    new CommonUseZoneData()
-                    {
-                        Readings = new List<CommonUseReading>()
-                        {
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PreCureOven1TempActValue,
-                                ReadingName = "PreCureOven1TempActValue",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PreCureOven2TempActValue,
-                                ReadingName = "PreCureOven2TempActValue",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PreCureOven3TempActValue,
-                                ReadingName = "PreCureOven3TempActValue",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.PreCureOven4TempActValue,
-                                ReadingName = "PreCureOven4TempActValue",
-                            }
-                        },
-                        Zone = new CommonUseZone()
-                        {
-                            ZoneName = "Zone2",
-                            StageSequence = 2,
-                            StageName = "PreCureOven"
-                        },
-                    },
-                    new CommonUseZoneData()
-                    {
-                        Readings = new List<CommonUseReading>()
-                        {
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.CureOven1TempActValue,
-                                ReadingName = "CureOven1ActValue",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.CureOven2TempActValue,
-                                ReadingName = "CureOven2ActValue",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.CureOven3TempActValue,
-                                ReadingName = "CureOven3ActValue",
-                            },
-                            new CommonUseReading()
-                            {
-                                ReadingValue = entity.CureOven4TempActValue,
-                                ReadingName = "CureOven4ActValue",
-                            }
-                        },
-                        Zone = new CommonUseZone()
-                        {
-                            ZoneName = "Zone3",
-                            StageSequence = 3,
-                            StageName = "CureOven"
-                        },
-                    }
+                    
                 }
             };