添加测试时间

BlankApp1/BlankApp1/App.config

@@ -5,6 +5,7 @@
 		<add key="MySql" value="Data Source=localhost;Database=plc_point_db2;User Id='root';Password='521125';port=3306;charset=utf8mb4;"/>
 		<add key="PLCIp" value="192.168.0.20"/>
 		<add key="PLCPort" value="9600"/>
-		<add key="DelayTime" value="60"/>
+		<add key="DelayTime" value="20"/>
+		<add key="LongDelayTime" value="60"/>
 	</appSettings>
 </configuration>

BlankApp1/BlankApp1/Common/AutoMapper/AutoMapProfile.cs

@@ -40,6 +40,7 @@ namespace BlankApp1.Common.AutoMapper
                 .ForMember(dest => dest.SchemeDtlId, opt => opt.MapFrom(src => src.scheme_dtl_id))
                 .ForMember(dest => dest.SchemeId, opt => opt.MapFrom(src => src.scheme_id))
                 .ForMember(dest => dest.ItemName, opt => opt.MapFrom(src => src.item_name))
+                     .ForMember(dest => dest.ItemTime, opt => opt.MapFrom(src => src.item_time))
                  .ForMember(dest => dest.ItemType, opt => opt.MapFrom(src => ItemTypeToStr(src.item_type)))
                   .ForMember(dest => dest.Precondition, opt => opt.MapFrom(src => src.precondition))
                    .ForMember(dest => dest.PreconditionDescribe, opt => opt.MapFrom(src => src.precondition_describe))

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddSchViewModel.cs

@@ -16,6 +16,7 @@ using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Configuration;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -38,7 +39,9 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private List<OptionConfigDto> _optionConfigs;
         private bas_plc_test_scheme bas_Plc_Test_Scheme;//测试方案
         private int schDtlMainId = 0;//测试方案明细主键id
-        public event Action<NavigationResult> RequestClose;
+       
+        private int delayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
+        private int longDelayTime = Convert.ToInt32(ConfigurationManager.AppSettings["LongDelayTime"]);
         public AddSchViewModel(IDialogService dialog, IEventAggregator aggregator, IRegionManager regionManager,IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBasicDeviceKindService iBasicDeviceKindService, IMapper mapper,ILogger logger)
         {
             _dialog = dialog;
@@ -483,6 +486,12 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
 
             }
 
+            //测试时间
+            TestTimeList.Clear();
+          
+            TestTimeList.Add(delayTime.ToString());
+            TestTimeList.Add(longDelayTime.ToString());
+            SelectTime = delayTime.ToString();
         }
 
 
@@ -695,6 +704,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             schDtlDto.ItemName = TestName;
 
             schDtlDto.ItemType = SelectTest;
+            schDtlDto.ItemTime = Convert.ToInt32(SelectTime);
             schDtlDto.Precondition = prefixJsonStr;
             schDtlDto.PreconditionDescribe = BeforeDetail;
             schDtlDto.Action = inJsonStr;
@@ -900,6 +910,22 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             get { return testKinds; }
             set { testKinds = value; RaisePropertyChanged(); }
         }
+        /// <summary>
+        /// 测试时间
+        /// </summary>
+        private string selectTime;
+        public string SelectTime
+        {
+            get { return selectTime; }
+            set { selectTime = value; RaisePropertyChanged(); }
+        }
+        private ObservableCollection<string> testTimeList = new ObservableCollection<string>();
+        public ObservableCollection<string> TestTimeList
+        {
+            get { return testTimeList; }
+            set { testTimeList = value; RaisePropertyChanged(); }
+        }
+        
         /// <summary>
         /// 
         /// </summary>

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/EditItemDetailViewModel.cs

@@ -16,6 +16,7 @@ using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Configuration;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -38,7 +39,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private List<OptionConfigDto> _optionConfigs;
         private bas_plc_test_scheme bas_Plc_Test_Scheme;//测试方案
         private int schDtlMainId = 0;//测试方案明细主键id
-        
+        private int delayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
+        private int longDelayTime = Convert.ToInt32(ConfigurationManager.AppSettings["LongDelayTime"]);
         public EditItemDetailViewModel(IDialogService dialog, IEventAggregator aggregator, IRegionManager regionManager, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBasicDeviceKindService iBasicDeviceKindService, IMapper mapper, ILogger logger)
         {
             _dialog = dialog;
@@ -142,6 +144,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 }
                 TestName = findresult.ItemName;
                 SelectTest = findresult.ItemType;
