Merge remote-tracking branch 'origin/master'

baoshiwei

2025-04-19 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76

 zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java

@@ -4,6 +4,7 @@
import com.zhitan.common.core.domain.AjaxResult;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.domain.EnergyIndexQuery;
import com.zhitan.model.domain.vo.ModelNodeIndexInfo;

import java.util.List;

@@ -103,7 +104,7 @@

    List<EnergyIndex> searchIndexByNodeAndChildrenNode(String nodeId, String filter);

    void removeNodeIndex(String nodeId, List<String> removeLink);
    void removeEnergyIndex(List<String> removeLink);

    AjaxResult importEnergyIndex(List<EnergyIndex> energyIndexList, boolean updateSupport);

@@ -136,8 +137,9 @@
    List<EnergyIndex> listDeviceIndex(String nodeId, String meterId);

    /**
     * 通过id删除采集点
     * 根据点位id获取模型节点点位信息
     * @param indexIds
     * @return
     */
    boolean deleteByIndexId(String indexId);

    List<ModelNodeIndexInfo> getModelNodeIndexInfoListByIndexIds(String[] indexIds);
}