From 9f046d256726cc43af43e8704a2888190029c241 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 05 八月 2024 18:52:44 +0800
Subject: [PATCH] 2024-08-05 朱宝民 指定时间段内指定开关阀类型开关阀次数
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/SignalIntensityQO.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 966 ++++++++++++------------
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/CloseTypeQo.java | 35
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java | 42
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 134 +++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java | 35
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfCloseType.java | 24
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 1028 +++++++++++++------------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java | 14
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java | 24
12 files changed, 1,333 insertions(+), 977 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java
index d4604e2..582f401 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOnHourReportLastMapper.java
@@ -138,4 +138,5 @@
* @return
*/
List<VoSignalIntensity> getSpecifiedSignalIntakes(Map<?, ?> params);
+
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
index e9b9ec6..0a8722f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
@@ -84,4 +84,18 @@
* @return
*/
List<VoOpenCloseValve> getOpenCloseValveReports_last(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁寮�闃�绫诲瀷鑾峰彇鎿嶄綔娆℃暟
+ * @param params
+ * @return
+ */
+ Integer getCountByOpenType(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鍏抽榾绫诲瀷鑾峰彇鎿嶄綔娆℃暟
+ * @param params
+ * @return
+ */
+ Integer getCountByCloseType(Map<?, ?> params);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfCloseType.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfCloseType.java
new file mode 100644
index 0000000..9d488e6
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfCloseType.java
@@ -0,0 +1,24 @@
+package com.dy.pipIrrGlobal.voSt;
+
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-08-05 16:11
+ * @LastEditTime 2024-08-05 16:11
+ * @Description 鍏抽榾绫诲瀷娆℃暟缁熻瑙嗗浘
+ */
+
+@Data
+public class VoCountOfCloseType {
+
+ /**
+ * 鍏抽榾绫诲瀷鍚嶇О
+ */
+ private String closeTypeName;
+
+ /**
+ * 鍏抽榾绫诲瀷娆℃暟
+ */
+ private Integer closeTypeCount;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java
new file mode 100644
index 0000000..22eda61
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java
@@ -0,0 +1,24 @@
+package com.dy.pipIrrGlobal.voSt;
+
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-08-05 16:03
+ * @LastEditTime 2024-08-05 16:03
+ * @Description 寮�闃�绫诲瀷娆℃暟缁熻瑙嗗浘
+ */
+
+@Data
+public class VoCountOfOpenType {
+
+ /**
+ * 寮�闃�鏂圭被鍨嬪悕绉�
+ */
+ private String openTypeName;
+
+ /**
+ * 寮�闃�绫诲瀷娆℃暟
+ */
+ private Integer openTypeCount;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
index 29f966b..a41ef3c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
@@ -417,4 +417,5 @@
</if>
</trim>
</select>
+
</mapper>
\ No newline at end of file
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 16e4487..b332c90 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -1,507 +1,531 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveHistoryMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
- <!--@mbg.generated-->
- <!--@Table rm_open_close_valve_history-->
- <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="op_dt" jdbcType="TIMESTAMP" property="opDt" />
- <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_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" />
- <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
- <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" />
- <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, client_id, client_name,
- 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-->
- select
- <include refid="Base_Column_List" />
- from rm_open_close_valve_history
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from rm_open_close_valve_history
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
- <!--@mbg.generated-->
- insert into rm_open_close_valve_history (id, client_id, client_name,
- 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}, #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR},
- #{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.RmOpenCloseValveHistory">
- <!--@mbg.generated-->
- insert into rm_open_close_valve_history
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
+ <!--@mbg.generated-->
+ <!--@Table rm_open_close_valve_history-->
+ <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="op_dt" jdbcType="TIMESTAMP" property="opDt"/>
+ <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_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"/>
+ <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo"/>
+ <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"/>
+ <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,
- </if>
- <if test="clientId != null">
client_id,
- </if>
- <if test="clientName != null">
client_name,
- </if>
- <if test="controllerId != null">
controller_id,
- </if>
- <if test="intakeId != null">
intake_id,
- </if>
- <if test="rtuAddr != null">
rtu_addr,
- </if>
- <if test="opDt != null">
op_dt,
- </if>
- <if test="opType != null">
op_type,
- </if>
- <if test="opTotalAmount != null">
op_total_amount,
- </if>
- <if test="opIcCardNo != null">
op_ic_card_no,
- </if>
- <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="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>
- <if test="clType != null">
cl_type,
- </if>
- <if test="clTotalAmount != null">
cl_total_amount,
- </if>
- <if test="clIcCardNo != null">
cl_ic_card_no,
- </if>
- <if test="clIcCardAddr != null">
cl_ic_card_addr,
- </if>
- <if test="clRemainMoney != null">
cl_remain_money,
- </if>
- <if test="clThisAmount != null">
cl_this_amount,
- </if>
- <if test="clThisMoney != null">
cl_this_money,
- </if>
- <if test="clThisTime != null">
cl_this_time,
- </if>
- <if test="clOpenDt != null">
cl_open_dt,
- </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=",">
- <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},
- </if>
- <if test="intakeId != null">
- #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- #{opDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opType != null">
- #{opType,jdbcType=TINYINT},
- </if>
- <if test="opTotalAmount != null">
- #{opTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="opIcCardNo != null">
- #{opIcCardNo,jdbcType=VARCHAR},
- </if>
- <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="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>
- <if test="clType != null">
- #{clType,jdbcType=TINYINT},
- </if>
- <if test="clTotalAmount != null">
- #{clTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="clIcCardNo != null">
- #{clIcCardNo,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardAddr != null">
- #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clRemainMoney != null">
- #{clRemainMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisAmount != null">
- #{clThisAmount,jdbcType=DOUBLE},
- </if>
- <if test="clThisMoney != null">
- #{clThisMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisTime != null">
- #{clThisTime,jdbcType=INTEGER},
- </if>
- <if test="clOpenDt != null">
- #{clOpenDt,jdbcType=TIMESTAMP},
- </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>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
- <!--@mbg.generated-->
- update rm_open_close_valve_history
- <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>
- <if test="intakeId != null">
- intake_id = #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opType != null">
- op_type = #{opType,jdbcType=TINYINT},
- </if>
- <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="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="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>
- <if test="clType != null">
- cl_type = #{clType,jdbcType=TINYINT},
- </if>
- <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="clIcCardAddr != null">
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clRemainMoney != null">
- cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisAmount != null">
- cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
- </if>
- <if test="clThisMoney != null">
- cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisTime != null">
- cl_this_time = #{clThisTime,jdbcType=INTEGER},
- </if>
- <if test="clOpenDt != null">
- cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
- </if>
- <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>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
- <!--@mbg.generated-->
- update rm_open_close_valve_history
- 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},
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- op_type = #{opType,jdbcType=TINYINT},
- op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
- 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},
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
- 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},
- 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>
+ cl_this_ele
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List"/>
+ from rm_open_close_valve_history
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete
+ from rm_open_close_valve_history
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
+ <!--@mbg.generated-->
+ insert into rm_open_close_valve_history (id, client_id, client_name,
+ 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}, #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR},
+ #{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.RmOpenCloseValveHistory">
+ <!--@mbg.generated-->
+ insert into rm_open_close_valve_history
+ <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,
+ </if>
+ <if test="intakeId != null">
+ intake_id,
+ </if>
+ <if test="rtuAddr != null">
+ rtu_addr,
+ </if>
+ <if test="opDt != null">
+ op_dt,
+ </if>
+ <if test="opType != null">
+ op_type,
+ </if>
+ <if test="opTotalAmount != null">
+ op_total_amount,
+ </if>
+ <if test="opIcCardNo != null">
+ op_ic_card_no,
+ </if>
+ <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="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>
+ <if test="clType != null">
+ cl_type,
+ </if>
+ <if test="clTotalAmount != null">
+ cl_total_amount,
+ </if>
+ <if test="clIcCardNo != null">
+ cl_ic_card_no,
+ </if>
+ <if test="clIcCardAddr != null">
+ cl_ic_card_addr,
+ </if>
+ <if test="clRemainMoney != null">
+ cl_remain_money,
+ </if>
+ <if test="clThisAmount != null">
+ cl_this_amount,
+ </if>
+ <if test="clThisMoney != null">
+ cl_this_money,
+ </if>
+ <if test="clThisTime != null">
+ cl_this_time,
+ </if>
+ <if test="clOpenDt != null">
+ cl_open_dt,
+ </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=",">
+ <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},
+ </if>
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ #{rtuAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="opDt != null">
+ #{opDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="opType != null">
+ #{opType,jdbcType=TINYINT},
+ </if>
+ <if test="opTotalAmount != null">
+ #{opTotalAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="opIcCardNo != null">
+ #{opIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <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="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>
+ <if test="clType != null">
+ #{clType,jdbcType=TINYINT},
+ </if>
+ <if test="clTotalAmount != null">
+ #{clTotalAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="clIcCardNo != null">
+ #{clIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clIcCardAddr != null">
+ #{clIcCardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="clRemainMoney != null">
+ #{clRemainMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisAmount != null">
+ #{clThisAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisMoney != null">
+ #{clThisMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisTime != null">
+ #{clThisTime,jdbcType=INTEGER},
+ </if>
+ <if test="clOpenDt != null">
+ #{clOpenDt,jdbcType=TIMESTAMP},
+ </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>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
+ <!--@mbg.generated-->
+ update rm_open_close_valve_history
+ <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>
+ <if test="intakeId != null">
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="opDt != null">
+ op_dt = #{opDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="opType != null">
+ op_type = #{opType,jdbcType=TINYINT},
+ </if>
+ <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="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="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>
+ <if test="clType != null">
+ cl_type = #{clType,jdbcType=TINYINT},
+ </if>
+ <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="clIcCardAddr != null">
+ cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="clRemainMoney != null">
+ cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisAmount != null">
+ cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisMoney != null">
+ cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisTime != null">
+ cl_this_time = #{clThisTime,jdbcType=INTEGER},
+ </if>
+ <if test="clOpenDt != null">
+ cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
+ </if>
+ <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>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
+ <!--@mbg.generated-->
+ update rm_open_close_valve_history
+ 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},
+ op_dt = #{opDt,jdbcType=TIMESTAMP},
+ op_type = #{opType,jdbcType=TINYINT},
+ op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
+ op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ 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},
+ cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ 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},
+ 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>
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰曟暟閲�-->
- <select id="getOpenCloseValveReportsCount_history" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
- FROM rm_open_close_valve_history oh
- INNER JOIN pr_intake inta ON inta.id = oh.intake_id
- <where>
- <if test="intakeId != null and intakeId >0">
- AND oh.intake_id = #{intakeId}
- </if>
- <if test = "intakeNum != null and intakeNum !=''">
- AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
- </if>
- <if test = "rtuAddr != null and rtuAddr !=''">
- AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
- </if>
- <if test = "timeStart_open != null and timeStop_open != null">
- AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
- </if>
- <if test = "timeStart_close != null and timeStop_close != null">
- AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
- </if>
- </where>
- </select>
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰曟暟閲�-->
+ <select id="getOpenCloseValveReportsCount_history" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM rm_open_close_valve_history oh
+ INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+ <where>
+ <if test="intakeId != null and intakeId > 0">
+ AND oh.intake_id = #{intakeId}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
+ </if>
+ <if test="timeStart_open != null and timeStop_open != null">
+ AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
+ </if>
+ <if test="timeStart_close != null and timeStop_close != null">
+ AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
+ </if>
+ </where>
+ </select>
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰�-->
- <select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
- SELECT
- oh.intake_id AS intakeId,
- inta.name AS intakenum,
- oh.rtu_addr AS rtuAddr,
- oh.client_name AS clientName,
- oh.op_ic_card_no AS openIcNum,
- oh.op_ic_card_addr AS openIcAddr,
- oh.op_dt AS openTime,
- CASE
- WHEN oh.op_type = 1 THEN "鍒峰崱寮�闃�"
- WHEN oh.op_type = 3 THEN "涓績绔欏紑闃�"
- WHEN oh.op_type = 5 THEN "娆犺垂鍏抽榾"
- WHEN oh.op_type = 8 THEN "鐢ㄦ埛杩滅▼寮�闃�"
- WHEN oh.op_type = 11 THEN "寮�鍏抽榾鍗″紑闃�"
- ELSE "鏈煡"
- END AS openType,
- oh.op_order_no AS openOrderNo,
- oh.op_total_amount AS openTotalAmount,
- oh.op_remain_money AS openRemainMoney,
- oh.op_water_remain_user AS openWaterRemain,
- oh.op_ele_total_amount AS openEleTotalAmount,
- oh.cl_ic_card_no AS closeIcNum,
- oh.cl_ic_card_addr AS closeIcAddr,
- oh.cl_dt AS closeTime,
- CASE
- WHEN oh.cl_type = 2 THEN "鍒峰崱鍏抽榾"
- WHEN oh.cl_type = 4 THEN "涓績绔欏叧闃�"
- WHEN oh.cl_type = 5 THEN "娆犺垂鍏抽榾"
- WHEN oh.cl_type = 6 THEN "娴侀噺璁℃晠闅滃叧闃�"
- WHEN oh.cl_type = 7 THEN "绱ф�ュ叧闂�"
- WHEN oh.cl_type = 9 THEN "鐢ㄦ埛杩滅▼鍏抽榾"
- WHEN oh.cl_type = 10 THEN "寮�鍏抽榾鍗″叧闃�"
- WHEN oh.cl_type = 12 THEN "榛戝悕鍗曞懡浠ゅ叧闃�"
- WHEN oh.cl_type = 13 THEN "鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾"
- WHEN oh.cl_type = 14 THEN "鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾"
- ELSE "鏈煡"
- END AS closeType,
- oh.cl_this_amount AS closeThisAmount,
- oh.cl_this_time AS thisTime,
- oh.cl_this_money AS thisMoney,
- oh.cl_remain_money AS closeRemainMoney,
- oh.cl_total_amount AS closeTotalAmount
- FROM rm_open_close_valve_history oh
- INNER JOIN pr_intake inta ON inta.id = oh.intake_id
- <where>
- <if test="intakeId != null and intakeId >0">
- AND oh.intake_id = #{intakeId}
- </if>
- <if test = "intakeNum != null and intakeNum !=''">
- AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
- </if>
- <if test = "rtuAddr != null and rtuAddr !=''">
- AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
- </if>
- <if test = "timeStart_open != null and timeStop_open != null">
- AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
- </if>
- <if test = "timeStart_close != null and timeStop_close != null">
- AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
- </if>
- </where>
- ORDER BY oh.op_dt DESC
- <trim prefix="limit " >
- <if test="start != null and count != null">
- #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
- </if>
- </trim>
- </select>
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰�-->
+ <select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
+ SELECT oh.intake_id AS intakeId,
+ inta.name AS intakenum,
+ oh.rtu_addr AS rtuAddr,
+ oh.client_name AS clientName,
+ oh.op_ic_card_no AS openIcNum,
+ oh.op_ic_card_addr AS openIcAddr,
+ oh.op_dt AS openTime,
+ CASE
+ WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
+ WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
+ WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
+ WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
+ ELSE '鏈煡'
+ END AS openType,
+ oh.op_order_no AS openOrderNo,
+ oh.op_total_amount AS openTotalAmount,
+ oh.op_remain_money AS openRemainMoney,
+ oh.op_water_remain_user AS openWaterRemain,
+ oh.op_ele_total_amount AS openEleTotalAmount,
+ oh.cl_ic_card_no AS closeIcNum,
+ oh.cl_ic_card_addr AS closeIcAddr,
+ oh.cl_dt AS closeTime,
+ CASE
+ WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
+ WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
+ WHEN oh.cl_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�'
+ WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闃�'
+ WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
+ WHEN oh.cl_type = 10 THEN '寮�鍏抽榾鍗″叧闃�'
+ WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
+ WHEN oh.cl_type = 13 THEN '杩滅▼瀹氭椂鍏抽榾'
+ WHEN oh.cl_type = 14 THEN '杩滅▼瀹氶噺鍏抽榾'
+ ELSE '鏈煡'
+ END AS closeType,
+ oh.cl_this_amount AS closeThisAmount,
+ oh.cl_this_time AS thisTime,
+ oh.cl_this_money AS thisMoney,
+ oh.cl_remain_money AS closeRemainMoney,
+ oh.cl_total_amount AS closeTotalAmount
+ FROM rm_open_close_valve_history oh
+ INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+ <where>
+ <if test="intakeId != null and intakeId > 0">
+ AND oh.intake_id = #{intakeId}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
+ </if>
+ <if test="timeStart_open != null and timeStop_open != null">
+ AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
+ </if>
+ <if test="timeStart_close != null and timeStop_close != null">
+ AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
+ </if>
+ </where>
+ ORDER BY oh.op_dt 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
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 61890c6..dba5edd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -1,527 +1,575 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveLastMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
- <!--@mbg.generated-->
- <!--@Table rm_open_close_valve_last-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="last_history_id" jdbcType="BIGINT" property="lastHistoryId" />
- <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="op_dt" jdbcType="TIMESTAMP" property="opDt" />
- <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_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" />
- <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
- <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" />
- <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, client_id, client_name,
- 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-->
- select
- <include refid="Base_Column_List" />
- from rm_open_close_valve_last
- where id = #{id,jdbcType=BIGINT}
- </select>
- <select id="selectByIntakeId" parameterType="java.lang.Long" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from rm_open_close_valve_last
- where intake_id = #{intakeId,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from rm_open_close_valve_last
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
- <!--@mbg.generated-->
- insert into rm_open_close_valve_last (id, last_history_id,
- client_id, client_name, 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},
- #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR}, #{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-->
- insert into rm_open_close_valve_last
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
+ <!--@mbg.generated-->
+ <!--@Table rm_open_close_valve_last-->
+ <id column="id" jdbcType="BIGINT" property="id"/>
+ <result column="last_history_id" jdbcType="BIGINT" property="lastHistoryId"/>
+ <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="op_dt" jdbcType="TIMESTAMP" property="opDt"/>
+ <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_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"/>
+ <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo"/>
+ <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"/>
+ <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,
- </if>
- <if test="lastHistoryId != null">
last_history_id,
- </if>
- <if test="clientId != null">
client_id,
- </if>
- <if test="clientName != null">
client_name,
- </if>
- <if test="controllerId != null">
controller_id,
- </if>
- <if test="intakeId != null">
intake_id,
- </if>
- <if test="rtuAddr != null">
rtu_addr,
- </if>
- <if test="opDt != null">
op_dt,
- </if>
- <if test="opType != null">
op_type,
- </if>
- <if test="opTotalAmount != null">
op_total_amount,
- </if>
- <if test="opIcCardNo != null">
op_ic_card_no,
- </if>
- <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="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>
- <if test="clType != null">
cl_type,
- </if>
- <if test="clTotalAmount != null">
cl_total_amount,
- </if>
- <if test="clIcCardNo != null">
cl_ic_card_no,
- </if>
- <if test="clIcCardAddr != null">
cl_ic_card_addr,
- </if>
- <if test="clRemainMoney != null">
cl_remain_money,
- </if>
- <if test="clThisAmount != null">
cl_this_amount,
- </if>
- <if test="clThisMoney != null">
cl_this_money,
- </if>
- <if test="clThisTime != null">
cl_this_time,
- </if>
- <if test="clOpenDt != null">
cl_open_dt,
- </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=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
- </if>
- <if test="lastHistoryId != null">
- #{lastHistoryId,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},
- </if>
- <if test="intakeId != null">
- #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- #{opDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opType != null">
- #{opType,jdbcType=TINYINT},
- </if>
- <if test="opTotalAmount != null">
- #{opTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="opIcCardNo != null">
- #{opIcCardNo,jdbcType=VARCHAR},
- </if>
- <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="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>
- <if test="clType != null">
- #{clType,jdbcType=TINYINT},
- </if>
- <if test="clTotalAmount != null">
- #{clTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="clIcCardNo != null">
- #{clIcCardNo,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardAddr != null">
- #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clRemainMoney != null">
- #{clRemainMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisAmount != null">
- #{clThisAmount,jdbcType=DOUBLE},
- </if>
- <if test="clThisMoney != null">
- #{clThisMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisTime != null">
- #{clThisTime,jdbcType=INTEGER},
- </if>
- <if test="clOpenDt != null">
- #{clOpenDt,jdbcType=TIMESTAMP},
- </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>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
- <!--@mbg.generated-->
- update rm_open_close_valve_last
- <set>
- <if test="lastHistoryId != null">
- last_history_id = #{lastHistoryId,jdbcType=BIGINT},
- </if>
- <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>
- <if test="intakeId != null">
- intake_id = #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opType != null">
- op_type = #{opType,jdbcType=TINYINT},
- </if>
- <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="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="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>
- <if test="clType != null">
- cl_type = #{clType,jdbcType=TINYINT},
- </if>
- <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="clIcCardAddr != null">
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clRemainMoney != null">
- cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisAmount != null">
- cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
- </if>
- <if test="clThisMoney != null">
- cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
- </if>
- <if test="clThisTime != null">
- cl_this_time = #{clThisTime,jdbcType=INTEGER},
- </if>
- <if test="clOpenDt != null">
- cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
- </if>
- <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>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
- <!--@mbg.generated-->
- update rm_open_close_valve_last
- set last_history_id = #{lastHistoryId,jdbcType=BIGINT},
- 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},
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- op_type = #{opType,jdbcType=TINYINT},
- op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
- 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},
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
- 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},
- 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>
+ cl_this_ele
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List"/>
+ from rm_open_close_valve_last
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <select id="selectByIntakeId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List"/>
+ from rm_open_close_valve_last
+ where intake_id = #{intakeId,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete
+ from rm_open_close_valve_last
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
+ <!--@mbg.generated-->
+ insert into rm_open_close_valve_last (id, last_history_id,
+ client_id, client_name, 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},
+ #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR}, #{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-->
+ insert into rm_open_close_valve_last
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="lastHistoryId != null">
+ last_history_id,
+ </if>
+ <if test="clientId != null">
+ client_id,
+ </if>
+ <if test="clientName != null">
+ client_name,
+ </if>
+ <if test="controllerId != null">
+ controller_id,
+ </if>
+ <if test="intakeId != null">
+ intake_id,
+ </if>
+ <if test="rtuAddr != null">
+ rtu_addr,
+ </if>
+ <if test="opDt != null">
+ op_dt,
+ </if>
+ <if test="opType != null">
+ op_type,
+ </if>
+ <if test="opTotalAmount != null">
+ op_total_amount,
+ </if>
+ <if test="opIcCardNo != null">
+ op_ic_card_no,
+ </if>
+ <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="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>
+ <if test="clType != null">
+ cl_type,
+ </if>
+ <if test="clTotalAmount != null">
+ cl_total_amount,
+ </if>
+ <if test="clIcCardNo != null">
+ cl_ic_card_no,
+ </if>
+ <if test="clIcCardAddr != null">
+ cl_ic_card_addr,
+ </if>
+ <if test="clRemainMoney != null">
+ cl_remain_money,
+ </if>
+ <if test="clThisAmount != null">
+ cl_this_amount,
+ </if>
+ <if test="clThisMoney != null">
+ cl_this_money,
+ </if>
+ <if test="clThisTime != null">
+ cl_this_time,
+ </if>
+ <if test="clOpenDt != null">
+ cl_open_dt,
+ </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=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="lastHistoryId != null">
+ #{lastHistoryId,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},
+ </if>
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ #{rtuAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="opDt != null">
+ #{opDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="opType != null">
+ #{opType,jdbcType=TINYINT},
+ </if>
+ <if test="opTotalAmount != null">
+ #{opTotalAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="opIcCardNo != null">
+ #{opIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <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="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>
+ <if test="clType != null">
+ #{clType,jdbcType=TINYINT},
+ </if>
+ <if test="clTotalAmount != null">
+ #{clTotalAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="clIcCardNo != null">
+ #{clIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clIcCardAddr != null">
+ #{clIcCardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="clRemainMoney != null">
+ #{clRemainMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisAmount != null">
+ #{clThisAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisMoney != null">
+ #{clThisMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisTime != null">
+ #{clThisTime,jdbcType=INTEGER},
+ </if>
+ <if test="clOpenDt != null">
+ #{clOpenDt,jdbcType=TIMESTAMP},
+ </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>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
+ <!--@mbg.generated-->
+ update rm_open_close_valve_last
+ <set>
+ <if test="lastHistoryId != null">
+ last_history_id = #{lastHistoryId,jdbcType=BIGINT},
+ </if>
+ <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>
+ <if test="intakeId != null">
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ </if>
+ <if test="rtuAddr != null">
+ rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="opDt != null">
+ op_dt = #{opDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="opType != null">
+ op_type = #{opType,jdbcType=TINYINT},
+ </if>
+ <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="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="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>
+ <if test="clType != null">
+ cl_type = #{clType,jdbcType=TINYINT},
+ </if>
+ <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="clIcCardAddr != null">
+ cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="clRemainMoney != null">
+ cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisAmount != null">
+ cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisMoney != null">
+ cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
+ </if>
+ <if test="clThisTime != null">
+ cl_this_time = #{clThisTime,jdbcType=INTEGER},
+ </if>
+ <if test="clOpenDt != null">
+ cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
+ </if>
+ <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>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
+ <!--@mbg.generated-->
+ update rm_open_close_valve_last
+ set last_history_id = #{lastHistoryId,jdbcType=BIGINT},
+ 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},
+ op_dt = #{opDt,jdbcType=TIMESTAMP},
+ op_type = #{opType,jdbcType=TINYINT},
+ op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
+ op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ 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},
+ cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ 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},
+ 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>
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ユ渶鏂拌褰曟暟閲�-->
- <select id="getOpenCloseValveReportsCount_last" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
- FROM rm_open_close_valve_last oh
- INNER JOIN pr_intake inta ON inta.id = oh.intake_id
- <where>
- <if test="intakeId != null and intakeId >0">
- AND oh.intake_id = #{intakeId}
- </if>
- <if test = "intakeNum != null and intakeNum !=''">
- AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
- </if>
- <if test = "rtuAddr != null and rtuAddr !=''">
- AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
- </if>
- <if test = "timeStart_open != null and timeStop_open != null">
- AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
- </if>
- <if test = "timeStart_close != null and timeStop_close != null">
- AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
- </if>
- </where>
- </select>
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ユ渶鏂拌褰曟暟閲�-->
+ <select id="getOpenCloseValveReportsCount_last" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM rm_open_close_valve_last oh
+ INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+ <where>
+ <if test="intakeId != null and intakeId > 0">
+ AND oh.intake_id = #{intakeId}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
+ </if>
+ <if test="timeStart_open != null and timeStop_open != null">
+ AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
+ </if>
+ <if test="timeStart_close != null and timeStop_close != null">
+ AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
+ </if>
+ </where>
+ </select>
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ユ渶鏂拌褰�-->
- <select id="getOpenCloseValveReports_last" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
- SELECT
- oh.intake_id AS intakeId,
- inta.name AS intakeNum,
- oh.rtu_addr AS rtuAddr,
- oh.client_name AS clientName,
- oh.op_ic_card_no AS openIcNum,
- oh.op_ic_card_addr AS openIcAddr,
- oh.op_dt AS openTime,
- CASE
- WHEN oh.op_type = 1 THEN "鍒峰崱寮�闃�"
- WHEN oh.op_type = 3 THEN "涓績绔欏紑闃�"
- WHEN oh.op_type = 5 THEN "娆犺垂鍏抽榾"
- WHEN oh.op_type = 8 THEN "鐢ㄦ埛杩滅▼寮�闃�"
- WHEN oh.op_type = 11 THEN "寮�鍏抽榾鍗″紑闃�"
- ELSE "鏈煡"
- END AS openType,
- oh.op_order_no AS openOrderNo,
- oh.op_total_amount AS openTotalAmount,
- oh.op_remain_money AS openRemainMoney,
- oh.op_water_remain_user AS openWaterRemain,
- oh.op_ele_total_amount AS openEleTotalAmount,
- oh.cl_ic_card_no AS closeIcNum,
- oh.cl_ic_card_addr AS closeIcAddr,
- oh.cl_dt AS closeTime,
- CASE
- WHEN oh.cl_type = 2 THEN "鍒峰崱鍏抽榾"
- WHEN oh.cl_type = 4 THEN "涓績绔欏叧闃�"
- WHEN oh.cl_type = 5 THEN "娆犺垂鍏抽榾"
- WHEN oh.cl_type = 6 THEN "娴侀噺璁℃晠闅滃叧闃�"
- WHEN oh.cl_type = 7 THEN "绱ф�ュ叧闂�"
- WHEN oh.cl_type = 9 THEN "鐢ㄦ埛杩滅▼鍏抽榾"
- WHEN oh.cl_type = 10 THEN "寮�鍏抽榾鍗″叧闃�"
- WHEN oh.cl_type = 12 THEN "榛戝悕鍗曞懡浠ゅ叧闃�"
- WHEN oh.cl_type = 13 THEN "鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾"
- WHEN oh.cl_type = 14 THEN "鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾"
- ELSE "鏈煡"
- END AS closeType,
- oh.cl_this_amount AS closeThisAmount,
- oh.cl_this_time AS thisTime,
- oh.cl_this_money AS thisMoney,
- oh.cl_remain_money AS closeRemainMoney,
- oh.cl_total_amount AS closeTotalAmount
- FROM rm_open_close_valve_last oh
- INNER JOIN pr_intake inta ON inta.id = oh.intake_id
- <where>
- <if test="intakeId != null and intakeId >0">
- AND oh.intake_id = #{intakeId}
- </if>
- <if test = "intakeNum != null and intakeNum !=''">
- AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
- </if>
- <if test = "rtuAddr != null and rtuAddr !=''">
- AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
- </if>
- <if test = "timeStart_open != null and timeStop_open != null">
- AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
- </if>
- <if test = "timeStart_close != null and timeStop_close != null">
- AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
- </if>
- </where>
- ORDER BY oh.op_dt DESC
- <trim prefix="limit " >
- <if test="start != null and count != null">
- #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
- </if>
- </trim>
- </select>
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ユ渶鏂拌褰�-->
+ <select id="getOpenCloseValveReports_last" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve">
+ SELECT oh.intake_id AS intakeId,
+ inta.name AS intakeNum,
+ oh.rtu_addr AS rtuAddr,
+ oh.client_name AS clientName,
+ oh.op_ic_card_no AS openIcNum,
+ oh.op_ic_card_addr AS openIcAddr,
+ oh.op_dt AS openTime,
+
+ CASE
+ WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
+ WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
+ WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
+ WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
+ ELSE '鏈煡'
+ END AS openType,
+ oh.op_order_no AS openOrderNo,
+ oh.op_total_amount AS openTotalAmount,
+ oh.op_remain_money AS openRemainMoney,
+ oh.op_water_remain_user AS openWaterRemain,
+ oh.op_ele_total_amount AS openEleTotalAmount,
+ oh.cl_ic_card_no AS closeIcNum,
+ oh.cl_ic_card_addr AS closeIcAddr,
+ oh.cl_dt AS closeTime,
+ CASE
+ WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
+ WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
+ WHEN oh.cl_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�'
+ WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闃�'
+ WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
+ WHEN oh.cl_type = 10 THEN '寮�鍏抽榾鍗″叧闃�'
+ WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
+ WHEN oh.cl_type = 13 THEN '杩滅▼瀹氭椂鍏抽榾'
+ WHEN oh.cl_type = 14 THEN '杩滅▼瀹氶噺鍏抽榾'
+ ELSE '鏈煡'
+ END AS closeType,
+ oh.cl_this_amount AS closeThisAmount,
+ oh.cl_this_time AS thisTime,
+ oh.cl_this_money AS thisMoney,
+ oh.cl_remain_money AS closeRemainMoney,
+ oh.cl_total_amount AS closeTotalAmount
+ FROM rm_open_close_valve_last oh
+ INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+ <where>
+ <if test="intakeId != null and intakeId > 0">
+ AND oh.intake_id = #{intakeId}
+ </if>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
+ </if>
+ <if test="rtuAddr != null and rtuAddr != ''">
+ AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
+ </if>
+ <if test="timeStart_open != null and timeStop_open != null">
+ AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
+ </if>
+ <if test="timeStart_close != null and timeStop_close != null">
+ AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
+ </if>
+ </where>
+ ORDER BY oh.op_dt DESC
+ <trim prefix="limit ">
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+ <!--鏍规嵁寮�闃�鏂瑰紡鑾峰彇鎿嶄綔娆℃暟-->
+ <select id="getCountByOpenType" resultType="java.lang.Integer">
+ SELECT COUNT(*) AS recordCount
+ FROM rm_open_close_valve_history
+ <where>
+ AND op_type = #{openType}
+ <if test="timeStart != null and timeStop != null">
+ AND op_dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鍏抽榾鏂瑰紡鑾峰彇鎿嶄綔娆℃暟-->
+ <select id="getCountByCloseType" resultType="java.lang.Integer">
+ SELECT COUNT(*) AS recordCount
+ FROM rm_open_close_valve_history
+ <where>
+ AND cl_type = #{closeType}
+ <if test="timeStart != null and timeStop != null">
+ AND cl_dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index 099c25f..c248646 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -3,14 +3,9 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.RmOnHourReportHistoryMapper;
import com.dy.pipIrrGlobal.daoRm.RmOnHourReportLastMapper;
-import com.dy.pipIrrGlobal.voSt.VoBatteryVolt;
-import com.dy.pipIrrGlobal.voSt.VoCumulativeFlow;
-import com.dy.pipIrrGlobal.voSt.VoIntake;
-import com.dy.pipIrrGlobal.voSt.VoSignalIntensity;
-import com.dy.pipIrrStatistics.intake.qo.BatteryVoltQO;
-import com.dy.pipIrrStatistics.intake.qo.CumulativeFlowQO;
-import com.dy.pipIrrStatistics.intake.qo.IntakeQO;
-import com.dy.pipIrrStatistics.intake.qo.SignalIntensityQO;
+import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveLastMapper;
+import com.dy.pipIrrGlobal.voSt.*;
+import com.dy.pipIrrStatistics.intake.qo.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +32,9 @@
private RmOnHourReportHistoryMapper rmOnHourReportHistoryMapper;
@Autowired
private RmOnHourReportLastMapper rmOnHourReportLastMapper;
+
+ @Autowired
+ private RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper;
@Value("${rtu.batteryVolt}")
private Double batteryVolt;
@@ -178,4 +176,124 @@
return rsVo ;
}
+ /**
+ * 鏍规嵁寮�闃�绫诲瀷鑾峰彇鎿嶄綔娆℃暟
+ * @param qo
+ * @return
+ */
+ public VoCountOfOpenType getCountByOpenType(OpenTypeQO qo) {
+ /**
+ * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
+ */
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart != null) {
+ timeStart = timeStart + " 00:00:00";
+ }else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ if(timeStop != null) {
+ timeStop = timeStop + " 23:59:59";
+ }
+ qo.setTimeStart(timeStart);
+ qo.setTimeStop(timeStop);
+
+ Integer openType = qo.getOpenType();
+ String openTypeName = "";
+ switch (openType) {
+ case 1:
+ openTypeName = "鍒峰崱寮�闃�";
+ break;
+ case 3:
+ openTypeName = "涓績绔欏紑闃�";
+ break;
+ case 8:
+ openTypeName = "鐢ㄦ埛杩滅▼寮�闃�";
+ break;
+ case 11:
+ openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ break;
+ case 13:
+ openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ break;
+ }
+
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+
+ Integer openTypeCount = Optional.ofNullable(rmOpenCloseValveLastMapper.getCountByOpenType(params)).orElse(0);
+
+ VoCountOfOpenType vo = new VoCountOfOpenType();
+ vo.setOpenTypeName(openTypeName);
+ vo.setOpenTypeCount(openTypeCount);
+ return vo;
+ }
+
+ /**
+ * 鏍规嵁鍏抽榾绫诲瀷鑾峰彇鎿嶄綔娆℃暟
+ * @param qo
+ * @return
+ */
+ public VoCountOfCloseType getCountByCloseType(CloseTypeQo qo) {
+ /**
+ * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
+ */
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart != null) {
+ timeStart = timeStart + " 00:00:00";
+ }else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ if(timeStop != null) {
+ timeStop = timeStop + " 23:59:59";
+ }
+ qo.setTimeStart(timeStart);
+ qo.setTimeStop(timeStop);
+
+ Integer closeType = qo.getCloseType();
+ String closeTypeName = "";
+ switch (closeType) {
+ case 2:
+ closeTypeName = "鍒峰崱鍏抽榾";
+ break;
+ case 4:
+ closeTypeName = "涓績绔欏叧闃�";
+ break;
+ case 5:
+ closeTypeName = "娆犺垂鍏抽榾";
+ break;
+ case 6:
+ closeTypeName = "娴侀噺璁℃晠闅滃叧闃�";
+ break;
+ case 7:
+ closeTypeName = "绱ф�ュ叧闃�";
+ break;
+ case 9:
+ closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
+ break;
+ case 10:
+ closeTypeName = "寮�鍏抽榾鍗″叧闃�";
+ break;
+ case 12:
+ closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
+ break;
+ case 13:
+ closeTypeName = "杩滅▼瀹氭椂鍏抽榾";
+ break;
+ case 14:
+ closeTypeName = "杩滅▼瀹氶噺鍏抽榾";
+ break;
+ }
+
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ Integer closeTypeCount = Optional.ofNullable(rmOpenCloseValveLastMapper.getCountByCloseType(params)).orElse(0);
+
+ VoCountOfCloseType vo = new VoCountOfCloseType();
+ vo.setCloseTypeName(closeTypeName);
+ vo.setCloseTypeCount(closeTypeCount);
+ return vo;
+ }
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
index 8f06af2..57374a7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
@@ -4,14 +4,8 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.voSt.VoBatteryVolt;
-import com.dy.pipIrrGlobal.voSt.VoCumulativeFlow;
-import com.dy.pipIrrGlobal.voSt.VoIntake;
-import com.dy.pipIrrGlobal.voSt.VoSignalIntensity;
-import com.dy.pipIrrStatistics.intake.qo.BatteryVoltQO;
-import com.dy.pipIrrStatistics.intake.qo.CumulativeFlowQO;
-import com.dy.pipIrrStatistics.intake.qo.IntakeQO;
-import com.dy.pipIrrStatistics.intake.qo.SignalIntensityQO;
+import com.dy.pipIrrGlobal.voSt.*;
+import com.dy.pipIrrStatistics.intake.qo.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -113,4 +107,36 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
+
+ /**
+ * 鏍规嵁寮�闃�绫诲瀷鑾峰彇鎿嶄綔娆℃暟
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getCountByOpenType")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<VoCountOfOpenType>> getCountByOpenType(OpenTypeQO qo) {
+ try {
+ return BaseResponseUtils.buildSuccess(intakeSv.getCountByOpenType(qo));
+ } catch (Exception e) {
+ log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鏍规嵁鍏抽榾绫诲瀷鑾峰彇鎿嶄綔娆℃暟
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getCountByCloseType")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<VoCountOfCloseType>> getCountByCloseType(CloseTypeQo qo) {
+ try {
+ return BaseResponseUtils.buildSuccess(intakeSv.getCountByCloseType(qo));
+ } catch (Exception e) {
+ log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/CloseTypeQo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/CloseTypeQo.java
new file mode 100644
index 0000000..a41230e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/CloseTypeQo.java
@@ -0,0 +1,35 @@
+package com.dy.pipIrrStatistics.intake.qo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-08-05 16:22
+ * @LastEditTime 2024-08-05 16:22
+ * @Description 鍏抽榾绫诲瀷鏌ヨ瀵硅薄
+ */
+
+@Data
+public class CloseTypeQo {
+ /**
+ * 鍏抽榾绫诲瀷
+ */
+ @NotNull(message = "鍏抽榾绫诲瀷涓嶈兘涓虹┖")
+ private Integer closeType;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String timeStart;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
+ private String timeStop;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java
new file mode 100644
index 0000000..e9b97ec
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java
@@ -0,0 +1,35 @@
+package com.dy.pipIrrStatistics.intake.qo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-08-05 16:19
+ * @LastEditTime 2024-08-05 16:19
+ * @Description 寮�闃�绫诲瀷鏌ヨ瀵硅薄
+ */
+
+@Data
+public class OpenTypeQO {
+ /**
+ * 寮�闃�绫诲瀷
+ */
+ @NotNull(message = "寮�闃�绫诲瀷涓嶈兘涓虹┖")
+ private Integer openType;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String timeStart;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
+ private String timeStop;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/SignalIntensityQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/SignalIntensityQO.java
index 69a66a0..9fec6a2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/SignalIntensityQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/SignalIntensityQO.java
@@ -1,6 +1,9 @@
package com.dy.pipIrrStatistics.intake.qo;
import com.dy.common.webUtil.QueryConditionVo;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
@@ -16,6 +19,9 @@
/**
* 淇″彿寮哄害锛�1-寮憋紝2-涓�鑸紝3-寮�
*/
+ @NotNull(message = "淇″彿寮哄害涓嶈兘涓虹┖")
+ @Min(value = 1, message = "淇″彿寮哄害閫夋嫨閿欒")
+ @Max(value = 3, message = "淇″彿寮哄害閫夋嫨閿欒")
private Integer signalIntensity;
/**
--
Gitblit v1.8.0