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/resources/mapper/PrMonitoringFlowmeterMapper.xml | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
index 4c63f19..916a032 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
@@ -16,6 +16,10 @@
<!--@mbg.generated-->
id, monitoringId, flowmeterId, operateType, remarks, `operator`, operateDt
</sql>
+ <sql id="Base_Column_List_NoId">
+ <!--@mbg.generated-->
+ monitoringId, flowmeterId, operateType, remarks, `operator`, operateDt
+ </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -143,4 +147,19 @@
</if>
</where>
</select>
+
+ <!--鏍规嵁 娴侀噺鐩戞祴绔欑紪鍙� 鑾峰彇 缁戝畾璁板綍 鎸夋搷浣滄椂闂撮檷搴�-->
+ <select id="getBingRecordsByMonitoringId" parameterType="string" resultType="java.util.Map">
+ select CAST(id AS char) as id,
+ CAST(monitoringId AS char)as monitoringId,
+ CAST(flowmeterId AS char)as flowmeterId,
+ operateType,
+ remarks,
+ `operator`,
+ operateDt
+ from pr_monitoring_flowmeter pmf
+ where
+ monitoringId=#{monitoringId,jdbcType=BIGINT}
+ order by operateDt desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0