From 28dc7dc6eab44e3988886e9b0304c95d1ffb281d Mon Sep 17 00:00:00 2001 From: zt916916 <1903964620@qq.com> Date: 星期四, 20 三月 2025 17:51:58 +0800 Subject: [PATCH] 重点设备能耗年优化 --- zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java index df2ac97..6cf4ac0 100644 --- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java +++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java @@ -2,7 +2,6 @@ import cn.hutool.core.date.DateUtil; import com.zhitan.common.constant.CommonConst; -import com.zhitan.common.enums.TimeType; import com.zhitan.common.utils.DateTimeUtil; import com.zhitan.comprehensivestatistics.domain.YearComperhensive; import com.zhitan.comprehensivestatistics.mapper.YearComprehensiveMapper; @@ -29,14 +28,14 @@ @Override public List<YearComperhensive> getYearComprehensiveList(String nodeId, List<YearComperhensive> dataList, - Date beginTime, Date endTime, TimeType timeType, String indexStorageId){ + Date beginTime, Date endTime, String timeType, String indexStorageId){ if (StringUtils.isNotEmpty(nodeId)) { return yearMapper.getYearComprehensiveList(nodeId, dataList, beginTime, endTime, timeType, indexStorageId); } return Collections.emptyList(); } @Override - public List<YearComperhensive> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){ + public List<YearComperhensive> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId){ List<YearComperhensive> dataList = new ArrayList<>(); if (StringUtils.isNotEmpty(indexId)) { List<YearComperhensive> listChart = yearMapper.getListChart(indexId, beginTime, endTime, timeType, indexStorageId); @@ -54,7 +53,7 @@ } else { yearComperhensive.setTimeCode(format); yearComperhensive.setIndexId(indexId); - yearComperhensive.setTimeType(timeType.name()); + yearComperhensive.setTimeType(timeType); yearComperhensive.setUnitId(first.getUnitId()); yearComperhensive.setIndexName(first.getIndexName()); } -- Gitblit v1.9.3