diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 6f6fe94..26874ee 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -840,11 +840,13 @@ //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) { -// id="1716997603953311746"; +// id="1720260188257480706"; QList result; QSqlQuery query; query.prepare("SELECT id,belong_standard_equipment FROM biz_business_device_measure_item_info bbdmii WHERE bbdmii.device_model_id =(SELECT eei.model_id from eqpt_equipment_info eei WHERE eei.id = :id )"); - // 将参数绑定到占位符 +// query.prepare("SELECT id,belong_standard_equipment FROM biz_business_device_measure_item_info bbdmii " +// "WHERE bbdmii.device_model_id = 1714161758107967489"); +// 将参数绑定到占位符 query.bindValue(":id", id); if (query.exec()) { while (query.next()) { @@ -886,7 +888,6 @@ */ //根据被检设备ID获取当前设备的 检定项目及检定点 - QMap> BaseCommonApi::Search_CalibrationTableClass(QString DeiverId,QMap *HeadList) { @@ -900,11 +901,16 @@ //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCalClass(CliTable[0].id,HeadList); + break; + case 4: + DataList=BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(CliTable[0].id,HeadList); + break; + } return DataList; } -//根据被检设备ID获取当前设备的 检定项目及检定点 +//根据被检设备ID获取当前设备的 检定项目及检定点 测试函数 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -918,6 +924,8 @@ //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); +// case 4: +// DataList=BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(CliTable[0].id,HeadList); } return DataList; @@ -1901,6 +1909,7 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); + instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); instruction.param = query.value("param").toString(); @@ -1975,7 +1984,6 @@ bool BaseCommonApi::DeleteInstructionLib(QString id) { QSqlQuery query; - //删除检定程序 query.prepare("DELETE FROM zd_instruction_library WHERE id = :id "); query.bindValue(":id", id); if (!query.exec()) { @@ -2059,7 +2067,7 @@ catory.eqptDeviceType = query.value("eqptDeviceType").toString(); result.append(catory); } - qDebug() << query.lastQuery(); +// qDebug() << query.lastQuery(); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } @@ -2139,7 +2147,6 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); @@ -3006,5 +3013,314 @@ return result; } +QMap> BaseCommonApi::GetDataReturnItemListByPistonGauge(QList ResultData,QMap> DataMapList,QMap *HeadMapList) +{ + QList isFirst; + isFirst.append(true); + QList DCVList; + for(const QStringList &row : ResultData) + { + if (!row.isEmpty()) { // 确保行不为空 + if(row[13] =="1") + { + QString VerificationItem=NULL; + if(isFirst[0]) + { + VerificationItem = "示值误差"; + //添加列头 + QStringList head; + head <<"外观及功能性检查"<<"示值误差、回程误差、轻敲位移" <<"理论输出值单位"<<"检定介质"<<"分度值的五分之一" + <<"序号"<<"标准器示值"<<"轻敲前示值"<<"正行程"<<"反行程"<<"轻敲后示值"<<"正行程"<<"反行程"<<"轻敲前后变动量"<<"正行程"<<"反行程" ; + HeadMapList->insert(VerificationItem,head); + isFirst[0]=false; + } + //添加数据 + QStringList Data; + Data.append(row[12]); //外观及功能性检查 + Data.append(row[13]); //示值误差、回程误差、轻敲位移 + Data.append(row[11]); //理论输出值单位 + Data.append(row[14]); //检定介质 + Data.append(row[15]); //分度值的五分之一 + Data.append(row[0]); //ID + Data.append(row[2]); //标准器示值 + Data.append(""); //轻敲前后变动量正行程 软件界面计算 + Data.append(""); //轻敲前后变动量反行程 软件界面计算 + //最大允许误差 根据公式计算 目前 先都按 a*标准值 + b*量程 +// try { +// //保证数据库内数据没问题 +// Data.append(QString::number((row[11].toDouble()*row[8].toDouble()) +// + (row[12].toDouble()*row[7].toDouble()))); +// } catch(const std::exception &e) { +// Data.append("0"); +// } +// Data.append(row[9]); + DCVList.append(Data); + } + } + if(DCVList.count()!=0){ + DataMapList.insert("示值误差",DCVList); + }; + return DataMapList; + } +} +//检定项0.02活塞式压力计数据(包含字典的字段都存为字典value) +QMap> BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(QString itemId,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + + QSqlQuery query; + query.prepare("SELECT bbdmidpg.*,bbdmii.appearance_function_check,bbdmicp.indication_error,bbdmicp.measure_medium,bbdmicp.division " + " FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id " + " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " + " WHERE bbdmidpg.item_id = :itemId "); + // 将参数绑定到占位符 + query.bindValue(":itemId", itemId); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_id").toString()); //检定项目ID + result.append(query.value("indicating_value").toString());//标准器示值 + result.append(query.value("return_error").toString());//回程误差允许值 + result.append(query.value("friction_error").toString());//轻敲位移允许值 + result.append(query.value("indicating_error").toString());//示值误差允许值 + result.append(query.value("zero_position").toString());//零位是否带止销 + result.append(query.value("measure_medium").toString());//检定介质(字典value) + result.append(query.value("accuracy_class").toString());//准确度等级 + result.append(query.value("maximum_error").toString());//最大允许误差 + result.append(query.value("theoretical_output_value").toString());//理论输出值 + result.append(query.value("theoretical_output_value_unit").toString());//理论输出值单位 + result.append(query.value("appearance_function_check").toString());//外观及功能性检查(1/0) + result.append(query.value("indication_error").toString());//示值误差、回程误差、轻敲位移 + result.append(query.value("measure_medium").toString());//检定介质(字典value) + result.append(query.value("division").toString());//分度值的五分之一 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + +// *headList <<"序号"<<"检定项id"<<"标准器示值"<<"回程误差允许值"<<"轻敲位移允许值"<<"示值误差允许值"<<"零位是否带止销" +// <<"检定介质"<<"准确度等级"<<"最大允许误差"<<"理论输出值"<<"理论输出值单位"<<"外观及功能性检查(1/0)"<<"示值误差、回程误差、轻敲位移" +// <<"检定介质(字典value)"<<"分度值的五分之一"<<"创建时间"<<"更新时间"; + //进行检定项目列头转换 + DataMapList= GetDataReturnItemListByPistonGauge(resultData,DataMapList,headList); + return DataMapList; +} + +//自动检定数据结果保存 参数1：装置字典1,2,3 参数2:BaseClass父类， 子类赋值 +bool BaseCommonApi::SearchSelectTable(QString id, BaseClass *object) { + bool result = false; // 初始化为 false 或根据需要初始化为其他值 + switch (id.toInt()) { + case 1: { + DeviceMeasureDataPistonGauge *recordGauge = dynamic_cast(object); + if (recordGauge != nullptr) { + result = BaseCommonApi::InsertDeviceMeasureDataPistonGauge(*recordGauge); + } else { + // 处理转换失败的情况 + result = false; // 或者其他表示失败的值 + } + break; + } + case 2: { + SaveDeviceMeasureCalibrator *recordCal = dynamic_cast(object); + if (recordCal != nullptr) { + result = BaseCommonApi::InsertVerMultiCal(*recordCal); // 注意这里使用recordCal而不是recordGauge + } else { + // 处理转换失败的情况 + result = false; // 或者其他表示失败的值 + } + break; + } + // 可能还有其他的case + default: + // 处理未知或未处理的id + result = false; // 或者其他表示失败的值 + break; + + } + + return result; // 返回结果 +} + //【结果保存】压力 +bool BaseCommonApi::InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_data_piston_gauge " + "(id, data_id, data_type, data_category, indicating_value, " + "before_friction_forward_stroke, before_friction_reverse_stroke, " + "after_friction_forward_stroke, after_friction_reverse_stroke, " + "variation_forward_stroke, variation_reverse_stroke, " + "theoretical_output_value, first_forward_stroke, first_reverse_stroke, " + "second_forward_stroke, second_reverse_stroke, third_forward_stroke, " + "third_reverse_stroke, indicating_error, return_error, average_forward_stroke, " + "average_reverse_stroke, average_value, average_return_error, item, " + "max_indicating_error, max_return_error, max_friction_error, maximum_error_absolute, " + "forward_stroke_switch_value, reverse_stroke_switch_value, point_deviation, " + "different_gap, max_point_deviation, allow_point_deviation, max_different_gap, " + "allow_different_gap, zero_drift_one, zero_drift_two, zero_drift_three, " + "zero_drift_four, zero_drift_five, intercept_a, slope_b, sensitivity_b, " + "repeatability_r, hysteresis_h, linear_l, basic_error_a, periodic_stability_s_b, " + "create_time, update_time) " + "VALUES (:id, :data_id, :data_type, :data_category, :indicating_value, " + ":before_friction_forward_stroke, :before_friction_reverse_stroke, " + ":after_friction_forward_stroke, :after_friction_reverse_stroke, " + ":variation_forward_stroke, :variation_reverse_stroke, " + ":theoretical_output_value, :first_forward_stroke, :first_reverse_stroke, " + ":second_forward_stroke, :second_reverse_stroke, :third_forward_stroke, " + ":third_reverse_stroke, :indicating_error, :return_error, :average_forward_stroke, " + ":average_reverse_stroke, :average_value, :average_return_error, :item, " + ":max_indicating_error, :max_return_error, :max_friction_error, :maximum_error_absolute, " + ":forward_stroke_switch_value, :reverse_stroke_switch_value, :point_deviation, " + ":different_gap, :max_point_deviation, :allow_point_deviation, :max_different_gap, " + ":allow_different_gap, :zero_drift_one, :zero_drift_two, :zero_drift_three, " + ":zero_drift_four, :zero_drift_five, :intercept_a, :slope_b, :sensitivity_b, " + ":repeatability_r, :hysteresis_h, :linear_l, :basic_error_a, :periodic_stability_s_b, " + ":create_time, :update_time)"); + + //// QString formattedUpdateDateTime = measureCalibrator.create_time.toString("yyyy-MM-dd HH:mm:ss"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", gauge.id); + query.bindValue(":data_id", gauge.data_id); + query.bindValue(":data_type", gauge.data_type); + query.bindValue(":data_category", gauge.data_category); + query.bindValue(":indicating_value", gauge.indicating_value); + query.bindValue(":before_friction_forward_stroke", gauge.before_friction_forward_stroke); + query.bindValue(":before_friction_reverse_stroke", gauge.before_friction_reverse_stroke); + query.bindValue(":after_friction_forward_stroke", gauge.after_friction_forward_stroke); + query.bindValue(":after_friction_reverse_stroke", gauge.after_friction_reverse_stroke); + query.bindValue(":variation_forward_stroke", gauge.variation_forward_stroke); + query.bindValue(":variation_reverse_stroke", gauge.variation_reverse_stroke); + query.bindValue(":theoretical_output_value", gauge.theoretical_output_value); + query.bindValue(":first_forward_stroke", gauge.first_forward_stroke); + query.bindValue(":first_reverse_stroke", gauge.first_reverse_stroke); + query.bindValue(":second_forward_stroke", gauge.second_forward_stroke); + query.bindValue(":second_reverse_stroke", gauge.second_reverse_stroke); + query.bindValue(":third_forward_stroke", gauge.third_forward_stroke); + query.bindValue(":third_reverse_stroke", gauge.third_reverse_stroke); + query.bindValue(":indicating_error", gauge.indicating_error); + query.bindValue(":return_error", gauge.return_error); + query.bindValue(":average_forward_stroke", gauge.average_forward_stroke); + query.bindValue(":average_reverse_stroke", gauge.average_reverse_stroke); + query.bindValue(":average_value", gauge.average_value); + query.bindValue(":average_return_error", gauge.average_return_error); + query.bindValue(":item", gauge.item); + query.bindValue(":max_indicating_error", gauge.max_indicating_error); + query.bindValue(":max_return_error", gauge.max_return_error); + query.bindValue(":max_friction_error", gauge.max_friction_error); + query.bindValue(":maximum_error_absolute", gauge.maximum_error_absolute); + query.bindValue(":forward_stroke_switch_value", gauge.forward_stroke_switch_value); + query.bindValue(":reverse_stroke_switch_value", gauge.reverse_stroke_switch_value); + query.bindValue(":point_deviation", gauge.point_deviation); + query.bindValue(":different_gap", gauge.different_gap); + query.bindValue(":max_point_deviation", gauge.max_point_deviation); + query.bindValue(":allow_point_deviation", gauge.allow_point_deviation); + query.bindValue(":max_different_gap", gauge.max_different_gap); + query.bindValue(":allow_different_gap", gauge.allow_different_gap); + query.bindValue(":zero_drift_one", gauge.zero_drift_one); + query.bindValue(":zero_drift_two", gauge.zero_drift_two); + query.bindValue(":zero_drift_three", gauge.zero_drift_three); + query.bindValue(":zero_drift_four", gauge.zero_drift_four); + query.bindValue(":zero_drift_five", gauge.zero_drift_five); + query.bindValue(":intercept_a", gauge.intercept_a); + query.bindValue(":slope_b", gauge.slope_b); + query.bindValue(":sensitivity_b", gauge.sensitivity_b); + query.bindValue(":repeatability_r", gauge.repeatability_r); + query.bindValue(":hysteresis_h", gauge.hysteresis_h); + query.bindValue(":linear_l", gauge.linear_l); + query.bindValue(":basic_error_a", gauge.basic_error_a); + query.bindValue(":periodic_stability_s_b", gauge.periodic_stability_s_b); + 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; +} +//【查询】 0.02压力结果表数据 +QList getDeviceMeasureDataPistonGauge(QString data_id,QStringList *HeadList) +{ + QList resultData; + QStringList result; + resultData.clear(); + + QSqlQuery query; + query.prepare("SELECT * FROM biz_business_device_measure_data_piston_gauge WHERE data_id= :data_id "); + // 将参数绑定到占位符 + query.bindValue(":data_id", data_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("data_id").toString()); //检定数据管理基础信息表id + result.append(query.value("data_type").toString());//检定数据类型(电接点一般压力表一个检定数据中区分两个表格)(字典code) + result.append(query.value("data_category").toString());//检定数据类别(1检定数据，2计算结果数据) + result.append(query.value("indicating_value").toString());//标准器示值 + result.append(query.value("before_friction_forward_stroke").toString());//轻敲前被检设备示值-正行程 + result.append(query.value("before_friction_reverse_stroke").toString());//轻敲前被检设备示值-反行程 + result.append(query.value("after_friction_forward_stroke").toString());//轻敲后被检设备示值-正行程 + result.append(query.value("after_friction_reverse_stroke").toString());//轻敲后被检设备示值-反行程 + result.append(query.value("variation_forward_stroke").toString());//轻敲前后变动量-正行程 + result.append(query.value("variation_reverse_stroke").toString());//轻敲前后变动量-反行程 + result.append(query.value("theoretical_output_value").toString());//理论输出值 + result.append(query.value("first_forward_stroke").toString());//第一次正行程 + result.append(query.value("first_reverse_stroke").toString());//第一次反行程 + result.append(query.value("second_forward_stroke").toString());//第二次正行程 + result.append(query.value("second_reverse_stroke").toString());//第二次反行程 + result.append(query.value("third_forward_stroke").toString());//第三次正行程 + result.append(query.value("third_reverse_stroke").toString());//第三次反行程 + result.append(query.value("indicating_error").toString());//示值误差 + result.append(query.value("return_error").toString());//回程误差 + result.append(query.value("average_forward_stroke").toString());//正行程平均值 + result.append(query.value("average_reverse_stroke").toString());//反行程平均值 + result.append(query.value("average_value").toString());//平均值 + result.append(query.value("average_return_error").toString());//回程误差平均值 + result.append(query.value("item").toString());//项目(结果表) + result.append(query.value("max_indicating_error").toString());//示值误差最大值(结果表) + result.append(query.value("max_return_error").toString());//回程误差最大值(结果表) + result.append(query.value("max_friction_error").toString());//轻敲位移最大值(结果表) + result.append(query.value("maximum_error_absolute").toString());//最大允许误差绝对值 + result.append(query.value("forward_stroke_switch_value").toString());//正行程切换值(电接点一般压力表) + result.append(query.value("reverse_stroke_switch_value").toString());//反行程切换值(电接点一般压力表) + result.append(query.value("point_deviation").toString());//设定点偏差(电接点一般压力表) + result.append(query.value("different_gap").toString());//切换差(电接点一般压力表) + result.append(query.value("max_point_deviation").toString());//最大设定点偏差绝对值(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("allow_point_deviation").toString());//允许设定点偏差绝对值(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("max_different_gap").toString());//最大切换差(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("allow_different_gap").toString());//允许切换差(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("zero_drift_one").toString());//零位漂移(数字压力计手工输入的第1个示值) + result.append(query.value("zero_drift_two").toString());//零位漂移(数字压力计手工输入的第2个示值) + result.append(query.value("zero_drift_three").toString());//零位漂移(数字压力计手工输入的第3个示值) + result.append(query.value("zero_drift_four").toString());//零位漂移(数字压力计手工输入的第4个示值) + result.append(query.value("zero_drift_five").toString());//零位漂移(数字压力计手工输入的第5个示值) + result.append(query.value("intercept_a").toString());//截距a(结果表) + result.append(query.value("slope_b").toString());//斜率b(结果表) + result.append(query.value("sensitivity_b").toString());//灵敏度b(结果表) + result.append(query.value("repeatability_r").toString());//重复性ξR(结果表) + result.append(query.value("hysteresis_h").toString());//迟滞ξH(结果表) + result.append(query.value("linear_l").toString());//线性ξL(结果表) + result.append(query.value("basic_error_a").toString());//基本误差A(结果表) + result.append(query.value("periodic_stability_s_b").toString());//周期稳定性Sb(结果表) + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + *HeadList <<"暂未修改序号"<<"检定项id"<<"标准器示值"<<"回程误差允许值"<<"轻敲位移允许值"<<"示值误差允许值"<<"零位是否带止销" + <<"检定介质"<<"准确度等级"<<"最大允许误差"<<"理论输出值"<<"理论输出值单位"<<"创建时间"<<"更新时间"; + return resultData; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 6f6fe94..26874ee 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -840,11 +840,13 @@ //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) { -// id="1716997603953311746"; +// id="1720260188257480706"; QList result; QSqlQuery query; query.prepare("SELECT id,belong_standard_equipment FROM biz_business_device_measure_item_info bbdmii WHERE bbdmii.device_model_id =(SELECT eei.model_id from eqpt_equipment_info eei WHERE eei.id = :id )"); - // 将参数绑定到占位符 +// query.prepare("SELECT id,belong_standard_equipment FROM biz_business_device_measure_item_info bbdmii " +// "WHERE bbdmii.device_model_id = 1714161758107967489"); +// 将参数绑定到占位符 query.bindValue(":id", id); if (query.exec()) { while (query.next()) { @@ -886,7 +888,6 @@ */ //根据被检设备ID获取当前设备的 检定项目及检定点 - QMap> BaseCommonApi::Search_CalibrationTableClass(QString DeiverId,QMap *HeadList) { @@ -900,11 +901,16 @@ //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCalClass(CliTable[0].id,HeadList); + break; + case 4: + DataList=BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(CliTable[0].id,HeadList); + break; + } return DataList; } -//根据被检设备ID获取当前设备的 检定项目及检定点 +//根据被检设备ID获取当前设备的 检定项目及检定点 测试函数 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -918,6 +924,8 @@ //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); +// case 4: +// DataList=BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(CliTable[0].id,HeadList); } return DataList; @@ -1901,6 +1909,7 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); + instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); instruction.param = query.value("param").toString(); @@ -1975,7 +1984,6 @@ bool BaseCommonApi::DeleteInstructionLib(QString id) { QSqlQuery query; - //删除检定程序 query.prepare("DELETE FROM zd_instruction_library WHERE id = :id "); query.bindValue(":id", id); if (!query.exec()) { @@ -2059,7 +2067,7 @@ catory.eqptDeviceType = query.value("eqptDeviceType").toString(); result.append(catory); } - qDebug() << query.lastQuery(); +// qDebug() << query.lastQuery(); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } @@ -2139,7 +2147,6 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); @@ -3006,5 +3013,314 @@ return result; } +QMap> BaseCommonApi::GetDataReturnItemListByPistonGauge(QList ResultData,QMap> DataMapList,QMap *HeadMapList) +{ + QList isFirst; + isFirst.append(true); + QList DCVList; + for(const QStringList &row : ResultData) + { + if (!row.isEmpty()) { // 确保行不为空 + if(row[13] =="1") + { + QString VerificationItem=NULL; + if(isFirst[0]) + { + VerificationItem = "示值误差"; + //添加列头 + QStringList head; + head <<"外观及功能性检查"<<"示值误差、回程误差、轻敲位移" <<"理论输出值单位"<<"检定介质"<<"分度值的五分之一" + <<"序号"<<"标准器示值"<<"轻敲前示值"<<"正行程"<<"反行程"<<"轻敲后示值"<<"正行程"<<"反行程"<<"轻敲前后变动量"<<"正行程"<<"反行程" ; + HeadMapList->insert(VerificationItem,head); + isFirst[0]=false; + } + //添加数据 + QStringList Data; + Data.append(row[12]); //外观及功能性检查 + Data.append(row[13]); //示值误差、回程误差、轻敲位移 + Data.append(row[11]); //理论输出值单位 + Data.append(row[14]); //检定介质 + Data.append(row[15]); //分度值的五分之一 + Data.append(row[0]); //ID + Data.append(row[2]); //标准器示值 + Data.append(""); //轻敲前后变动量正行程 软件界面计算 + Data.append(""); //轻敲前后变动量反行程 软件界面计算 + //最大允许误差 根据公式计算 目前 先都按 a*标准值 + b*量程 +// try { +// //保证数据库内数据没问题 +// Data.append(QString::number((row[11].toDouble()*row[8].toDouble()) +// + (row[12].toDouble()*row[7].toDouble()))); +// } catch(const std::exception &e) { +// Data.append("0"); +// } +// Data.append(row[9]); + DCVList.append(Data); + } + } + if(DCVList.count()!=0){ + DataMapList.insert("示值误差",DCVList); + }; + return DataMapList; + } +} +//检定项0.02活塞式压力计数据(包含字典的字段都存为字典value) +QMap> BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(QString itemId,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + + QSqlQuery query; + query.prepare("SELECT bbdmidpg.*,bbdmii.appearance_function_check,bbdmicp.indication_error,bbdmicp.measure_medium,bbdmicp.division " + " FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id " + " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " + " WHERE bbdmidpg.item_id = :itemId "); + // 将参数绑定到占位符 + query.bindValue(":itemId", itemId); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_id").toString()); //检定项目ID + result.append(query.value("indicating_value").toString());//标准器示值 + result.append(query.value("return_error").toString());//回程误差允许值 + result.append(query.value("friction_error").toString());//轻敲位移允许值 + result.append(query.value("indicating_error").toString());//示值误差允许值 + result.append(query.value("zero_position").toString());//零位是否带止销 + result.append(query.value("measure_medium").toString());//检定介质(字典value) + result.append(query.value("accuracy_class").toString());//准确度等级 + result.append(query.value("maximum_error").toString());//最大允许误差 + result.append(query.value("theoretical_output_value").toString());//理论输出值 + result.append(query.value("theoretical_output_value_unit").toString());//理论输出值单位 + result.append(query.value("appearance_function_check").toString());//外观及功能性检查(1/0) + result.append(query.value("indication_error").toString());//示值误差、回程误差、轻敲位移 + result.append(query.value("measure_medium").toString());//检定介质(字典value) + result.append(query.value("division").toString());//分度值的五分之一 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + +// *headList <<"序号"<<"检定项id"<<"标准器示值"<<"回程误差允许值"<<"轻敲位移允许值"<<"示值误差允许值"<<"零位是否带止销" +// <<"检定介质"<<"准确度等级"<<"最大允许误差"<<"理论输出值"<<"理论输出值单位"<<"外观及功能性检查(1/0)"<<"示值误差、回程误差、轻敲位移" +// <<"检定介质(字典value)"<<"分度值的五分之一"<<"创建时间"<<"更新时间"; + //进行检定项目列头转换 + DataMapList= GetDataReturnItemListByPistonGauge(resultData,DataMapList,headList); + return DataMapList; +} + +//自动检定数据结果保存 参数1：装置字典1,2,3 参数2:BaseClass父类， 子类赋值 +bool BaseCommonApi::SearchSelectTable(QString id, BaseClass *object) { + bool result = false; // 初始化为 false 或根据需要初始化为其他值 + switch (id.toInt()) { + case 1: { + DeviceMeasureDataPistonGauge *recordGauge = dynamic_cast(object); + if (recordGauge != nullptr) { + result = BaseCommonApi::InsertDeviceMeasureDataPistonGauge(*recordGauge); + } else { + // 处理转换失败的情况 + result = false; // 或者其他表示失败的值 + } + break; + } + case 2: { + SaveDeviceMeasureCalibrator *recordCal = dynamic_cast(object); + if (recordCal != nullptr) { + result = BaseCommonApi::InsertVerMultiCal(*recordCal); // 注意这里使用recordCal而不是recordGauge + } else { + // 处理转换失败的情况 + result = false; // 或者其他表示失败的值 + } + break; + } + // 可能还有其他的case + default: + // 处理未知或未处理的id + result = false; // 或者其他表示失败的值 + break; + + } + + return result; // 返回结果 +} + //【结果保存】压力 +bool BaseCommonApi::InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_data_piston_gauge " + "(id, data_id, data_type, data_category, indicating_value, " + "before_friction_forward_stroke, before_friction_reverse_stroke, " + "after_friction_forward_stroke, after_friction_reverse_stroke, " + "variation_forward_stroke, variation_reverse_stroke, " + "theoretical_output_value, first_forward_stroke, first_reverse_stroke, " + "second_forward_stroke, second_reverse_stroke, third_forward_stroke, " + "third_reverse_stroke, indicating_error, return_error, average_forward_stroke, " + "average_reverse_stroke, average_value, average_return_error, item, " + "max_indicating_error, max_return_error, max_friction_error, maximum_error_absolute, " + "forward_stroke_switch_value, reverse_stroke_switch_value, point_deviation, " + "different_gap, max_point_deviation, allow_point_deviation, max_different_gap, " + "allow_different_gap, zero_drift_one, zero_drift_two, zero_drift_three, " + "zero_drift_four, zero_drift_five, intercept_a, slope_b, sensitivity_b, " + "repeatability_r, hysteresis_h, linear_l, basic_error_a, periodic_stability_s_b, " + "create_time, update_time) " + "VALUES (:id, :data_id, :data_type, :data_category, :indicating_value, " + ":before_friction_forward_stroke, :before_friction_reverse_stroke, " + ":after_friction_forward_stroke, :after_friction_reverse_stroke, " + ":variation_forward_stroke, :variation_reverse_stroke, " + ":theoretical_output_value, :first_forward_stroke, :first_reverse_stroke, " + ":second_forward_stroke, :second_reverse_stroke, :third_forward_stroke, " + ":third_reverse_stroke, :indicating_error, :return_error, :average_forward_stroke, " + ":average_reverse_stroke, :average_value, :average_return_error, :item, " + ":max_indicating_error, :max_return_error, :max_friction_error, :maximum_error_absolute, " + ":forward_stroke_switch_value, :reverse_stroke_switch_value, :point_deviation, " + ":different_gap, :max_point_deviation, :allow_point_deviation, :max_different_gap, " + ":allow_different_gap, :zero_drift_one, :zero_drift_two, :zero_drift_three, " + ":zero_drift_four, :zero_drift_five, :intercept_a, :slope_b, :sensitivity_b, " + ":repeatability_r, :hysteresis_h, :linear_l, :basic_error_a, :periodic_stability_s_b, " + ":create_time, :update_time)"); + + //// QString formattedUpdateDateTime = measureCalibrator.create_time.toString("yyyy-MM-dd HH:mm:ss"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", gauge.id); + query.bindValue(":data_id", gauge.data_id); + query.bindValue(":data_type", gauge.data_type); + query.bindValue(":data_category", gauge.data_category); + query.bindValue(":indicating_value", gauge.indicating_value); + query.bindValue(":before_friction_forward_stroke", gauge.before_friction_forward_stroke); + query.bindValue(":before_friction_reverse_stroke", gauge.before_friction_reverse_stroke); + query.bindValue(":after_friction_forward_stroke", gauge.after_friction_forward_stroke); + query.bindValue(":after_friction_reverse_stroke", gauge.after_friction_reverse_stroke); + query.bindValue(":variation_forward_stroke", gauge.variation_forward_stroke); + query.bindValue(":variation_reverse_stroke", gauge.variation_reverse_stroke); + query.bindValue(":theoretical_output_value", gauge.theoretical_output_value); + query.bindValue(":first_forward_stroke", gauge.first_forward_stroke); + query.bindValue(":first_reverse_stroke", gauge.first_reverse_stroke); + query.bindValue(":second_forward_stroke", gauge.second_forward_stroke); + query.bindValue(":second_reverse_stroke", gauge.second_reverse_stroke); + query.bindValue(":third_forward_stroke", gauge.third_forward_stroke); + query.bindValue(":third_reverse_stroke", gauge.third_reverse_stroke); + query.bindValue(":indicating_error", gauge.indicating_error); + query.bindValue(":return_error", gauge.return_error); + query.bindValue(":average_forward_stroke", gauge.average_forward_stroke); + query.bindValue(":average_reverse_stroke", gauge.average_reverse_stroke); + query.bindValue(":average_value", gauge.average_value); + query.bindValue(":average_return_error", gauge.average_return_error); + query.bindValue(":item", gauge.item); + query.bindValue(":max_indicating_error", gauge.max_indicating_error); + query.bindValue(":max_return_error", gauge.max_return_error); + query.bindValue(":max_friction_error", gauge.max_friction_error); + query.bindValue(":maximum_error_absolute", gauge.maximum_error_absolute); + query.bindValue(":forward_stroke_switch_value", gauge.forward_stroke_switch_value); + query.bindValue(":reverse_stroke_switch_value", gauge.reverse_stroke_switch_value); + query.bindValue(":point_deviation", gauge.point_deviation); + query.bindValue(":different_gap", gauge.different_gap); + query.bindValue(":max_point_deviation", gauge.max_point_deviation); + query.bindValue(":allow_point_deviation", gauge.allow_point_deviation); + query.bindValue(":max_different_gap", gauge.max_different_gap); + query.bindValue(":allow_different_gap", gauge.allow_different_gap); + query.bindValue(":zero_drift_one", gauge.zero_drift_one); + query.bindValue(":zero_drift_two", gauge.zero_drift_two); + query.bindValue(":zero_drift_three", gauge.zero_drift_three); + query.bindValue(":zero_drift_four", gauge.zero_drift_four); + query.bindValue(":zero_drift_five", gauge.zero_drift_five); + query.bindValue(":intercept_a", gauge.intercept_a); + query.bindValue(":slope_b", gauge.slope_b); + query.bindValue(":sensitivity_b", gauge.sensitivity_b); + query.bindValue(":repeatability_r", gauge.repeatability_r); + query.bindValue(":hysteresis_h", gauge.hysteresis_h); + query.bindValue(":linear_l", gauge.linear_l); + query.bindValue(":basic_error_a", gauge.basic_error_a); + query.bindValue(":periodic_stability_s_b", gauge.periodic_stability_s_b); + 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; +} +//【查询】 0.02压力结果表数据 +QList getDeviceMeasureDataPistonGauge(QString data_id,QStringList *HeadList) +{ + QList resultData; + QStringList result; + resultData.clear(); + + QSqlQuery query; + query.prepare("SELECT * FROM biz_business_device_measure_data_piston_gauge WHERE data_id= :data_id "); + // 将参数绑定到占位符 + query.bindValue(":data_id", data_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("data_id").toString()); //检定数据管理基础信息表id + result.append(query.value("data_type").toString());//检定数据类型(电接点一般压力表一个检定数据中区分两个表格)(字典code) + result.append(query.value("data_category").toString());//检定数据类别(1检定数据，2计算结果数据) + result.append(query.value("indicating_value").toString());//标准器示值 + result.append(query.value("before_friction_forward_stroke").toString());//轻敲前被检设备示值-正行程 + result.append(query.value("before_friction_reverse_stroke").toString());//轻敲前被检设备示值-反行程 + result.append(query.value("after_friction_forward_stroke").toString());//轻敲后被检设备示值-正行程 + result.append(query.value("after_friction_reverse_stroke").toString());//轻敲后被检设备示值-反行程 + result.append(query.value("variation_forward_stroke").toString());//轻敲前后变动量-正行程 + result.append(query.value("variation_reverse_stroke").toString());//轻敲前后变动量-反行程 + result.append(query.value("theoretical_output_value").toString());//理论输出值 + result.append(query.value("first_forward_stroke").toString());//第一次正行程 + result.append(query.value("first_reverse_stroke").toString());//第一次反行程 + result.append(query.value("second_forward_stroke").toString());//第二次正行程 + result.append(query.value("second_reverse_stroke").toString());//第二次反行程 + result.append(query.value("third_forward_stroke").toString());//第三次正行程 + result.append(query.value("third_reverse_stroke").toString());//第三次反行程 + result.append(query.value("indicating_error").toString());//示值误差 + result.append(query.value("return_error").toString());//回程误差 + result.append(query.value("average_forward_stroke").toString());//正行程平均值 + result.append(query.value("average_reverse_stroke").toString());//反行程平均值 + result.append(query.value("average_value").toString());//平均值 + result.append(query.value("average_return_error").toString());//回程误差平均值 + result.append(query.value("item").toString());//项目(结果表) + result.append(query.value("max_indicating_error").toString());//示值误差最大值(结果表) + result.append(query.value("max_return_error").toString());//回程误差最大值(结果表) + result.append(query.value("max_friction_error").toString());//轻敲位移最大值(结果表) + result.append(query.value("maximum_error_absolute").toString());//最大允许误差绝对值 + result.append(query.value("forward_stroke_switch_value").toString());//正行程切换值(电接点一般压力表) + result.append(query.value("reverse_stroke_switch_value").toString());//反行程切换值(电接点一般压力表) + result.append(query.value("point_deviation").toString());//设定点偏差(电接点一般压力表) + result.append(query.value("different_gap").toString());//切换差(电接点一般压力表) + result.append(query.value("max_point_deviation").toString());//最大设定点偏差绝对值(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("allow_point_deviation").toString());//允许设定点偏差绝对值(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("max_different_gap").toString());//最大切换差(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("allow_different_gap").toString());//允许切换差(结果表)(电接点一般压力表的第2个结果表) + result.append(query.value("zero_drift_one").toString());//零位漂移(数字压力计手工输入的第1个示值) + result.append(query.value("zero_drift_two").toString());//零位漂移(数字压力计手工输入的第2个示值) + result.append(query.value("zero_drift_three").toString());//零位漂移(数字压力计手工输入的第3个示值) + result.append(query.value("zero_drift_four").toString());//零位漂移(数字压力计手工输入的第4个示值) + result.append(query.value("zero_drift_five").toString());//零位漂移(数字压力计手工输入的第5个示值) + result.append(query.value("intercept_a").toString());//截距a(结果表) + result.append(query.value("slope_b").toString());//斜率b(结果表) + result.append(query.value("sensitivity_b").toString());//灵敏度b(结果表) + result.append(query.value("repeatability_r").toString());//重复性ξR(结果表) + result.append(query.value("hysteresis_h").toString());//迟滞ξH(结果表) + result.append(query.value("linear_l").toString());//线性ξL(结果表) + result.append(query.value("basic_error_a").toString());//基本误差A(结果表) + result.append(query.value("periodic_stability_s_b").toString());//周期稳定性Sb(结果表) + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + *HeadList <<"暂未修改序号"<<"检定项id"<<"标准器示值"<<"回程误差允许值"<<"轻敲位移允许值"<<"示值误差允许值"<<"零位是否带止销" + <<"检定介质"<<"准确度等级"<<"最大允许误差"<<"理论输出值"<<"理论输出值单位"<<"创建时间"<<"更新时间"; + return resultData; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 4949683..0b4ca5d 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -10,7 +10,11 @@ #include "id\IdWorker.h" #include "id\TaskManager.h" - +class BaseClass +{ +public: + virtual ~BaseClass() {} // 虚析构函数 +}; //部门任务 @@ -617,7 +621,7 @@ }; //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) -class SaveDeviceMeasureCalibrator +class SaveDeviceMeasureCalibrator:public BaseClass { public: QString id; @@ -651,8 +655,8 @@ QDateTime create_time; QDateTime update_time; }; -//【自动检定新版】检定数据【新增】计量检定业务-受检设备检定管理-检定项0.02活塞式压力计数据(包含字典的字段都存为字典value) -class SaveDeviceMeasureCalibratorNew +//检定项0.02活塞式压力计数据(包含字典的字段都存为字典value) +class DeviceMeasureCalibratorPistonGauge { public: QString id; @@ -936,8 +940,64 @@ }; +//计量检定业务-受检设备检定管理-检定数据管理0.02级活塞式压力计数据(自动检定输出或业务创建) +class DeviceMeasureDataPistonGauge:public BaseClass +{ +public: + QString id; + QString data_id;//检定数据管理基础信息表id + QString data_type;//检定数据类型(电接点一般压力表一个检定数据中区分两个表格)(字典code) + QString data_category;//检定数据类别(1检定数据，2计算结果数据) + QString indicating_value;//标准器示值 + QString before_friction_forward_stroke;//轻敲前被检设备示值-正行程 + QString before_friction_reverse_stroke;//轻敲前被检设备示值-反行程 + QString after_friction_forward_stroke;//轻敲后被检设备示值-正行程 + QString after_friction_reverse_stroke;//轻敲后被检设备示值-反行程 + QString variation_forward_stroke;//轻敲前后变动量-正行程 + QString variation_reverse_stroke;//轻敲前后变动量-反行程 + QString theoretical_output_value;//理论输出值 + QString first_forward_stroke;//第一次正行程 + QString first_reverse_stroke;//第一次反行程 + QString second_forward_stroke;//第二次正行程 + QString second_reverse_stroke;//第二次反行程 + QString third_forward_stroke;//第三次正行程 + QString third_reverse_stroke;//第三次反行程 + QString indicating_error;//示值误差 + QString return_error;//回程误差 + QString average_forward_stroke;//正行程平均值 + QString average_reverse_stroke;//反行程平均值 + QString average_value;//平均值 + QString average_return_error;//回程误差平均值 + QString item;//项目(结果表) + QString max_indicating_error;//示值误差最大值(结果表) + QString max_return_error;//回程误差最大值(结果表) + QString max_friction_error;//轻敲位移最大值(结果表) + QString maximum_error_absolute;//最大允许误差绝对值 + QString forward_stroke_switch_value;//正行程切换值(电接点一般压力表) + QString reverse_stroke_switch_value;//反行程切换值(电接点一般压力表) + QString point_deviation;//设定点偏差(电接点一般压力表) + QString different_gap;//切换差(电接点一般压力表) + QString max_point_deviation;//最大设定点偏差绝对值(结果表)(电接点一般压力表的第2个结果表) + QString allow_point_deviation;//允许设定点偏差绝对值(结果表)(电接点一般压力表的第2个结果表) + QString max_different_gap;//最大切换差(结果表)(电接点一般压力表的第2个结果表) + QString allow_different_gap;//允许切换差(结果表)(电接点一般压力表的第2个结果表) + QString zero_drift_one;//零位漂移(数字压力计手工输入的第1个示值) + QString zero_drift_two;//零位漂移(数字压力计手工输入的第2个示值) + QString zero_drift_three;//零位漂移(数字压力计手工输入的第3个示值) + QString zero_drift_four;//零位漂移(数字压力计手工输入的第4个示值) + QString zero_drift_five;//零位漂移(数字压力计手工输入的第5个示值) + QString intercept_a;//截距a(结果表) + QString slope_b;//斜率b(结果表) + QString sensitivity_b;//灵敏度b(结果表) + QString repeatability_r;//重复性ξR(结果表) + QString hysteresis_h;//迟滞ξH(结果表) + QString linear_l;//线性ξL(结果表) + QString basic_error_a;//基本误差A(结果表) + QString periodic_stability_s_b;//周期稳定性Sb(结果表) + QDateTime create_time; + QDateTime update_time; +}; enum class SyncRunStatus { - Running, Stopped, Paused @@ -1030,7 +1090,9 @@ //检定数据管理-基本信息 参数首页数据的id static VerificationBasicDataDetails getVerificationBasicDataDetails(QString dataId); //检定数据管理-检定结果信息-多功能校准源 - static QList getVerificationMultiCalResultData(QString sampleId,QStringList *HeadList); + static QList getVerificationMultiCalResultData(QString dataId,QStringList *HeadList); + //检定数据管理-检定结果信息-0.02压力 + static QList getDeviceMeasureDataPistonGauge(QString data_id,QStringList *HeadList); //核查数据管理-首页 static QList getCheckData(); // 核查数据管理-基本信息-核查件 @@ -1062,7 +1124,6 @@ static bool DeleteInstructionLib(QString id); //更新指令库 static bool UpdateInstructionLib(InstructionLib instructionLib); - //新增通讯接口 static bool InsertVerificationProgramConfigInterface(VerificationProgramConfigInterface configInterdace); //更新检定程序 @@ -1083,7 +1144,6 @@ static QList getDeviceMeasureEquipmentCatory(QString deviceId); //自动检定-根据被检设备 查询检定项分类 在查询检定程序 static QList getVerificationProgramInfoByDeviceId(QString deviceId); - //自动检定-结果保存-基本信息 static bool InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo); //自动检定-结果保存-数据关联-计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 @@ -1156,7 +1216,13 @@ //根据log_sync_id查询数据同步表 static QList getzdDataSyncByuserId(QString log_sync_id); + //【查询】检定项0.02活塞式压力计数据(包含字典的字段都存为字典value) +// static QList getDeviceMeasureCalibratorPistonGauge(QString itemId,QStringList *headList); + static QMap> getDeviceMeasureCalibratorPistonGauge(QString itemId,QMap *headList); + static QMap> GetDataReturnItemListByPistonGauge(QList ResultData,QMap> DataMapList,QMap *HeadMapList); + static bool SearchSelectTable(QString id, BaseClass *object); + //【结果保存】压力 + static bool InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge); }; - #endif // BASECOMMONAPI_H