powerIntelligenceSystem.git

			@@ -593,13 +593,13 @@
			return list;
			}
			//系统概览获取半小时交流输入统计
			public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity,Date recordDatetime,Date recordDatetime1) {
			public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity,Date recordDatetime,Date recordDatetime1,Integer maxRecordNum,Integer minRecordNum) {
			String sql=" select distinct record_datetime,acin1_vola,acin1_volb,acin1_volc,acin2_vola,acin2_volb,acin2_volc " +
			" ,acin1_curra,acin1_currb,acin1_currc,acin2_curra,acin2_currb,acin2_currc " +
			" from "+tableName+" where record_datetime>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
			" and record_datetime<='"+ActionUtil.sdf.format(recordDatetime1)+
			"' and record_num%"+granularity+"=0 or record_num=1 or record_num=100 ";
			sql+=" order by record_datetime asc";
			"' and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+minRecordNum+" or record_num="+maxRecordNum;
			sql+=" order by record_datetime asc";
			List<PwrHisRealAcInDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			public List getResults(ResultSet rs) throws SQLException {
			@@ -627,13 +627,11 @@
			return list;
			}

			public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity,String halfHourAgoTime) {
			public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity,Date recordDatetime,Date recordDatetime1,Integer maxRecordNum,Integer minRecordNum) {
			String sql="select distinct * " +
			"from (select a.*, (@i:= @i+1) as number " +
			" from (select * from "+tableName+" "+
			" where record_datetime>='"+halfHourAgoTime+"') a, " +
			" (select @i:=0) b) c "+
			" where c.number%"+granularity+"=0 or c.number=1 ";
			" from "+tableName+" where record_datetime>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
			" and record_datetime<='"+ActionUtil.sdf.format(recordDatetime1)+
			"' and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+minRecordNum+" or record_num="+maxRecordNum;
			sql+=" order by record_datetime asc";
			List<PwrHisRealDcoutInDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			@@ -798,8 +796,38 @@
			});
			return list;
			}

			//系统概览获取前N笔核容设备信息
			public List<RealDateDTO> getBattDevData100(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1,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 "+tableName+" " +
			" where record_time >= '"+ThreadLocalUtil.format(recordDatetime,1)+"' " +
			" and record_time <= '"+ThreadLocalUtil.format(recordDatetime1,1)+"' "+
			" and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+minRecordNum+" or record_num="+maxRecordNum ;
			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;
			}
			//电池数据历史实时处理(预警分析)
			public List<ResAnalysis> getBattHisRealInAlm(BattRealdataId realdata, Map<String,Integer> battMap) {
			public List<ResAnalysis> getBattHisRealInAlm(BattRealdataId realdata, Map<String,Object> battMap) {
			String result = String.join(",", battMap.keySet());
			String sql=" select record_time,"+result+" " +
			" from db_data_history.tb_batt_realdata_"+realdata.getTableName()+" " +
			@@ -815,7 +843,7 @@
			ph.setRecordTime(rs.getTimestamp("record_time"));
			int i=1;
			for (String key : battMap.keySet()) {
			Integer dataType = battMap.get(key);
			Integer dataType = (Integer) battMap.get(key);
			try {
			String propertyType = "dataType"+(i);
			Field fieldType = ResAnalysis.class.getDeclaredField(propertyType);
			@@ -848,7 +876,7 @@
			}

			//电源数据历史实时处理(预警分析)
			public List<ResAnalysis> getPwrHisRealInAlm(PwrdevHistorydataId pwrHis, Map<String,Integer> pwrMap) {
			public List<ResAnalysis> getPwrHisRealInAlm(PwrdevHistorydataId pwrHis, Map<String,Object> pwrMap) {
			String result = String.join(",", pwrMap.keySet());
			String sql=" select record_datetime,"+result+" " +
			" from db_data_history.tb_pwrdev_historydata_"+pwrHis.getTableName()+" " +
			@@ -864,7 +892,7 @@
			ph.setRecordTime(rs.getTimestamp("record_datetime"));
			int i=1;
			for (String key : pwrMap.keySet()) {
			Integer dataType = pwrMap.get(key);
			Integer dataType = (Integer) pwrMap.get(key);
			try {
			String propertyType = "dataType"+(i);
			Field fieldType = ResAnalysis.class.getDeclaredField(propertyType);
			@@ -895,12 +923,12 @@
			});
			return list;
			}
			//获取指定时间段内最大最小recordNum确保数据的完整
			public List getMaxAndMinRecordNum(BattRealdataId realdata) {
			//获取电池组指定时间段内最大最小recordNum确保数据的完整
			public List getBattMaxAndMinRecordNum(String tableName, Date recordDatetime, Date recordDatetime1) {
			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)+"' " +
			" from " + tableName+" " +
			" where record_time >= '"+ThreadLocalUtil.format(recordDatetime,1)+"' " +
			" and record_time <= '"+ThreadLocalUtil.format(recordDatetime1,1)+"' " +
			" limit 1";
			List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			@@ -914,6 +942,26 @@
			}
			});
			return list;
			}
			//获取电源指定时间段内最大最小recordNum确保数据的完整
			public List getPwrMaxAndMinRecordNum(String tableName, Date recordDatetime, Date recordDatetime1) {
			String sql="select max(record_num) as maxRecordNum,min(record_num) as minRecordNum " +
			" from " + tableName+" " +
			" where record_datetime >= '"+ThreadLocalUtil.format(recordDatetime,1)+"' " +
			" and record_datetime <= '"+ThreadLocalUtil.format(recordDatetime1,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;
			}
			//1.2.7优良电源统计上一季度的电源某一属性和参数阈值超过的次数
			public List<PwrdevHistorydataId> getPwrQuarter7(String tableName,List<String> propertyNameList) {
			@@ -984,4 +1032,5 @@
			});
			return list;
			}

			}