From e86db806e1dcde94b1aa38230138a3fa3895572a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 19 十二月 2024 15:04:22 +0800
Subject: [PATCH] 增加巡检轨迹接口 返回值inspectid、inspectorid由Long类型改为String
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
index 6f67db7..60a4696 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
@@ -66,10 +66,30 @@
@SsoAop()
public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
try {
- QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
- return BaseResponseUtils.buildSuccess(res);
+ //QueryResultVo<List<VoIssueReport_temp>> res = issueSv.getIssueReports(vo);
+ return BaseResponseUtils.buildSuccess(issueSv.getIssueReports(vo));
} catch (Exception e) {
log.error("鑾峰彇宸℃鍛橀棶棰樹笂鎶ヨ褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鑾峰彇涓�涓贰妫�鍛橀棶棰樹笂鎶ヨ褰曡鎯�
+ * @param issueReportId
+ * @return
+ */
+ @GetMapping(path = "/getOneIssueReport")
+ @SsoAop()
+ public BaseResponse<VoIssueReport> getOneIssueReport(@RequestParam("issueReportId") Long issueReportId) {
+ try {
+ VoIssueReport issueReport = issueSv.getIssueReportById(issueReportId);
+ if(issueReport == null) {
+ return BaseResponseUtils.buildNonExist();
+ }
+ return BaseResponseUtils.buildSuccess(issueReport);
+ } catch (Exception e) {
+ log.error("鑾峰彇闂涓婃姤璁板綍璇︽儏寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
@@ -105,9 +125,11 @@
@Transactional(rollbackFor = Exception.class)
public BaseResponse<Boolean> replyReport(@RequestBody @Valid OpeReportReply po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
-
+ if (issueSv.getReportReply(po.getReportId()).get("code").equals("0001")){
+ return BaseResponseUtils.buildErrorMsg("璇ラ棶棰樹笂鎶ュ凡鍥炲锛岃鍕块噸澶嶅洖澶�");
+ }
String result = issueSv.replyReport(po);
if(!result.equals("sucess")) {
return BaseResponseUtils.buildErrorMsg(result);
--
Gitblit v1.8.0