From 4b3f119b61143fed474b9dfcafd2369fc558a3b9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 07 五月 2025 15:06:52 +0800
Subject: [PATCH] 添加分页获取未删除阀控器列表接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 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 3b40503..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
@@ -1,5 +1,6 @@
package com.dy.pipIrrApp.issue;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -9,6 +10,7 @@
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
import com.dy.pipIrrGlobal.pojoOp.OpeReportReply;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
+import com.dy.pipIrrGlobal.voOp.VoIssueReportReply;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -64,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());
}
}
@@ -103,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);
@@ -114,5 +138,21 @@
return BaseResponseUtils.buildSuccess() ;
}
+ /**
+ * 鏍规嵁闂涓婃姤ID鑾峰彇涓婃姤鍥炲淇℃伅
+ * @param reportId
+ * @return
+ */
+ @GetMapping(path = "/getReportReply")
+ public BaseResponse<VoIssueReportReply> getReportReply(@RequestParam("reportId") Long reportId) {
+
+ JSONObject result = issueSv.getReportReply(reportId);
+ if(!result.get("code").equals("0001")) {
+ return BaseResponseUtils.buildErrorMsg(result.get("msg").toString());
+ }
+
+ return BaseResponseUtils.buildSuccess(result.get("data"));
+
+ }
}
--
Gitblit v1.8.0