From 4b3f119b61143fed474b9dfcafd2369fc558a3b9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 07 五月 2025 15:06:52 +0800
Subject: [PATCH] 添加分页获取未删除阀控器列表接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

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 e13d639..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
@@ -12,10 +12,8 @@
 import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
 import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
 import com.dy.pipIrrGlobal.pojoPr.PrIntake;
-import com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat;
-import com.dy.pipIrrGlobal.voPr.VoAllIntake;
-import com.dy.pipIrrGlobal.voPr.VoIntake;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+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;
@@ -119,14 +117,14 @@
      */
 
     public int update(PrIntake po) {
-        if (po.getTownId() == null || po.getTownId() == 0) {
-            Long townId = getSupperByVillageId(po.getVillageId());
-            po.setTownId(townId);
-        }
-        if (po.getCountyId() == null || po.getCountyId() == 0) {
-            Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
-            po.setCountyId(countyId);
-        }
+//        if (po.getTownId() == null || po.getTownId() == 0) {
+//            Long townId = getSupperByVillageId(po.getVillageId());
+//            po.setTownId(townId);
+//        }
+//        if (po.getCountyId() == null || po.getCountyId() == 0) {
+//            Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
+//            po.setCountyId(countyId);
+//        }
         return this.prIntakeMapper.updateByPrimaryKeySelective(po);
 //        return this.prIntakeMapper.updateByPrimaryKey(po);
     }
@@ -351,4 +349,13 @@
     public int updateIntakeLngLat(IntakeUpdateLngLat po) {
         return prIntakeMapper.updateByPrimaryKeySelective1(po);
     }
+
+    /**
+     * 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙e垪琛�
+     * @return
+     */
+    public List<VoIntakeSimple> getFreeIntakes(QoIntake queryVo) {
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+        return prIntakeMapper.getFreeIntakes(params);
+    }
 }

--
Gitblit v1.8.0