From 06d3d15a5a08637041cc601101c063b11b07a346 Mon Sep 17 00:00:00 2001
From: net <net@netdeMBP.lan>
Date: 星期五, 14 二月 2025 17:25:21 +0800
Subject: [PATCH]  合并理去杀杀人

---
 zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java |  174 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 96 insertions(+), 78 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java b/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
index 6807f7e..1f4c23c 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
@@ -13,107 +13,125 @@
  * @author fanxinfu
  * @date 2020-02-14
  */
-public interface IEnergyIndexService  {
+public interface IEnergyIndexService {
 
-  EnergyIndex getiEnergyIndexByCode(String code);
+    EnergyIndex getiEnergyIndexByCode(String code);
 
-  /**
-   * 鏍规嵁璁¢噺鍣ㄥ叿id闆嗗悎鏌ヨ鐐逛綅淇℃伅
-   *
-   * @param meterId 璁¢噺鍣ㄥ叿id闆嗗悎
-   * @return
-   */
-  List<EnergyIndex> listIndexByMeterIds(String nodeId,List<String> meterId);
+    /**
+     * 鏍规嵁璁¢噺鍣ㄥ叿id闆嗗悎鏌ヨ鐐逛綅淇℃伅
+     *
+     * @param meterId 璁¢噺鍣ㄥ叿id闆嗗悎
+     * @return
+     */
+    List<EnergyIndex> listIndexByMeterIds(String nodeId, List<String> meterId);
 
-  /**
-   * 鏌ヨ鎸囨爣淇℃伅
-   *
-   * @param indexId 鎸囨爣淇℃伅ID
-   * @return 鎸囨爣淇℃伅
-   */
-  EnergyIndex selectEnergyIndexById(String indexId);
+    /**
+     * 鏌ヨ鎸囨爣淇℃伅
+     *
+     * @param indexId 鎸囨爣淇℃伅ID
+     * @return 鎸囨爣淇℃伅
+     */
+    EnergyIndex selectEnergyIndexById(String indexId);
 
-  /**
-   * 鏌ヨ鎸囨爣淇℃伅
-   *
-   * @param indexId 鎸囨爣淇℃伅ID
-   * @return 鎸囨爣淇℃伅
-   */
-  List<EnergyIndex> selectEnergyIndexByIds(List<String> indexId);
+    /**
+     * 鏌ヨ鎸囨爣淇℃伅
+     *
+     * @param indexId 鎸囨爣淇℃伅ID
+     * @return 鎸囨爣淇℃伅
+     */
+    List<EnergyIndex> selectEnergyIndexByIds(List<String> indexId);
 
-  /**
-   * 鏌ヨ鎸囨爣淇℃伅鍒楄〃
-   *
-   * @param energyIndex 鎸囨爣淇℃伅
-   * @return 鎸囨爣淇℃伅闆嗗悎
-   */
-  List<EnergyIndex> selectEnergyIndexList(EnergyIndex energyIndex);
+    /**
+     * 鏌ヨ鎸囨爣淇℃伅鍒楄〃
+     *
+     * @param energyIndex 鎸囨爣淇℃伅
+     * @return 鎸囨爣淇℃伅闆嗗悎
+     */
+    List<EnergyIndex> selectEnergyIndexList(EnergyIndex energyIndex);
 
-  /**
-   * 鏌ヨ鎸囨爣淇℃伅鍒楄〃
-   *
-   * @param query 鎸囨爣淇℃伅
-   * @return 鎸囨爣淇℃伅闆嗗悎
-   */
-  List<EnergyIndex> selectEnergyIndexList(EnergyIndexQuery query);
+    /**
+     * 鏌ヨ鎸囨爣淇℃伅鍒楄〃
+     *
+     * @param query 鎸囨爣淇℃伅
+     * @return 鎸囨爣淇℃伅闆嗗悎
+     */
+    List<EnergyIndex> selectEnergyIndexList(EnergyIndexQuery query);
 
-  /**
-   * 鏂板鎸囨爣淇℃伅
-   *
-   * @param nodeId
-   * @param energyIndex 鎸囨爣淇℃伅
-   * @return 缁撴灉
-   */
-  int insertEnergyIndex(String nodeId, EnergyIndex energyIndex);
+    /**
+     * 鏂板鎸囨爣淇℃伅
+     *
+     * @param nodeId
+     * @param energyIndex 鎸囨爣淇℃伅
+     * @return 缁撴灉
+     */
+    int insertEnergyIndex(String nodeId, EnergyIndex energyIndex);
 
-  /**
-   * 淇敼鎸囨爣淇℃伅
-   *
-   * @param energyIndex 鎸囨爣淇℃伅
-   * @return 缁撴灉
-   */
-  int updateEnergyIndex(EnergyIndex energyIndex);
+    /**
+     * 淇敼鎸囨爣淇℃伅
+     *
+     * @param energyIndex 鎸囨爣淇℃伅
+     * @return 缁撴灉
+     */
+    int updateEnergyIndex(EnergyIndex energyIndex);
 
-  /**
-   * 鎵归噺鍒犻櫎鎸囨爣淇℃伅
-   *
-   *
-   * @param nodeId
-   * @param indexIds 闇�瑕佸垹闄ょ殑鎸囨爣淇℃伅ID
-   * @return 缁撴灉
-   */
-  int deleteEnergyIndexByIds(String nodeId, String[] indexIds);
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣淇℃伅
+     *
+     * @param nodeId
+     * @param indexIds 闇�瑕佸垹闄ょ殑鎸囨爣淇℃伅ID
+     * @return 缁撴灉
+     */
+    int deleteEnergyIndexByIds(String nodeId, String[] indexIds);
 
-  boolean energyIndexHasExist(String code);
+    boolean energyIndexHasExist(String code);
 
-  boolean energyIndexHasExist(String indexId, String code);
+    boolean energyIndexHasExist(String indexId, String code);
 
-  AjaxResult addMeterIndex(String meterId);
+    AjaxResult addMeterIndex(String meterId);
 
-  List<EnergyIndex> getMeterIndex(String meterId);
+    List<EnergyIndex> getMeterIndex(String meterId);
 
-  boolean modelHasConfig(String modelCode);
+    boolean modelHasConfig(String modelCode);
 
-  List<EnergyIndex> selectCollectIndex(String deviceId);
+    List<EnergyIndex> selectCollectIndex(String deviceId);
 
-  List<EnergyIndex> getEnergyIndexByIds(List<String> indexIds);
+    List<EnergyIndex> getEnergyIndexByIds(List<String> indexIds);
 
-  List<EnergyIndex> getEnergyIndexByCodes(List<String> indexCodes);
+    List<EnergyIndex> getEnergyIndexByCodes(List<String> indexCodes);
 
-  List<EnergyIndex> getIndexByNodeAndChildrenNode(String nodeId);
+    List<EnergyIndex> getIndexByNodeAndChildrenNode(String nodeId);
 
-  List<EnergyIndex> searchIndexByNodeAndChildrenNode(String nodeId, String filter);
+    List<EnergyIndex> searchIndexByNodeAndChildrenNode(String nodeId, String filter);
 
-  void removeNodeIndex(String nodeId, List<String> removeLink);
+    void removeNodeIndex(String nodeId, List<String> removeLink);
 
-  AjaxResult importEnergyIndex(List<EnergyIndex> energyIndexList, boolean updateSupport);
+    AjaxResult importEnergyIndex(List<EnergyIndex> energyIndexList, boolean updateSupport);
 
-  List<EnergyIndex> getEnergyIndexMeterByCodes(List<String> indexCodes);
+    List<EnergyIndex> getEnergyIndexMeterByCodes(List<String> indexCodes);
 
-  Page<EnergyIndex> selectEnergyIndexPage(EnergyIndexQuery query, Long pageNum, Long pageSize);
+    Page<EnergyIndex> selectEnergyIndexPage(EnergyIndexQuery query, Long pageNum, Long pageSize);
 
-  Page<EnergyIndex> getMeterIndexList(List<String> meterIndexIds,String code,
-                                      String name,Long pageNum, Long pageSize);
+    Page<EnergyIndex> getMeterIndexList(List<String> meterIndexIds, String code,
+                                        String name, Long pageNum, Long pageSize);
 
-  List<EnergyIndex> getIndexByCode(String code,String nodeId);
+    List<EnergyIndex> getIndexByCode(String code, String nodeId);
+
+    /**
+     * 鏍规嵁鐢ㄨ兘鍗曞厓id鍜岃澶噄d锛屼互鍙婄偣浣嶇紪鐮佽幏鍙栫偣浣�
+     *
+     * @param nodeId    鑺傜偣id
+     * @param meterId   璁惧id
+     * @param indexCode 鐐逛綅缂栫爜鎴栬�呯偣浣嶇紪鐮佺殑涓�閮ㄥ垎
+     * @return
+     */
+    EnergyIndex getDeviceIndexByCode(String nodeId, String meterId, String indexCode);
+
+    /**
+     * 鏍规嵁鐢ㄨ兘鍗曞厓id鍜岃澶噄d锛屼互鍙婄偣浣嶇紪鐮佽幏鍙栫偣浣�
+     *
+     * @param nodeId  鑺傜偣id
+     * @param meterId 璁惧id
+     * @return
+     */
+    List<EnergyIndex> listDeviceIndex(String nodeId, String meterId);
 }

--
Gitblit v1.9.3