From fd2de42e8b0019e660f04c72d0a9d218e032f4e4 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 05 七月 2024 13:59:02 +0800
Subject: [PATCH] 添加取水口和更改取水口时判断取水口是否重名
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
index ec8521a..a06bd6d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -15,14 +15,13 @@
<result column="loss_amount" jdbcType="FLOAT" property="lossAmount" />
<result column="water_press" jdbcType="FLOAT" property="waterPress" />
<result column="battery_volt" jdbcType="FLOAT" property="batteryVolt" />
- <result column="sun_volt" jdbcType="FLOAT" property="sunVolt" />
<result column="signal_value" jdbcType="INTEGER" property="signalValue" />
<result column="water_price" jdbcType="FLOAT" property="waterPrice" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, controller_id, intake_id, rtu_addr, dt, rtu_dt, instant_amount, total_amount,
- loss_amount, water_press, battery_volt, sun_volt, signal_value, water_price
+ loss_amount, water_press, battery_volt, signal_value, water_price
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -41,12 +40,12 @@
insert into rm_on_hour_report_history (id, controller_id, intake_id,
rtu_addr, dt, rtu_dt,
instant_amount, total_amount, loss_amount,
- water_press, battery_volt, sun_volt,
+ water_press, battery_volt,
signal_value, water_price)
values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
#{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP},
#{instantAmount,jdbcType=FLOAT}, #{totalAmount,jdbcType=FLOAT}, #{lossAmount,jdbcType=FLOAT},
- #{waterPress,jdbcType=FLOAT}, #{batteryVolt,jdbcType=FLOAT}, #{sunVolt,jdbcType=FLOAT},
+ #{waterPress,jdbcType=FLOAT}, #{batteryVolt,jdbcType=FLOAT},
#{signalValue,jdbcType=INTEGER}, #{waterPrice,jdbcType=FLOAT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOnHourReportHistory">
@@ -85,9 +84,6 @@
</if>
<if test="batteryVolt != null">
battery_volt,
- </if>
- <if test="sunVolt != null">
- sun_volt,
</if>
<if test="signalValue != null">
signal_value,
@@ -129,9 +125,6 @@
</if>
<if test="batteryVolt != null">
#{batteryVolt,jdbcType=FLOAT},
- </if>
- <if test="sunVolt != null">
- #{sunVolt,jdbcType=FLOAT},
</if>
<if test="signalValue != null">
#{signalValue,jdbcType=INTEGER},
@@ -175,9 +168,6 @@
<if test="batteryVolt != null">
battery_volt = #{batteryVolt,jdbcType=FLOAT},
</if>
- <if test="sunVolt != null">
- sun_volt = #{sunVolt,jdbcType=FLOAT},
- </if>
<if test="signalValue != null">
signal_value = #{signalValue,jdbcType=INTEGER},
</if>
@@ -200,7 +190,6 @@
loss_amount = #{lossAmount,jdbcType=FLOAT},
water_press = #{waterPress,jdbcType=FLOAT},
battery_volt = #{batteryVolt,jdbcType=FLOAT},
- sun_volt = #{sunVolt,jdbcType=FLOAT},
signal_value = #{signalValue,jdbcType=INTEGER},
water_price = #{waterPrice,jdbcType=FLOAT}
where id = #{id,jdbcType=BIGINT}
--
Gitblit v1.8.0