From b83f639362ae959de55900d14d132585cd72a90d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 08:39:41 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调，并修改完善代码。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 131 +++++++++++++++++++++++++++++++++++--------
1 files changed, 107 insertions(+), 24 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index 0ffaefd..bb558ac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -16,6 +16,9 @@
<result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
<result column="op_remain_money" jdbcType="DOUBLE" property="opRemainMoney" />
<result column="open_dt" jdbcType="TIMESTAMP" property="openDt" />
+ <result column="op_order_no" jdbcType="VARCHAR" property="opOrderNo" />
+ <result column="op_ele_total_amount" jdbcType="FLOAT" property="opEleTotalAmount" />
+ <result column="op_water_remain_user" jdbcType="FLOAT" property="opWaterRemainUser" />
<result column="cl_dt" jdbcType="TIMESTAMP" property="clDt" />
<result column="cl_type" jdbcType="TINYINT" property="clType" />
<result column="cl_total_amount" jdbcType="DOUBLE" property="clTotalAmount" />
@@ -27,13 +30,18 @@
<result column="cl_this_time" jdbcType="INTEGER" property="clThisTime" />
<result column="cl_open_dt" jdbcType="TIMESTAMP" property="clOpenDt" />
<result column="close_dt" jdbcType="TIMESTAMP" property="closeDt" />
+ <result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo" />
+ <result column="cl_ele_total_amount" jdbcType="FLOAT" property="clEleTotalAmount" />
+ <result column="cl_water_remain_user" jdbcType="FLOAT" property="clWaterRemainUser" />
+ <result column="cl_this_ele" jdbcType="FLOAT" property="clThisEle" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, last_history_id, controller_id, intake_id, rtu_addr, op_dt, op_type, op_total_amount, op_ic_card_no,
- op_ic_card_addr, op_remain_money, open_dt, cl_dt, cl_type, cl_total_amount, cl_ic_card_no,
- cl_ic_card_addr, cl_remain_money, cl_this_amount, cl_this_money, cl_this_time, cl_open_dt,
- close_dt
+ id, last_history_id, controller_id, intake_id, rtu_addr, op_dt, op_type, op_total_amount,
+ op_ic_card_no, op_ic_card_addr, op_remain_money, open_dt, op_order_no, op_ele_total_amount,
+ op_water_remain_user, cl_dt, cl_type, cl_total_amount, cl_ic_card_no, cl_ic_card_addr,
+ cl_remain_money, cl_this_amount, cl_this_money, cl_this_time, cl_open_dt, close_dt,
+ cl_order_no, cl_ele_total_amount, cl_water_remain_user, cl_this_ele
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -42,13 +50,12 @@
from rm_open_close_valve_last
where id = #{id,jdbcType=BIGINT}
</select>
-
- <select id="selectByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
+ <select id="selectByIntakeId" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
from rm_open_close_valve_last
- where rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
+ where intake_id = #{intakeId,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
@@ -57,22 +64,28 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
<!--@mbg.generated-->
- insert into rm_open_close_valve_last (id, last_history_id, controller_id, intake_id,
- rtu_addr, op_dt, op_type,
- op_total_amount, op_ic_card_no, op_ic_card_addr,
- op_remain_money, open_dt, cl_dt,
- cl_type, cl_total_amount, cl_ic_card_no,
- cl_ic_card_addr, cl_remain_money, cl_this_amount,
- cl_this_money, cl_this_time, cl_open_dt,
- close_dt)
- values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT},
- #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP},
- #{opType,jdbcType=TINYINT}, #{opTotalAmount,jdbcType=DOUBLE}, #{opIcCardNo,jdbcType=VARCHAR},
- #{opIcCardAddr,jdbcType=VARCHAR}, #{opRemainMoney,jdbcType=DOUBLE}, #{openDt,jdbcType=TIMESTAMP},
- #{clDt,jdbcType=TIMESTAMP}, #{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE},
- #{clIcCardNo,jdbcType=VARCHAR}, #{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE},
- #{clThisAmount,jdbcType=DOUBLE}, #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER},
- #{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP})
+ insert into rm_open_close_valve_last (id, last_history_id, controller_id,
+ intake_id, rtu_addr, op_dt,
+ op_type, op_total_amount, op_ic_card_no,
+ op_ic_card_addr, op_remain_money, open_dt,
+ op_order_no, op_ele_total_amount, op_water_remain_user,
+ cl_dt, cl_type, cl_total_amount,
+ cl_ic_card_no, cl_ic_card_addr, cl_remain_money,
+ cl_this_amount, cl_this_money, cl_this_time,
+ cl_open_dt, close_dt, cl_order_no,
+ cl_ele_total_amount, cl_water_remain_user, cl_this_ele
+ )
+ values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT},
+ #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP},
+ #{opType,jdbcType=TINYINT}, #{opTotalAmount,jdbcType=DOUBLE}, #{opIcCardNo,jdbcType=VARCHAR},
+ #{opIcCardAddr,jdbcType=VARCHAR}, #{opRemainMoney,jdbcType=DOUBLE}, #{openDt,jdbcType=TIMESTAMP},
+ #{opOrderNo,jdbcType=VARCHAR}, #{opEleTotalAmount,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT},
+ #{clDt,jdbcType=TIMESTAMP}, #{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE},
+ #{clIcCardNo,jdbcType=VARCHAR}, #{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE},
+ #{clThisAmount,jdbcType=DOUBLE}, #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER},
+ #{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP}, #{clOrderNo,jdbcType=VARCHAR},
+ #{clEleTotalAmount,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT}
+ )
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
<!--@mbg.generated-->
@@ -114,6 +127,15 @@
<if test="openDt != null">
open_dt,
</if>
+ <if test="opOrderNo != null">
+ op_order_no,
+ </if>
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount,
+ </if>
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user,
+ </if>
<if test="clDt != null">
cl_dt,
</if>
@@ -146,6 +168,18 @@
</if>
<if test="closeDt != null">
close_dt,
+ </if>
+ <if test="clOrderNo != null">
+ cl_order_no,
+ </if>
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount,
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user,
+ </if>
+ <if test="clThisEle != null">
+ cl_this_ele,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -185,6 +219,15 @@
<if test="openDt != null">
#{openDt,jdbcType=TIMESTAMP},
</if>
+ <if test="opOrderNo != null">
+ #{opOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opEleTotalAmount != null">
+ #{opEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="opWaterRemainUser != null">
+ #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
<if test="clDt != null">
#{clDt,jdbcType=TIMESTAMP},
</if>
@@ -217,6 +260,18 @@
</if>
<if test="closeDt != null">
#{closeDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="clOrderNo != null">
+ #{clOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clEleTotalAmount != null">
+ #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clThisEle != null">
+ #{clThisEle,jdbcType=FLOAT},
</if>
</trim>
</insert>
@@ -257,6 +312,15 @@
<if test="openDt != null">
open_dt = #{openDt,jdbcType=TIMESTAMP},
</if>
+ <if test="opOrderNo != null">
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
<if test="clDt != null">
cl_dt = #{clDt,jdbcType=TIMESTAMP},
</if>
@@ -290,6 +354,18 @@
<if test="closeDt != null">
close_dt = #{closeDt,jdbcType=TIMESTAMP},
</if>
+ <if test="clOrderNo != null">
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clThisEle != null">
+ cl_this_ele = #{clThisEle,jdbcType=FLOAT},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -307,6 +383,9 @@
op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
open_dt = #{openDt,jdbcType=TIMESTAMP},
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
cl_dt = #{clDt,jdbcType=TIMESTAMP},
cl_type = #{clType,jdbcType=TINYINT},
cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
@@ -317,7 +396,11 @@
cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
cl_this_time = #{clThisTime,jdbcType=INTEGER},
cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
- close_dt = #{closeDt,jdbcType=TIMESTAMP}
+ close_dt = #{closeDt,jdbcType=TIMESTAMP},
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ cl_this_ele = #{clThisEle,jdbcType=FLOAT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0