From f1599d8230e83fb08ebb0473bbe486979b4d1d38 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 29 五月 2024 17:24:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
index 37c0c6c..3bc43bd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -9,11 +9,7 @@
<result column="command_name" jdbcType="VARCHAR" property="commandName" />
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
- <result column="command_type" jdbcType="VARCHAR" property="commandType" />
- <result column="callBack" jdbcType="VARCHAR" property="callback" />
-<!-- <result column="param" jdbcType="VARCHAR" property="param" />-->
<result column="param" property="param" jdbcType="JAVA_OBJECT" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
-
<result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
<result column="operator" jdbcType="BIGINT" property="operator" />
<result column="result" jdbcType="TINYINT" property="result" />
@@ -22,8 +18,8 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, command_code, command_name, rtuAddr, protocol, command_type, callBack, param,
- send_time, `operator`, `result`, result_time, result_text
+ id, command_code, command_name, rtuAddr, protocol, param, send_time, `operator`,
+ `result`, result_time, result_text
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -40,15 +36,13 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmCommandHistory">
<!--@mbg.generated-->
insert into rm_command_history (id, command_code, command_name,
- rtuAddr, protocol, command_type,
- callBack, param, send_time,
- `operator`, `result`, result_time,
- result_text)
+ rtuAddr, protocol, param,
+ send_time, `operator`, `result`,
+ result_time, result_text)
values (#{id,jdbcType=BIGINT}, #{commandCode,jdbcType=VARCHAR}, #{commandName,jdbcType=VARCHAR},
- #{rtuaddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR}, #{commandType,jdbcType=VARCHAR},
- #{callback,jdbcType=VARCHAR}, #{param,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}, #{sendTime,jdbcType=TIMESTAMP},
- #{operator,jdbcType=BIGINT}, #{result,jdbcType=TINYINT}, #{resultTime,jdbcType=TIMESTAMP},
- #{resultText,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler})
+ #{rtuaddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR}, #{param,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ #{sendTime,jdbcType=TIMESTAMP}, #{operator,jdbcType=BIGINT}, #{result,jdbcType=TINYINT},
+ #{resultTime,jdbcType=TIMESTAMP}, #{resultText,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmCommandHistory">
<!--@mbg.generated-->
@@ -68,12 +62,6 @@
</if>
<if test="protocol != null">
protocol,
- </if>
- <if test="commandType != null">
- command_type,
- </if>
- <if test="callback != null">
- callBack,
</if>
<if test="param != null">
param,
@@ -109,12 +97,6 @@
</if>
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
- </if>
- <if test="commandType != null">
- #{commandType,jdbcType=VARCHAR},
- </if>
- <if test="callback != null">
- #{callback,jdbcType=VARCHAR},
</if>
<if test="param != null">
#{param,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
@@ -152,12 +134,6 @@
<if test="protocol != null">
protocol = #{protocol,jdbcType=VARCHAR},
</if>
- <if test="commandType != null">
- command_type = #{commandType,jdbcType=VARCHAR},
- </if>
- <if test="callback != null">
- callBack = #{callback,jdbcType=VARCHAR},
- </if>
<if test="param != null">
param = #{param,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
</if>
@@ -186,8 +162,6 @@
command_name = #{commandName,jdbcType=VARCHAR},
rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- command_type = #{commandType,jdbcType=VARCHAR},
- callBack = #{callback,jdbcType=VARCHAR},
param = #{param,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
send_time = #{sendTime,jdbcType=TIMESTAMP},
`operator` = #{operator,jdbcType=BIGINT},
@@ -196,4 +170,30 @@
result_text = #{resultText,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級-->
+ <select id="getUnclosedValves" resultType="com.dy.pipIrrGlobal.voRm.VoUnclosedValve">
+ SELECT
+ com.command_code AS commandCode,
+ inta.name AS intakeNum,
+ rtus.isOnLine,
+ com.rtuAddr,
+ com.param ->>'$.orderNo' AS orderNo,
+ com.param ->>'$.icCardNo' AS vcNum,
+ com.send_time AS openTime
+ FROM rm_command_history com
+ INNER JOIN pr_controller con ON com.rtuAddr = con.rtuAddr
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
+ INNER JOIN JSON_TABLE(
+ <!--'[{"rtuAddr":"37142501020100215","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
+ #{onLineMap},
+ '$[*]' COLUMNS(
+ rtuAddr VARCHAR(20) PATH '$.rtuAddr',
+ isOnLine BOOLEAN PATH '$.isOnLine'
+ )
+ ) rtus ON com.rtuAddr = rtus.rtuAddr
+ WHERE (com.command_code = '92' OR com.command_code = 'A2') AND com.operator = #{operator}
+ AND NOT EXISTS (SELECT * FROM rm_command_history WHERE (command_code = '93' OR command_code = 'A3') AND param ->>'$.orderNo' = com.param ->>'$.orderNo')
+ ORDER BY com.send_time DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0