From 9281643d18bc2e0aaffed3c5f216d1df12d68424 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 18 一月 2024 09:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowmeterMapper.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowmeterMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowmeterMapper.java
index e4a7ada..3cdb561 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowmeterMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowmeterMapper.java
@@ -1,7 +1,12 @@
 package com.dy.pipIrrGlobal.daoPr;
 
 import com.dy.pipIrrGlobal.pojoPr.PrFlowmeter;
+import com.dy.pipIrrGlobal.voPr.VoFlowMeter;
+import com.dy.pipIrrGlobal.voPr.VoFlowMonitoring;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZhuBaoMin
@@ -34,5 +39,21 @@
      * @param flowmeterId
      * @return
      */
-    Integer getRecordCountOfFlowmeter(@Param("flowmeterId") Long flowmeterId);
+    Integer getRecordCountOfFlowmeterByCode(@Param("flowmeterId") Long flowmeterId);
+
+    /**
+     * 鏍规嵁娴侀噺璁� 缂栧彿 鍦ㄧ嚎鐘舵�� 鑾峰彇鏈垹闄ょ殑娴侀噺璁℃暟閲�
+     *
+     * @param params
+     * @return
+     */
+    Integer getRecordCountOfFlowMeterByOthers(Map<?, ?> params);
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇娴侀噺璁″疄浣撹褰�
+     *
+     * @param params
+     * @return 瀹炰綋闆嗗悎
+     */
+    List<VoFlowMeter> getFlowMeters(Map<?, ?> params);
 }
\ No newline at end of file

--
Gitblit v1.8.0