From de2fafa2e1fc28b7f1780b5ebb27feaeed0ef0c6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 06 一月 2025 15:36:45 +0800
Subject: [PATCH] 1、王江海协议上线解析中未把版本号放入IoSession中的问题解决; 2、配置文件调整与统一

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 115 insertions(+), 2 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 c12a4d2..9a94c28 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
@@ -2,8 +2,12 @@
 
 
 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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -22,13 +26,13 @@
      * @param id primary key
      * @return object by primary key
      */
-    PrIntake selectByPrimaryKey(Long id);
+    VoAllIntake selectByPrimaryKey(Long id);
 
     /**
      * 寰楀埌鍏ㄩ儴瀹炰綋
      * @return 鍏ㄩ儴瀹炰綋
      * */
-    List<PrIntake> selectAll();
+    List<VoAllIntake> selectAll();
 
     /**
      * 閫昏緫鍒犻櫎
@@ -76,5 +80,114 @@
      */
     List<VoIntake> getIntakes(Map<?, ?> params);
 
+    /**
+     * 鏍规嵁涓嬬骇Id鑾峰彇涓婁竴绾у湴鍧�Id
+     * @param vaId 涓嬩竴绾d
+     * @return
+     */
     Long getSupperByVillageId(long vaId);
+
+    /**
+     * 鏍规嵁鍙栨按鍙g紪鍙疯幏鍙栨湭鍒犻櫎鐨勫彇姘村彛鏁伴噺
+     * @param intakeId
+     * @return  address
+     */
+    Integer getRecordCountOfIntake(@Param("intakeId") Long intakeId);
+
+    /**
+     * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
+     * @param villageId 鏉慖d
+     * @return  address  鍏ㄩ儴浜旂骇鍦板潃
+     */
+    String getAddressByVillageId(long villageId);
+
+    /**
+     * 鏍规嵁鍖哄煙Id鑾峰彇鍖哄煙绛夌骇
+     * @param regionId 鍖哄煙Id
+     * @return  Level  鍖哄煙绛夌骇
+     */
+    Integer getLevelByRegionId(long regionId);
+
+    /**
+     * 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙e垪琛�
+     * @return
+     */
+    List<Map<String, Object>> getNoBindingIntakes();
+
+    /**
+     * 鑾峰彇鍙栨按鍙f暟閲忥紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
+     * @param params
+     * @return
+     */
+    Long getOnLineIntakesCount(Map<?, ?> params);
+
+    /**
+     * 鑾峰彇鍙栨按鍙e垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
+     * @param params
+     * @return
+     */
+    //List<VoOnLineIntake> getOnLineIntakes(@Param("onLineMap") String onLineMap, @Param("isOnLine") Boolean isOnLine);
+    List<VoOnLineIntake> getOnLineIntakes(Map<?, ?> params);
+
+
+    /**
+     * 鑾峰彇鍙栨按鍙f暟閲忥紙鍦ㄧ嚎鎴栦笉鍦ㄧ嚎锛�
+     * @param params
+     * @return
+     */
+    Long selectIntakesCountForOnLine(Map<?, ?> params);
+
+    /**
+     * 鑾峰彇鍙栨按鍙e垪琛ㄥ湪绾挎垨涓嶅湪绾匡級
+     * @param params
+     * @return
+     */
+    List<VoOnLineIntake> selectIntakesForOnLine(Map<?, ?> params);
+
+
+
+    /**
+     * 鏍规嵁鍙栨按鍙g紪鍙疯幏鍙栧彇姘村彛瀵硅薄
+     * @param params
+     * @return
+     */
+    VoOnLineIntake getIntakeByName(Map<?, ?> params);
+
+
+    /**
+     * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
+     * @return
+     */
+    List<VoOnLineIntake> getUsedIntakes(@Param("onLineMap") String onLineMap, @Param("operatorId") Long operatorId);
+
+    /**
+     * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
+     * @param intakeName
+     * @return
+     */
+    Long getIntakeIdByName(String intakeName);
+
+    /**
+     * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+     * @param intakeName
+     * @return
+     */
+    List<Long> getIntakeIdsByName(String intakeName);
+
+    /**
+     * 鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+     * @param id
+     * @param intakeName
+     * @return
+     */
+    List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
+
+
+    /**
+     * app淇敼鍙栨按鍙g粡绾害
+     * @param record
+     * @return
+     */
+    int updateByPrimaryKeySelective1(IntakeUpdateLngLat record);
+
 }

--
Gitblit v1.8.0