From f26157e748d7ed28ee1149c6e9bc1672b9146f2b Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期三, 25 八月 2021 09:37:12 +0800
Subject: [PATCH] V1.104 2021-08-24 lijun 1.新增远程下载充放电一体机历史数据文件以及转储到数据库
---
BattMonitor_FGCD-A059NT/src/com/battmonitor/data_store/InsertDataToMysql_Task_SQL.java | 92 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/BattMonitor_FGCD-A059NT/src/com/battmonitor/data_store/InsertDataToMysql_Task_SQL.java b/BattMonitor_FGCD-A059NT/src/com/battmonitor/data_store/InsertDataToMysql_Task_SQL.java
index 232efec..78abc88 100644
--- a/BattMonitor_FGCD-A059NT/src/com/battmonitor/data_store/InsertDataToMysql_Task_SQL.java
+++ b/BattMonitor_FGCD-A059NT/src/com/battmonitor/data_store/InsertDataToMysql_Task_SQL.java
@@ -9,6 +9,7 @@
import com.battmonitor.data.MonVolData;
import com.battmonitor.sql.MysqlConnPool;
import com.battmonitor.sql.Sql_Mysql;
+import com.batttest.BattResStorePro_Thread;
public class InsertDataToMysql_Task_SQL {
@@ -404,6 +405,97 @@
return sql_str;
}
+ /**
+ *
+ * @lijun 2021-08-16向tb_batttestdata_inf表中添加数据或者更新数据
+ * @param rt_data
+ * @return
+ */
+ public static String getInsertOrUpdateBattTestDataInfStr(MysqlConnPool pool,BattData_RT rt_data, int test_stoptype_t)
+ {
+ String sql_str = " ";
+ BattStatData tmp_test_data = rt_data.mTestData.clone();
+ tmp_test_data.test_stoptype = test_stoptype_t;
+
+ if(false == rt_data.MysqlRecordInf_Exist)
+ {
+ sql_str = "INSERT INTO " + Sql_Mysql.BattTestDataInf_Table
+ + " (BattGroupId, "
+ + "test_record_count, "
+ + "test_type, "
+ + "record_time_interval, "
+ + "data_new, "
+ + "data_available, "
+ + "record_num, "
+ + "test_starttime, "
+ + "test_starttype, "
+ + "record_time, "
+ + "test_timelong, "
+ + "test_stoptype, "
+ + "group_vol, "
+ + "test_curr, "
+ + "test_cap, "
+ + "max_monnum, "
+ + "max_monvol, "
+ + "min_monnum, "
+ + "min_monvol) "
+ + " VALUES "
+ + "("+ rt_data.BattGroupId + ", "
+ + tmp_test_data.testRecordCount + ", "
+ + tmp_test_data.battTestType_For_DataSave + ", "
+ + rt_data.mSaveDataTimeInterval + ", "
+ + true + ", "
+ + true + ", "
+ + (tmp_test_data.recordNum + 1) + ", "
+ + "'" + tmp_test_data.getStartTestTimeString() + "', "
+ + tmp_test_data.testLoaderType + ", "
+ + "'" + tmp_test_data.getRecordTimeString() + "', "
+ + tmp_test_data.testTimeLong + ", "
+ + tmp_test_data.test_stoptype + ", "
+ + tmp_test_data.groupVol + ", "
+ + tmp_test_data.testCurr + ", "
+ + tmp_test_data.testCap + ", "
+ + rt_data.mMaxMonNum + ", "
+ + rt_data.mMaxMonVol + ", "
+ + rt_data.mMinMonNum + ", "
+ + rt_data.mMinMonVol + ") ";
+ /**
+ * 2021-08-16 @lijun 向插入batttestdata_inf表中插入历史数据时记录当前电池组的内阻数据
+ *
+ */
+ BattResStorePro_Thread.insertMonDataToResTable(pool, rt_data, tmp_test_data.getStartTestTime(), BattStatData.BATTDATA_RES);
+ }
+ else
+ {
+ sql_str = "UPDATE " + Sql_Mysql.BattTestDataInf_Table
+ + " SET "
+ + "test_type=" + tmp_test_data.battTestType_For_DataSave + ", "
+ + "record_time_interval=" + rt_data.mSaveDataTimeInterval + ", "
+ + "data_new=" + true + ", "
+ + "data_available=" + true + ", "
+ + "record_num=" + (tmp_test_data.recordNum + 1) + ", "
+ + "test_starttime='" + tmp_test_data.getStartTestTimeString() + "', "
+ + "test_starttype=" + tmp_test_data.testLoaderType + ", "
+ + "record_time='" + tmp_test_data.getRecordTimeString() + "', "
+ + "test_timelong=" + tmp_test_data.testTimeLong + ", "
+ + "test_stoptype=" + tmp_test_data.test_stoptype + ", "
+ + "group_vol=" + tmp_test_data.groupVol + ", "
+ + "test_curr=" + tmp_test_data.testCurrAbsMax + ", "
+ + "test_cap=" + tmp_test_data.testCap + ", "
+ + "max_monnum=" + rt_data.mMaxMonNum + ", "
+ + "max_monvol=" + rt_data.mMaxMonVol + ", "
+ + "min_monnum=" + rt_data.mMinMonNum + ", "
+ + "min_monvol=" + rt_data.mMinMonVol + " "
+ + " WHERE "
+ + " BattGroupId=" + rt_data.BattGroupId
+ + " AND "
+ + " test_starttime='" + tmp_test_data.getStartTestTimeString() + "'";
+ //+ " test_record_count=" + tmp_test_data.testRecordCount;
+ }
+
+ return sql_str;
+ }
+
/**
* 根据测试rt_data数据对象构造删除在tb_batttestdata_id,tb_testdatastop_id,tb_batttestdata_inf中的测试记录的SQL语句集合
--
Gitblit v1.9.1