ecms.git - Gitblit

			@@ -10,6 +10,7 @@
			import com.zhitan.branchanalysis.service.IBranchAnalysisService;
			import com.zhitan.common.utils.PropUtils;
			import com.zhitan.dataitem.mapper.DataItemMapper;
			import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
			import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
			import com.zhitan.model.mapper.ModelNodeMapper;
			import com.zhitan.realtimedata.domain.DataItem;
			@@ -38,17 +39,17 @@
			public BranchAnalysisVO getBranchAnalysisService(BranchAnalysisDTO dto) {
			String timeType = dto.getTimeType();
			String dataTime = dto.getDataTime();
			Date beginTime = DateTimeUtil.getTypeTime(timeType, dataTime);
			Date beginTime = DateTimeUtil.getTime(timeType, dataTime);
			DateTime endTime = null;

			List<ModelNodeIndexInfor> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
			List<String> indexlist = nodeIndexInfo.stream().map(ModelNodeIndexInfor::getIndexId).collect(Collectors.toList());
			List<ModelNodeIndexInfo> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
			List<String> indexlist = nodeIndexInfo.stream().map(ModelNodeIndexInfo::getIndexId).collect(Collectors.toList());

			if (ObjectUtil.isEmpty(indexlist)) {
			return new BranchAnalysisVO();
			}

			ModelNodeIndexInfor info = nodeIndexInfo.stream().findFirst().get();
			ModelNodeIndexInfo info = nodeIndexInfo.stream().findFirst().get();

			//根据时间类型调整时间范围
			switch (dto.getTimeType()) {
			@@ -67,7 +68,7 @@
			default:
			throw new ServiceException("时间格式错误");
			}
			//获取数据项列表

			List<DataItem> dataItemlist = dataItemMapper.getDataItemTimeRangeInforByIndexIds(beginTime, endTime, timeType, indexlist);

			BranchAnalysisVO vo = new BranchAnalysisVO();