From 61cfa0d30461a8020f4e54330ea049ac6efb07c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 16:21:41 +0800
Subject: [PATCH] 1、完善代码； 2、修改上行命令结果匹配命令的bug;
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml | 186 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 152 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 f656fde..f0ba647 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -4,10 +4,11 @@
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmCommandHistory">
<!--@mbg.generated-->
<!--@Table rm_command_history-->
- <id column="id" jdbcType="BIGINT" property="id" />
+ <id column="com_id" jdbcType="BIGINT" property="comId" />
<result column="command_code" jdbcType="VARCHAR" property="commandCode" />
<result column="command_name" jdbcType="VARCHAR" property="commandName" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
+ <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
+ <result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
<result column="param" property="param" jdbcType="JAVA_OBJECT" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
<result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
@@ -18,7 +19,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, command_code, command_name, rtuAddr, protocol, param, send_time, `operator`,
+ com_id, command_code, command_name, intake_id, rtu_addr, protocol, param, send_time, `operator`,
`result`, result_time, result_text
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -26,21 +27,21 @@
select
<include refid="Base_Column_List" />
from rm_command_history
- where id = #{id,jdbcType=BIGINT}
+ where com_id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from rm_command_history
- where id = #{id,jdbcType=BIGINT}
+ where com_id = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmCommandHistory">
<!--@mbg.generated-->
- insert into rm_command_history (id, command_code, command_name,
- rtuAddr, protocol, param,
+ insert into rm_command_history (com_id, command_code, command_name,
+ intake_id, rtu_addr, 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}, #{param,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ values (#{comId,jdbcType=BIGINT}, #{commandCode,jdbcType=VARCHAR}, #{commandName,jdbcType=VARCHAR}, #{intakeId,jdbcType=BIGINT},
+ #{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>
@@ -48,8 +49,8 @@
<!--@mbg.generated-->
insert into rm_command_history
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
+ <if test="comId != null">
+ com_id,
</if>
<if test="commandCode != null">
command_code,
@@ -57,8 +58,11 @@
<if test="commandName != null">
command_name,
</if>
- <if test="rtuaddr != null">
- rtuAddr,
+ <if test="intakeId != null">
+ intake_id,
+ </if>
+ <if test="rtuAddr != null">
+ rtu_addr,
</if>
<if test="protocol != null">
protocol,
@@ -83,8 +87,8 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
+ <if test="comId != null">
+ #{comId,jdbcType=BIGINT},
</if>
<if test="commandCode != null">
#{commandCode,jdbcType=VARCHAR},
@@ -92,8 +96,11 @@
<if test="commandName != null">
#{commandName,jdbcType=VARCHAR},
</if>
- <if test="rtuaddr != null">
- #{rtuaddr,jdbcType=VARCHAR},
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ #{rtuAddr,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
@@ -128,8 +135,11 @@
<if test="commandName != null">
command_name = #{commandName,jdbcType=VARCHAR},
</if>
- <if test="rtuaddr != null">
- rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
+ <if test="intakeId != null">
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
protocol = #{protocol,jdbcType=VARCHAR},
@@ -153,14 +163,15 @@
result_text = #{resultText,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
</if>
</set>
- where id = #{id,jdbcType=BIGINT}
+ where com_id = #{comId,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmCommandHistory">
<!--@mbg.generated-->
update rm_command_history
set command_code = #{commandCode,jdbcType=VARCHAR},
command_name = #{commandName,jdbcType=VARCHAR},
- rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
param = #{param,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
send_time = #{sendTime,jdbcType=TIMESTAMP},
@@ -168,23 +179,130 @@
`result` = #{result,jdbcType=TINYINT},
result_time = #{resultTime,jdbcType=TIMESTAMP},
result_text = #{resultText,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}
- where id = #{id,jdbcType=BIGINT}
+ where com_id = #{comId,jdbcType=BIGINT}
</update>
- <!--鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍-->
+ <!--鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級-->
<select id="getUnclosedValves" resultType="com.dy.pipIrrGlobal.voRm.VoUnclosedValve">
SELECT
- com.command_code AS commandCode,
- inta.name AS intakeNum,
- com.rtuAddr,
- com.param ->>'$.orderNo' AS orderNo,
- com.param ->>'$.icCardNo' AS vcNum,
- com.send_time AS openTime
+ inta.name AS intakeNum,
+ rtus.isOnLine,
+ com.rtu_addr AS rtuAddr,
+ com.param ->>'$.icCardNo' AS vcNum,
+ (SELECT param ->>'$.orderNo' AS orderNo FROM rm_command_history WHERE rtu_addr = com.rtu_addr ORDER BY send_time desc LIMIT 0,1) AS orderNo
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
- 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
+ INNER JOIN pr_controller con ON com.rtu_addr = 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.rtu_addr = rtus.rtuAddr
+ <where>
+ AND (com.command_code = '92' OR com.command_code = 'A2' OR com.command_code = '97')
+ AND com.operator = #{operator}
+ AND NOT EXISTS (
+ SELECT *
+ FROM rm_command_history
+ WHERE (result IS NULL OR result = 1 )
+ AND (command_code = '93' OR command_code = 'A3' OR command_code = '98')
+ AND param ->>'$.orderNo' = com.param ->>'$.orderNo'
+ )
+ </where>
+ GROUP BY inta.name, rtus.isOnLine, com.rtu_addr, com.param ->>'$.icCardNo'
</select>
+
+ <!--鏍规嵁鍙栨按鍙D鑾峰彇璇ュ彇姘村彛鏈叧闃�鍙傛暟-->
+ <select id="getUncloseParam" resultType="com.dy.pipIrrGlobal.voRm.VoUnclosedParam">
+ SELECT
+ com.rtu_addr AS rtuAddr,
+ com.param ->>'$.orderNo' AS orderNo,
+ com.param ->>'$.icCardNo' AS vcNum
+ FROM rm_command_history com
+ INNER JOIN pr_controller con ON com.rtu_addr = con.rtuAddr
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
+ INNER JOIN JSON_TABLE(
+<!-- '[{"rtuAddr":"620201000029","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
+ #{onLineMap},
+ '$[*]' COLUMNS(
+ rtuAddr VARCHAR(20) PATH '$.rtuAddr',
+ isOnLine BOOLEAN PATH '$.isOnLine'
+ )
+ ) rtus ON com.rtu_addr = rtus.rtuAddr
+ WHERE (com.command_code = '92' OR com.command_code = 'A2' OR com.command_code = '97') AND con.intakeId = #{intakeId}
+ AND NOT EXISTS (
+ SELECT *
+ FROM rm_command_history
+ WHERE (result IS NULL OR result = 1 )
+ AND (command_code = '93' OR command_code = 'A3' OR command_code = '98')
+ AND param ->>'$.orderNo' = com.param ->>'$.orderNo'
+ )
+ ORDER BY com.send_time DESC
+ LIMIT 0,1
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍鎬绘暟-->
+ <select id="getCommandHistoriesCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM rm_command_history his
+ INNER JOIN pr_intake inta ON inta.id = his.intake_id
+ LEFT JOIN se_client cli ON cli.id = his.operator
+ LEFT JOIN ba_user user ON user.id = his.operator
+ <where>
+ <if test = "commandName != null and commandName !=''">
+ AND his.command_name LIKE CONCAT('%',#{commandName},'%')
+ </if>
+ <if test = "result != null">
+ AND his.result = #{result}
+ </if>
+ <if test = "timeStart != null and timeStop != null">
+ AND his.send_time BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍-->
+ <select id="getCommandHistories" resultType="com.dy.pipIrrGlobal.voRm.VoCommand">
+ SELECT
+ his.com_id AS comId,
+ his.command_name AS commandName,
+ inta.name AS intakeName,
+ his.rtu_addr AS rtuAddr,
+ his.protocol,
+ his.send_time AS sendTime,
+ his.result_time AS resultTime,
+ (CASE
+ WHEN his.result = 1 THEN "鎴愬姛"
+ ELSE "澶辫触"
+ END) AS result,
+ his.result_text,
+ IFNULL(cli.name, user.name) AS userName
+ FROM rm_command_history his
+ INNER JOIN pr_intake inta ON inta.id = his.intake_id
+ LEFT JOIN se_client cli ON cli.id = his.operator
+ LEFT JOIN ba_user user ON user.id = his.operator
+ <where>
+ <if test = "commandName != null and commandName !=''">
+ AND his.command_name LIKE CONCAT('%',#{commandName},'%')
+ </if>
+ <if test = "result != null">
+ AND his.result = #{result}
+ </if>
+
+ <if test = "timeStart != null and timeStop != null">
+ AND his.send_time BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ORDER BY his.send_time DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0