diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8a7a344..49cbd7e 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -2847,7 +2847,7 @@ } //设备与装置-标准装置管理-核查数据管理核查数据历史修改记录[查询] 参数 检定数据管理基础信息表id -QList getMeasureModifyRecord(QString data_id) +QList BaseCommonApi::getMeasureModifyRecord(QString data_id) { QList result; QSqlQuery query; @@ -2871,3 +2871,104 @@ } return result; } + +//新增日志表数据 +bool BaseCommonApi::InsertzdLog(zdLog log) +{ + QSqlQuery query; + query.prepare("INSERT INTO zd_log(id,is_sync,sync_time,remark,userid,type,create_time,update_time) " + " VALUES(:id,:is_sync,:sync_time,:remark,:userid,:type,:create_time,:update_time) "); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", log.id); + query.bindValue(":is_sync", log.is_sync); + query.bindValue(":sync_time", log.sync_time.toString("yyyy-MM-dd HH:mm:ss")); + query.bindValue(":remark", log.remark); + query.bindValue(":userid", log.userid); + query.bindValue(":type", log.type); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} +//根据userid查询日志表数据 +QList BaseCommonApi::getzdLogByuserId(QString userid) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM zd_log WHERE userid = :userid "); + query.bindValue(":userid",userid); + if (query.exec()) { + while (query.next()) { + zdLog log; + log.id = query.value("id").toString(); + log.is_sync = query.value("is_sync").toString(); + log.sync_time = query.value("sync_time").toDateTime(); + log.remark = query.value("remark").toString(); + log.type = query.value("type").toString(); + log.create_time = query.value("create_time").toDateTime(); + log.update_time = query.value("update_time").toDateTime(); + result.append(log); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//新增数据同步表 +bool BaseCommonApi::InsertzdDataSync(zdDataSync data) +{ + QSqlQuery query; + query.prepare("INSERT INTO zd_data_sync(id,type,ssql,userid,remark,create_time,update_time,log_sync_id,sync_type) " + " VALUES " + " (:id,:type,:ssql,:userid,:remark,:create_time,:update_time,:log_sync_id,:sync_type) "); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", data.id); + query.bindValue(":type", data.type); + query.bindValue(":ssql", data.ssql); + query.bindValue(":remark", data.remark); + query.bindValue(":userid", data.userid); + query.bindValue(":log_sync_id", data.log_sync_id); + query.bindValue(":sync_type", data.sync_type); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} +//根据userid查询数据同步表 +QList getzdDataSyncByuserId(QString userid) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM zd_data_sync WHERE userid= :userid "); + query.bindValue(":userid",userid); + if (query.exec()) { + while (query.next()) { + zdDataSync data; + data.id = query.value("id").toString(); + data.type = query.value("type").toString(); + data.ssql = query.value("ssql").toString(); + data.remark = query.value("remark").toString(); + data.userid = query.value("userid").toString(); + data.log_sync_id = query.value("log_sync_id").toString(); + data.sync_type = query.value("sync_type").toString(); + data.create_time = query.value("create_time").toDateTime(); + data.update_time = query.value("update_time").toDateTime(); + result.append(data); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + + diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8a7a344..49cbd7e 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -2847,7 +2847,7 @@ } //设备与装置-标准装置管理-核查数据管理核查数据历史修改记录[查询] 参数 检定数据管理基础信息表id -QList getMeasureModifyRecord(QString data_id) +QList BaseCommonApi::getMeasureModifyRecord(QString data_id) { QList result; QSqlQuery query; @@ -2871,3 +2871,104 @@ } return result; } + +//新增日志表数据 +bool BaseCommonApi::InsertzdLog(zdLog log) +{ + QSqlQuery query; + query.prepare("INSERT INTO zd_log(id,is_sync,sync_time,remark,userid,type,create_time,update_time) " + " VALUES(:id,:is_sync,:sync_time,:remark,:userid,:type,:create_time,:update_time) "); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", log.id); + query.bindValue(":is_sync", log.is_sync); + query.bindValue(":sync_time", log.sync_time.toString("yyyy-MM-dd HH:mm:ss")); + query.bindValue(":remark", log.remark); + query.bindValue(":userid", log.userid); + query.bindValue(":type", log.type); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} +//根据userid查询日志表数据 +QList BaseCommonApi::getzdLogByuserId(QString userid) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM zd_log WHERE userid = :userid "); + query.bindValue(":userid",userid); + if (query.exec()) { + while (query.next()) { + zdLog log; + log.id = query.value("id").toString(); + log.is_sync = query.value("is_sync").toString(); + log.sync_time = query.value("sync_time").toDateTime(); + log.remark = query.value("remark").toString(); + log.type = query.value("type").toString(); + log.create_time = query.value("create_time").toDateTime(); + log.update_time = query.value("update_time").toDateTime(); + result.append(log); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//新增数据同步表 +bool BaseCommonApi::InsertzdDataSync(zdDataSync data) +{ + QSqlQuery query; + query.prepare("INSERT INTO zd_data_sync(id,type,ssql,userid,remark,create_time,update_time,log_sync_id,sync_type) " + " VALUES " + " (:id,:type,:ssql,:userid,:remark,:create_time,:update_time,:log_sync_id,:sync_type) "); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", data.id); + query.bindValue(":type", data.type); + query.bindValue(":ssql", data.ssql); + query.bindValue(":remark", data.remark); + query.bindValue(":userid", data.userid); + query.bindValue(":log_sync_id", data.log_sync_id); + query.bindValue(":sync_type", data.sync_type); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} +//根据userid查询数据同步表 +QList getzdDataSyncByuserId(QString userid) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM zd_data_sync WHERE userid= :userid "); + query.bindValue(":userid",userid); + if (query.exec()) { + while (query.next()) { + zdDataSync data; + data.id = query.value("id").toString(); + data.type = query.value("type").toString(); + data.ssql = query.value("ssql").toString(); + data.remark = query.value("remark").toString(); + data.userid = query.value("userid").toString(); + data.log_sync_id = query.value("log_sync_id").toString(); + data.sync_type = query.value("sync_type").toString(); + data.create_time = query.value("create_time").toDateTime(); + data.update_time = query.value("update_time").toDateTime(); + result.append(data); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + + diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index e7891fd..12196fb 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -906,6 +906,35 @@ QDateTime update_time; }; +//数据同步-日志表 +class zdLog +{ +public: + QString id; + QString is_sync;//是否同步成功 + QDateTime sync_time;//同步时间 + QString remark;//备注(同步失败原因) + QString userid;//用户id + QString type;//类型(0上传,1下载) + QDateTime create_time; + QDateTime update_time; +}; +//数据同步-数据表 +class zdDataSync +{ +public: + QString id;//id + QString type;//sql类型 + QString ssql;//sql代码 + QString userid;//用户id + QString remark;//备注 + QDateTime create_time; + QDateTime update_time; + QString log_sync_id;//日志表id + QString sync_type;//0未同步,1成功,2失败 +}; + + using namespace Jiawa::Core; class BaseCommonApi @@ -1101,10 +1130,21 @@ static QList getMeasureModifyRecord(QString data_id); //查询最新结果保存记录 static SaveDeviceMeasureInfo getNewResultData(); - + //删除任务详情表同一任务ID的设备 static bool DeleteTaskSameDevice(QString order_id); + //删除任务单信息记录表同一任务ID的设备 static bool DeleteTaskInfoRecordDevice(QString order_id); + //单独查询任务单表 + //更新 任务单 static InsertTask SelectTaskSingle(QString order_id); + //新增日志表数据 + static bool InsertzdLog(zdLog log); + //查询日志表数据 + static QList getzdLogByuserId(QString userid); + //新增数据同步表 + static bool InsertzdDataSync(zdDataSync data); + //根据userid查询数据同步表 + static QList getzdDataSyncByuserId(QString userid); };