From f3baf33f3dbb9b3091881185ccbe72327e7326c1 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 09:39:48 +0800
Subject: [PATCH] 查询巡检轨迹接口返回值增加巡检距离字段

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 0 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 20893a0..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
@@ -1,14 +1,20 @@
 package com.dy.pipIrrApp.inspect;
 
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrApp.inspect.qo.QoInspect;
 import com.dy.pipIrrGlobal.daoOp.OpeInspectMapper;
 import com.dy.pipIrrGlobal.daoOp.OpeTrackMapper;
 import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
 import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
+import com.dy.pipIrrGlobal.voOp.VoInspect;
+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;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZhuBaoMin
@@ -28,6 +34,7 @@
 
     /**
      * 娣诲姞宸℃璁板綍
+     *
      * @param po
      * @return
      */
@@ -37,7 +44,18 @@
     }
 
     /**
+     * 淇敼宸℃璁板綍
+     *
+     * @param po
+     * @return
+     */
+    public Integer updateInspect(OpeInspect po) {
+        return opeInspectMapper.updateByPrimaryKeySelective(po);
+    }
+
+    /**
      * 鎵归噺娣诲姞宸℃杞ㄨ抗
+     *
      * @param list
      * @return
      */
@@ -45,5 +63,81 @@
         return opeTrackMapper.insertTracks(list);
     }
 
+    /**
+     * 宸℃鏌ヨ
+     *
+     * @param queryVo
+     * @return
+     */
+    public QueryResultVo<List<VoInspect>> getInspects(QoInspect queryVo) {
+        //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
+        String timeStart = queryVo.getTimeStart();
+        String timeStop = queryVo.getTimeStop();
 
+        if (timeStart == null || timeStart == "" || timeStop == null || timeStop == "") {
+            queryVo.setTimeStart(null);
+            queryVo.setTimeStop(null);
+        } else {
+            timeStart = timeStart + " 00:00:00";
+            queryVo.setTimeStart(timeStart);
+            timeStop = timeStop + " 23:59:59";
+            queryVo.setTimeStop(timeStop);
+        }
+
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+        Long itemTotal = opeInspectMapper.getInspectsCount(params);
+        QueryResultVo<List<VoInspect>> rsVo = new QueryResultVo<>();
+
+        rsVo.pageSize = queryVo.pageSize;
+        rsVo.pageCurr = queryVo.pageCurr;
+
+        rsVo.calculateAndSet(itemTotal, params);
+
+        List<VoInspect> inspects = opeInspectMapper.getInspects(params);
+        for (int i = 0; i < inspects.size(); i++) {
+            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