pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeReportReplyMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoOp.OpeReportReply; import com.dy.pipIrrGlobal.voOp.VoIssueReportReply; import org.apache.ibatis.annotations.Mapper; /** @@ -24,4 +25,11 @@ int updateByPrimaryKeySelective(OpeReportReply record); int updateByPrimaryKey(OpeReportReply record); /** * 根据问题上报ID获取上报回复信息 * @param reportId * @return */ VoIssueReportReply getReportReplyByReportId(Long reportId); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReportReply.java
New file @@ -0,0 +1,45 @@ package com.dy.pipIrrGlobal.voOp; import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.writer.ObjectWriterImplToString; import com.dy.common.po.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; import java.util.Date; /** * @author ZhuBaoMin * @date 2024-11-14 11:25 * @LastEditTime 2024-11-14 11:25 * @Description 巡检员问题上报回复视图对象 */ @Data @JsonPropertyOrder({"replyContent", "replyTime", "replierId", "replier"}) public class VoIssueReportReply implements BaseEntity { private static final long serialVersionUID = 202411141126001L; /** * 回复内容 */ private String replyContent; /** * 回复时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date replyTime; /** * 回复人ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) private Long replierId; /** * 回复人姓名 */ private String replier; } pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
@@ -5,9 +5,9 @@ #name: ym type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull username: root password: dysql,;.abc!@# druid: pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -77,7 +77,7 @@ pipIrr: global: dev: true #是否开发阶段，true或false dev: false #是否开发阶段，true或false dsName: ym #开发阶段，设置临时的数据库名称 nginx: webPort: 54321 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeReportReplyMapper.xml
@@ -99,4 +99,16 @@ replier_id = #{replierId,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} </update> <!--根据问题上报ID获取上报回复信息--> <select id="getReportReplyByReportId" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReportReply"> SELECT rpy.reply_content AS replyContent, rpy.reply_time AS replyTime, rpy.replier_id AS replierId, user.name AS replier FROM ope_report_reply rpy INNER JOIN ba_user user ON user.id = rpy.replier_id WHERE rpy.report_id = #{reportId} </select> </mapper> 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; @@ -114,5 +116,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")); } } pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
@@ -1,6 +1,8 @@ package com.dy.pipIrrApp.issue; import com.alibaba.fastjson2.JSONObject; import com.dy.common.webUtil.QueryResultVo; import com.dy.common.webUtil.ResultCodeMsg; import com.dy.pipIrrApp.issue.dto.DtoDeleteParam; import com.dy.pipIrrApp.issue.qo.QoIssueReport; import com.dy.pipIrrGlobal.daoOp.OpeIssueReportMapper; @@ -8,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 lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -124,4 +127,30 @@ return "sucess"; } /** * 获取上报回复信息 * @param reportId * @return */ public JSONObject getReportReply(Long reportId) { JSONObject result = new JSONObject(); if(reportId == null) { result.put("code", ResultCodeMsg.RsCode.ERROR_CODE); result.put("msg","请选择一个问题上报"); return result; } VoIssueReportReply issueReportReply = opeReportReplyMapper.getReportReplyByReportId(reportId); if(issueReportReply != null) { result.put("code", ResultCodeMsg.RsCode.SUCCESS_CODE); result.put("msg","success"); result.put("data", issueReportReply); return result; } result.put("code", ResultCodeMsg.RsCode.ERROR_CODE); result.put("msg","未获取到上报回复信息"); return result; } } pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -36,4 +36,10 @@ # 压缩消息阈值，默认4k(1024 * 4) compressMessageBodyThreshold: 4096 # 是否在内部发送失败时重试另一个broker，默认false retryNextServer: false retryNextServer: false logging: level: com: dy: pipIrrGlobal: daoOp: trace