+                SelectTime = findresult.ItemTime.ToString();
                 //前置项解析
                 string preconStr = findresult.Precondition.ToString();
                 if (!string.IsNullOrEmpty(preconStr))
@@ -484,6 +487,12 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 OutJudgeLogicKinds.Add(logic.ContentOption);
 
             }
+            //测试时间
+          
+         
+            TestTimeList.Add(delayTime.ToString());
+            TestTimeList.Add(longDelayTime.ToString());
+      
 
         }
 
@@ -646,6 +655,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             schDtlDto.ItemName = TestName;
 
             schDtlDto.ItemType = SelectTest;
+            schDtlDto.ItemTime =Convert.ToInt32(SelectTime);
             schDtlDto.Precondition = prefixJsonStr;
             schDtlDto.PreconditionDescribe = BeforeDetail;
             schDtlDto.Action = inJsonStr;
@@ -888,6 +898,22 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             get { return selectTest; }
             set { selectTest = value; RaisePropertyChanged(); }
         }
+
+        /// <summary>
+        /// 测试时间
+        /// </summary>
+        private string selectTime;
+        public string SelectTime
+        {
+            get { return selectTime; }
+            set { selectTime = value; RaisePropertyChanged(); }
+        }
+        private ObservableCollection<string> testTimeList = new ObservableCollection<string>();
+        public ObservableCollection<string> TestTimeList
+        {
+            get { return testTimeList; }
+            set { testTimeList = value; RaisePropertyChanged(); }
+        }
         /// <summary>
         /// 判定类型(前置项）
         /// </summary>

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -49,7 +49,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private long selctStartDetailId = 0; //当前选择的第一个方案明细id
         private BizTestRecordDtlDto bizTestRecordDtlDto = new BizTestRecordDtlDto(); //测试方案明细表
         private const string TestMode = "自动测试";
-        private int delayTime= Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
+        private int defaultDelayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
+        private int delayTime;
         ManualResetEvent m = new ManualResetEvent(true); //实例化阻塞事件
         CancellationTokenSource tokensource = new CancellationTokenSource(); //声明令牌
         public AutoTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService, IMapper mapper, ILogger logger)
@@ -212,6 +213,15 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 }
                 TestName = findresult.ItemName;
                 SelectTest = findresult.ItemType;
+                //测试时间
+                if (findresult.ItemTime == 0)
+                {
+                    delayTime = defaultDelayTime;
+                }
+                else
+                {
+                    delayTime = findresult.ItemTime;
+                }
                 //前置项解析
                 string preconStr = findresult.Precondition.ToString();
                 if (!string.IsNullOrEmpty(preconStr))

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -50,7 +50,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private BizTestRecordDtlDto bizTestRecordDtlDto = new BizTestRecordDtlDto(); //测试方案明细表
         private const string TestMode = "手动测试";
 
