From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowMonitoringMapper.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowMonitoringMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowMonitoringMapper.java
index 1c33361..cdd3082 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowMonitoringMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowMonitoringMapper.java
@@ -1,7 +1,14 @@
package com.dy.pipIrrGlobal.daoPr;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.pojoPr.PrFlowMonitoring;
+import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.VoFlowMonitoring;
+import com.dy.pipIrrGlobal.voPr.VoIntake;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
* @author ZhuBaoMin
@@ -24,6 +31,7 @@
/**
* 鏍规嵁鐩戞祴绔欑紪鍙峰垹闄ょ洃娴嬬珯
+ *
* @param flowMonitoringId
* @return
*/
@@ -31,8 +39,34 @@
/**
* 鏍规嵁鐩戞祴绔欑紪鍙疯幏鍙栨湭鍒犻櫎鐨勭洃娴嬬珯鏁伴噺
+ *
* @param flowMonitoringId
* @return
*/
- Integer getRecordCountOfFlowMonitoring(@Param("flowMonitoringId") Long flowMonitoringId);
+ Integer getRecordCountOfFlowMonitoringByFlowMonitoringId(@Param("flowMonitoringId") Long flowMonitoringId);
+
+ /**
+ * 鏍规嵁鐩戞祴绔� 鍚嶇О 缁戝畾鐘舵�� 鑾峰彇鏈垹闄ょ殑鐩戞祴绔欐暟閲�
+ *
+ * @param params
+ * @return
+ */
+ Integer getRecordCountOfFlowMonitoring(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇娴侀噺鐩戞祴绔欏疄浣撹褰�
+ *
+ * @param params
+ * @return 瀹炰綋闆嗗悎
+ */
+ List<VoFlowMonitoring> getPrFlowMonitoring(Map<?, ?> params);
+
+ /**
+ * 鏌ヨ鍏ㄩ儴娴侀噺鐩戞祴绔欏疄浣撹褰�
+ *
+ * @return 瀹炰綋闆嗗悎
+ */
+ List<PrFlowMonitoring> selectAll();
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0