From 24f53bb77f9ac80feb2e62e8ee670be4aa5f3c6e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 13 二月 2025 11:56:42 +0800
Subject: [PATCH] 1、远程模块remote模块实现： （1、系统启动时向通信中间件注册消息接收者； （2、消息接收者ctr实现（测试阶段）； 2、在配置文件增加配置Springboot RestTemplate网络请求超时时长； 3、其他一些测试与优化。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 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 cffa01f..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
@@ -95,7 +95,7 @@
* @param params
* @return
*/
- List<VoIntake> getNeverOpenValveIntakes(Map<?, ?> params);
+ List<VoIntakeUnOpenValve> getNeverOpenValveIntakes(Map<?, ?> params);
/**
* 鑾峰彇鎸囧畾鏃堕棿娈靛唴寮�闃�娆℃暟瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�
@@ -238,34 +238,6 @@
List<VoClient> getSmallWaterDurationClients(Map<String, Object> params);
/**
- * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�
- * @param params
- * @return
- */
- Long getUseWaterGtValueIntakesCount(Map<String, Object> params);
-
- /**
- * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
- * @param params
- * @return
- */
- List<VoIntakeAccumulateAmount> getUseWaterGtValueIntakes(Map<String, Object> params);
-
- /**
- * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｇ殑鏁伴噺
- * @param params
- * @return
- */
- Long getExpenseGtValueIntakesCount(Map<String, Object> params);
-
- /**
- * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
- * @param params
- * @return
- */
- List<VoIntakeAccumulateAmount> getExpenseGtValueIntakes(Map<String, Object> params);
-
- /**
* 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�
* @param params
* @return
@@ -351,5 +323,20 @@
//缁熻鐩稿叧 //
// //
//////////////////////////////////////////
+
+ /**
+ * 浠ュ啘鎴枫�佸啘鎴稩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