-        private int delayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
+        private int defaultDelayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
+        private int delayTime;
         public ManualTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService,IMapper mapper,ILogger logger)
         {
             _dialog = dialog;
@@ -174,10 +175,20 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 {
                     ScheduleName = findSch.scheme_name;
                     DeviceKindName = findSch.devicekind_name;
-
+                    
                 }
                 TestName = findresult.ItemName;
                 SelectTest = findresult.ItemType;
+                //测试时间
+                if(findresult.ItemTime == 0)
+                {
+                    delayTime = defaultDelayTime;
+                }
+                else
+                {
+                    delayTime = findresult.ItemTime;
+                }
+                   
                 //前置项解析
                 string preconStr = findresult.Precondition.ToString();
                 if (!string.IsNullOrEmpty(preconStr))
@@ -995,7 +1006,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 string plcAddress = item.PlcAddress;
                 string plcAddType = item.PlcAddType;
                 string plcValue = item.PlcValue;
-
+       
                 switch (plcAddType)
                 {
 

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/RetryTestViewModel.cs

@@ -45,7 +45,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private BizTestRecordDtlDto bizTestRecordDtlDto = new BizTestRecordDtlDto(); //测试方案明细表
         private const string TestMode = "重新测试";
 
-        private int delayTime =Convert.ToInt32( ConfigurationManager.AppSettings["DelayTime"]);
+        private int defaultDelayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
+        private int delayTime;
         public RetryTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService, IMapper mapper, ILogger logger)
         {
             _dialog = dialog;
@@ -185,6 +186,15 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 }
                 TestName = findresult.ItemName;
                 SelectTest = findresult.ItemType;
+                //测试时间
+                if (findresult.ItemTime == 0)
+                {
+                    delayTime = defaultDelayTime;
+                }
+                else
+                {
+                    delayTime = findresult.ItemTime;
+                }
                 //前置项解析
                 string preconStr = findresult.Precondition.ToString();
                 if (!string.IsNullOrEmpty(preconStr))

BlankApp1/BlankApp1/Views/BasicConfigView/AddSchView.xaml

@@ -102,6 +102,11 @@
                                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                                 <ComboBox  Height="28" Width="160" ItemsSource="{Binding TestKinds}" SelectedItem="{Binding SelectTest}" />
                             </StackPanel>
+                            <StackPanel Orientation="Horizontal" >
+                                <TextBlock Text="测试项时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                                <ComboBox  Height="28" Width="80" ItemsSource="{Binding TestTimeList}" SelectedItem="{Binding SelectTime}" />
+                                <TextBlock Text="S"  Style="{StaticResource NormalTextBlockStyle}" Margin="5,0,5,0"/>
+                            </StackPanel>
                         </StackPanel>
 
                         <Border Grid.Row="1"  BorderBrush="#CBCBCB" BorderThickness="1" />

BlankApp1/BlankApp1/Views/BasicConfigView/EditItemDetailView.xaml

@@ -100,7 +100,12 @@
                                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                                 <ComboBox  Height="28" Width="160" ItemsSource="{Binding TestKinds}" SelectedItem="{Binding SelectTest}" />
                             </StackPanel>
+                        <StackPanel Orientation="Horizontal" >
+                            <TextBlock Text="测试项时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
+                            <ComboBox  Height="28" Width="80" ItemsSource="{Binding TestTimeList}" SelectedItem="{Binding SelectTime}" />
+                            <TextBlock Text="S"  Style="{StaticResource NormalTextBlockStyle}" Margin="5,0,5,0"/>
                         </StackPanel>
+                    </StackPanel>
 
                         <Border Grid.Row="1"  BorderBrush="#CBCBCB" BorderThickness="1" />
                         <ScrollViewer Grid.Row="2">

BlankApp1/BlankApp1/Views/MonitorManageView/LogView.xaml

@@ -25,7 +25,7 @@
             <RowDefinition/>
         </Grid.RowDefinitions>
         <StackPanel  Grid.Row="0" Orientation="Horizontal">
-            <Button  Content="开始监控"   Margin="5,0"  Command="{Binding StartCommand}" Style="{StaticResource NormalButtonStyle}" IsChecked="True"/>
+            <Button  Content="开始监控"   Margin="5,0"  Command="{Binding StartCommand}" Style="{StaticResource NormalButtonStyle}" />
             <Button  Content="停止监控"   Margin="5,0"  Command="{Binding StopCommand}" Style="{StaticResource NormalButtonStyle}" />
             <Button  Content="清理Log"   Margin="5,0"  Command="{Binding CleanCommand}" Style="{StaticResource NormalButtonStyle}" />
         </StackPanel>

BlankApp1/Model/Dto/BasicPlcTestSchemeDtlDto.cs

@@ -44,6 +44,19 @@ namespace Model.Dto
             get { return itemName; }
             set { itemName = value; OnPropertyChanged(); }
         }
+       
+        /// <summary>
+        /// Desc:测试项时间，0为正常时间，1为超长时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        
+        private int itemTime { get; set; }
+        public int ItemTime
+        {
+            get { return itemTime; }
+            set { itemTime = value; OnPropertyChanged(); }
+        }
         /// <summary>
         /// Desc:测试项类型。0：代表测试方案的前置项，需要首先进行测试。1：PLC点位测试项。2：Robot动作测试
         /// Default:

BlankApp1/Model/Entities/bas_plc_test_scheme_dtl.cs

@@ -36,13 +36,18 @@ namespace Model.Entities
            /// Nullable:True
            /// </summary>           
            public string item_name {get;set;}
-
-           /// <summary>
-           /// Desc:测试项类型。0：代表测试方案的前置项，需要首先进行测试。1：PLC点位测试项。2：Robot动作测试
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? item_type {get;set;}
+        /// <summary>
+        /// Desc:测试项时间，0为正常时间，1为超长时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int item_time { get; set; }
+        /// <summary>
+        /// Desc:测试项类型。0：代表测试方案的前置项，需要首先进行测试。1：PLC点位测试项。2：Robot动作测试
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int? item_type {get;set;}
 
            /// <summary>
            /// Desc:测试项前置条件