wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2106): 调整jumpUrl类型和格式

Browse Source 
JSONObject->JSONArray
This commit is contained in:
chenwenjian 2024-04-16 12:32:42 +08:00
parent 60a0df3447
commit 9cc2c60ca9
7 changed files with 90 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateApplicationVersionReq.java
View File

@ -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

32
banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/CreateMaterialReq.java
View File

@ -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

17
banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/UpdateApplicationVersionReq.java
View File

@ -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

28
banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java
View File

@ -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

18
banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java
View File

@ -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

17
banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/ApplicationVersion.java
View File

@ -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<ApplicationVersion> {
/**
* 跳转地址
* 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

28
banner/banner-server/src/main/java/cn/axzo/nanopart/server/domain/Material.java
View File

@ -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<Material> {
/**
* 跳转地址
* 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