支路用能分析

zt916916

2025-03-25 d6fb5de911ce329a667d5f39ee50869003186ce0

支路用能分析

This reverts commit 2e732cecef614ebf288a251e8bf47771b59045e9.

 zhitan-admin/src/main/java/com/zhitan/web/controller/branchanalysis/BranchEnergyAnalysisController.java

ÎļþÒÑɾ³ý

 zhitan-common/src/main/java/com/zhitan/common/utils/PropUtils.java

ÎļþÒÑɾ³ý

 zhitan-system/src/main/java/com/zhitan/branchanalysis/domain/BranchAnalysisVO.java

ÎļþÒÑɾ³ý

 zhitan-system/src/main/java/com/zhitan/branchanalysis/mapper/BranchAnalysisMapper.java

ÎļþÒÑɾ³ý

 zhitan-system/src/main/java/com/zhitan/branchanalysis/service/IBranchAnalysisService.java

ÎļþÒÑɾ³ý

 zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java

ÎļþÒÑɾ³ý

 zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfor.java

@@ -2,7 +2,6 @@


import com.zhitan.common.core.domain.BaseEntity;
import lombok.Data;

/**
 * æ¨¡åž‹èŠ‚点与点位关系对象
@@ -10,7 +9,6 @@
 * @Author: Zhujw
 * @Date: 2023/3/2
 */
@Data
public class ModelNodeIndexInfor extends BaseEntity {
  private static final long serialVersionUID = 1L;

@@ -35,8 +33,44 @@
  private String energyId;

  private String indexType;
  /**
   * å•ä½
   */
  private String unitId;

  public String getNodeId() {
    return nodeId;
  }

  public void setNodeId(String nodeId) {
    this.nodeId = nodeId;
  }

  public String getName() {
    return name;
  }

  public void setName(String name) {
    this.name = name;
  }

  public String getIndexId() {
    return indexId;
  }

  public void setIndexId(String indexId) {
    this.indexId = indexId;
  }

  public String getEnergyId() {
    return energyId;
  }

  public void setEnergyId(String energyId) {
    this.energyId = energyId;
  }

  public String getIndexType() {
    return indexType;
  }

  public void setIndexType(String indexType) {
    this.indexType = indexType;
  }
}

 zhitan-system/src/main/java/com/zhitan/realtimedata/domain/dto/BranchAnalysisDTO.java

ÎļþÒÑɾ³ý

 zhitan-system/src/main/resources/mapper/branchanalysis/BranchAnalysisMapper.xml

ÎļþÒÑɾ³ý

 zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml

@@ -385,8 +385,7 @@
        mn."name" "name",
        ni.index_id indexId,
        ei.energy_id energyId,
        ei.index_type indexType,
        ei.unit_id unitId
        ei.index_type indexType
        FROM "model_node" mn
        LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
        LEFT JOIN energy_index ei on ni.index_id = ei.index_id