综合能耗分析 过滤统计点位

VVT789

2025-02-07 f4dbfb0f7142a41cc8dc1e7cca8bc7526b4a6643

综合能耗分析 过滤统计点位

 zhitan-system/src/main/java/com/zhitan/consumptionanalysis/service/impl/ConsumptionAnalysisServiceImpl.java

@@ -397,8 +397,8 @@
//        if (CollectionUtils.isEmpty(nodeIndexInforList)) {
//            return consumptionAnalysisVO;
//        }

        final List<String> eneryIdList = nodeIndexInforList.stream().map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
        //修改过滤统计点位
        final List<String> eneryIdList = nodeIndexInforList.stream().filter(x->x.getIndexType().equals("STATISTIC")).map(ModelNodeIndexInfor::getEnergyId).distinct().collect(Collectors.toList());
        final LambdaQueryWrapper<SysEnergy> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(CollectionUtils.isNotEmpty(eneryIdList),SysEnergy::getEnersno,eneryIdList);
        final List<SysEnergy> sysEnergies = sysEnergyMapper.selectList(queryWrapper);

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

@@ -32,6 +32,8 @@
   */
  private String energyId;

  private String indexType;

  public String getNodeId() {
    return nodeId;
  }
@@ -63,4 +65,12 @@
  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/resources/mapper/model/ModelNodeMapper.xml

@@ -382,7 +382,8 @@
        SELECT mn.node_id  nodeId,
               mn."name"   "name",
               ni.index_id indexId,
               ei.energy_id energyId
               ei.energy_id energyId,
               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