~whyclmx/iec61850_for_shanxi.git

			@@ -6,6 +6,7 @@
			import java.util.Date;

			import com.base.Com;
			import com.dec.fbs9100.AppParam;
			import com.dec.fbs9100.BattResStorePro_Thread;
			import com.dec.fbs9100.FBS9100_batt_testparam;
			import com.dec.fbs9100.MysqlConnPool;
			@@ -599,6 +600,7 @@
			+ "max_monnum, "
			+ "max_monvol, "
			+ "min_monnum, "
			+ "test_datatype, "
			+ "min_monvol) "
			+ " VALUES "
			+ "("+ rt_data.BattGroupId + ", "
			@@ -619,6 +621,7 @@
			+ rt_data.mMaxMonNum + ", "
			+ rt_data.mMaxMonVol + ", "
			+ rt_data.mMinMonNum + ", "
			+ tmp_test_data.test_datatype + ", "
			+ rt_data.mMinMonVol + ") ";
			/**
			* 2021-08-17 @lijun 向插入batttestdata_inf表中插入历史数据时记录当前电池组的内阻数据
			@@ -652,6 +655,7 @@
			+ "max_monnum=" + rt_data.mMaxMonNum + ", "
			+ "max_monvol=" + rt_data.mMaxMonVol + ", "
			+ "min_monnum=" + rt_data.mMinMonNum + ", "
			+ "test_datatype=" + tmp_test_data.test_datatype + ", "
			+ "min_monvol=" + rt_data.mMinMonVol + " "
			+ " WHERE "
			+ " BattGroupId=" + rt_data.BattGroupId
			@@ -1053,5 +1057,86 @@
			sql.close_con();
			}
			}

			/**
			* 查询指定电池组指定时间内的放电测试次数
			* @param conn_pool
			* @param rd_data
			* @return
			*/
			public static int queryBattTestDataTimes(MysqlConnPool pool,BattData_RT rt_data,AppParam appParam) {
			int disCount = 0;
			Date starttime = rt_data.mTestData.startTestTime;
			Date before = new Date(starttime.getTime() - (appParam.getDisimes_LimitTimeLong()601000));
			String sql_str = " SELECT COUNT(*) as count FROM " + Sql_Mysql.BattTestDataInf_Table +
			" WHERE BattGroupId = " + rt_data.BattGroupId + " AND test_type = 3 AND "
			+ " ((test_starttime >= '"+ Com.getDateTimeFormat(before, Com.DTF_YMDhms)+"' AND test_starttime < '" + Com.getDateTimeFormat(starttime, Com.DTF_YMDhms) + "') "
			+ " OR (record_time >= '" + Com.getDateTimeFormat(before, Com.DTF_YMDhms) + "' AND record_time<'"+Com.getDateTimeFormat(starttime, Com.DTF_YMDhms)+"'))";
			Sql_Mysql sql = new Sql_Mysql(pool);
			ResultSet res = null;
			try {
			//System.out.println(sql_str);
			res = sql.sqlMysqlQuery(sql_str);
			if(res.next()) {
			disCount = res.getInt("count");
			}
			} catch (SQLException e) {
			sql.logger.error("BattData_RT_SQL.queryBattTestDataTimes():" + e.toString(), e);
			} finally {
			if(null != res) {
			try {
			res.close();
			} catch (SQLException e) {
			sql.logger.error("BattData_RT_SQL.queryBattTestDataTimes():" + e.toString(), e);
			}
			}
			sql.close_con();
			}
			return disCount;
			}

			/**
			*
			* @param conn_pool
			* @param rd_data
			* @return
			*/
			public static void queryAppParamFromDataBase(MysqlConnPool pool,AppParam appParam) {
			/**
			* 2023-06-05 @lijun 山西新增放电测试逻辑参数
			*/
			ResultSet res = null;
			Sql_Mysql sql = new Sql_Mysql(pool);
			try {
			res = sql.sqlMysqlQuery("SELECT * FROM " + Sql_Mysql.Page_Param_Table + " WHERE id >= 47 AND id <= 51;");
			while(res.next()) {
			int id = res.getInt("id");
			int param_vaule = res.getInt("status");
			if(id == 47) {
			appParam.SetDischarge_TestTimeLong_Monit(param_vaule); //监测放电限制测试时长【分钟】
			}else if(id == 48) {
			appParam.SetPowerVol_ChangeTimeLong(param_vaule); //电源电压变化限制时长【分钟】
			}else if(id == 49) {
			appParam.SetPowerVol_ChangeTimesLimit(param_vaule); //电源电压变化限制次数
			}else if(id == 50) {
			appParam.SetDisimes_LimitTimeLong(param_vaule); //限制指定时间的测试时长【分钟】
			}else if(id == 51) {
			appParam.SetDisimes_LimitTimes(param_vaule); //限制指定时间的放电次数
			}
			}
			} catch (SQLException e) {
			sql.logger.error("BattData_RT_SQL.queryAppParamFromDataBase():" + e.toString(), e);
			} finally {
			if(null != res) {
			try {
			res.close();
			} catch (SQLException e) {
			sql.logger.error("BattData_RT_SQL.queryAppParamFromDataBase():" + e.toString(), e);
			}
			}
			sql.close_con();
			}
			}

			/************************************************************************************************/
			}