From 26d63d120e517624be6fcf70ae9620c3582a91dd Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 17:35:06 +0800
Subject: [PATCH] 2024-06-18 朱宝民 优化开关阀逻辑
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 337 ++++++++++++++++++++++----------------------------------
1 files changed, 133 insertions(+), 204 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index 5d82bb0..f1de3dd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -9,37 +9,30 @@
<result column="intake_id" jdbcType="BIGINT" property="intakeId" />
<result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="op_dt" jdbcType="TIMESTAMP" property="opDt" />
- <result column="op_rtu_dt" jdbcType="TIMESTAMP" property="opRtuDt" />
- <result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
+ <result column="op_type" jdbcType="TINYINT" property="opType" />
+ <result column="op_total_amount" jdbcType="DOUBLE" property="opTotalAmount" />
<result column="op_ic_card_no" jdbcType="VARCHAR" property="opIcCardNo" />
- <result column="op_order_no" jdbcType="VARCHAR" property="opOrderNo" />
+ <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_water_total_amount" jdbcType="FLOAT" property="opWaterTotalAmount" />
- <result column="op_ele_total_amount" jdbcType="FLOAT" property="opEleTotalAmount" />
- <result column="op_money_remain_user" jdbcType="FLOAT" property="opMoneyRemainUser" />
- <result column="op_water_remain_user" jdbcType="FLOAT" property="opWaterRemainUser" />
- <result column="op_type" jdbcType="VARCHAR" property="opType" />
- <result column="cl_ic_card_addr" jdbcType="VARCHAR" property="clIcCardAddr" />
+ <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" />
<result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
- <result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo" />
- <result column="start_dt" jdbcType="TIMESTAMP" property="startDt" />
- <result column="end_dt" jdbcType="TIMESTAMP" property="endDt" />
- <result column="cl_water_total_amount" jdbcType="FLOAT" property="clWaterTotalAmount" />
- <result column="cl_ele_total_amount" jdbcType="FLOAT" property="clEleTotalAmount" />
- <result column="cl_money_remain_user" jdbcType="FLOAT" property="clMoneyRemainUser" />
- <result column="cl_water_remain_user" jdbcType="FLOAT" property="clWaterRemainUser" />
- <result column="this_ele" jdbcType="FLOAT" property="thisEle" />
- <result column="this_water" jdbcType="FLOAT" property="thisWater" />
- <result column="this_money" jdbcType="FLOAT" property="thisMoney" />
- <result column="this_duration" jdbcType="INTEGER" property="thisDuration" />
+ <result column="cl_ic_card_addr" jdbcType="VARCHAR" property="clIcCardAddr" />
+ <result column="cl_remain_money" jdbcType="DOUBLE" property="clRemainMoney" />
+ <result column="cl_this_amount" jdbcType="DOUBLE" property="clThisAmount" />
+ <result column="cl_this_money" jdbcType="DOUBLE" property="clThisMoney" />
+ <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" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, controller_id, intake_id, rtu_addr, op_dt, op_rtu_dt, op_ic_card_addr, op_ic_card_no,
- op_order_no, open_dt, op_water_total_amount, op_ele_total_amount, op_money_remain_user,
- op_water_remain_user, op_type, cl_ic_card_addr, cl_ic_card_no, cl_order_no, start_dt,
- end_dt, cl_water_total_amount, cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user,
- this_ele, this_water, this_money, this_duration
+ 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
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -56,25 +49,21 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
<!--@mbg.generated-->
insert into rm_open_close_valve_history (id, controller_id, intake_id,
- rtu_addr, op_dt, op_rtu_dt,
- op_ic_card_addr, op_ic_card_no, op_order_no,
- open_dt, op_water_total_amount, op_ele_total_amount,
- op_money_remain_user, op_water_remain_user, op_type,
- cl_ic_card_addr, cl_ic_card_no, cl_order_no,
- start_dt, end_dt, cl_water_total_amount,
- cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user,
- this_ele, this_water, this_money,
- this_duration)
+ 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}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP}, #{opRtuDt,jdbcType=TIMESTAMP},
- #{opIcCardAddr,jdbcType=VARCHAR}, #{opIcCardNo,jdbcType=VARCHAR}, #{opOrderNo,jdbcType=VARCHAR},
- #{openDt,jdbcType=TIMESTAMP}, #{opWaterTotalAmount,jdbcType=FLOAT}, #{opEleTotalAmount,jdbcType=FLOAT},
- #{opMoneyRemainUser,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT}, #{opType,jdbcType=VARCHAR},
- #{clIcCardAddr,jdbcType=VARCHAR}, #{clIcCardNo,jdbcType=VARCHAR}, #{clOrderNo,jdbcType=VARCHAR},
- #{startDt,jdbcType=TIMESTAMP}, #{endDt,jdbcType=TIMESTAMP}, #{clWaterTotalAmount,jdbcType=FLOAT},
- #{clEleTotalAmount,jdbcType=FLOAT}, #{clMoneyRemainUser,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT},
- #{thisEle,jdbcType=FLOAT}, #{thisWater,jdbcType=FLOAT}, #{thisMoney,jdbcType=FLOAT},
- #{thisDuration,jdbcType=INTEGER})
+ #{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>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
<!--@mbg.generated-->
@@ -95,74 +84,56 @@
<if test="opDt != null">
op_dt,
</if>
- <if test="opRtuDt != null">
- op_rtu_dt,
+ <if test="opType != null">
+ op_type,
</if>
- <if test="opIcCardAddr != null">
- op_ic_card_addr,
+ <if test="opTotalAmount != null">
+ op_total_amount,
</if>
<if test="opIcCardNo != null">
op_ic_card_no,
</if>
- <if test="opOrderNo != null">
- op_order_no,
+ <if test="opIcCardAddr != null">
+ op_ic_card_addr,
+ </if>
+ <if test="opRemainMoney != null">
+ op_remain_money,
</if>
<if test="openDt != null">
open_dt,
</if>
- <if test="opWaterTotalAmount != null">
- op_water_total_amount,
+ <if test="clDt != null">
+ cl_dt,
</if>
- <if test="opEleTotalAmount != null">
- op_ele_total_amount,
+ <if test="clType != null">
+ cl_type,
</if>
- <if test="opMoneyRemainUser != null">
- op_money_remain_user,
- </if>
- <if test="opWaterRemainUser != null">
- op_water_remain_user,
- </if>
- <if test="opType != null">
- op_type,
- </if>
- <if test="clIcCardAddr != null">
- cl_ic_card_addr,
+ <if test="clTotalAmount != null">
+ cl_total_amount,
</if>
<if test="clIcCardNo != null">
cl_ic_card_no,
</if>
- <if test="clOrderNo != null">
- cl_order_no,
+ <if test="clIcCardAddr != null">
+ cl_ic_card_addr,
</if>
- <if test="startDt != null">
- start_dt,
+ <if test="clRemainMoney != null">
+ cl_remain_money,
</if>
- <if test="endDt != null">
- end_dt,
+ <if test="clThisAmount != null">
+ cl_this_amount,
</if>
- <if test="clWaterTotalAmount != null">
- cl_water_total_amount,
+ <if test="clThisMoney != null">
+ cl_this_money,
</if>
- <if test="clEleTotalAmount != null">
- cl_ele_total_amount,
+ <if test="clThisTime != null">
+ cl_this_time,
</if>
- <if test="clMoneyRemainUser != null">
- cl_money_remain_user,
+ <if test="clOpenDt != null">
+ cl_open_dt,
</if>
- <if test="clWaterRemainUser != null">
- cl_water_remain_user,
- </if>
- <if test="thisEle != null">
- this_ele,
- </if>
- <if test="thisWater != null">
- this_water,
- </if>
- <if test="thisMoney != null">
- this_money,
- </if>
- <if test="thisDuration != null">
- this_duration,
+ <if test="closeDt != null">
+ close_dt,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -181,74 +152,56 @@
<if test="opDt != null">
#{opDt,jdbcType=TIMESTAMP},
</if>
- <if test="opRtuDt != null">
- #{opRtuDt,jdbcType=TIMESTAMP},
+ <if test="opType != null">
+ #{opType,jdbcType=TINYINT},
</if>
- <if test="opIcCardAddr != null">
- #{opIcCardAddr,jdbcType=VARCHAR},
+ <if test="opTotalAmount != null">
+ #{opTotalAmount,jdbcType=DOUBLE},
</if>
<if test="opIcCardNo != null">
#{opIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="opOrderNo != null">
- #{opOrderNo,jdbcType=VARCHAR},
+ <if test="opIcCardAddr != null">
+ #{opIcCardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="opRemainMoney != null">
+ #{opRemainMoney,jdbcType=DOUBLE},
</if>
<if test="openDt != null">
#{openDt,jdbcType=TIMESTAMP},
</if>
- <if test="opWaterTotalAmount != null">
- #{opWaterTotalAmount,jdbcType=FLOAT},
+ <if test="clDt != null">
+ #{clDt,jdbcType=TIMESTAMP},
</if>
- <if test="opEleTotalAmount != null">
- #{opEleTotalAmount,jdbcType=FLOAT},
+ <if test="clType != null">
+ #{clType,jdbcType=TINYINT},
</if>
- <if test="opMoneyRemainUser != null">
- #{opMoneyRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opWaterRemainUser != null">
- #{opWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opType != null">
- #{opType,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardAddr != null">
- #{clIcCardAddr,jdbcType=VARCHAR},
+ <if test="clTotalAmount != null">
+ #{clTotalAmount,jdbcType=DOUBLE},
</if>
<if test="clIcCardNo != null">
#{clIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="clOrderNo != null">
- #{clOrderNo,jdbcType=VARCHAR},
+ <if test="clIcCardAddr != null">
+ #{clIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="startDt != null">
- #{startDt,jdbcType=TIMESTAMP},
+ <if test="clRemainMoney != null">
+ #{clRemainMoney,jdbcType=DOUBLE},
</if>
- <if test="endDt != null">
- #{endDt,jdbcType=TIMESTAMP},
+ <if test="clThisAmount != null">
+ #{clThisAmount,jdbcType=DOUBLE},
</if>
- <if test="clWaterTotalAmount != null">
- #{clWaterTotalAmount,jdbcType=FLOAT},
+ <if test="clThisMoney != null">
+ #{clThisMoney,jdbcType=DOUBLE},
</if>
- <if test="clEleTotalAmount != null">
- #{clEleTotalAmount,jdbcType=FLOAT},
+ <if test="clThisTime != null">
+ #{clThisTime,jdbcType=INTEGER},
</if>
- <if test="clMoneyRemainUser != null">
- #{clMoneyRemainUser,jdbcType=FLOAT},
+ <if test="clOpenDt != null">
+ #{clOpenDt,jdbcType=TIMESTAMP},
</if>
- <if test="clWaterRemainUser != null">
- #{clWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="thisEle != null">
- #{thisEle,jdbcType=FLOAT},
- </if>
- <if test="thisWater != null">
- #{thisWater,jdbcType=FLOAT},
- </if>
- <if test="thisMoney != null">
- #{thisMoney,jdbcType=FLOAT},
- </if>
- <if test="thisDuration != null">
- #{thisDuration,jdbcType=INTEGER},
+ <if test="closeDt != null">
+ #{closeDt,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
@@ -268,74 +221,56 @@
<if test="opDt != null">
op_dt = #{opDt,jdbcType=TIMESTAMP},
</if>
- <if test="opRtuDt != null">
- op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
+ <if test="opType != null">
+ op_type = #{opType,jdbcType=TINYINT},
</if>
- <if test="opIcCardAddr != null">
- op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
+ <if test="opTotalAmount != null">
+ op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
</if>
<if test="opIcCardNo != null">
op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="opOrderNo != null">
- op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ <if test="opIcCardAddr != null">
+ op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="opRemainMoney != null">
+ op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
</if>
<if test="openDt != null">
open_dt = #{openDt,jdbcType=TIMESTAMP},
</if>
- <if test="opWaterTotalAmount != null">
- op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
+ <if test="clDt != null">
+ cl_dt = #{clDt,jdbcType=TIMESTAMP},
</if>
- <if test="opEleTotalAmount != null">
- op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ <if test="clType != null">
+ cl_type = #{clType,jdbcType=TINYINT},
</if>
- <if test="opMoneyRemainUser != null">
- op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opWaterRemainUser != null">
- op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opType != null">
- op_type = #{opType,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardAddr != null">
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
+ <if test="clTotalAmount != null">
+ cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
</if>
<if test="clIcCardNo != null">
cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="clOrderNo != null">
- cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ <if test="clIcCardAddr != null">
+ cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="startDt != null">
- start_dt = #{startDt,jdbcType=TIMESTAMP},
+ <if test="clRemainMoney != null">
+ cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
</if>
- <if test="endDt != null">
- end_dt = #{endDt,jdbcType=TIMESTAMP},
+ <if test="clThisAmount != null">
+ cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
</if>
- <if test="clWaterTotalAmount != null">
- cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
+ <if test="clThisMoney != null">
+ cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
</if>
- <if test="clEleTotalAmount != null">
- cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ <if test="clThisTime != null">
+ cl_this_time = #{clThisTime,jdbcType=INTEGER},
</if>
- <if test="clMoneyRemainUser != null">
- cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
+ <if test="clOpenDt != null">
+ cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
</if>
- <if test="clWaterRemainUser != null">
- cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="thisEle != null">
- this_ele = #{thisEle,jdbcType=FLOAT},
- </if>
- <if test="thisWater != null">
- this_water = #{thisWater,jdbcType=FLOAT},
- </if>
- <if test="thisMoney != null">
- this_money = #{thisMoney,jdbcType=FLOAT},
- </if>
- <if test="thisDuration != null">
- this_duration = #{thisDuration,jdbcType=INTEGER},
+ <if test="closeDt != null">
+ close_dt = #{closeDt,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -347,29 +282,23 @@
intake_id = #{intakeId,jdbcType=BIGINT},
rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
op_dt = #{opDt,jdbcType=TIMESTAMP},
- op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
- op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
+ op_type = #{opType,jdbcType=TINYINT},
+ op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
- op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
+ op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
open_dt = #{openDt,jdbcType=TIMESTAMP},
- op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
- op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
- op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
- op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
- op_type = #{opType,jdbcType=VARCHAR},
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
+ cl_dt = #{clDt,jdbcType=TIMESTAMP},
+ cl_type = #{clType,jdbcType=TINYINT},
+ cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
- cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
- start_dt = #{startDt,jdbcType=TIMESTAMP},
- end_dt = #{endDt,jdbcType=TIMESTAMP},
- cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
- cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
- cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
- cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
- this_ele = #{thisEle,jdbcType=FLOAT},
- this_water = #{thisWater,jdbcType=FLOAT},
- this_money = #{thisMoney,jdbcType=FLOAT},
- this_duration = #{thisDuration,jdbcType=INTEGER}
+ cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
+ cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
+ cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
+ cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
+ cl_this_time = #{clThisTime,jdbcType=INTEGER},
+ cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
+ close_dt = #{closeDt,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0