From 8fb298d1015d6a00be63533ee99021d4d6a625eb Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 23 Oct 2024 19:49:39 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3045:=20=E5=87=8F=E5=B0=91=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/pending/response/v3/model/ParsedGroupInfo.java | 3 +++ .../service/pending/response/v3/model/ParsedGroupV3.java | 3 +++ .../service/pending/response/v3/model/SessionUrlInfo.java | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupInfo.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupInfo.java index e3699877..8a6b658f 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupInfo.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupInfo.java @@ -4,9 +4,11 @@ import cn.axzo.msg.center.service.domain.DetailConfig; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; +import javax.annotation.Nullable; import java.util.List; /** @@ -30,6 +32,7 @@ public class ParsedGroupInfo { /** * 详情信息 */ + @Nullable @JsonInclude(JsonInclude.Include.NON_NULL) private ParsedGroupDetail parsedDetail; @JsonIgnore @JSONField(serialize = false) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupV3.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupV3.java index 10670143..57fd1e23 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupV3.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedGroupV3.java @@ -4,9 +4,11 @@ import cn.axzo.msg.center.service.enums.GroupType; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; +import javax.annotation.Nullable; import javax.validation.constraints.NotNull; import java.util.Collections; import java.util.List; @@ -42,6 +44,7 @@ public class ParsedGroupV3 { *

* 由yoke填充 */ + @Nullable @JsonInclude(JsonInclude.Include.NON_NULL) private WorkerInfo workerInfo; @NotNull diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlInfo.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlInfo.java index 4f630fe9..dbcf4449 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlInfo.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlInfo.java @@ -2,9 +2,12 @@ package cn.axzo.msg.center.service.pending.response.v3.model; import cn.axzo.msg.center.service.enums.AppTerminalTypeEnum; import cn.axzo.msg.center.service.enums.WebPageOpenStrategy; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; +import javax.annotation.Nullable; + /** * @author yanglin */ @@ -20,11 +23,13 @@ public class SessionUrlInfo { /** * 网页打开方式. NEW_PAGE: 新页面打开, CURRENT_PAGE: 当前页面打开, DRAWER: 抽屉 */ + @Nullable @JsonInclude(JsonInclude.Include.NON_NULL) private WebPageOpenStrategy webOpenStrategy; /** * 当前的端信息. B_ENTERPRISE_APP: B-安心筑企业版, C_WORKER_APP: C-安心筑工人版, CMS_WEB_PC: CMS PC端, OMS_WEB_PC: OMS PC端, PC_GA_GENERAL: 政府管理-政务 */ + @Nullable @JsonInclude(JsonInclude.Include.NON_NULL) private AppTerminalTypeEnum appTerminalType; /**