From 9cc2c60ca9818d9e289e4a63f6fa9002e0c702e2 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Tue, 16 Apr 2024 12:32:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2106):=20=E8=B0=83=E6=95=B4jumpUrl?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JSONObject->JSONArray --- .../request/CreateApplicationVersionReq.java | 25 +++++++-------- .../api/request/CreateMaterialReq.java | 32 ++++++++----------- .../request/UpdateApplicationVersionReq.java | 17 +++++++--- .../nanopart/api/response/MaterialResp.java | 28 ++++++++-------- .../response/PageApplicationVersionResp.java | 18 ++++++++--- .../server/domain/ApplicationVersion.java | 17 +++++++--- .../axzo/nanopart/server/domain/Material.java | 28 ++++++++-------- 7 files changed, 90 insertions(+), 75 deletions(-) diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateApplicationVersionReq.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateApplicationVersionReq.java index 9c2e8805..8c25823d 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateApplicationVersionReq.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateApplicationVersionReq.java @@ -2,7 +2,7 @@ package cn.axzo.nanopart.api.request; import cn.axzo.nanopart.api.enums.OpSystemTypeEnum; import cn.axzo.nanopart.api.enums.PlatformTypeEnum; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONArray; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -58,19 +58,18 @@ public class CreateApplicationVersionReq { /** * 跳转地址 * eg: - * { - * "PC": { - * "H5": "http://www.baidu.com/defalut.html", - * "Web": "http://www.baidu.com/default.html" - * }, - * "APP": { - * "H5": "http://www.baidu.com/defalut.html", - * "iOS": "http://www.baidu.com/default.html", - * "Android": "http://www.baidu.com/default.html" - * } - * } + * [ + * { + * "label": "H5", + * "value": "http://www.baidu.com/defalut.html" + * }, + * { + * "label": "iOS", + * "value": "http://www.baidu.com/defalut.html" + * } + * ] */ - private JSONObject jumpUrl; + private JSONArray jumpUrl; /** * 更新后是否弹窗提醒，0不提醒，1提醒，默认0 diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateMaterialReq.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateMaterialReq.java index cc6ea55a..9b71dadc 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateMaterialReq.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateMaterialReq.java @@ -2,8 +2,8 @@ package cn.axzo.nanopart.api.request; import cn.axzo.nanopart.api.enums.MaterialDisplayFrequencyTypeEnum; import cn.axzo.nanopart.api.enums.MaterialTargetUserTypeEnum; -import cn.axzo.nanopart.api.enums.MaterialTypeEnum; import cn.axzo.nanopart.api.enums.StatusEnum; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; @@ -70,8 +70,7 @@ public class CreateMaterialReq { private StatusEnum status; /** - * 素材类型，取值：IMAGE, VIDEO, APPLET - */ + * 素材类型，取值：IMAGE, VIDEO, AUDIO private MaterialTypeEnum materialType; /** @@ -99,22 +98,19 @@ public class CreateMaterialReq { /** * 跳转地址 - * eg: { - * "APP": { - * "Android": "http://www.baidu.com/defalut.html", - * "iOS": "http://www.baidu.com/defalut.html", - * "h5": "http://www.baidu.com/defalut.html" - * }, - * "Applet": { - * "applet": "http://www.baidu.com/defalut.html", - * "h5": "http://www.baidu.com/defalut.html" - * }, - * "PC": { - * "h5": "http://www.baidu.com/defalut.html" - * } - * } + * eg: + * [ + * { + * "label": "H5", + * "value": "http://www.baidu.com/defalut.html" + * }, + * { + * "label": "iOS", + * "value": "http://www.baidu.com/defalut.html" + * } + * ] */ - private JSONObject jumpUrl; + private JSONArray jumpUrl; /** * 目标投放对象类型呢，取值：ALL_USER, PROJECT, UNIT diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/UpdateApplicationVersionReq.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/UpdateApplicationVersionReq.java index 7e2f51ab..d9d2eec3 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/UpdateApplicationVersionReq.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/UpdateApplicationVersionReq.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.api.request; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONArray; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -46,11 +46,18 @@ public class UpdateApplicationVersionReq { /** * 跳转地址 - * eg: { - * "H5": "http://www.baidu.com/defalut.html" - * } + * eg: [ + * { + * "label": "H5", + * "value": "http://www.baidu.com/defalut.html" + * }, + * { + * "label": "iOS", + * "value": "http://www.baidu.com/defalut.html" + * } + * ] */ - private JSONObject jumpUrl; + private JSONArray jumpUrl; /** * 更新后是否弹窗提醒，0不提醒，1提醒，默认0 diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java index 0588993d..fbdd46a2 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java @@ -3,6 +3,7 @@ package cn.axzo.nanopart.api.response; import cn.axzo.nanopart.api.enums.MaterialDisplayFrequencyTypeEnum; import cn.axzo.nanopart.api.enums.MaterialTargetUserTypeEnum; import cn.axzo.nanopart.api.enums.MaterialTypeEnum; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; @@ -53,22 +54,19 @@ public class MaterialResp extends PageMaterialResp { /** * 跳转地址 - * eg: { - * "APP": { - * "Android": "http://www.baidu.com/defalut.html", - * "iOS": "http://www.baidu.com/defalut.html", - * "h5": "http://www.baidu.com/defalut.html" - * }, - * "Applet": { - * "applet": "http://www.baidu.com/defalut.html", - * "h5": "http://www.baidu.com/defalut.html" - * }, - * "PC": { - * "h5": "http://www.baidu.com/defalut.html" - * } - * } + * eg: + * [ + * { + * "label": "H5", + * "value": "http://www.baidu.com/defalut.html" + * }, + * { + * "label": "iOS", + * "value": "http://www.baidu.com/defalut.html" + * } + * ] */ - private JSONObject jumpUrl; + private JSONArray jumpUrl; /** * 目标投放对象类型呢，取值：ALL_USER, PROJECT, UNIT diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java index 1cdef1ef..8dae672a 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java @@ -2,7 +2,7 @@ package cn.axzo.nanopart.api.response; import cn.axzo.nanopart.api.enums.OpSystemTypeEnum; import cn.axzo.nanopart.api.enums.PlatformTypeEnum; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONArray; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -54,11 +54,19 @@ public class PageApplicationVersionResp { /** * 跳转地址 - * eg: { - * "H5": "http://www.baidu.com/defalut.html" - * } + * eg: + * [ + * { + * "label": "H5", + * "value": "http://www.baidu.com/defalut.html" + * }, + * { + * "label": "iOS", + * "value": "http://www.baidu.com/defalut.html" + * } + * ] */ - private JSONObject jumpUrl; + private JSONArray jumpUrl; /** * 更新后是否弹窗提醒，0不提醒，1提醒，默认0 diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/ApplicationVersion.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/ApplicationVersion.java index 18232ccb..eefe4e14 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/ApplicationVersion.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/ApplicationVersion.java @@ -3,6 +3,7 @@ package cn.axzo.nanopart.server.domain; import cn.axzo.nanopart.api.enums.OpSystemTypeEnum; import cn.axzo.nanopart.api.enums.PlatformTypeEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -64,12 +65,20 @@ public class ApplicationVersion extends BaseEntity { /** * 跳转地址 - * eg: { - * "H5": "http://www.baidu.com/defalut.html" - * } + * eg: + * [ + * { + * "label": "H5", + * "value": "http://www.baidu.com/defalut.html" + * }, + * { + * "label": "iOS", + * "value": "http://www.baidu.com/defalut.html" + * } + * ] */ @TableField(value = "jump_url", typeHandler = FastjsonTypeHandler.class) - private JSONObject jumpUrl; + private JSONArray jumpUrl; /** * 更新后是否弹窗提醒，0不提醒，1提醒，默认0 diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/Material.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/Material.java index 2008d0e9..54b40a3c 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/Material.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/Material.java @@ -6,6 +6,7 @@ import cn.axzo.nanopart.api.enums.MaterialTypeEnum; import cn.axzo.nanopart.api.enums.StatusEnum; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.pokonyan.config.mybatisplus.type.LongListTypeHandler; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -103,23 +104,20 @@ public class Material extends BaseEntity { /** * 跳转地址 - * eg: { - * "APP": { - * "Android": "http://www.baidu.com/defalut.html", - * "iOS": "http://www.baidu.com/defalut.html", - * "h5": "http://www.baidu.com/defalut.html" - * }, - * "Applet": { - * "applet": "http://www.baidu.com/defalut.html", - * "h5": "http://www.baidu.com/defalut.html" - * }, - * "PC": { - * "h5": "http://www.baidu.com/defalut.html" - * } - * } + * eg: + * [ + * { + * "label": "H5", + * "value": "http://www.baidu.com/defalut.html" + * }, + * { + * "label": "iOS", + * "value": "http://www.baidu.com/defalut.html" + * } + * ] */ @TableField(value = "jump_url", typeHandler = FastjsonTypeHandler.class) - private JSONObject jumpUrl; + private JSONArray jumpUrl; /** * 目标投放对象类型呢，取值：ALL_USER, PROJECT, UNIT