diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs index 3aaa5b1..ff93478 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -12,7 +12,9 @@ { class CounterDataServiceImpl:CounterDataService { - public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + + public int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime) { int iRetval = -1; try @@ -23,14 +25,17 @@ return iRetval; } - string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + - "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + string sQry = "INSERT INTO r_counter_data (DEVICE_ID,DEVICE_MODEL,CHANNL,OUT_VALUE,CHECK_VALUE,VOLTAGE,CHECK_TIME)" + + "values(@DEVICE_ID,@DEVICE_MODEL,@CHANNL,@OUT_VALUE,@CHECK_VALUE,@VOLTAGE,@CHECK_TIME)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; - cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; - cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; - cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + cmd.Parameters.Add("@DEVICE_MODEL", MySqlDbType.String, 255).Value = deviceModel; + cmd.Parameters.Add("@CHANNL", MySqlDbType.String, 0).Value = channl; + cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 0).Value = outValue; + cmd.Parameters.Add("@CHECK_VALUE", MySqlDbType.String, 0).Value = checkValue; + cmd.Parameters.Add("@VOLTAGE", MySqlDbType.String, 0).Value = volTage; + cmd.Parameters.Add("@CHECK_TIME", MySqlDbType.DateTime, 0).Value = checkTime; cmd.ExecuteNonQuery(); @@ -38,7 +43,7 @@ iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); iRetval = -1; @@ -46,48 +51,5 @@ return iRetval; } - - public CounterParam getCounterParamByDeviceId(int deviceId) - { - CounterParam counterParam = new CounterParam(); - - try - { - string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; - - MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); - - MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); - - if (aReader != null) - { - if (aReader.Read()) - { - //判断门的状态 - if (!aReader.IsDBNull(0)) - counterParam.Id = Convert.ToInt32(aReader.GetString(0)); - if (!aReader.IsDBNull(1)) - counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); - if (!aReader.IsDBNull(2)) - counterParam.BaudRate = aReader.GetString(2); - if (!aReader.IsDBNull(3)) - counterParam.GeneratorIp = aReader.GetString(3); - if (!aReader.IsDBNull(4)) - counterParam.SignalSourceIp = aReader.GetString(4); - } - } - - cmd.Dispose(); - - } - catch(MySqlException ex) - { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); - counterParam = null; - } - - return counterParam; - } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs index 3aaa5b1..ff93478 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -12,7 +12,9 @@ { class CounterDataServiceImpl:CounterDataService { - public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + + public int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime) { int iRetval = -1; try @@ -23,14 +25,17 @@ return iRetval; } - string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + - "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + string sQry = "INSERT INTO r_counter_data (DEVICE_ID,DEVICE_MODEL,CHANNL,OUT_VALUE,CHECK_VALUE,VOLTAGE,CHECK_TIME)" + + "values(@DEVICE_ID,@DEVICE_MODEL,@CHANNL,@OUT_VALUE,@CHECK_VALUE,@VOLTAGE,@CHECK_TIME)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; - cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; - cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; - cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + cmd.Parameters.Add("@DEVICE_MODEL", MySqlDbType.String, 255).Value = deviceModel; + cmd.Parameters.Add("@CHANNL", MySqlDbType.String, 0).Value = channl; + cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 0).Value = outValue; + cmd.Parameters.Add("@CHECK_VALUE", MySqlDbType.String, 0).Value = checkValue; + cmd.Parameters.Add("@VOLTAGE", MySqlDbType.String, 0).Value = volTage; + cmd.Parameters.Add("@CHECK_TIME", MySqlDbType.DateTime, 0).Value = checkTime; cmd.ExecuteNonQuery(); @@ -38,7 +43,7 @@ iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); iRetval = -1; @@ -46,48 +51,5 @@ return iRetval; } - - public CounterParam getCounterParamByDeviceId(int deviceId) - { - CounterParam counterParam = new CounterParam(); - - try - { - string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; - - MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); - - MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); - - if (aReader != null) - { - if (aReader.Read()) - { - //判断门的状态 - if (!aReader.IsDBNull(0)) - counterParam.Id = Convert.ToInt32(aReader.GetString(0)); - if (!aReader.IsDBNull(1)) - counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); - if (!aReader.IsDBNull(2)) - counterParam.BaudRate = aReader.GetString(2); - if (!aReader.IsDBNull(3)) - counterParam.GeneratorIp = aReader.GetString(3); - if (!aReader.IsDBNull(4)) - counterParam.SignalSourceIp = aReader.GetString(4); - } - } - - cmd.Dispose(); - - } - catch(MySqlException ex) - { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); - counterParam = null; - } - - return counterParam; - } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs index d8e2187..85134c9 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs @@ -10,21 +10,24 @@ //当前测量模式0，频率；1周期 private string checkModel; - //当前频率 + //输入频率 private string freq; - //当前周期 + //输入周期 private string period; - //当前灵敏度 - private string ampl; + //输入灵敏度 + private string volTage; - //当前检测值频率 + //输出检测值频率 private string reFreq; - //当前检测值周期 + //输出检测值周期 private string rePeriod; + //检测时间 + private DateTime checkTime; + public string Freq { get @@ -51,19 +54,6 @@ } } - public string Ampl - { - get - { - return ampl; - } - - set - { - ampl = value; - } - } - public string ReFreq { get @@ -103,5 +93,30 @@ } } + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs index 3aaa5b1..ff93478 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -12,7 +12,9 @@ { class CounterDataServiceImpl:CounterDataService { - public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + + public int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime) { int iRetval = -1; try @@ -23,14 +25,17 @@ return iRetval; } - string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + - "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + string sQry = "INSERT INTO r_counter_data (DEVICE_ID,DEVICE_MODEL,CHANNL,OUT_VALUE,CHECK_VALUE,VOLTAGE,CHECK_TIME)" + + "values(@DEVICE_ID,@DEVICE_MODEL,@CHANNL,@OUT_VALUE,@CHECK_VALUE,@VOLTAGE,@CHECK_TIME)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; - cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; - cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; - cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + cmd.Parameters.Add("@DEVICE_MODEL", MySqlDbType.String, 255).Value = deviceModel; + cmd.Parameters.Add("@CHANNL", MySqlDbType.String, 0).Value = channl; + cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 0).Value = outValue; + cmd.Parameters.Add("@CHECK_VALUE", MySqlDbType.String, 0).Value = checkValue; + cmd.Parameters.Add("@VOLTAGE", MySqlDbType.String, 0).Value = volTage; + cmd.Parameters.Add("@CHECK_TIME", MySqlDbType.DateTime, 0).Value = checkTime; cmd.ExecuteNonQuery(); @@ -38,7 +43,7 @@ iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); iRetval = -1; @@ -46,48 +51,5 @@ return iRetval; } - - public CounterParam getCounterParamByDeviceId(int deviceId) - { - CounterParam counterParam = new CounterParam(); - - try - { - string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; - - MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); - - MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); - - if (aReader != null) - { - if (aReader.Read()) - { - //判断门的状态 - if (!aReader.IsDBNull(0)) - counterParam.Id = Convert.ToInt32(aReader.GetString(0)); - if (!aReader.IsDBNull(1)) - counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); - if (!aReader.IsDBNull(2)) - counterParam.BaudRate = aReader.GetString(2); - if (!aReader.IsDBNull(3)) - counterParam.GeneratorIp = aReader.GetString(3); - if (!aReader.IsDBNull(4)) - counterParam.SignalSourceIp = aReader.GetString(4); - } - } - - cmd.Dispose(); - - } - catch(MySqlException ex) - { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); - counterParam = null; - } - - return counterParam; - } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs index d8e2187..85134c9 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs @@ -10,21 +10,24 @@ //当前测量模式0，频率；1周期 private string checkModel; - //当前频率 + //输入频率 private string freq; - //当前周期 + //输入周期 private string period; - //当前灵敏度 - private string ampl; + //输入灵敏度 + private string volTage; - //当前检测值频率 + //输出检测值频率 private string reFreq; - //当前检测值周期 + //输出检测值周期 private string rePeriod; + //检测时间 + private DateTime checkTime; + public string Freq { get @@ -51,19 +54,6 @@ } } - public string Ampl - { - get - { - return ampl; - } - - set - { - ampl = value; - } - } - public string ReFreq { get @@ -103,5 +93,30 @@ } } + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index e66c214..da417d4 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -1,5 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; using Casic.Birmm.RbFreqStandMeasure.R_DevService.Dto; +using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Reflection; @@ -9,10 +10,10 @@ class SensitivityServiceImpl:SensitivityService { - public void beginTest(string type, GPIBService gPIBService, GPIBService tcpService, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam) + public int beginTest(string type, GPIBService gPIBService, GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam) { - sensitivityContentParam = new SensitivityContentParam(); + int iRetval = -1; try { //启动output（一次）OUTPUT 0\OUTPUT 1 @@ -29,65 +30,94 @@ while (!lessTolerance) { //获取当前灵敏度 - currentVolTage = getVOLTageValue(counterCheckParam, currentVolTage); + getVOLTageValue(counterCheckParam, ref currentVolTage); //设置当前灵敏度 GPIB_TCPIP_OPERATIO.setVOLTage(gPIBService, currentVolTage, counterCheckParam.SoOutDelay); - string checkResult = ""; + string currentValue = ""; //主动读取检测数据LAN if (type == "freq") - checkResult = GPIB_TCPIP_OPERATIO.getFreq(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") - checkResult = GPIB_TCPIP_OPERATIO.getPeriod(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s //检测数据是否在容差范围内 - - - + bool errorCheckResult=satisfyCheck(counterCheckParam, sensitivityContentParam,currentValue,type); //返回满足容差的数据 + if (errorCheckResult) + { + if (type == "freq") + sensitivityContentParam.ReFreq = currentValue; + else if (type == "period") + sensitivityContentParam.RePeriod = currentValue; - lessTolerance = true; + sensitivityContentParam.VolTage = currentVolTage; + sensitivityContentParam.CheckTime = new DateTime(); + + lessTolerance = true; + } } - + iRetval = 0; } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "beginTest:" + ex.Message); sensitivityContentParam = null; + iRetval = -1; } + return iRetval; } - string getVOLTageValue(CounterCheckParam counterCheckParam,string currentValue) + void getVOLTageValue(CounterCheckParam counterCheckParam, ref string currentValue) { if (currentValue == "0") - return counterCheckParam.SoEleFrequency; + currentValue = counterCheckParam.SoEleFrequency; else - return (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); + currentValue = (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); } bool satisfyCheck(CounterCheckParam counterCheckParams, SensitivityContentParam sensitivityContentParam, string currentValue,string checkType) { - bool satisfyResult = false; try { if (checkType == "freq") { + double freThreshold1 = Convert.ToDouble(counterCheckParams.FreThreshold1); + double freThreshold2 = Convert.ToDouble(counterCheckParams.FreThreshold2); + double bFreq = UnitConvertHelper.convertHZ(sensitivityContentParam.Freq); + double cFreq = Convert.ToDouble(currentValue); + double errorFreq = Math.Abs(cFreq - bFreq); + + if (bFreq > 80 * 1000 * 1000) + return errorFreq < freThreshold2 ? true : false; + else + return errorFreq < freThreshold1 ? true : false; } else if (checkType == "period") { + double periodThreshold1 = Convert.ToDouble(counterCheckParams.CycThreshold1); + double periodThreshold2 = Convert.ToDouble(counterCheckParams.CycThreshold2); + double bPeriod = UnitConvertHelper.convertS(sensitivityContentParam.Period); + double cPeriod = Convert.ToDouble(currentValue); + + double errorPeriod = Math.Abs(cPeriod - bPeriod); + + if (bPeriod > 12.5 * 1000 * 1000 * 1000) + return errorPeriod < periodThreshold2 ? true : false; + else + return errorPeriod < periodThreshold1 ? true : false; } - - satisfyResult = true; + else + return false; } catch(Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType,"statisfyCheck:"+ex.Message); - satisfyResult = false; + return false; } - return satisfyResult; } @@ -98,7 +128,7 @@ * gPIBService.open(); * for(datagridview.row) * { - * SensitivityService.beginTest() + * SensitivityService.beginTest()//0：成功；-1：失败 * } * gPIBService.close(); * */ diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs index 3aaa5b1..ff93478 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -12,7 +12,9 @@ { class CounterDataServiceImpl:CounterDataService { - public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + + public int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime) { int iRetval = -1; try @@ -23,14 +25,17 @@ return iRetval; } - string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + - "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + string sQry = "INSERT INTO r_counter_data (DEVICE_ID,DEVICE_MODEL,CHANNL,OUT_VALUE,CHECK_VALUE,VOLTAGE,CHECK_TIME)" + + "values(@DEVICE_ID,@DEVICE_MODEL,@CHANNL,@OUT_VALUE,@CHECK_VALUE,@VOLTAGE,@CHECK_TIME)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; - cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; - cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; - cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + cmd.Parameters.Add("@DEVICE_MODEL", MySqlDbType.String, 255).Value = deviceModel; + cmd.Parameters.Add("@CHANNL", MySqlDbType.String, 0).Value = channl; + cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 0).Value = outValue; + cmd.Parameters.Add("@CHECK_VALUE", MySqlDbType.String, 0).Value = checkValue; + cmd.Parameters.Add("@VOLTAGE", MySqlDbType.String, 0).Value = volTage; + cmd.Parameters.Add("@CHECK_TIME", MySqlDbType.DateTime, 0).Value = checkTime; cmd.ExecuteNonQuery(); @@ -38,7 +43,7 @@ iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); iRetval = -1; @@ -46,48 +51,5 @@ return iRetval; } - - public CounterParam getCounterParamByDeviceId(int deviceId) - { - CounterParam counterParam = new CounterParam(); - - try - { - string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; - - MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); - - MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); - - if (aReader != null) - { - if (aReader.Read()) - { - //判断门的状态 - if (!aReader.IsDBNull(0)) - counterParam.Id = Convert.ToInt32(aReader.GetString(0)); - if (!aReader.IsDBNull(1)) - counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); - if (!aReader.IsDBNull(2)) - counterParam.BaudRate = aReader.GetString(2); - if (!aReader.IsDBNull(3)) - counterParam.GeneratorIp = aReader.GetString(3); - if (!aReader.IsDBNull(4)) - counterParam.SignalSourceIp = aReader.GetString(4); - } - } - - cmd.Dispose(); - - } - catch(MySqlException ex) - { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); - counterParam = null; - } - - return counterParam; - } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs index d8e2187..85134c9 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs @@ -10,21 +10,24 @@ //当前测量模式0，频率；1周期 private string checkModel; - //当前频率 + //输入频率 private string freq; - //当前周期 + //输入周期 private string period; - //当前灵敏度 - private string ampl; + //输入灵敏度 + private string volTage; - //当前检测值频率 + //输出检测值频率 private string reFreq; - //当前检测值周期 + //输出检测值周期 private string rePeriod; + //检测时间 + private DateTime checkTime; + public string Freq { get @@ -51,19 +54,6 @@ } } - public string Ampl - { - get - { - return ampl; - } - - set - { - ampl = value; - } - } - public string ReFreq { get @@ -103,5 +93,30 @@ } } + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index e66c214..da417d4 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -1,5 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; using Casic.Birmm.RbFreqStandMeasure.R_DevService.Dto; +using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Reflection; @@ -9,10 +10,10 @@ class SensitivityServiceImpl:SensitivityService { - public void beginTest(string type, GPIBService gPIBService, GPIBService tcpService, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam) + public int beginTest(string type, GPIBService gPIBService, GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam) { - sensitivityContentParam = new SensitivityContentParam(); + int iRetval = -1; try { //启动output（一次）OUTPUT 0\OUTPUT 1 @@ -29,65 +30,94 @@ while (!lessTolerance) { //获取当前灵敏度 - currentVolTage = getVOLTageValue(counterCheckParam, currentVolTage); + getVOLTageValue(counterCheckParam, ref currentVolTage); //设置当前灵敏度 GPIB_TCPIP_OPERATIO.setVOLTage(gPIBService, currentVolTage, counterCheckParam.SoOutDelay); - string checkResult = ""; + string currentValue = ""; //主动读取检测数据LAN if (type == "freq") - checkResult = GPIB_TCPIP_OPERATIO.getFreq(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") - checkResult = GPIB_TCPIP_OPERATIO.getPeriod(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s //检测数据是否在容差范围内 - - - + bool errorCheckResult=satisfyCheck(counterCheckParam, sensitivityContentParam,currentValue,type); //返回满足容差的数据 + if (errorCheckResult) + { + if (type == "freq") + sensitivityContentParam.ReFreq = currentValue; + else if (type == "period") + sensitivityContentParam.RePeriod = currentValue; - lessTolerance = true; + sensitivityContentParam.VolTage = currentVolTage; + sensitivityContentParam.CheckTime = new DateTime(); + + lessTolerance = true; + } } - + iRetval = 0; } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "beginTest:" + ex.Message); sensitivityContentParam = null; + iRetval = -1; } + return iRetval; } - string getVOLTageValue(CounterCheckParam counterCheckParam,string currentValue) + void getVOLTageValue(CounterCheckParam counterCheckParam, ref string currentValue) { if (currentValue == "0") - return counterCheckParam.SoEleFrequency; + currentValue = counterCheckParam.SoEleFrequency; else - return (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); + currentValue = (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); } bool satisfyCheck(CounterCheckParam counterCheckParams, SensitivityContentParam sensitivityContentParam, string currentValue,string checkType) { - bool satisfyResult = false; try { if (checkType == "freq") { + double freThreshold1 = Convert.ToDouble(counterCheckParams.FreThreshold1); + double freThreshold2 = Convert.ToDouble(counterCheckParams.FreThreshold2); + double bFreq = UnitConvertHelper.convertHZ(sensitivityContentParam.Freq); + double cFreq = Convert.ToDouble(currentValue); + double errorFreq = Math.Abs(cFreq - bFreq); + + if (bFreq > 80 * 1000 * 1000) + return errorFreq < freThreshold2 ? true : false; + else + return errorFreq < freThreshold1 ? true : false; } else if (checkType == "period") { + double periodThreshold1 = Convert.ToDouble(counterCheckParams.CycThreshold1); + double periodThreshold2 = Convert.ToDouble(counterCheckParams.CycThreshold2); + double bPeriod = UnitConvertHelper.convertS(sensitivityContentParam.Period); + double cPeriod = Convert.ToDouble(currentValue); + + double errorPeriod = Math.Abs(cPeriod - bPeriod); + + if (bPeriod > 12.5 * 1000 * 1000 * 1000) + return errorPeriod < periodThreshold2 ? true : false; + else + return errorPeriod < periodThreshold1 ? true : false; } - - satisfyResult = true; + else + return false; } catch(Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType,"statisfyCheck:"+ex.Message); - satisfyResult = false; + return false; } - return satisfyResult; } @@ -98,7 +128,7 @@ * gPIBService.open(); * for(datagridview.row) * { - * SensitivityService.beginTest() + * SensitivityService.beginTest()//0：成功；-1：失败 * } * gPIBService.close(); * */ diff --git a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs index adc64db..9ce1ebd 100644 --- a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs @@ -9,9 +9,16 @@ { interface SensitivityService { - //单行检测 - void beginTest(string type,GPIBService gPIBService,GPIBService tcpService,string freq, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam); + /// + /// 单行检测 + /// + /// 检测模式 + /// gpib + /// tcp + /// 系统配置参数 + /// 检测参数 + int beginTest(string type,GPIBService gPIBService,GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs index 3aaa5b1..ff93478 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -12,7 +12,9 @@ { class CounterDataServiceImpl:CounterDataService { - public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + + public int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime) { int iRetval = -1; try @@ -23,14 +25,17 @@ return iRetval; } - string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + - "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + string sQry = "INSERT INTO r_counter_data (DEVICE_ID,DEVICE_MODEL,CHANNL,OUT_VALUE,CHECK_VALUE,VOLTAGE,CHECK_TIME)" + + "values(@DEVICE_ID,@DEVICE_MODEL,@CHANNL,@OUT_VALUE,@CHECK_VALUE,@VOLTAGE,@CHECK_TIME)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; - cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; - cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; - cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + cmd.Parameters.Add("@DEVICE_MODEL", MySqlDbType.String, 255).Value = deviceModel; + cmd.Parameters.Add("@CHANNL", MySqlDbType.String, 0).Value = channl; + cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 0).Value = outValue; + cmd.Parameters.Add("@CHECK_VALUE", MySqlDbType.String, 0).Value = checkValue; + cmd.Parameters.Add("@VOLTAGE", MySqlDbType.String, 0).Value = volTage; + cmd.Parameters.Add("@CHECK_TIME", MySqlDbType.DateTime, 0).Value = checkTime; cmd.ExecuteNonQuery(); @@ -38,7 +43,7 @@ iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); iRetval = -1; @@ -46,48 +51,5 @@ return iRetval; } - - public CounterParam getCounterParamByDeviceId(int deviceId) - { - CounterParam counterParam = new CounterParam(); - - try - { - string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; - - MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); - - MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); - - if (aReader != null) - { - if (aReader.Read()) - { - //判断门的状态 - if (!aReader.IsDBNull(0)) - counterParam.Id = Convert.ToInt32(aReader.GetString(0)); - if (!aReader.IsDBNull(1)) - counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); - if (!aReader.IsDBNull(2)) - counterParam.BaudRate = aReader.GetString(2); - if (!aReader.IsDBNull(3)) - counterParam.GeneratorIp = aReader.GetString(3); - if (!aReader.IsDBNull(4)) - counterParam.SignalSourceIp = aReader.GetString(4); - } - } - - cmd.Dispose(); - - } - catch(MySqlException ex) - { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); - counterParam = null; - } - - return counterParam; - } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs index d8e2187..85134c9 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs @@ -10,21 +10,24 @@ //当前测量模式0，频率；1周期 private string checkModel; - //当前频率 + //输入频率 private string freq; - //当前周期 + //输入周期 private string period; - //当前灵敏度 - private string ampl; + //输入灵敏度 + private string volTage; - //当前检测值频率 + //输出检测值频率 private string reFreq; - //当前检测值周期 + //输出检测值周期 private string rePeriod; + //检测时间 + private DateTime checkTime; + public string Freq { get @@ -51,19 +54,6 @@ } } - public string Ampl - { - get - { - return ampl; - } - - set - { - ampl = value; - } - } - public string ReFreq { get @@ -103,5 +93,30 @@ } } + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index e66c214..da417d4 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -1,5 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; using Casic.Birmm.RbFreqStandMeasure.R_DevService.Dto; +using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Reflection; @@ -9,10 +10,10 @@ class SensitivityServiceImpl:SensitivityService { - public void beginTest(string type, GPIBService gPIBService, GPIBService tcpService, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam) + public int beginTest(string type, GPIBService gPIBService, GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam) { - sensitivityContentParam = new SensitivityContentParam(); + int iRetval = -1; try { //启动output（一次）OUTPUT 0\OUTPUT 1 @@ -29,65 +30,94 @@ while (!lessTolerance) { //获取当前灵敏度 - currentVolTage = getVOLTageValue(counterCheckParam, currentVolTage); + getVOLTageValue(counterCheckParam, ref currentVolTage); //设置当前灵敏度 GPIB_TCPIP_OPERATIO.setVOLTage(gPIBService, currentVolTage, counterCheckParam.SoOutDelay); - string checkResult = ""; + string currentValue = ""; //主动读取检测数据LAN if (type == "freq") - checkResult = GPIB_TCPIP_OPERATIO.getFreq(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") - checkResult = GPIB_TCPIP_OPERATIO.getPeriod(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s //检测数据是否在容差范围内 - - - + bool errorCheckResult=satisfyCheck(counterCheckParam, sensitivityContentParam,currentValue,type); //返回满足容差的数据 + if (errorCheckResult) + { + if (type == "freq") + sensitivityContentParam.ReFreq = currentValue; + else if (type == "period") + sensitivityContentParam.RePeriod = currentValue; - lessTolerance = true; + sensitivityContentParam.VolTage = currentVolTage; + sensitivityContentParam.CheckTime = new DateTime(); + + lessTolerance = true; + } } - + iRetval = 0; } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "beginTest:" + ex.Message); sensitivityContentParam = null; + iRetval = -1; } + return iRetval; } - string getVOLTageValue(CounterCheckParam counterCheckParam,string currentValue) + void getVOLTageValue(CounterCheckParam counterCheckParam, ref string currentValue) { if (currentValue == "0") - return counterCheckParam.SoEleFrequency; + currentValue = counterCheckParam.SoEleFrequency; else - return (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); + currentValue = (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); } bool satisfyCheck(CounterCheckParam counterCheckParams, SensitivityContentParam sensitivityContentParam, string currentValue,string checkType) { - bool satisfyResult = false; try { if (checkType == "freq") { + double freThreshold1 = Convert.ToDouble(counterCheckParams.FreThreshold1); + double freThreshold2 = Convert.ToDouble(counterCheckParams.FreThreshold2); + double bFreq = UnitConvertHelper.convertHZ(sensitivityContentParam.Freq); + double cFreq = Convert.ToDouble(currentValue); + double errorFreq = Math.Abs(cFreq - bFreq); + + if (bFreq > 80 * 1000 * 1000) + return errorFreq < freThreshold2 ? true : false; + else + return errorFreq < freThreshold1 ? true : false; } else if (checkType == "period") { + double periodThreshold1 = Convert.ToDouble(counterCheckParams.CycThreshold1); + double periodThreshold2 = Convert.ToDouble(counterCheckParams.CycThreshold2); + double bPeriod = UnitConvertHelper.convertS(sensitivityContentParam.Period); + double cPeriod = Convert.ToDouble(currentValue); + + double errorPeriod = Math.Abs(cPeriod - bPeriod); + + if (bPeriod > 12.5 * 1000 * 1000 * 1000) + return errorPeriod < periodThreshold2 ? true : false; + else + return errorPeriod < periodThreshold1 ? true : false; } - - satisfyResult = true; + else + return false; } catch(Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType,"statisfyCheck:"+ex.Message); - satisfyResult = false; + return false; } - return satisfyResult; } @@ -98,7 +128,7 @@ * gPIBService.open(); * for(datagridview.row) * { - * SensitivityService.beginTest() + * SensitivityService.beginTest()//0：成功；-1：失败 * } * gPIBService.close(); * */ diff --git a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs index adc64db..9ce1ebd 100644 --- a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs @@ -9,9 +9,16 @@ { interface SensitivityService { - //单行检测 - void beginTest(string type,GPIBService gPIBService,GPIBService tcpService,string freq, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam); + /// + /// 单行检测 + /// + /// 检测模式 + /// gpib + /// tcp + /// 系统配置参数 + /// 检测参数 + int beginTest(string type,GPIBService gPIBService,GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 0d2d8a3..dc553f2 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -342,6 +342,7 @@ StatusCtrlForm.cs + diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs index 3aaa5b1..ff93478 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -12,7 +12,9 @@ { class CounterDataServiceImpl:CounterDataService { - public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + + public int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime) { int iRetval = -1; try @@ -23,14 +25,17 @@ return iRetval; } - string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + - "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + string sQry = "INSERT INTO r_counter_data (DEVICE_ID,DEVICE_MODEL,CHANNL,OUT_VALUE,CHECK_VALUE,VOLTAGE,CHECK_TIME)" + + "values(@DEVICE_ID,@DEVICE_MODEL,@CHANNL,@OUT_VALUE,@CHECK_VALUE,@VOLTAGE,@CHECK_TIME)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; - cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; - cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; - cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + cmd.Parameters.Add("@DEVICE_MODEL", MySqlDbType.String, 255).Value = deviceModel; + cmd.Parameters.Add("@CHANNL", MySqlDbType.String, 0).Value = channl; + cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 0).Value = outValue; + cmd.Parameters.Add("@CHECK_VALUE", MySqlDbType.String, 0).Value = checkValue; + cmd.Parameters.Add("@VOLTAGE", MySqlDbType.String, 0).Value = volTage; + cmd.Parameters.Add("@CHECK_TIME", MySqlDbType.DateTime, 0).Value = checkTime; cmd.ExecuteNonQuery(); @@ -38,7 +43,7 @@ iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); iRetval = -1; @@ -46,48 +51,5 @@ return iRetval; } - - public CounterParam getCounterParamByDeviceId(int deviceId) - { - CounterParam counterParam = new CounterParam(); - - try - { - string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; - - MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); - - MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); - - if (aReader != null) - { - if (aReader.Read()) - { - //判断门的状态 - if (!aReader.IsDBNull(0)) - counterParam.Id = Convert.ToInt32(aReader.GetString(0)); - if (!aReader.IsDBNull(1)) - counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); - if (!aReader.IsDBNull(2)) - counterParam.BaudRate = aReader.GetString(2); - if (!aReader.IsDBNull(3)) - counterParam.GeneratorIp = aReader.GetString(3); - if (!aReader.IsDBNull(4)) - counterParam.SignalSourceIp = aReader.GetString(4); - } - } - - cmd.Dispose(); - - } - catch(MySqlException ex) - { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); - counterParam = null; - } - - return counterParam; - } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs index d8e2187..85134c9 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs @@ -10,21 +10,24 @@ //当前测量模式0，频率；1周期 private string checkModel; - //当前频率 + //输入频率 private string freq; - //当前周期 + //输入周期 private string period; - //当前灵敏度 - private string ampl; + //输入灵敏度 + private string volTage; - //当前检测值频率 + //输出检测值频率 private string reFreq; - //当前检测值周期 + //输出检测值周期 private string rePeriod; + //检测时间 + private DateTime checkTime; + public string Freq { get @@ -51,19 +54,6 @@ } } - public string Ampl - { - get - { - return ampl; - } - - set - { - ampl = value; - } - } - public string ReFreq { get @@ -103,5 +93,30 @@ } } + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index e66c214..da417d4 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -1,5 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; using Casic.Birmm.RbFreqStandMeasure.R_DevService.Dto; +using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Reflection; @@ -9,10 +10,10 @@ class SensitivityServiceImpl:SensitivityService { - public void beginTest(string type, GPIBService gPIBService, GPIBService tcpService, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam) + public int beginTest(string type, GPIBService gPIBService, GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam) { - sensitivityContentParam = new SensitivityContentParam(); + int iRetval = -1; try { //启动output（一次）OUTPUT 0\OUTPUT 1 @@ -29,65 +30,94 @@ while (!lessTolerance) { //获取当前灵敏度 - currentVolTage = getVOLTageValue(counterCheckParam, currentVolTage); + getVOLTageValue(counterCheckParam, ref currentVolTage); //设置当前灵敏度 GPIB_TCPIP_OPERATIO.setVOLTage(gPIBService, currentVolTage, counterCheckParam.SoOutDelay); - string checkResult = ""; + string currentValue = ""; //主动读取检测数据LAN if (type == "freq") - checkResult = GPIB_TCPIP_OPERATIO.getFreq(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") - checkResult = GPIB_TCPIP_OPERATIO.getPeriod(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s //检测数据是否在容差范围内 - - - + bool errorCheckResult=satisfyCheck(counterCheckParam, sensitivityContentParam,currentValue,type); //返回满足容差的数据 + if (errorCheckResult) + { + if (type == "freq") + sensitivityContentParam.ReFreq = currentValue; + else if (type == "period") + sensitivityContentParam.RePeriod = currentValue; - lessTolerance = true; + sensitivityContentParam.VolTage = currentVolTage; + sensitivityContentParam.CheckTime = new DateTime(); + + lessTolerance = true; + } } - + iRetval = 0; } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "beginTest:" + ex.Message); sensitivityContentParam = null; + iRetval = -1; } + return iRetval; } - string getVOLTageValue(CounterCheckParam counterCheckParam,string currentValue) + void getVOLTageValue(CounterCheckParam counterCheckParam, ref string currentValue) { if (currentValue == "0") - return counterCheckParam.SoEleFrequency; + currentValue = counterCheckParam.SoEleFrequency; else - return (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); + currentValue = (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); } bool satisfyCheck(CounterCheckParam counterCheckParams, SensitivityContentParam sensitivityContentParam, string currentValue,string checkType) { - bool satisfyResult = false; try { if (checkType == "freq") { + double freThreshold1 = Convert.ToDouble(counterCheckParams.FreThreshold1); + double freThreshold2 = Convert.ToDouble(counterCheckParams.FreThreshold2); + double bFreq = UnitConvertHelper.convertHZ(sensitivityContentParam.Freq); + double cFreq = Convert.ToDouble(currentValue); + double errorFreq = Math.Abs(cFreq - bFreq); + + if (bFreq > 80 * 1000 * 1000) + return errorFreq < freThreshold2 ? true : false; + else + return errorFreq < freThreshold1 ? true : false; } else if (checkType == "period") { + double periodThreshold1 = Convert.ToDouble(counterCheckParams.CycThreshold1); + double periodThreshold2 = Convert.ToDouble(counterCheckParams.CycThreshold2); + double bPeriod = UnitConvertHelper.convertS(sensitivityContentParam.Period); + double cPeriod = Convert.ToDouble(currentValue); + + double errorPeriod = Math.Abs(cPeriod - bPeriod); + + if (bPeriod > 12.5 * 1000 * 1000 * 1000) + return errorPeriod < periodThreshold2 ? true : false; + else + return errorPeriod < periodThreshold1 ? true : false; } - - satisfyResult = true; + else + return false; } catch(Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType,"statisfyCheck:"+ex.Message); - satisfyResult = false; + return false; } - return satisfyResult; } @@ -98,7 +128,7 @@ * gPIBService.open(); * for(datagridview.row) * { - * SensitivityService.beginTest() + * SensitivityService.beginTest()//0：成功；-1：失败 * } * gPIBService.close(); * */ diff --git a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs index adc64db..9ce1ebd 100644 --- a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs @@ -9,9 +9,16 @@ { interface SensitivityService { - //单行检测 - void beginTest(string type,GPIBService gPIBService,GPIBService tcpService,string freq, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam); + /// + /// 单行检测 + /// + /// 检测模式 + /// gpib + /// tcp + /// 系统配置参数 + /// 检测参数 + int beginTest(string type,GPIBService gPIBService,GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 0d2d8a3..dc553f2 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -342,6 +342,7 @@ StatusCtrlForm.cs + diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 5d4acd6..6934bef 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs index 19bbfee..3c310c9 100644 --- a/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs +++ b/RbFreqStandMeasure/R_DataBase/Model/CounterData.cs @@ -8,13 +8,13 @@ class CounterData { private int id; - private long deviceId; + private string deviceId; + private string deviceModel; + private string channl; private string outValue; - - private string value; - private string sensitivity; - private string logTime; - private int detecType; //1-频率测量，2-周期测量 + private string checkValue; + private string volTage; + private DateTime checkTime; //1-频率测量，2-周期测量 public int Id { @@ -29,11 +29,95 @@ } } - public long DeviceId { get => deviceId; set => deviceId = value; } - public string OutValue { get => outValue; set => outValue = value; } - public string Value { get => value; set => this.value = value; } - public string Sensitivity { get => sensitivity; set => sensitivity = value; } - public string LogTime { get => logTime; set => logTime = value; } - public int DetecType { get => detecType; set => detecType = value; } + public string DeviceId + { + get + { + return deviceId; + } + + set + { + deviceId = value; + } + } + + public string DeviceModel + { + get + { + return deviceModel; + } + + set + { + deviceModel = value; + } + } + + public string Channl + { + get + { + return channl; + } + + set + { + channl = value; + } + } + + public string OutValue + { + get + { + return outValue; + } + + set + { + outValue = value; + } + } + + public string CheckValue + { + get + { + return checkValue; + } + + set + { + checkValue = value; + } + } + + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs index 54a9859..e620997 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/CounterDataService.cs @@ -8,7 +8,7 @@ { interface CounterDataService { - - + int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime); } -} +} \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs index 3aaa5b1..ff93478 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs @@ -12,7 +12,9 @@ { class CounterDataServiceImpl:CounterDataService { - public int add(int deviceId, String baudRate, String generatorIp, String signalSourceIp) + + public int add(string deviceId, string deviceModel, string channl, string outValue, string checkValue, + string volTage, DateTime checkTime) { int iRetval = -1; try @@ -23,14 +25,17 @@ return iRetval; } - string sQry = "INSERT INTO r_counter_param (DEVICE_ID,BAUD_RATE,GENERATOR_IP,SIGNAL_SOURCE_IP)" + - "values(@DEVICE_ID,@BAUD_RATE,@GENERATOR_IP,@SIGNAL_SOURCE_IP)"; + string sQry = "INSERT INTO r_counter_data (DEVICE_ID,DEVICE_MODEL,CHANNL,OUT_VALUE,CHECK_VALUE,VOLTAGE,CHECK_TIME)" + + "values(@DEVICE_ID,@DEVICE_MODEL,@CHANNL,@OUT_VALUE,@CHECK_VALUE,@VOLTAGE,@CHECK_TIME)"; MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect); cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId; - cmd.Parameters.Add("@BAUD_RATE", MySqlDbType.String, 255).Value = baudRate; - cmd.Parameters.Add("@GENERATOR_IP", MySqlDbType.String, 0).Value = generatorIp; - cmd.Parameters.Add("@SIGNAL_SOURCE_IP", MySqlDbType.String, 0).Value = signalSourceIp; + cmd.Parameters.Add("@DEVICE_MODEL", MySqlDbType.String, 255).Value = deviceModel; + cmd.Parameters.Add("@CHANNL", MySqlDbType.String, 0).Value = channl; + cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 0).Value = outValue; + cmd.Parameters.Add("@CHECK_VALUE", MySqlDbType.String, 0).Value = checkValue; + cmd.Parameters.Add("@VOLTAGE", MySqlDbType.String, 0).Value = volTage; + cmd.Parameters.Add("@CHECK_TIME", MySqlDbType.DateTime, 0).Value = checkTime; cmd.ExecuteNonQuery(); @@ -38,7 +43,7 @@ iRetval = 0; } - catch(MySqlException ex) + catch (MySqlException ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); iRetval = -1; @@ -46,48 +51,5 @@ return iRetval; } - - public CounterParam getCounterParamByDeviceId(int deviceId) - { - CounterParam counterParam = new CounterParam(); - - try - { - string sql = "SELECT * FROM r_counter_param where DEVICE_ID = " + deviceId; - - MySqlCommand cmd = new MySqlCommand(sql, DbConnectService.mySqlConnect); - - MySqlDataReader aReader = cmd.ExecuteReader(CommandBehavior.Default); - - if (aReader != null) - { - if (aReader.Read()) - { - //判断门的状态 - if (!aReader.IsDBNull(0)) - counterParam.Id = Convert.ToInt32(aReader.GetString(0)); - if (!aReader.IsDBNull(1)) - counterParam.DeviceId = Convert.ToInt32(aReader.GetString(1)); - if (!aReader.IsDBNull(2)) - counterParam.BaudRate = aReader.GetString(2); - if (!aReader.IsDBNull(3)) - counterParam.GeneratorIp = aReader.GetString(3); - if (!aReader.IsDBNull(4)) - counterParam.SignalSourceIp = aReader.GetString(4); - } - } - - cmd.Dispose(); - - } - catch(MySqlException ex) - { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message); - counterParam = null; - } - - return counterParam; - } - } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs index d8e2187..85134c9 100644 --- a/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs +++ b/RbFreqStandMeasure/R_DevService/Dto/SensitivityContentParam.cs @@ -10,21 +10,24 @@ //当前测量模式0，频率；1周期 private string checkModel; - //当前频率 + //输入频率 private string freq; - //当前周期 + //输入周期 private string period; - //当前灵敏度 - private string ampl; + //输入灵敏度 + private string volTage; - //当前检测值频率 + //输出检测值频率 private string reFreq; - //当前检测值周期 + //输出检测值周期 private string rePeriod; + //检测时间 + private DateTime checkTime; + public string Freq { get @@ -51,19 +54,6 @@ } } - public string Ampl - { - get - { - return ampl; - } - - set - { - ampl = value; - } - } - public string ReFreq { get @@ -103,5 +93,30 @@ } } + public string VolTage + { + get + { + return volTage; + } + + set + { + volTage = value; + } + } + + public DateTime CheckTime + { + get + { + return checkTime; + } + + set + { + checkTime = value; + } + } } } \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index e66c214..da417d4 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -1,5 +1,6 @@ using Casic.Birmm.RbFreqStandMeasure.R_DataBase.Model; using Casic.Birmm.RbFreqStandMeasure.R_DevService.Dto; +using Casic.Birmm.RbFreqStandMeasure.tools; using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Reflection; @@ -9,10 +10,10 @@ class SensitivityServiceImpl:SensitivityService { - public void beginTest(string type, GPIBService gPIBService, GPIBService tcpService, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam) + public int beginTest(string type, GPIBService gPIBService, GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam) { - sensitivityContentParam = new SensitivityContentParam(); + int iRetval = -1; try { //启动output（一次）OUTPUT 0\OUTPUT 1 @@ -29,65 +30,94 @@ while (!lessTolerance) { //获取当前灵敏度 - currentVolTage = getVOLTageValue(counterCheckParam, currentVolTage); + getVOLTageValue(counterCheckParam, ref currentVolTage); //设置当前灵敏度 GPIB_TCPIP_OPERATIO.setVOLTage(gPIBService, currentVolTage, counterCheckParam.SoOutDelay); - string checkResult = ""; + string currentValue = ""; //主动读取检测数据LAN if (type == "freq") - checkResult = GPIB_TCPIP_OPERATIO.getFreq(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") - checkResult = GPIB_TCPIP_OPERATIO.getPeriod(tcpService); + currentValue = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s //检测数据是否在容差范围内 - - - + bool errorCheckResult=satisfyCheck(counterCheckParam, sensitivityContentParam,currentValue,type); //返回满足容差的数据 + if (errorCheckResult) + { + if (type == "freq") + sensitivityContentParam.ReFreq = currentValue; + else if (type == "period") + sensitivityContentParam.RePeriod = currentValue; - lessTolerance = true; + sensitivityContentParam.VolTage = currentVolTage; + sensitivityContentParam.CheckTime = new DateTime(); + + lessTolerance = true; + } } - + iRetval = 0; } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "beginTest:" + ex.Message); sensitivityContentParam = null; + iRetval = -1; } + return iRetval; } - string getVOLTageValue(CounterCheckParam counterCheckParam,string currentValue) + void getVOLTageValue(CounterCheckParam counterCheckParam, ref string currentValue) { if (currentValue == "0") - return counterCheckParam.SoEleFrequency; + currentValue = counterCheckParam.SoEleFrequency; else - return (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); + currentValue = (Convert.ToInt32(currentValue) + Convert.ToInt32(counterCheckParam.SoEleAddValue)).ToString(); } bool satisfyCheck(CounterCheckParam counterCheckParams, SensitivityContentParam sensitivityContentParam, string currentValue,string checkType) { - bool satisfyResult = false; try { if (checkType == "freq") { + double freThreshold1 = Convert.ToDouble(counterCheckParams.FreThreshold1); + double freThreshold2 = Convert.ToDouble(counterCheckParams.FreThreshold2); + double bFreq = UnitConvertHelper.convertHZ(sensitivityContentParam.Freq); + double cFreq = Convert.ToDouble(currentValue); + double errorFreq = Math.Abs(cFreq - bFreq); + + if (bFreq > 80 * 1000 * 1000) + return errorFreq < freThreshold2 ? true : false; + else + return errorFreq < freThreshold1 ? true : false; } else if (checkType == "period") { + double periodThreshold1 = Convert.ToDouble(counterCheckParams.CycThreshold1); + double periodThreshold2 = Convert.ToDouble(counterCheckParams.CycThreshold2); + double bPeriod = UnitConvertHelper.convertS(sensitivityContentParam.Period); + double cPeriod = Convert.ToDouble(currentValue); + + double errorPeriod = Math.Abs(cPeriod - bPeriod); + + if (bPeriod > 12.5 * 1000 * 1000 * 1000) + return errorPeriod < periodThreshold2 ? true : false; + else + return errorPeriod < periodThreshold1 ? true : false; } - - satisfyResult = true; + else + return false; } catch(Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType,"statisfyCheck:"+ex.Message); - satisfyResult = false; + return false; } - return satisfyResult; } @@ -98,7 +128,7 @@ * gPIBService.open(); * for(datagridview.row) * { - * SensitivityService.beginTest() + * SensitivityService.beginTest()//0：成功；-1：失败 * } * gPIBService.close(); * */ diff --git a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs index adc64db..9ce1ebd 100644 --- a/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs +++ b/RbFreqStandMeasure/R_DevService/Service/SensitivityService.cs @@ -9,9 +9,16 @@ { interface SensitivityService { - //单行检测 - void beginTest(string type,GPIBService gPIBService,GPIBService tcpService,string freq, - CounterCheckParam counterCheckParam, out SensitivityContentParam sensitivityContentParam); + /// + /// 单行检测 + /// + /// 检测模式 + /// gpib + /// tcp + /// 系统配置参数 + /// 检测参数 + int beginTest(string type,GPIBService gPIBService,GPIBService tcpService, + CounterCheckParam counterCheckParam, ref SensitivityContentParam sensitivityContentParam); } } \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 0d2d8a3..dc553f2 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -342,6 +342,7 @@ StatusCtrlForm.cs + diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 5d4acd6..6934bef 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/tools/UnitConvertHelper.cs b/RbFreqStandMeasure/tools/UnitConvertHelper.cs index e898f9c..d0c2b6b 100644 --- a/RbFreqStandMeasure/tools/UnitConvertHelper.cs +++ b/RbFreqStandMeasure/tools/UnitConvertHelper.cs @@ -6,9 +6,9 @@ namespace Casic.Birmm.RbFreqStandMeasure.tools { - class UnitConvertHelper + public class UnitConvertHelper { - double convertHZ(string currentFreq) + public static double convertHZ(string currentFreq) { string unit= Regex.Replace(currentFreq, @"\d", ""); @@ -31,7 +31,7 @@ } } - double convertS(string currentPeriod) + public static double convertS(string currentPeriod) { string unit = Regex.Replace(currentPeriod,@"\d","");