diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8efbe12..0be3d34 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3272,9 +3272,19 @@ } break; } + case 13: { + //示波器 + DeviceOscilloscopeCalibration *recordGauge = dynamic_cast(object); + if (recordGauge != nullptr) { + result = BaseCommonApi::InsertDeviceOscilloscopeCalibration(*recordGauge); + } else { + // 处理转换失败的情况 + result = false; + } + break; + } // 可能还有其他的case default: - // 处理未知或未处理的id result = false; break; @@ -4089,3 +4099,125 @@ } return DataMapList; }; +// 【结果保存】 示波器 +bool BaseCommonApi::InsertDeviceOscilloscopeCalibration(DeviceOscilloscopeCalibration scope){ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_data_oscilloscope ( " + " id, data_id, data_type, cycle_signal, cycle_signal_unit," + " time_base_absolute_error, time_base_absolute_error_unit," + " time_base_relative_error, time_base_relative_error_unit," + " technical_index_symbol, technical_index, technical_index_unit," + " conclusion, thoroughfare, impedance, impedance_unit," + " vertical_deflect_coefficient, vertical_deflect_coefficient_unit," + " standard_value, standard_value_unit, measure_value, measure_value_unit," + " relative_error, error_value, band_width, band_width_unit," + " reference_amplitude, reference_amplitude_unit, measure_amplitude," + " measure_amplitude_unit, decibel_number, trigger_type," + " signal_frequency, signal_frequency_unit, item_type, nominal_value," + " nominal_value_unit, top_measure_value, top_measure_value_unit," + " bottom_measure_value, bottom_measure_value_unit, scan_type," + " horizontal_scale_gear, horizontal_scale_gear_unit," + " vertical_scale_gear, vertical_scale_gear_unit, frequency_upper," + " frequency_upper_unit, output_signal_amplitude, rise_time," + " correct_rise_time, signal_type, nominal_amplitude_value," + " nominal_amplitude_value_unit, nominal_frequency_value," + " nominal_frequency_value_unit, measure_amplitude_value," + " measure_amplitude_value_unit, measure_frequency_value," + " frequency_deviation, amplitude_deviation, exceed_mark, create_time," + " update_time" + " ) VALUES (" + " :id, :data_id, :data_type, :cycle_signal, :cycle_signal_unit," + " :time_base_absolute_error, :time_base_absolute_error_unit," + " :time_base_relative_error, :time_base_relative_error_unit," + " :technical_index_symbol, :technical_index, :technical_index_unit," + " :conclusion, :thoroughfare, :impedance, :impedance_unit," + " :vertical_deflect_coefficient, :vertical_deflect_coefficient_unit," + " :standard_value, :standard_value_unit, :measure_value, :measure_value_unit," + " :relative_error, :error_value, :band_width, :band_width_unit," + " :reference_amplitude, :reference_amplitude_unit, :measure_amplitude," + " :measure_amplitude_unit, :decibel_number, :trigger_type," + " :signal_frequency, :signal_frequency_unit, :item_type, :nominal_value," + " :nominal_value_unit, :top_measure_value, :top_measure_value_unit," + " :bottom_measure_value, :bottom_measure_value_unit, :scan_type," + " :horizontal_scale_gear, :horizontal_scale_gear_unit," + " :vertical_scale_gear, :vertical_scale_gear_unit, :frequency_upper," + " :frequency_upper_unit, :output_signal_amplitude, :rise_time," + " :correct_rise_time, :signal_type, :nominal_amplitude_value," + " :nominal_amplitude_value_unit, :nominal_frequency_value," + " :nominal_frequency_value_unit, :measure_amplitude_value," + " :measure_amplitude_value_unit, :measure_frequency_value," + " :frequency_deviation, :amplitude_deviation, :exceed_mark, :create_time," + " :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", scope.id); + query.bindValue(":data_id", scope.data_id); + query.bindValue(":data_type", scope.data_type); + query.bindValue(":cycle_signal", scope.cycle_signal); + query.bindValue(":cycle_signal_unit", scope.cycle_signal_unit); + query.bindValue(":time_base_absolute_error", scope.time_base_absolute_error); + query.bindValue(":time_base_absolute_error_unit", scope.time_base_absolute_error_unit); + query.bindValue(":time_base_relative_error", scope.time_base_relative_error); + query.bindValue(":time_base_relative_error_unit", scope.time_base_relative_error_unit); + query.bindValue(":technical_index_symbol", scope.technical_index_symbol); + query.bindValue(":technical_index", scope.technical_index); + query.bindValue(":technical_index_unit", scope.technical_index_unit); + query.bindValue(":conclusion", scope.conclusion); + query.bindValue(":thoroughfare", scope.thoroughfare); + query.bindValue(":impedance", scope.impedance); + query.bindValue(":impedance_unit", scope.impedance_unit); + query.bindValue(":vertical_deflect_coefficient", scope.vertical_deflect_coefficient); + query.bindValue(":vertical_deflect_coefficient_unit", scope.vertical_deflect_coefficient_unit); + query.bindValue(":standard_value", scope.standard_value); + query.bindValue(":standard_value_unit", scope.standard_value_unit); + query.bindValue(":measure_value", scope.measure_value); + query.bindValue(":measure_value_unit", scope.measure_value_unit); + query.bindValue(":relative_error", scope.relative_error); + query.bindValue(":error_value", scope.error_value); + query.bindValue(":band_width", scope.band_width); + query.bindValue(":band_width_unit", scope.band_width_unit); + query.bindValue(":reference_amplitude", scope.reference_amplitude); + query.bindValue(":reference_amplitude_unit", scope.reference_amplitude_unit); + query.bindValue(":measure_amplitude", scope.measure_amplitude); + query.bindValue(":measure_amplitude_unit", scope.measure_amplitude_unit); + query.bindValue(":decibel_number", scope.decibel_number); + query.bindValue(":trigger_type", scope.trigger_type); + query.bindValue(":signal_frequency", scope.signal_frequency); + query.bindValue(":signal_frequency_unit", scope.signal_frequency_unit); + query.bindValue(":item_type", scope.item_type); + query.bindValue(":nominal_value", scope.nominal_value); + query.bindValue(":nominal_value_unit", scope.nominal_value_unit); + query.bindValue(":top_measure_value", scope.top_measure_value); + query.bindValue(":top_measure_value_unit", scope.top_measure_value_unit); + query.bindValue(":bottom_measure_value", scope.bottom_measure_value); + query.bindValue(":bottom_measure_value_unit", scope.bottom_measure_value_unit); + query.bindValue(":scan_type", scope.scan_type); + query.bindValue(":horizontal_scale_gear", scope.horizontal_scale_gear); + query.bindValue(":horizontal_scale_gear_unit", scope.horizontal_scale_gear_unit); + query.bindValue(":vertical_scale_gear", scope.vertical_scale_gear); + query.bindValue(":vertical_scale_gear_unit", scope.vertical_scale_gear_unit); + query.bindValue(":frequency_upper", scope.frequency_upper); + query.bindValue(":frequency_upper_unit", scope.frequency_upper_unit); + query.bindValue(":output_signal_amplitude", scope.output_signal_amplitude); + query.bindValue(":rise_time", scope.rise_time); + query.bindValue(":correct_rise_time", scope.correct_rise_time); + query.bindValue(":signal_type", scope.signal_type); + query.bindValue(":nominal_amplitude_value", scope.nominal_amplitude_value); + query.bindValue(":nominal_amplitude_value_unit", scope.nominal_amplitude_value_unit); + query.bindValue(":nominal_frequency_value", scope.nominal_frequency_value); + query.bindValue(":nominal_frequency_value_unit", scope.nominal_frequency_value_unit); + query.bindValue(":measure_amplitude_value", scope.measure_amplitude_value); + query.bindValue(":measure_amplitude_value_unit", scope.measure_amplitude_value_unit); + query.bindValue(":measure_frequency_value", scope.measure_frequency_value); + query.bindValue(":measure_frequency_value_unit", scope.measure_frequency_value_unit); + query.bindValue(":frequency_deviation", scope.frequency_deviation); + query.bindValue(":amplitude_deviation", scope.amplitude_deviation); + query.bindValue(":exceed_mark", scope.exceed_mark); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert data failed: " << query.lastError().text(); + } + + return isSuccess; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8efbe12..0be3d34 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3272,9 +3272,19 @@ } break; } + case 13: { + //示波器 + DeviceOscilloscopeCalibration *recordGauge = dynamic_cast(object); + if (recordGauge != nullptr) { + result = BaseCommonApi::InsertDeviceOscilloscopeCalibration(*recordGauge); + } else { + // 处理转换失败的情况 + result = false; + } + break; + } // 可能还有其他的case default: - // 处理未知或未处理的id result = false; break; @@ -4089,3 +4099,125 @@ } return DataMapList; }; +// 【结果保存】 示波器 +bool BaseCommonApi::InsertDeviceOscilloscopeCalibration(DeviceOscilloscopeCalibration scope){ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_data_oscilloscope ( " + " id, data_id, data_type, cycle_signal, cycle_signal_unit," + " time_base_absolute_error, time_base_absolute_error_unit," + " time_base_relative_error, time_base_relative_error_unit," + " technical_index_symbol, technical_index, technical_index_unit," + " conclusion, thoroughfare, impedance, impedance_unit," + " vertical_deflect_coefficient, vertical_deflect_coefficient_unit," + " standard_value, standard_value_unit, measure_value, measure_value_unit," + " relative_error, error_value, band_width, band_width_unit," + " reference_amplitude, reference_amplitude_unit, measure_amplitude," + " measure_amplitude_unit, decibel_number, trigger_type," + " signal_frequency, signal_frequency_unit, item_type, nominal_value," + " nominal_value_unit, top_measure_value, top_measure_value_unit," + " bottom_measure_value, bottom_measure_value_unit, scan_type," + " horizontal_scale_gear, horizontal_scale_gear_unit," + " vertical_scale_gear, vertical_scale_gear_unit, frequency_upper," + " frequency_upper_unit, output_signal_amplitude, rise_time," + " correct_rise_time, signal_type, nominal_amplitude_value," + " nominal_amplitude_value_unit, nominal_frequency_value," + " nominal_frequency_value_unit, measure_amplitude_value," + " measure_amplitude_value_unit, measure_frequency_value," + " frequency_deviation, amplitude_deviation, exceed_mark, create_time," + " update_time" + " ) VALUES (" + " :id, :data_id, :data_type, :cycle_signal, :cycle_signal_unit," + " :time_base_absolute_error, :time_base_absolute_error_unit," + " :time_base_relative_error, :time_base_relative_error_unit," + " :technical_index_symbol, :technical_index, :technical_index_unit," + " :conclusion, :thoroughfare, :impedance, :impedance_unit," + " :vertical_deflect_coefficient, :vertical_deflect_coefficient_unit," + " :standard_value, :standard_value_unit, :measure_value, :measure_value_unit," + " :relative_error, :error_value, :band_width, :band_width_unit," + " :reference_amplitude, :reference_amplitude_unit, :measure_amplitude," + " :measure_amplitude_unit, :decibel_number, :trigger_type," + " :signal_frequency, :signal_frequency_unit, :item_type, :nominal_value," + " :nominal_value_unit, :top_measure_value, :top_measure_value_unit," + " :bottom_measure_value, :bottom_measure_value_unit, :scan_type," + " :horizontal_scale_gear, :horizontal_scale_gear_unit," + " :vertical_scale_gear, :vertical_scale_gear_unit, :frequency_upper," + " :frequency_upper_unit, :output_signal_amplitude, :rise_time," + " :correct_rise_time, :signal_type, :nominal_amplitude_value," + " :nominal_amplitude_value_unit, :nominal_frequency_value," + " :nominal_frequency_value_unit, :measure_amplitude_value," + " :measure_amplitude_value_unit, :measure_frequency_value," + " :frequency_deviation, :amplitude_deviation, :exceed_mark, :create_time," + " :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", scope.id); + query.bindValue(":data_id", scope.data_id); + query.bindValue(":data_type", scope.data_type); + query.bindValue(":cycle_signal", scope.cycle_signal); + query.bindValue(":cycle_signal_unit", scope.cycle_signal_unit); + query.bindValue(":time_base_absolute_error", scope.time_base_absolute_error); + query.bindValue(":time_base_absolute_error_unit", scope.time_base_absolute_error_unit); + query.bindValue(":time_base_relative_error", scope.time_base_relative_error); + query.bindValue(":time_base_relative_error_unit", scope.time_base_relative_error_unit); + query.bindValue(":technical_index_symbol", scope.technical_index_symbol); + query.bindValue(":technical_index", scope.technical_index); + query.bindValue(":technical_index_unit", scope.technical_index_unit); + query.bindValue(":conclusion", scope.conclusion); + query.bindValue(":thoroughfare", scope.thoroughfare); + query.bindValue(":impedance", scope.impedance); + query.bindValue(":impedance_unit", scope.impedance_unit); + query.bindValue(":vertical_deflect_coefficient", scope.vertical_deflect_coefficient); + query.bindValue(":vertical_deflect_coefficient_unit", scope.vertical_deflect_coefficient_unit); + query.bindValue(":standard_value", scope.standard_value); + query.bindValue(":standard_value_unit", scope.standard_value_unit); + query.bindValue(":measure_value", scope.measure_value); + query.bindValue(":measure_value_unit", scope.measure_value_unit); + query.bindValue(":relative_error", scope.relative_error); + query.bindValue(":error_value", scope.error_value); + query.bindValue(":band_width", scope.band_width); + query.bindValue(":band_width_unit", scope.band_width_unit); + query.bindValue(":reference_amplitude", scope.reference_amplitude); + query.bindValue(":reference_amplitude_unit", scope.reference_amplitude_unit); + query.bindValue(":measure_amplitude", scope.measure_amplitude); + query.bindValue(":measure_amplitude_unit", scope.measure_amplitude_unit); + query.bindValue(":decibel_number", scope.decibel_number); + query.bindValue(":trigger_type", scope.trigger_type); + query.bindValue(":signal_frequency", scope.signal_frequency); + query.bindValue(":signal_frequency_unit", scope.signal_frequency_unit); + query.bindValue(":item_type", scope.item_type); + query.bindValue(":nominal_value", scope.nominal_value); + query.bindValue(":nominal_value_unit", scope.nominal_value_unit); + query.bindValue(":top_measure_value", scope.top_measure_value); + query.bindValue(":top_measure_value_unit", scope.top_measure_value_unit); + query.bindValue(":bottom_measure_value", scope.bottom_measure_value); + query.bindValue(":bottom_measure_value_unit", scope.bottom_measure_value_unit); + query.bindValue(":scan_type", scope.scan_type); + query.bindValue(":horizontal_scale_gear", scope.horizontal_scale_gear); + query.bindValue(":horizontal_scale_gear_unit", scope.horizontal_scale_gear_unit); + query.bindValue(":vertical_scale_gear", scope.vertical_scale_gear); + query.bindValue(":vertical_scale_gear_unit", scope.vertical_scale_gear_unit); + query.bindValue(":frequency_upper", scope.frequency_upper); + query.bindValue(":frequency_upper_unit", scope.frequency_upper_unit); + query.bindValue(":output_signal_amplitude", scope.output_signal_amplitude); + query.bindValue(":rise_time", scope.rise_time); + query.bindValue(":correct_rise_time", scope.correct_rise_time); + query.bindValue(":signal_type", scope.signal_type); + query.bindValue(":nominal_amplitude_value", scope.nominal_amplitude_value); + query.bindValue(":nominal_amplitude_value_unit", scope.nominal_amplitude_value_unit); + query.bindValue(":nominal_frequency_value", scope.nominal_frequency_value); + query.bindValue(":nominal_frequency_value_unit", scope.nominal_frequency_value_unit); + query.bindValue(":measure_amplitude_value", scope.measure_amplitude_value); + query.bindValue(":measure_amplitude_value_unit", scope.measure_amplitude_value_unit); + query.bindValue(":measure_frequency_value", scope.measure_frequency_value); + query.bindValue(":measure_frequency_value_unit", scope.measure_frequency_value_unit); + query.bindValue(":frequency_deviation", scope.frequency_deviation); + query.bindValue(":amplitude_deviation", scope.amplitude_deviation); + query.bindValue(":exceed_mark", scope.exceed_mark); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert data failed: " << query.lastError().text(); + } + + return isSuccess; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 8657156..2446bad 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -1066,68 +1066,69 @@ { public: QString id; - QString data_id; - QString data_type; - QString cycle_signal; - QString cycle_signal_unit; - QString time_base_absolute_error; - QString time_base_absolute_error_unit; - QString time_base_relative_error; - QString time_base_relative_error_unit; - QString technical_index_symbol; - QString technical_index; - QString technical_index_unit; - QString conclusion; - QString thoroughfare; - QString impedance; - QString impedance_unit; - QString vertical_deflect_coefficient; - QString vertical_deflect_coefficient_unit; - QString standard_value; - QString standard_value_unit; - QString measure_value; - QString measure_value_unit; - QString relative_error; - QString error_value; - QString band_width; - QString band_width_unit; - QString reference_amplitude; - QString reference_amplitude_unit; - QString measure_amplitude; - QString measure_amplitude_unit; - QString decibel_number; - QString trigger_type; - QString signal_frequency; - QString signal_frequency_unit; - QString item_type; - QString nominal_value; - QString nominal_value_unit; - QString top_measure_value; - QString top_measure_value_unit; - QString bottom_measure_value; - QString bottom_measure_value_unit; - QString scan_type; - QString horizontal_scale_gear; - QString horizontal_scale_gear_unit; - QString vertical_scale_gear; - QString vertical_scale_gear_unit; - QString frequency_upper; - QString frequency_upper_unit; - QString output_signal_amplitude; - QString rise_time; - QString correct_rise_time; - QString signal_type; - QString nominal_amplitude_value; - QString nominal_amplitude_value_unit; - QString nominal_frequency_value; - QString nominal_frequency_value_unit; - QString measure_amplitude_value; - QString measure_amplitude_value_unit; - QString measure_frequency_value; - QString measure_frequency_value_unit; - QString frequency_deviation; - QString amplitude_deviation; - QString exceed_mark; + QString data_id;//检定数据管理基础信息表id + //1时基 2直流增益 3直流偏置 4频带宽度 5触发灵敏度 6上升时间 7输入电阻 8校准信号 + QString data_type;//检定数据类型(一个检定数据中区分两个表格)(字典code) + QString cycle_signal;//周期时标信号（方法一）/ 参考输出（方法二） + QString cycle_signal_unit;//周期时标信号单位（方法一）/ 参考输出单位（方法二） + QString time_base_absolute_error;//时基绝对误差（方法一）/ 差拍波形频率测量值（方法二） + QString time_base_absolute_error_unit;//时基绝对误差单位（方法一）/ 差拍波形频率测量值单位（方法二） + QString time_base_relative_error;//时基相对误差 + QString time_base_relative_error_unit;//时基相对误差单位 + QString technical_index_symbol;//技术指标前符号 + QString technical_index;//技术指标 + QString technical_index_unit;//技术指标单位 + QString conclusion;//结论 + QString thoroughfare;//通道 + QString impedance;//阻抗 + QString impedance_unit;//阻抗单位 + QString vertical_deflect_coefficient;//垂直偏转系数 + QString vertical_deflect_coefficient_unit;//垂直偏转系数单位 + QString standard_value;//标准值 + QString standard_value_unit;//标准值单位 + QString measure_value;//测量值 + QString measure_value_unit;//测量值单位 + QString relative_error;//相对误差 + QString error_value;//误差 + QString band_width;//频带宽度 + QString band_width_unit;//频带宽度单位 + QString reference_amplitude;//参考幅度 + QString reference_amplitude_unit;//参考幅度单位 + QString measure_amplitude;//测量幅度 + QString measure_amplitude_unit;//测量幅度单位 + QString decibel_number;//分贝数 + QString trigger_type;//触发类型(字典value) + QString signal_frequency;//信号频率 + QString signal_frequency_unit;//信号频率单位 + QString item_type;//项目(字典value) + QString nominal_value;//标称值 + QString nominal_value_unit;//标称值单位 + QString top_measure_value;//顶部测量值 + QString top_measure_value_unit;//顶部测量值单位 + QString bottom_measure_value;//底部测量值 + QString bottom_measure_value_unit;//底部测量值单位 + QString scan_type;//扫描方式(模拟示波器)(字典value) + QString horizontal_scale_gear;//水平刻度档位(模拟示波器) + QString horizontal_scale_gear_unit;//水平刻度档位单位(模拟示波器) + QString vertical_scale_gear;//垂直刻度档位(模拟示波器) + QString vertical_scale_gear_unit;//垂直刻度档位单位(模拟示波器) + QString frequency_upper;//频率上限(模拟示波器) + QString frequency_upper_unit;//频率上限单位(模拟示波器) + QString output_signal_amplitude;//输出信号幅度 + QString rise_time;//上升时间 + QString correct_rise_time;//修正上升时间 + QString signal_type;//信号类型(模拟示波器)(字典value) + QString nominal_amplitude_value;//幅度标称值(模拟示波器) + QString nominal_amplitude_value_unit;//幅度标称值单位(模拟示波器) + QString nominal_frequency_value;//频率标称值(模拟示波器) + QString nominal_frequency_value_unit;//频率标称值单位(模拟示波器) + QString measure_amplitude_value;//幅度测量值(模拟示波器) + QString measure_amplitude_value_unit;//幅度测量值单位(模拟示波器) + QString measure_frequency_value;//频率测量值(模拟示波器) + QString measure_frequency_value_unit;//频率测量值单位(模拟示波器) + QString frequency_deviation;//频率偏差(模拟示波器) + QString amplitude_deviation;//幅度偏差(模拟示波器) + QString exceed_mark;//超出范围标*(1/0) QDateTime create_time; QDateTime update_time; }; @@ -1376,6 +1377,8 @@ //示波器 static QMap> getDeviceOscilloscopeCalibration(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByOscilloscope(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); + //【结果保存】示波器 + static bool InsertDeviceOscilloscopeCalibration(DeviceOscilloscopeCalibration scope); };