From 844594bc560ba6c5dd7f92ce3301295fb980282a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:09:42 +0800
Subject: [PATCH] 充值机模块，获取农户及开卡三个接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
index 7434053..bbe60a5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
@@ -7,7 +7,7 @@
 import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
 import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
 import com.dy.pipIrrGlobal.voOp.VoInspect;
-import com.dy.pipIrrGlobal.voOp.VoIssueReport;
+import com.dy.pipIrrGlobal.voOp.VoTrackPoint;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +34,7 @@
 
     /**
      * 娣诲姞宸℃璁板綍
+     *
      * @param po
      * @return
      */
@@ -44,6 +45,7 @@
 
     /**
      * 淇敼宸℃璁板綍
+     *
      * @param po
      * @return
      */
@@ -53,6 +55,7 @@
 
     /**
      * 鎵归噺娣诲姞宸℃杞ㄨ抗
+     *
      * @param list
      * @return
      */
@@ -62,6 +65,7 @@
 
     /**
      * 宸℃鏌ヨ
+     *
      * @param queryVo
      * @return
      */
@@ -69,11 +73,13 @@
         //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
         String timeStart = queryVo.getTimeStart();
         String timeStop = queryVo.getTimeStop();
-        if (timeStart != null) {
+
+        if (timeStart == null || timeStart == "" || timeStop == null || timeStop == "") {
+            queryVo.setTimeStart(null);
+            queryVo.setTimeStop(null);
+        } else {
             timeStart = timeStart + " 00:00:00";
             queryVo.setTimeStart(timeStart);
-        }
-        if (timeStop != null) {
             timeStop = timeStop + " 23:59:59";
             queryVo.setTimeStop(timeStop);
         }
@@ -90,9 +96,48 @@
 
         List<VoInspect> inspects = opeInspectMapper.getInspects(params);
         for (int i = 0; i < inspects.size(); i++) {
-             inspects.get(i).setTracks(opeTrackMapper.selectByInspectId(inspects.get(i).getInspectId()));
+            List<OpeTrack> tracks = opeTrackMapper.selectByInspectId(inspects.get(i).getInspectId());
+            inspects.get(i).setTracks(tracks);
         }
         rsVo.obj = inspects;
         return rsVo;
     }
+
+    /**
+     * 鑾峰彇鎸囧畾宸℃ID涓嬬殑鍏ㄩ儴杞ㄨ抗鐐�
+     * @param inspectId
+     * @return
+     */
+    public List<VoTrackPoint> getTrackPointsById(Long inspectId) {
+        return opeTrackMapper.getTrackPointsById(inspectId);
+    }
+
+    /**
+     * 鏇存柊鎸囧畾宸℃璁板綍鐨勫贰妫�璺濈
+     * @param inspectId
+     * @param distance
+     * @return
+     */
+    public int updateInspectDistance(Long inspectId, double distance ) {
+        return opeInspectMapper.updateInspectDistance(inspectId, distance);
+    }
+
+    /**
+     * 鏍规嵁宸℃鍛業D鑾峰彇宸℃鍒楄〃
+     * @param queryVo
+     * @return
+     */
+    public QueryResultVo<List<VoInspect>> getInstectsByInspectorId(QoInspect queryVo) {
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+        Long itemTotal = opeInspectMapper.getInstectsCountByInspectorId(params);
+
+        QueryResultVo<List<VoInspect>> rsVo = new QueryResultVo<>();
+        rsVo.pageSize = queryVo.pageSize;
+        rsVo.pageCurr = queryVo.pageCurr;
+
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = opeInspectMapper.getInstectsByInspectorId(params);
+        return rsVo;
+    }
 }

--
Gitblit v1.8.0