From 3b58972c757734f0dc4b1ff29a0a179ed564ab64 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 七月 2024 11:47:42 +0800
Subject: [PATCH] 2024-07-17 朱宝民 重构命令日志表，返回结果改为text类型
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml | 373 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 323 insertions(+), 50 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml
index d4ab507..dc9d03b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml
@@ -5,20 +5,47 @@
<!--@mbg.generated-->
<!--@Table rm_work_report_last-->
<id column="id" jdbcType="BIGINT" property="id" />
+ <result column="client_id" jdbcType="BIGINT" property="clientId" />
+ <result column="client_name" jdbcType="VARCHAR" property="clientName" />
<result column="controller_id" jdbcType="BIGINT" property="controllerId" />
<result column="intake_id" jdbcType="BIGINT" property="intakeId" />
<result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="dt" jdbcType="TIMESTAMP" property="dt" />
- <result column="ic_card_no" jdbcType="VARCHAR" property="icCardNo" />
- <result column="total_amount" jdbcType="DOUBLE" property="totalAmount" />
- <result column="instant_amount" jdbcType="DOUBLE" property="instantAmount" />
- <result column="remain_money" jdbcType="DOUBLE" property="remainMoney" />
<result column="rtu_dt" jdbcType="TIMESTAMP" property="rtuDt" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="ic_card_addr" jdbcType="VARCHAR" property="icCardAddr" />
+ <result column="ic_card_no" jdbcType="VARCHAR" property="icCardNo" />
+ <result column="water_level" jdbcType="FLOAT" property="waterLevel" />
+ <result column="water_press" jdbcType="FLOAT" property="waterPress" />
+ <result column="water_instant" jdbcType="FLOAT" property="waterInstant" />
+ <result column="water_total" jdbcType="FLOAT" property="waterTotal" />
+ <result column="ele_total" jdbcType="FLOAT" property="eleTotal" />
+ <result column="money_remain" jdbcType="FLOAT" property="moneyRemain" />
+ <result column="water_remain" jdbcType="FLOAT" property="waterRemain" />
+ <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="water_price" jdbcType="FLOAT" property="waterPrice" />
+ <result column="ele_price" jdbcType="FLOAT" property="elePrice" />
+ <result column="a_volt" jdbcType="FLOAT" property="aVolt" />
+ <result column="b_volt" jdbcType="FLOAT" property="bVolt" />
+ <result column="c_volt" jdbcType="FLOAT" property="cVolt" />
+ <result column="a_current" jdbcType="FLOAT" property="aCurrent" />
+ <result column="b_current" jdbcType="FLOAT" property="bCurrent" />
+ <result column="c_current" jdbcType="FLOAT" property="cCurrent" />
+ <result column="battery_volt" jdbcType="FLOAT" property="batteryVolt" />
+ <result column="water_meter_trans_volt" jdbcType="FLOAT" property="waterMeterTransVolt" />
+ <result column="water_meter_work_volt" jdbcType="FLOAT" property="waterMeterWorkVolt" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, controller_id, intake_id, rtu_addr, dt, ic_card_no, total_amount, instant_amount,
- remain_money, rtu_dt
+ id, client_id, client_name,
+ controller_id, intake_id, rtu_addr, dt, rtu_dt, order_no, ic_card_addr, ic_card_no,
+ water_level, water_press, water_instant, water_total, ele_total, money_remain, water_remain,
+ this_ele, this_water, this_money, this_duration, water_price, ele_price, a_volt,
+ b_volt, c_volt, a_current, b_current, c_current, battery_volt, water_meter_trans_volt,
+ water_meter_work_volt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -27,13 +54,6 @@
from rm_work_report_last
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from rm_work_report_last
- where rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
- </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from rm_work_report_last
@@ -41,14 +61,30 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportLast">
<!--@mbg.generated-->
- insert into rm_work_report_last (id, controller_id, intake_id,
- rtu_addr, dt, ic_card_no,
- total_amount, instant_amount, remain_money,
- rtu_dt)
- values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{icCardNo,jdbcType=VARCHAR},
- #{totalAmount,jdbcType=DOUBLE}, #{instantAmount,jdbcType=DOUBLE}, #{remainMoney,jdbcType=DOUBLE},
- #{rtuDt,jdbcType=TIMESTAMP})
+ insert into rm_work_report_last (id, client_id, client_name,
+ controller_id, intake_id,
+ rtu_addr, dt, rtu_dt,
+ order_no, ic_card_addr, ic_card_no,
+ water_level, water_press, water_instant,
+ water_total, ele_total, money_remain,
+ water_remain, this_ele, this_water,
+ this_money, this_duration, water_price,
+ ele_price, a_volt, b_volt, c_volt,
+ a_current, b_current, c_current,
+ battery_volt, water_meter_trans_volt, water_meter_work_volt
+ )
+ values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR},
+ #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP},
+ #{orderNo,jdbcType=VARCHAR}, #{icCardAddr,jdbcType=VARCHAR}, #{icCardNo,jdbcType=VARCHAR},
+ #{waterLevel,jdbcType=FLOAT}, #{waterPress,jdbcType=FLOAT}, #{waterInstant,jdbcType=FLOAT},
+ #{waterTotal,jdbcType=FLOAT}, #{eleTotal,jdbcType=FLOAT}, #{moneyRemain,jdbcType=FLOAT},
+ #{waterRemain,jdbcType=FLOAT}, #{thisEle,jdbcType=FLOAT}, #{thisWater,jdbcType=FLOAT},
+ #{thisMoney,jdbcType=FLOAT}, #{thisDuration,jdbcType=INTEGER}, #{waterPrice,jdbcType=FLOAT},
+ #{elePrice,jdbcType=FLOAT}, #{aVolt,jdbcType=FLOAT}, #{bVolt,jdbcType=FLOAT}, #{cVolt,jdbcType=FLOAT},
+ #{aCurrent,jdbcType=FLOAT}, #{bCurrent,jdbcType=FLOAT}, #{cCurrent,jdbcType=FLOAT},
+ #{batteryVolt,jdbcType=FLOAT}, #{waterMeterTransVolt,jdbcType=FLOAT}, #{waterMeterWorkVolt,jdbcType=FLOAT}
+ )
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportLast">
<!--@mbg.generated-->
@@ -56,6 +92,12 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
+ </if>
+ <if test="clientId != null">
+ client_id,
+ </if>
+ <if test="clientName != null">
+ client_name,
</if>
<if test="controllerId != null">
controller_id,
@@ -69,25 +111,94 @@
<if test="dt != null">
dt,
</if>
+ <if test="rtuDt != null">
+ rtu_dt,
+ </if>
+ <if test="orderNo != null">
+ order_no,
+ </if>
+ <if test="icCardAddr != null">
+ ic_card_addr,
+ </if>
<if test="icCardNo != null">
ic_card_no,
</if>
- <if test="totalAmount != null">
- total_amount,
+ <if test="waterLevel != null">
+ water_level,
</if>
- <if test="instantAmount != null">
- instant_amount,
+ <if test="waterPress != null">
+ water_press,
</if>
- <if test="remainMoney != null">
- remain_money,
+ <if test="waterInstant != null">
+ water_instant,
</if>
- <if test="rtuDt != null">
- rtu_dt,
+ <if test="waterTotal != null">
+ water_total,
+ </if>
+ <if test="eleTotal != null">
+ ele_total,
+ </if>
+ <if test="moneyRemain != null">
+ money_remain,
+ </if>
+ <if test="waterRemain != null">
+ water_remain,
+ </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>
+ <if test="waterPrice != null">
+ water_price,
+ </if>
+ <if test="elePrice != null">
+ ele_price,
+ </if>
+ <if test="aVolt != null">
+ a_volt,
+ </if>
+ <if test="bVolt != null">
+ b_volt,
+ </if>
+ <if test="cVolt != null">
+ c_volt,
+ </if>
+ <if test="aCurrent != null">
+ a_current,
+ </if>
+ <if test="bCurrent != null">
+ b_current,
+ </if>
+ <if test="cCurrent != null">
+ c_current,
+ </if>
+ <if test="batteryVolt != null">
+ battery_volt,
+ </if>
+ <if test="waterMeterTransVolt != null">
+ water_meter_trans_volt,
+ </if>
+ <if test="waterMeterWorkVolt != null">
+ water_meter_work_volt,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
+ </if>
+ <if test="clientId != null">
+ #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="clientName != null">
+ #{clientName,jdbcType=VARCHAR},
</if>
<if test="controllerId != null">
#{controllerId,jdbcType=BIGINT},
@@ -101,20 +212,83 @@
<if test="dt != null">
#{dt,jdbcType=TIMESTAMP},
</if>
+ <if test="rtuDt != null">
+ #{rtuDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orderNo != null">
+ #{orderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="icCardAddr != null">
+ #{icCardAddr,jdbcType=VARCHAR},
+ </if>
<if test="icCardNo != null">
#{icCardNo,jdbcType=VARCHAR},
</if>
- <if test="totalAmount != null">
- #{totalAmount,jdbcType=DOUBLE},
+ <if test="waterLevel != null">
+ #{waterLevel,jdbcType=FLOAT},
</if>
- <if test="instantAmount != null">
- #{instantAmount,jdbcType=DOUBLE},
+ <if test="waterPress != null">
+ #{waterPress,jdbcType=FLOAT},
</if>
- <if test="remainMoney != null">
- #{remainMoney,jdbcType=DOUBLE},
+ <if test="waterInstant != null">
+ #{waterInstant,jdbcType=FLOAT},
</if>
- <if test="rtuDt != null">
- #{rtuDt,jdbcType=TIMESTAMP},
+ <if test="waterTotal != null">
+ #{waterTotal,jdbcType=FLOAT},
+ </if>
+ <if test="eleTotal != null">
+ #{eleTotal,jdbcType=FLOAT},
+ </if>
+ <if test="moneyRemain != null">
+ #{moneyRemain,jdbcType=FLOAT},
+ </if>
+ <if test="waterRemain != null">
+ #{waterRemain,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>
+ <if test="waterPrice != null">
+ #{waterPrice,jdbcType=FLOAT},
+ </if>
+ <if test="elePrice != null">
+ #{elePrice,jdbcType=FLOAT},
+ </if>
+ <if test="aVolt != null">
+ #{aVolt,jdbcType=FLOAT},
+ </if>
+ <if test="bVolt != null">
+ #{bVolt,jdbcType=FLOAT},
+ </if>
+ <if test="cVolt != null">
+ #{cVolt,jdbcType=FLOAT},
+ </if>
+ <if test="aCurrent != null">
+ #{aCurrent,jdbcType=FLOAT},
+ </if>
+ <if test="bCurrent != null">
+ #{bCurrent,jdbcType=FLOAT},
+ </if>
+ <if test="cCurrent != null">
+ #{cCurrent,jdbcType=FLOAT},
+ </if>
+ <if test="batteryVolt != null">
+ #{batteryVolt,jdbcType=FLOAT},
+ </if>
+ <if test="waterMeterTransVolt != null">
+ #{waterMeterTransVolt,jdbcType=FLOAT},
+ </if>
+ <if test="waterMeterWorkVolt != null">
+ #{waterMeterWorkVolt,jdbcType=FLOAT},
</if>
</trim>
</insert>
@@ -122,6 +296,12 @@
<!--@mbg.generated-->
update rm_work_report_last
<set>
+ <if test="clientId != null">
+ client_id = #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="clientName != null">
+ client_name = #{clientName,jdbcType=VARCHAR},
+ </if>
<if test="controllerId != null">
controller_id = #{controllerId,jdbcType=BIGINT},
</if>
@@ -134,20 +314,83 @@
<if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
+ <if test="rtuDt != null">
+ rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orderNo != null">
+ order_no = #{orderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="icCardAddr != null">
+ ic_card_addr = #{icCardAddr,jdbcType=VARCHAR},
+ </if>
<if test="icCardNo != null">
ic_card_no = #{icCardNo,jdbcType=VARCHAR},
</if>
- <if test="totalAmount != null">
- total_amount = #{totalAmount,jdbcType=DOUBLE},
+ <if test="waterLevel != null">
+ water_level = #{waterLevel,jdbcType=FLOAT},
</if>
- <if test="instantAmount != null">
- instant_amount = #{instantAmount,jdbcType=DOUBLE},
+ <if test="waterPress != null">
+ water_press = #{waterPress,jdbcType=FLOAT},
</if>
- <if test="remainMoney != null">
- remain_money = #{remainMoney,jdbcType=DOUBLE},
+ <if test="waterInstant != null">
+ water_instant = #{waterInstant,jdbcType=FLOAT},
</if>
- <if test="rtuDt != null">
- rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+ <if test="waterTotal != null">
+ water_total = #{waterTotal,jdbcType=FLOAT},
+ </if>
+ <if test="eleTotal != null">
+ ele_total = #{eleTotal,jdbcType=FLOAT},
+ </if>
+ <if test="moneyRemain != null">
+ money_remain = #{moneyRemain,jdbcType=FLOAT},
+ </if>
+ <if test="waterRemain != null">
+ water_remain = #{waterRemain,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>
+ <if test="waterPrice != null">
+ water_price = #{waterPrice,jdbcType=FLOAT},
+ </if>
+ <if test="elePrice != null">
+ ele_price = #{elePrice,jdbcType=FLOAT},
+ </if>
+ <if test="aVolt != null">
+ a_volt = #{aVolt,jdbcType=FLOAT},
+ </if>
+ <if test="bVolt != null">
+ b_volt = #{bVolt,jdbcType=FLOAT},
+ </if>
+ <if test="cVolt != null">
+ c_volt = #{cVolt,jdbcType=FLOAT},
+ </if>
+ <if test="aCurrent != null">
+ a_current = #{aCurrent,jdbcType=FLOAT},
+ </if>
+ <if test="bCurrent != null">
+ b_current = #{bCurrent,jdbcType=FLOAT},
+ </if>
+ <if test="cCurrent != null">
+ c_current = #{cCurrent,jdbcType=FLOAT},
+ </if>
+ <if test="batteryVolt != null">
+ battery_volt = #{batteryVolt,jdbcType=FLOAT},
+ </if>
+ <if test="waterMeterTransVolt != null">
+ water_meter_trans_volt = #{waterMeterTransVolt,jdbcType=FLOAT},
+ </if>
+ <if test="waterMeterWorkVolt != null">
+ water_meter_work_volt = #{waterMeterWorkVolt,jdbcType=FLOAT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -155,15 +398,45 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportLast">
<!--@mbg.generated-->
update rm_work_report_last
- set controller_id = #{controllerId,jdbcType=BIGINT},
+ set client_id = #{clientId,jdbcType=BIGINT},
+ client_name = #{clientName,jdbcType=VARCHAR},
+ controller_id = #{controllerId,jdbcType=BIGINT},
intake_id = #{intakeId,jdbcType=BIGINT},
rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
dt = #{dt,jdbcType=TIMESTAMP},
+ rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+ order_no = #{orderNo,jdbcType=VARCHAR},
+ ic_card_addr = #{icCardAddr,jdbcType=VARCHAR},
ic_card_no = #{icCardNo,jdbcType=VARCHAR},
- total_amount = #{totalAmount,jdbcType=DOUBLE},
- instant_amount = #{instantAmount,jdbcType=DOUBLE},
- remain_money = #{remainMoney,jdbcType=DOUBLE},
- rtu_dt = #{rtuDt,jdbcType=TIMESTAMP}
+ water_level = #{waterLevel,jdbcType=FLOAT},
+ water_press = #{waterPress,jdbcType=FLOAT},
+ water_instant = #{waterInstant,jdbcType=FLOAT},
+ water_total = #{waterTotal,jdbcType=FLOAT},
+ ele_total = #{eleTotal,jdbcType=FLOAT},
+ money_remain = #{moneyRemain,jdbcType=FLOAT},
+ water_remain = #{waterRemain,jdbcType=FLOAT},
+ this_ele = #{thisEle,jdbcType=FLOAT},
+ this_water = #{thisWater,jdbcType=FLOAT},
+ this_money = #{thisMoney,jdbcType=FLOAT},
+ this_duration = #{thisDuration,jdbcType=INTEGER},
+ water_price = #{waterPrice,jdbcType=FLOAT},
+ ele_price = #{elePrice,jdbcType=FLOAT},
+ a_volt = #{aVolt,jdbcType=FLOAT},
+ b_volt = #{bVolt,jdbcType=FLOAT},
+ c_volt = #{cVolt,jdbcType=FLOAT},
+ a_current = #{aCurrent,jdbcType=FLOAT},
+ b_current = #{bCurrent,jdbcType=FLOAT},
+ c_current = #{cCurrent,jdbcType=FLOAT},
+ battery_volt = #{batteryVolt,jdbcType=FLOAT},
+ water_meter_trans_volt = #{waterMeterTransVolt,jdbcType=FLOAT},
+ water_meter_work_volt = #{waterMeterWorkVolt,jdbcType=FLOAT}
where id = #{id,jdbcType=BIGINT}
</update>
+ <select id="selectByIntakeId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from rm_work_report_last
+ where intake_id = #{intakeId,jdbcType=BIGINT}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0