From d65cc4cd967d9c8cbdc8a4dd7c803e952f01098f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 14:53:35 +0800
Subject: [PATCH] 修改用户登录接口 优化取水口绑定、解绑控制器接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 213 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index 6c188cc..5e895e4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -494,7 +494,7 @@
CASE
WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
- WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
ELSE '鏈煡'
@@ -510,7 +510,7 @@
CASE
WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
- WHEN oh.cl_type = 5 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 '鐢ㄦ埛杩滅▼鍏抽榾'
@@ -563,7 +563,7 @@
CASE
WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
- WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
ELSE '鏈煡'
@@ -579,7 +579,7 @@
CASE
WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
- WHEN oh.cl_type = 5 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 '鐢ㄦ埛杩滅▼鍏抽榾'
@@ -791,9 +791,10 @@
<select id="getLargeWaterConsumptionClientsCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
FROM se_client cli
- INNER JOIN rm_open_close_valve_history his ON his.client_id = cli.id
- WHERE his.op_dt BETWEEN #{timeStart} AND #{timeStop}
- AND his.cl_this_amount > #{waterConsumption}
+ WHERE (SELECT SUM(his.cl_this_amount)
+ FROM rm_open_close_valve_history his
+ WHERE his.client_id = cli.id
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterConsumption}
</select>
<!--鑾峰彇鎸囧畾鏃堕棿娈靛唴鐢ㄦ按閲忚秴杩囨寚瀹氬�肩殑鍐滄埛-->
@@ -805,9 +806,10 @@
cli.phone,
cli.idCard
FROM se_client cli
- INNER JOIN rm_open_close_valve_history his ON his.client_id = cli.id
- WHERE his.op_dt BETWEEN #{timeStart} AND #{timeStop}
- AND his.cl_this_amount > #{waterConsumption}
+ WHERE (SELECT SUM(his.cl_this_amount)
+ FROM rm_open_close_valve_history his
+ WHERE his.client_id = cli.id
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterConsumption}
ORDER BY cli.id
<trim prefix="limit ">
<if test="start != null and count != null">
@@ -820,9 +822,10 @@
<select id="getLargeAmountSpentClientsCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
FROM se_client cli
- INNER JOIN rm_open_close_valve_history his ON his.client_id = cli.id
- WHERE his.op_dt BETWEEN #{timeStart} AND #{timeStop}
- AND his.cl_this_money > #{amountSpent}
+ WHERE (SELECT SUM(his.cl_this_money)
+ FROM rm_open_close_valve_history his
+ WHERE his.client_id = cli.id
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{amountSpent}
</select>
<!--鑾峰彇鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍐滄埛-->
<select id="getLargeAmountSpentClients" resultType="com.dy.pipIrrGlobal.voSt.VoClient">
@@ -833,9 +836,10 @@
cli.phone,
cli.idCard
FROM se_client cli
- INNER JOIN rm_open_close_valve_history his ON his.client_id = cli.id
- WHERE his.op_dt BETWEEN #{timeStart} AND #{timeStop}
- AND his.cl_this_money > #{amountSpent}
+ WHERE (SELECT SUM(his.cl_this_money)
+ FROM rm_open_close_valve_history his
+ WHERE his.client_id = cli.id
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{amountSpent}
ORDER BY cli.id
<trim prefix="limit ">
<if test="start != null and count != null">
@@ -848,9 +852,10 @@
<select id="getLargeWaterDurationClientsCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
FROM se_client cli
- INNER JOIN rm_open_close_valve_history his ON his.client_id = cli.id
- WHERE his.op_dt BETWEEN #{timeStart} AND #{timeStop}
- AND his.cl_this_time > #{waterDuration}
+ WHERE (SELECT SUM(his.cl_this_time)
+ FROM rm_open_close_valve_history his
+ WHERE his.client_id = cli.id
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterDuration}
</select>
<!--鑾峰彇鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍐滄埛-->
@@ -862,9 +867,10 @@
cli.phone,
cli.idCard
FROM se_client cli
- INNER JOIN rm_open_close_valve_history his ON his.client_id = cli.id
- WHERE his.op_dt BETWEEN #{timeStart} AND #{timeStop}
- AND his.cl_this_time > #{waterDuration}
+ WHERE (SELECT SUM(his.cl_this_time)
+ FROM rm_open_close_valve_history his
+ WHERE his.client_id = cli.id
+ AND his.op_dt BETWEEN #{timeStart} AND #{timeStop}) > #{waterDuration}
ORDER BY cli.id
<trim prefix="limit ">
<if test="start != null and count != null">
@@ -872,4 +878,189 @@
</if>
</trim>
</select>
+ <!--鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�-->
+ <select id="getUseWaterGtValueIntakesCount" resultType="java.lang.Long">
+ select
+ count(*)
+ from
+ ( SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName ,
+ IFNULL(SUM(rocvh.cl_this_amount),0) AS value
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt >= #{timeStart} AND rocvh.cl_dt <= #{timeStop} AND inta.deleted = 0
+ GROUP BY inta.id
+ HAVING IFNULL(SUM(rocvh.cl_this_amount),0) > #{value}) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�-->
+ <select id="getUseWaterGtValueIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount">
+ SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName ,
+ IFNULL(SUM(rocvh.cl_this_amount),0) AS value
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt >= #{timeStart} AND rocvh.cl_dt <= #{timeStop} AND inta.deleted = 0
+ GROUP BY inta.id
+ HAVING IFNULL(SUM(rocvh.cl_this_amount),0) > #{value}
+ ORDER BY inta.id
+ <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="getExpenseGtValueIntakesCount" resultType="java.lang.Long">
+ select
+ count(*)
+ from
+ ( SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName ,
+ IFNULL(SUM(rocvh.cl_this_money),0) AS value
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt >= #{timeStart} AND rocvh.cl_dt <= #{timeStop} AND inta.deleted = 0
+ GROUP BY inta.id
+ HAVING IFNULL(SUM(rocvh.cl_this_money),0) > #{value}) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�-->
+ <select id="getExpenseGtValueIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount">
+ SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName ,
+ IFNULL(SUM(rocvh.cl_this_money),0) AS value
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt >= #{timeStart} AND rocvh.cl_dt <= #{timeStop} AND inta.deleted = 0
+ GROUP BY inta.id
+ HAVING IFNULL(SUM(rocvh.cl_this_money),0) > #{value}
+ ORDER BY inta.id
+ <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="getUseWaterDurationGtValueIntakesCount" resultType="java.lang.Long">
+ select
+ count(*)
+ from
+ ( SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName ,
+ IFNULL(SUM(rocvh.cl_this_time),0) AS recordCount
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt >= #{timeStart} AND rocvh.cl_dt <= #{timeStop} AND inta.deleted = 0
+ GROUP BY inta.id
+ HAVING IFNULL(SUM(rocvh.cl_this_time),0) > #{value}) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�-->
+ <select id="getUseWaterDurationGtValueIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeOpenCount">
+ SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName ,
+ IFNULL(SUM(rocvh.cl_this_time),0) AS recordCount
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ LEFT JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt >= #{timeStart} AND rocvh.cl_dt <= #{timeStop} AND inta.deleted = 0
+ GROUP BY inta.id
+ HAVING IFNULL(SUM(rocvh.cl_this_time),0) > #{value}
+ ORDER BY inta.id
+ <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="getHaveOpenNoCloseIntakesCount" resultType="java.lang.Long">
+ select count(*) from
+ (
+ SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt BETWEEN #{timeStart} AND #{timeStop} AND rocvh.cl_dt IS NULL AND inta.deleted = 0
+ GROUP BY inta.id) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈� 鏈夊紑闃� 鏃犲叧闃�鐨勫彇姘村彛-->
+ <select id="getHaveOpenNoCloseIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntake">
+ SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.op_dt BETWEEN #{timeStart} AND #{timeStop} AND rocvh.cl_dt IS NULL AND inta.deleted = 0
+ GROUP BY inta.id
+ ORDER BY inta.id
+ <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="getNoOpenHaveCloseIntakesCount" resultType="java.lang.Long">
+ select count(*) from
+ (
+ SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.cl_dt BETWEEN #{timeStart} AND #{timeStop} AND rocvh.op_dt IS NULL AND inta.deleted = 0
+ GROUP BY inta.id) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈� 鏃犲紑闃� 鏈夊叧闃�鐨勫彇姘村彛-->
+ <select id="getNoOpenHaveCloseIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntake">
+ SELECT
+ inta.id AS intakeId,
+ inta.NAME AS intakeNum,
+ blo.NAME AS blockName
+ FROM
+ pr_intake inta
+ INNER JOIN ba_block blo ON blo.id = inta.blockId
+ inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+ WHERE rocvh.cl_dt BETWEEN #{timeStart} AND #{timeStop} AND rocvh.op_dt IS NULL AND inta.deleted = 0
+ GROUP BY inta.id
+ ORDER BY inta.id
+ <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
--
Gitblit v1.8.0