From 7b119de9ee015934f8b001b6038e282522993c80 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 11 二月 2025 11:55:40 +0800
Subject: [PATCH] 远程模块实现websocket基本框架

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java |   59 ++++++++++++++++++++++++++---------------------------------
 1 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
index acf5ddc..3fbbcb1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
@@ -5,12 +5,11 @@
 import com.dy.pipIrrGlobal.voRm.VoExpend;
 import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve;
 import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat;
-import com.dy.pipIrrGlobal.voSt.VoClient;
-import com.dy.pipIrrGlobal.voSt.VoIntake;
-import com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount;
-import com.dy.pipIrrGlobal.voSt.VoIntakeOpenCount;
+import com.dy.pipIrrGlobal.voSt.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -96,7 +95,7 @@
      * @param params
      * @return
      */
-    List<VoIntake> getNeverOpenValveIntakes(Map<?, ?> params);
+    List<VoIntakeUnOpenValve> getNeverOpenValveIntakes(Map<?, ?> params);
 
     /**
      * 鑾峰彇鎸囧畾鏃堕棿娈靛唴寮�闃�娆℃暟瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙f暟閲�
@@ -239,34 +238,6 @@
     List<VoClient> getSmallWaterDurationClients(Map<String, Object> params);
 
     /**
-     * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙f暟閲�
-     * @param params
-     * @return
-     */
-    Long getUseWaterGtValueIntakesCount(Map<String, Object> params);
-
-    /**
-     * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
-     * @param params
-     * @return
-     */
-    List<VoIntakeAccumulateAmount> getUseWaterGtValueIntakes(Map<String, Object> params);
-
-    /**
-     * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙g殑鏁伴噺
-     * @param params
-     * @return
-     */
-    Long getExpenseGtValueIntakesCount(Map<String, Object> params);
-
-    /**
-     * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
-     * @param params
-     * @return
-     */
-    List<VoIntakeAccumulateAmount> getExpenseGtValueIntakes(Map<String, Object> params);
-
-    /**
      * 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙f暟閲�
      * @param params
      * @return
@@ -346,4 +317,26 @@
      * @return
      */
     List<VoOpenClostWechat> getVcCardOpenClose(Map<String, Object> params);
+
+    //////////////////////////////////////////
+    //                                      //
+    //缁熻鐩稿叧                                //
+    //                                      //
+    //////////////////////////////////////////
+
+    /**
+     * 浠ュ啘鎴枫�佸啘鎴稩C鍗′负鍗曚綅杩涜缁熻
+     * @param startDt
+     * @param endDt
+     * @return
+     */
+    List<VoIcConsumeStatistics> statisticsByIc(@Param("startDt")Date startDt, @Param("endDt")Date endDt);
+
+    /**
+     * 浠ュ啘鎴蜂负鍗曚綅杩涜缁熻
+     * @param startDt
+     * @param endDt
+     * @return
+     */
+    List<VoClientConsumeStatistics> statisticsByClient(@Param("startDt")Date startDt, @Param("endDt")Date endDt);
 }
\ No newline at end of file

--
Gitblit v1.8.0