From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期六, 19 四月 2025 12:39:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhitan-system/src/main/java/com/zhitan/processenergy/service/impl/YearProcessEnergyServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/processenergy/service/impl/YearProcessEnergyServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/processenergy/service/impl/YearProcessEnergyServiceImpl.java new file mode 100644 index 0000000..4f992b0 --- /dev/null +++ b/zhitan-system/src/main/java/com/zhitan/processenergy/service/impl/YearProcessEnergyServiceImpl.java @@ -0,0 +1,59 @@ +package com.zhitan.processenergy.service.impl; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.zhitan.common.utils.DateTimeUtil; +import com.zhitan.common.utils.TypeTime; +import com.zhitan.processenergy.domain.YearProcessEnergy; +import com.zhitan.processenergy.mapper.YearProcessEnergyMapper; +import com.zhitan.processenergy.service.IYearProcessEnergyService; +import com.zhitan.realtimedata.domain.dto.DataItemQueryDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.annotation.Resources; +import java.util.Collections; +import java.util.Date; +import java.util.List; + + +/** + *閲嶇偣璁惧鑳借�楃粺璁� 骞� + * + * @author sys + * @date 2021-01-11 + */ +@Service +public class YearProcessEnergyServiceImpl implements IYearProcessEnergyService { + + @Resource + private YearProcessEnergyMapper yearProcessEnergyMapper; + + @Override + public List<YearProcessEnergy> getYearProcessEnergy(List<String> indexIds, List<TypeTime> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId){ + if (indexIds != null && !indexIds.isEmpty()) { + return yearProcessEnergyMapper.getYearProcessEnergy(indexIds, dataList, beginTime, endTime, timeType, indexStorageId); + } + return Collections.emptyList(); + } + + /** + * + * @param queryDto + * @return + */ + @Override + public List<YearProcessEnergy> getListChart(DataItemQueryDTO queryDto) { + + if(ObjectUtil.isEmpty(queryDto.getIndexId())) { + return Collections.emptyList(); + } + + Date convertTime = DateTimeUtil.getTypeTime(queryDto.getTimeType(), queryDto.getDataTime()); + DateTime beginTime = DateUtil.beginOfYear(convertTime); + DateTime endTime = DateUtil.endOfYear(convertTime); + return yearProcessEnergyMapper.getListChart(queryDto.getIndexId(),beginTime,endTime,queryDto.getTimeType()); + } +} -- Gitblit v1.9.3