From a6874344d96b58312337225cb62b2927162bb626 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 02 十二月 2024 16:41:05 +0800
Subject: [PATCH] 重构添加巡检轨迹接口，如果巡检已存在，返回巡检员ID对应的巡检ID
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
index 26446d4..7e7f3c1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
@@ -1,22 +1,24 @@
package com.dy.pipIrrApp.inspect;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.inspect.dto.Inspects;
+import com.dy.pipIrrApp.inspect.qo.QoInspect;
import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
+import com.dy.pipIrrGlobal.voOp.VoInspect;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
@@ -56,6 +58,7 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ JSONArray result_array = new JSONArray();
if(list_Inspects != null && list_Inspects.size() > 0) {
for (int i = 0; i < list_Inspects.size(); i++) {
Inspects inspects = list_Inspects.get(i);
@@ -87,6 +90,12 @@
return BaseResponseUtils.buildErrorMsg("宸℃璁板綍娣诲姞澶辫触");
}
+ // 鏋勯�犺繑鍥炲��
+ JSONObject inspect_job = new JSONObject();
+ inspect_job.put("inspectorId", inspectorId);
+ inspect_job.put("inspectId", inspectId);
+ result_array.add(inspect_job);
+
for (int j = 0; j < tracks.size(); j++) {
tracks.get(j).setId(idLongGenerator.generate());
tracks.get(j).setInspectId(inspectId);
@@ -116,9 +125,29 @@
}
}
}
+ if(result_array != null && result_array.size() > 0) {
+ return BaseResponseUtils.buildSuccess(result_array) ;
+ }
return BaseResponseUtils.buildSuccess() ;
}
return BaseResponseUtils.buildErrorMsg("鎮ㄦ彁浜ょ殑宸℃杞ㄨ抗涓虹┖");
}
+ /**
+ * 鏌ヨ宸℃杞ㄨ抗
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getInspects")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoInspect>>> getInspects(QoInspect qo){
+
+ try{
+ QueryResultVo<List<VoInspect>> res = inspectSv.getInspects(qo);
+ return BaseResponseUtils.buildSuccess(res);
+ }catch (Exception e){
+ log.error("鑾峰彇宸℃鍒楄〃寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0