powerIntelligenceSystem.git

			@@ -199,7 +199,7 @@
			data.setProvice(rs.getString("provice"));
			data.setCity(rs.getString("city"));
			data.setCountry(rs.getString("country"));
			data.setBattGroupName(rs.getString("battgroup_name"));
			data.setBattgroupName(rs.getString("battgroup_name"));
			list.add(data);
			}
			return list;
			@@ -531,7 +531,7 @@
			});
			return list;
			}
			//找这次放电的最后一笔数据
			//找这次放电的指定一笔数据
			public List<BatttestdataId> getLastDataByBattgroupId(Integer battgroupId, Integer testRecordCount, Integer recordNum) {
			String sql="select distinct * from db_batt_testdata.tb_batttestdata_"+battgroupId
			+" where test_record_count="+testRecordCount+" and record_num="+recordNum+ " order by mon_num asc";
			@@ -624,7 +624,7 @@
			}

			public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity) {
			String sql="select distinct record_datetime,dcout_vol,dcout_curr,battgroup1_vol,battgroup1_curr,battgroup2_vol,battgroup2_curr " +
			String sql="select distinct * " +
			"from (select a.*, (@i:= @i+1) as number " +
			" from (select * from "+tableName+" "+
			" where record_datetime>date_sub(now(),interval 0.5 hour)) a, " +
			@@ -638,12 +638,39 @@
			while (rs.next()){
			PwrHisRealDcoutInDto data=new PwrHisRealDcoutInDto();
			data.setRecordDatetime(rs.getTimestamp("record_datetime"));
			data.setDcoutVol(rs.getFloat("dcout_vol"));
			data.setDcoutCurr(rs.getFloat("dcout_curr"));
			data.setBattgroup1Vol(rs.getFloat("battgroup1_vol"));
			data.setBattgroup1Curr(rs.getFloat("battgroup1_curr"));
			data.setBattgroup2Vol(rs.getFloat("battgroup2_vol"));
			data.setBattgroup2Curr(rs.getFloat("battgroup2_curr"));
			data.setMOutputvol(rs.getFloat("m_outputvol"));
			data.setM1Outcurr(rs.getFloat("m1_outcurr"));
			data.setM2Outcurr(rs.getFloat("m2_outcurr"));
			data.setM3Outcurr(rs.getFloat("m3_outcurr"));
			data.setM4Outcurr(rs.getFloat("m4_outcurr"));
			data.setM5Outcurr(rs.getFloat("m5_outcurr"));
			data.setM6Outcurr(rs.getFloat("m6_outcurr"));
			data.setM7Outcurr(rs.getFloat("m7_outcurr"));
			data.setM8Outcurr(rs.getFloat("m8_outcurr"));
			data.setM9Outcurr(rs.getFloat("m9_outcurr"));
			data.setM10Outcurr(rs.getFloat("m10_outcurr"));
			data.setM11Outcurr(rs.getFloat("m11_outcurr"));
			data.setM12Outcurr(rs.getFloat("m12_outcurr"));
			data.setM13Outcurr(rs.getFloat("m13_outcurr"));
			data.setM14Outcurr(rs.getFloat("m14_outcurr"));
			data.setM15Outcurr(rs.getFloat("m15_outcurr"));
			data.setM16Outcurr(rs.getFloat("m16_outcurr"));
			data.setM1OutVol(rs.getFloat("m1_out_vol"));
			data.setM2OutVol(rs.getFloat("m2_out_vol"));
			data.setM3OutVol(rs.getFloat("m3_out_vol"));
			data.setM4OutVol(rs.getFloat("m4_out_vol"));
			data.setM5OutVol(rs.getFloat("m5_out_vol"));
			data.setM6OutVol(rs.getFloat("m6_out_vol"));
			data.setM7OutVol(rs.getFloat("m7_out_vol"));
			data.setM8OutVol(rs.getFloat("m8_out_vol"));
			data.setM9OutVol(rs.getFloat("m9_out_vol"));
			data.setM10OutVol(rs.getFloat("m10_out_vol"));
			data.setM11OutVol(rs.getFloat("m11_out_vol"));
			data.setM12OutVol(rs.getFloat("m12_out_vol"));
			data.setM13OutVol(rs.getFloat("m13_out_vol"));
			data.setM14OutVol(rs.getFloat("m14_out_vol"));
			data.setM15OutVol(rs.getFloat("m15_out_vol"));
			data.setM16OutVol(rs.getFloat("m16_out_vol"));
			list.add(data);
			}
			return list;
			@@ -651,4 +678,116 @@
			});
			return list;
			}
			//历史测试记录具体某一次放电数据详情
			public List<BatttestdataId> getTinfDataWithTestRecordCount(String tableName, Integer testRecordCount, Integer recordNum, Integer granularity) {
			String sql="select distinct * from "+tableName+" "+
			" where test_record_count="+testRecordCount+" " +
			" and record_num%"+granularity+"=0 or record_num=1 or record_num="+recordNum;
			sql+=" order by record_time asc";
			List<BatttestdataId> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			public List getResults(ResultSet rs) throws SQLException {
			List<BatttestdataId> list=new ArrayList<>();
			while (rs.next()){
			BatttestdataId data=new BatttestdataId();
			data.setNum(rs.getInt("num"));
			data.setBattgroupId(rs.getInt("battgroup_id"));
			data.setTestRecordCount(rs.getInt("test_record_count"));
			data.setTestType(rs.getInt("test_type"));
			data.setRecordNum(rs.getInt("record_num"));
			data.setDataNew(rs.getInt("data_new"));
			data.setDataAvailable(rs.getInt("data_available"));
			data.setTestTimelong(rs.getInt("test_timelong"));
			data.setTestCurr(rs.getFloat("test_curr"));
			data.setTestCap(rs.getFloat("test_cap"));
			data.setMonNum(rs.getInt("mon_num"));
			data.setMonVol(rs.getFloat("mon_vol"));
			data.setMonTmp(rs.getFloat("mon_tmp"));
			data.setMonRes(rs.getFloat("mon_res"));
			data.setTestStarttime(rs.getTimestamp("test_starttime"));
			data.setRecordTime(rs.getTimestamp("record_time"));
			data.setGroupVol(rs.getFloat("group_vol"));
			data.setOnlineVol(rs.getFloat("online_vol"));
			list.add(data);
			}
			return list;
			}
			});
			return list;
			}
			//判断历史实时表是否存在
			public int judgeTable_realdata( String table){
			String sql="select count(*) as tableNum " +
			" from INFORMATION_SCHEMA.TABLES " +
			" where TABLE_SCHEMA = 'db_data_history' " +
			" and TABLE_NAME = 'tb_batt_realdata_"+table+"'";
			List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			public List getResults(ResultSet rs) throws SQLException {
			LinkedList<Object> temp = new LinkedList<>();
			try {
			while (rs.next())
			temp.add(rs.getInt("tableNum"));
			} catch (SQLException e) {
			e.printStackTrace();
			}
			return temp;
			}
			});
			int tableNum =0;
			if(list!=null){
			tableNum= (int) list.get(0);
			}
			return tableNum;
			}

			//电池数据历史实时处理
			public List<RealDateDTO> getBattRealDataHis(BattRealdataId realdata, int granularity,Integer maxRecordNum,Integer minRecordNum) {
			String sql=" select record_time, group_vol, online_vol,group_curr, mon_vol, mon_tmp, mon_res, mon_num,record_num " +
			" from db_data_history.tb_batt_realdata_"+realdata.getTableName()+" " +
			" where record_time >= '"+ThreadLocalUtil.format(realdata.getRecordTime(),1)+"' " +
			" and record_time <= '"+ThreadLocalUtil.format(realdata.getRecordTime1(),1)+"' "+
			" and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+maxRecordNum+" or record_num="+minRecordNum ;
			List<RealDateDTO> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			public List getResults(ResultSet rs) throws SQLException {
			List<RealDateDTO> list=new ArrayList<>();
			while (rs.next()){
			RealDateDTO ph=new RealDateDTO();
			ph.setRecordTime(rs.getTimestamp("record_time"));
			ph.setGroupVol(rs.getFloat("group_vol"));
			ph.setOnlineVol(rs.getFloat("online_vol"));
			ph.setGroupCurr(rs.getFloat("group_curr"));
			ph.setMonVol(rs.getFloat("mon_vol"));
			ph.setMonTmp(rs.getFloat("mon_tmp"));
			ph.setMonRes(rs.getFloat("mon_res"));
			ph.setMonNum(rs.getInt("mon_num"));
			ph.setRecordNum(rs.getInt("record_num"));
			list.add(ph);
			}
			return list;
			}
			});
			return list;
			}
			//获取指定时间段内最大最小recordNum确保数据的完整
			public List getMaxAndMinRecordNum(BattRealdataId realdata) {
			String sql="select max(record_num) as maxRecordNum,min(record_num) as minRecordNum " +
			" from db_data_history.tb_batt_realdata_" + realdata.getTableName()+" " +
			" where record_time >= '"+ThreadLocalUtil.format(realdata.getRecordTime(),1)+"' " +
			" and record_time <= '"+ThreadLocalUtil.format(realdata.getRecordTime1(),1)+"' " +
			" limit 1";
			List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			public List getResults(ResultSet rs) throws SQLException {
			List list = new ArrayList<>();
			while (rs.next()) {
			list.add(rs.getInt("maxRecordNum"));
			list.add(rs.getInt("minRecordNum"));
			}
			return list;
			}
			});
			return list;
			}
			}