From 756b41e393c40f1c2ba29851d8cff366d9cd767d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 30 Jul 2021 17:36:58 +0800 Subject: [PATCH] =?UTF-8?q?bsp=20=E4=BF=AE=E6=94=B9pojo,=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?icloud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/bean/model/MethodGroupListModel.java | 23 +++++++++++++++++++++ .../bsp/server/bean/model/MethodGroupModel.java | 19 ++++++++++------- .../bsp/server/bean/model/MethodLevelModel.java | 12 +++++------ .../server/bean/model/MethodLevelParamModel.java | 14 ++++++------- .../bsp/server/bean/model/MethodListModel.java | 24 ++++++++++++++++++++++ .../bsp/server/bean/model/RegistryMessageInfo.java | 12 +++++------ .../bsp/server/bean/model/RegistryMethodInfo.java | 11 +++++----- .../server/bean/model/RegistryMethodParamInfo.java | 12 +++++------ .../pojo/bsp/server/bean/model/RouteParam.java | 4 ++-- .../pojo/bsp/server/bean/po/MethodGroupInfo.java | 4 ++++ 10 files changed, 95 insertions(+), 40 deletions(-) create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java new file mode 100644 index 0000000..01684c1 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 查询方法组使用的model + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/30 9:36 + * @Modify: + **/ +@ApiModel("查询方法组") +@Data +public class MethodGroupListModel { + + @ApiModelProperty("方法组名字") + private String methodGroupName; + + @ApiModelProperty("方法组分类") + private String classify; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java index 0614b68..dab4701 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java @@ -1,12 +1,11 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import java.util.List; -import java.util.Map; /** * @Description : @@ -17,13 +16,19 @@ import java.util.Map; **/ @Data @AllArgsConstructor -@Api("添加方法组") +@ApiModel("添加方法组") public class MethodGroupModel { - @ApiParam("方法组的名称") + @ApiModelProperty("方法组的名称") private String methodGroupName; - @ApiParam("方法组的描述") + + @ApiModelProperty("方法组的描述") private String description; - @ApiParam("方法组层级列表") + + @ApiModelProperty("方法组层级列表") private List methodLevel; + + @ApiModelProperty("方法组分类") + private String classify; + } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java index 13ca0b7..0cce4ee 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,13 +16,13 @@ import java.util.List; **/ @Data @AllArgsConstructor -@Api("添加方法组层级") +@ApiModel("添加方法组层级") public class MethodLevelModel { - @ApiParam("方法Id") + @ApiModelProperty("方法Id") private Long methodId; - @ApiParam("方法层级") + @ApiModelProperty("方法层级") private String level; - @ApiParam("参数列表") + @ApiModelProperty("参数列表") List paramModels; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java index 5664d22..b6d1924 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java @@ -1,12 +1,10 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; -import java.util.Map; - /** * @Description : * @Reference : @@ -16,12 +14,12 @@ import java.util.Map; **/ @Data @AllArgsConstructor -@Api("添加方法组层级参数") +@ApiModel("添加方法组层级参数") public class MethodLevelParamModel { - @ApiParam("根据出参生成，入参key = 层级 + methodId + 出参Name") + @ApiModelProperty("根据出参生成，入参key = 层级 + methodId + 出参Name") private String paramKey; - @ApiParam("对应本方法的入参名称") + @ApiModelProperty("对应本方法的入参名称") private String paramValue; - @ApiParam("入参类型，用于校验数据类型") + @ApiModelProperty("入参类型，用于校验数据类型") private String type; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java new file mode 100644 index 0000000..bcd60f7 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/7/29 10:14 + * @Modify: + **/ +@Data +@ApiModel("分页查询方法列表") +public class MethodListModel { + + @ApiModelProperty(name = "执行器名") + private String appName; + @ApiModelProperty(name = "方法的版本号") + private String version; + + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java index 420f335..95e1f6a 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,16 +16,16 @@ import java.util.List; **/ @Data @AllArgsConstructor -@Api("注册/心跳") +@ApiModel("注册/心跳") public class RegistryMessageInfo { - @ApiParam("appName,根据appName分执行器组") + @ApiModelProperty("appName,根据appName分执行器组") private String appName; - @ApiParam("执行器地址") + @ApiModelProperty("执行器地址") private String address; - @ApiParam("方法列表") + @ApiModelProperty("方法列表") private List methodRegistryParamList; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java index bac52b3..ce2f963 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,16 +17,16 @@ import java.util.List; **/ @Data @AllArgsConstructor -@Api("注册方法信息") +@ApiModel("注册方法信息") public class RegistryMethodInfo { - @ApiParam("方法名") + @ApiModelProperty("方法名") private String methodName; - @ApiParam("调用方法时的key") + @ApiModelProperty("调用方法时的key") private String methodHandlerKey; - @ApiParam("参数列表") + @ApiModelProperty("参数列表") private List methodParamList; /*-----------------------------------文档------------------------------------------------*/ diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java index 06899f1..4ab8832 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.model; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -14,16 +14,16 @@ import lombok.Data; **/ @Data @AllArgsConstructor -@Api("方法注册参数") +@ApiModel("方法注册参数") public class RegistryMethodParamInfo { - @ApiParam("参数名") + @ApiModelProperty("参数名") private String name; - @ApiParam("参数类型，入参1，出参0") + @ApiModelProperty("参数类型，入参1，出参0") private Integer type; - @ApiParam("数据类型，基本数据类型") + @ApiModelProperty("数据类型，基本数据类型") private String typeName; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java index a9f2148..971b152 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java @@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description :路由参数 @@ -21,7 +21,7 @@ public class RouteParam { @ApiModelProperty(value = "执行方法Id") private Long methodId; @ApiModelProperty(value = "路由的权重配置") - private HashMap weightConfig; + private Map weightConfig; @ApiModelProperty(value = "执行器地址列表") private List addressList; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java index f010070..d5ec62c 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java @@ -38,5 +38,9 @@ public class MethodGroupInfo extends BaseBean implements Serializable { @ApiModelProperty("方法组描述") private String description; + @Column(name = "CLASSIFY") + @ApiModelProperty("方法组分类(唯一)") + private String classify; + }