From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 19:19:35 +0800 Subject: [PATCH] 1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java index d4ccf4b..50022e3 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java @@ -1,5 +1,6 @@ package com.dy.pipIrrGlobal.voOp; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.writer.ObjectWriterImplToString; import com.dy.common.po.BaseEntity; @@ -11,15 +12,15 @@ /** * @author ZhuBaoMin - * @date 2024-11-12 14:46 - * @LastEditTime 2024-11-12 14:46 + * @date 2024-12-03 15:02 + * @LastEditTime 2024-12-03 15:02 * @Description 宸℃鍛橀棶棰樹笂鎶ヨ鍥惧璞� */ @Data -@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"}) +@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime","replyContent","replyPersonId", "stateId", "state"}) public class VoIssueReport implements BaseEntity { - private static final long serialVersionUID = 202411121448001L; + private static final long serialVersionUID = 202412031504001L; /** * 宸℃鍛橀棶棰樹笂鎶D @@ -51,17 +52,17 @@ /** * 鐓х墖鍒楄〃 */ - private String images; + private JSONArray images; /** * 闊抽鍒楄〃 */ - private String audios; + private JSONArray audios; /** * 瑙嗛鍒楄〃 */ - private String videos; + private JSONArray videos; /** * 涓婃姤鍥炲鏃堕棿 @@ -70,6 +71,17 @@ private Date replyTime; /** + * 鍥炲鍐呭 + */ + private String replyContent; + + /** + * 鍥炲浜篒D + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + private Long replyPersonId; + + /** * 鐘舵�佸�� */ private Integer stateId; -- Gitblit v1.8.0