From 7adab86fc7f9767def711031716221f6144ef9ee Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 25 七月 2024 17:41:30 +0800
Subject: [PATCH] 8个接口增加可以通过取水口ID或农户ID查询
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml | 6 +++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java | 3 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml | 6 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 6 +++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java | 3 +
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java | 3 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml | 6 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml | 6 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 6 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 6 +++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java | 5 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml | 6 +++
12 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
index 55279e8..d0fa274 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -396,6 +396,9 @@
<if test="valveState != null">
and rash.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
@@ -477,6 +480,9 @@
<if test="valveState != null">
and rash.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 98990c4..2134c01 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -378,6 +378,9 @@
<if test="valveState != null">
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
@@ -459,6 +462,9 @@
<if test="valveState != null">
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index f674e37..2446e7e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -197,6 +197,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcad.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcadl.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -225,6 +228,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcad.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcadl.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
index e2cbdd6..7275f77 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -187,6 +187,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcad.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcad.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -215,6 +218,9 @@
<if test="clientName != null">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
+ <if test="clientId != null">
+ and rcad.client_id = #{clientId}
+ </if>
<if test="startDt != null">
and rcad.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
index ea0db3b..14c712e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml
@@ -176,6 +176,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -202,6 +205,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riadl.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
index ac46b99..72263b5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml
@@ -164,6 +164,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riad.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -190,6 +193,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and riad.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index cf6a6ca..972b0df 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -168,6 +168,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rldl.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -193,6 +196,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rldl.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index cbd6149..6c10de8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -158,6 +158,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
@@ -183,6 +186,9 @@
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
+ <if test="intakeId != null">
+ and rash.intake_id = #{intakeId}
+ </if>
<if test="startDt != null">
and rld.dt >= #{startDt,jdbcType=DATE}
</if>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java
index e26c93c..2f7a749 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java
@@ -1,6 +1,8 @@
package com.dy.pipIrrRemote.records.clientAmountDay;
import com.dy.common.webUtil.QueryConditionVo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -21,6 +23,9 @@
@Schema(name = "鍐滄埛鏃ョ敤姘撮噺缁熻鏌ヨ鏉′欢")
public class ClientAmountDayQueryVo extends QueryConditionVo {
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private String clientId;
+
@Schema(description = "鍐滄埛濮撳悕", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String clientName;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
index bc3d339..993b064 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
@@ -26,6 +26,9 @@
@Schema(description = "鍙栨按鍙ｅ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String intakeName;
+ @Schema(description = "鍙栨按鍙D")
+ private String intakeId;
+
@Schema(description = "闃�闂ㄧ姸鎬�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)//锛�0鎵撳紑銆�1鍏抽棴锛�
private Byte valveState;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java
index 5bb8dd0..9e7b078 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java
@@ -24,6 +24,9 @@
@Schema(description = "鍙栨按鍙ｅ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String intakeName;
+ @Schema(description = "鍙栨按鍙D")
+ private String intakeId;
+
@Schema(description = "缁熻寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date startDt;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
index 66f92f0..cba8680 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
@@ -25,6 +25,9 @@
@Schema(description = "鍙栨按鍙ｅ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String intakeName;
+ @Schema(description = "鍙栨按鍙D")
+ private String intakeId;
+
@Schema(description = "缁熻寮�濮嬫棩鏈�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date startDt;
--
Gitblit v1.8.0