z1415143022
2025-03-25 31e16712da634bb06a4788e7419ce4884f769d62
分项用能分析
已修改3个文件
17 ■■■■ 文件已修改
zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfo.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java
@@ -10,7 +10,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import static com.zhitan.common.core.domain.AjaxResult.success;
/**
zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
@@ -12,7 +12,7 @@
import com.zhitan.common.utils.DateTimeUtil;
import com.zhitan.common.utils.PropUtils;
import com.zhitan.dataitem.service.IDataItemService;
import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import com.zhitan.model.mapper.ModelNodeMapper;
import com.zhitan.realtimedata.domain.DataItem;
import lombok.AllArgsConstructor;
@@ -29,7 +29,7 @@
 * 分项用能分析
 *
 * @author sys
 * @date 2021-01-11
 * @date 2025-03-25
 */
@Service
@AllArgsConstructor
@@ -53,14 +53,14 @@
        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 ItemizedEnergyAnalysisVO();
        }
        ModelNodeIndexInfor info = nodeIndexInfo.stream().findFirst().get();
        ModelNodeIndexInfo info = nodeIndexInfo.stream().findFirst().get();
        // 根据时间类型调整时间范围
        switch (dto.getTimeType()) {
zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfo.java
@@ -38,7 +38,6 @@
     * 名称
     */
    private String nodeName;
    /**
     * 点位id
     */
@@ -60,5 +59,8 @@
     * 点位类型
     */
    private String indexType;
    /**
     * 单位
     */
    private String unitId;
}