ecms.git - Gitblit

			@@ -127,6 +127,7 @@
			List<TagValue> minList = new ArrayList<>();
			List<TagValue> avgList = new ArrayList<>();
			if (TimeTypeConst.TIME_TYPE_DAY.equals(timeType)) {

			} else {
			String tempTimeCode = StringUtil.ifEmptyOrNullReturnValue(timeCode).replace(CommonConst.SINGLE_MINUS_SIGN, CommonConst.EMPTY);
			Date start = DateTimeUtil.toDateTime(tempTimeCode, DateTimeUtil.COMMON_PATTERN_MONTH);
			@@ -233,13 +234,13 @@
			TagValue rt3 = realtimeDatabaseService.statistics(code, date, endTime, CollectionModes.max);
			TagValue rt4 = realtimeDatabaseService.statistics(code, date, endTime, CollectionModes.min);
			TagValue rt2 = realtimeDatabaseService.statistics(code, date, endTime, CollectionModes.mean);
			if (ObjectUtils.isNotEmpty(rt2.getValue())) {
			if (ObjectUtils.isNotEmpty(rt2)) {
			temp.setAvg(String.valueOf(DoubleUtil.formatDouble(rt2.getValue())));
			}
			if (ObjectUtils.isNotEmpty(rt3.getValue())) {
			if (ObjectUtils.isNotEmpty(rt3)) {
			temp.setMax(String.valueOf(DoubleUtil.formatDouble(rt3.getValue())));
			}
			if (ObjectUtils.isNotEmpty(rt4.getValue())) {
			if (ObjectUtils.isNotEmpty(rt4)) {
			temp.setMin(String.valueOf(DoubleUtil.formatDouble(rt4.getValue())));
			}
			}

			@@ -115,7 +115,7 @@
			@Override
			public TagValue statistics(String tagCode, Date beginTime, Date endTime, CollectionModes collectionModes) {
			List<TagValue> tagValues = repository.statistics(Collections.singletonList(tagCode), beginTime, endTime, collectionModes);
			return CollectionUtils.isEmpty(tagValues) ? tagValues.get(0) : null;
			return CollectionUtils.isNotEmpty(tagValues) ? tagValues.get(0) : null;
			}

			/**

	zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zhitan-system/src/main/java/com/zhitan/realtimedata/service/impl/RealtimeDatabaseServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史