From a1744d0bf7f0ad8ac861d672cffd7c710dac4e7e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 14:17:36 +0800
Subject: [PATCH] 获取未绑定轮灌组的取水口
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 5 +++--
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 8 ++++----
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/qo/QoIntake.java | 17 +++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 12 +++++++-----
5 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index 3ae6c73..35a5b41 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -198,7 +198,7 @@
* 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙ｅ垪琛�
* @return
*/
- List<VoIntakeSimple> getFreeIntakes();
+ List<VoIntakeSimple> getFreeIntakes(Map<?, ?> params);
/**
* 鑾峰彇鏈粦瀹氳櫄鎷熷崱鐨勫彇姘村彛鍒楄〃锛岀粰鍙栨按鍙ｇ粦铏氭嫙鍗′娇鐢�
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 46397ea..e580bd8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -744,11 +744,13 @@
id AS intakeId,
name AS intakeName
FROM pr_intake inta
- WHERE NOT EXISTS (
- SELECT 1
- FROM ir_group_intake gi
- WHERE gi.intake_id = inta.id
- ) AND inta.deleted = 0
+ <where>
+ AND inta.deleted = 0
+ AND NOT EXISTS (SELECT 1 FROM ir_group_intake gi WHERE gi.intake_id = inta.id)
+ <if test="intakeName != null and intakeName != ''">
+ AND LOWER(inta.name) LIKE CONCAT('%', #{intakeName}, '%')
+ </if>
+ </where>
</select>
<!--鑾峰彇鏈粦瀹氳櫄鎷熷崱鐨勫彇姘村彛鍒楄〃锛岀粰鍙栨按鍙ｇ粦铏氭嫙鍗′娇鐢�-->
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 6591aad..399d528 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -11,6 +11,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.*;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrProject.intake.qo.QoIntake;
import com.dy.pipIrrProject.result.ProjectResultCode;
import com.taobao.api.ApiException;
import io.swagger.v3.oas.annotations.Operation;
@@ -351,9 +352,9 @@
*/
@GetMapping(path = "getFreeIntakes")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoIntakeSimple>>> getFreeIntakes() {
+ public BaseResponse<List<VoIntakeSimple>> getFreeIntakes(QoIntake qo) {
try {
- QueryResultVo<List<VoIntakeSimple>> res = intakeSv.getFreeIntakes();
+ List<VoIntakeSimple> res = intakeSv.getFreeIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 1a7137f..b71783d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -13,6 +13,7 @@
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.*;
+import com.dy.pipIrrProject.intake.qo.QoIntake;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -353,9 +354,8 @@
* 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙ｅ垪琛�
* @return
*/
- public QueryResultVo<List<VoIntakeSimple>> getFreeIntakes() {
- QueryResultVo<List<VoIntakeSimple>> rsVo = new QueryResultVo<>();
- rsVo.obj = prIntakeMapper.getFreeIntakes();
- return rsVo;
+ public List<VoIntakeSimple> getFreeIntakes(QoIntake queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ return prIntakeMapper.getFreeIntakes(params);
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/qo/QoIntake.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/qo/QoIntake.java
new file mode 100644
index 0000000..068d95f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/qo/QoIntake.java
@@ -0,0 +1,17 @@
+package com.dy.pipIrrProject.intake.qo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-04-11 14:02
+ * @LastEditTime 2025-04-11 14:02
+ * @Description 鍙栨按鍙ｆ煡璇㈠璞★紝鑾峰彇鏈粦瀹氳疆鐏岀粍鏃朵娇鐢�
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class QoIntake {
+ private String intakeName;
+}
--
Gitblit v1.8.0