powerIntelligenceSystem.git

			@@ -1,9 +1,6 @@
			package com.whyc.service;

			import com.whyc.dto.Real.BattHisRealDto;
			import com.whyc.dto.Real.CompareDto;
			import com.whyc.dto.Real.QuarterDto;
			import com.whyc.dto.Real.RealDateDTO;
			import com.whyc.dto.Real.*;
			import com.whyc.dto.Response;
			import com.whyc.factory.ThreadPoolExecutorFactory;
			import com.whyc.mapper.CommonMapper;
			@@ -11,6 +8,7 @@
			import com.whyc.pojo.db_data_history.BattRealdataId;
			import com.whyc.pojo.db_param.AlmAnalysisParam;
			import com.whyc.pojo.db_param.AppParam;
			import com.whyc.pojo.db_param.PowerheartParam;
			import com.whyc.pojo.db_ram_db.BattRtstate;
			import com.whyc.pojo.db_station.BattInf;
			import com.whyc.util.ActionUtil;
			@@ -47,6 +45,9 @@

			@Autowired(required = false)
			private BattRtstateService rtstateService;

			@Autowired
			private PowerheartParamService heartService;



			@@ -170,23 +171,60 @@
			}
			return new Response().setII(1,map.size()>0,map,"获取电池组最近一季度的温度数据");
			}
			//系统概览获取半小时核容设备信息
			public Response getHalfHourBattDevData(Integer battgroupId,Integer granularity) {
			String dateTime = ActionUtil.sdfwithOutday.format(new Date());
			String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+dateTime;
			//获取前半个小时数据
			LocalDateTime now = LocalDateTime.now();
			// 计算半小时前的时间点
			LocalDateTime halfHourAgo = now.minusMinutes(30);
			// 格式化输出
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			String halfHourAgoTime=halfHourAgo.format(formatter);
			String existTableName = commonMapper.existTable("db_data_history", "tb_batt_realdata_"+battgroupId+"_"+dateTime);
			if(existTableName == null){
			return new Response().set(1,false,"当前电池组不存在前面小时数据");
			//系统概览获取前N笔核容设备信息
			public Response getBattDevData100(Integer powerId,Integer battgroupId) throws ParseException, InterruptedException {
			//获取前笔数*时间间隔
			PowerheartParam heartParam=heartService.getHeartParamByPowerId(powerId);
			Integer interverCount=100*10;//默认值
			Integer granularity=5;//默认值
			if(heartParam!=null){
			interverCount=heartParam.getHrInterverCfg()*heartParam.getHrCountCfg();
			granularity=heartParam.getHrInterverCfg();
			}
			List<BattHisRealDto> datalist=subTablePageInfoService.getHalfHourBattDevData(tableName,granularity,halfHourAgoTime);
			return new Response().setII(1,datalist.size()>0,datalist,"获取半小时内核容设备信息");
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			LocalDateTime now = LocalDateTime.now();
			String dateTime = now.format(formatter);
			Date endTime=ActionUtil.sdf.parse(dateTime);
			// 计算笔数*时间间隔的时间点
			LocalDateTime halfHourAgo = now.minusMinutes(interverCount);
			// 格式化输出
			String halfHourAgoTime=halfHourAgo.format(formatter);
			Date startTime=ActionUtil.sdf.parse(halfHourAgoTime);
			List<List<Date>> monthTimeList = DateUtil.getMonthTime(startTime,endTime);
			List<RealDateDTO> dataList = new LinkedList<>();
			ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
			CountDownLatch latch = new CountDownLatch(monthTimeList.size());
			for (int i = 0; i < monthTimeList.size(); i++) {
			int finalI = i;
			Integer finalGranularity = granularity;
			pool.execute(() -> {
			int finalII = finalI;
			Date recordDatetime=monthTimeList.get(finalII).get(0);
			Date recordDatetime1=monthTimeList.get(finalII).get(1);
			String table = battgroupId + "_" + ThreadLocalUtil.format(recordDatetime,2);
			String tableName="db_data_history.tb_batt_realdata_"+table;
			//判断表是否存在
			int tableNum = subTablePageInfoService.judgeTable_realdata(table);
			List<RealDateDTO> list = new ArrayList();
			if (tableNum > 0) {
			//获取指定时间段内最大最小recordNum确保数据的完整
			List recordNums= subTablePageInfoService.getBattMaxAndMinRecordNum(tableName,recordDatetime,recordDatetime1);
			Integer maxRecordNum= 0;
			Integer minRecordNum= 0;
			if(recordNums.size()>0){
			maxRecordNum=(Integer)recordNums.get(0);
			minRecordNum=(Integer)recordNums.get(1);
			}
			list = subTablePageInfoService.getBattDevData100(tableName, finalGranularity,recordDatetime,recordDatetime1,maxRecordNum,minRecordNum);
			}
			dataList.addAll(list);
			latch.countDown();
			});
			sleep(200);
			}
			latch.await(10, TimeUnit.MINUTES);
			List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());
			return new Response().setII(1,dataList.size()>0,dataListSorted,"获取半小时内核容设备信息");
			}
			//历史实时数据
			public Response getBattRealDataHis(Integer battgroupId, Integer granularity,String startTime,String endTime) throws ParseException, InterruptedException {
			@@ -212,13 +250,14 @@
			realdata.setRecordTime(monthTimeList.get(finalII).get(0));
			realdata.setRecordTime1(monthTimeList.get(finalII).get(1));
			String table = battgroupId + "_" + ThreadLocalUtil.format(realdata.getRecordTime(),2);
			String tableName="db_data_history.tb_batt_realdata_"+table;
			realdata.setTableName(table);//表名时间格式部分
			//判断表是否存在
			int tableNum = subTablePageInfoService.judgeTable_realdata(table);
			List<RealDateDTO> list = new ArrayList();
			if (tableNum > 0) {
			//获取指定时间段内最大最小recordNum确保数据的完整
			List recordNums= subTablePageInfoService.getMaxAndMinRecordNum(realdata);
			List recordNums= subTablePageInfoService.getBattMaxAndMinRecordNum(tableName,realdata.getRecordTime(),realdata.getRecordTime1());
			Integer maxRecordNum= 0;
			Integer minRecordNum= 0;
			if(recordNums.size()>0){