From 171439bcb3b5e4a636bbb81a93d61396f6e2940e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 17 二月 2025 17:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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..3ced131 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,11 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String timeStart = queryVo.getTimeStart();
String timeStop = queryVo.getTimeStop();
- if (timeStart != null) {
+ if (timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
queryVo.setTimeStart(timeStart);
}
- if (timeStop != null) {
+ if (timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
queryVo.setTimeStop(timeStop);
}
@@ -90,9 +94,29 @@
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);
+ }
}
--
Gitblit v1.8.0