liurunyu
2025-01-14 706f722adc849eba0296f1dbd64166e1e0bde4c5
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"));
    }
}