Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;
+}

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.ApiModel;
-import io.swagger.annotations.ApiParam;
+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<MethodLevelModel> methodLevel;
+
+    @ApiModelProperty("方法组分类")
+    private String classify;
+
 }

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.ApiModel;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -16,13 +16,15 @@ import java.util.List;
  **/
 @Data
 @AllArgsConstructor
-@Api("添加方法组层级")
+@ApiModel("添加方法组层级")
 public class MethodLevelModel {
 
-    @ApiParam("方法Id")
+    @ApiModelProperty("方法Id")
     private Long methodId;
-    @ApiParam("方法层级")
+    @ApiModelProperty("方法名称")
+    private String methodName;
+    @ApiModelProperty("方法层级")
     private String level;
-    @ApiParam("参数列表")
+    @ApiModelProperty("参数列表")
     List<MethodLevelParamModel> paramModels;
 }

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.ApiModel;
-import io.swagger.annotations.ApiParam;
+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;
+    private String methodParamName;
-    @ApiParam("入参类型，用于校验数据类型")
+    @ApiModelProperty("入参类型，用于校验数据类型")
     private String type;
 }

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;
+
+
+}

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.ApiModel;
-import io.swagger.annotations.ApiParam;
+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<RegistryMethodInfo> methodRegistryParamList;
 
 

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<RegistryMethodParamInfo> methodParamList;
 
     /*-----------------------------------文档------------------------------------------------*/

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.ApiModel;
-import io.swagger.annotations.ApiParam;
+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;
 
 

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<String,Integer> weightConfig;
+    private Map<String,Integer> weightConfig;
     @ApiModelProperty(value = "执行器地址列表")
     private List<String> addressList;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java

@@ -40,7 +40,7 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable
 
     @Column(name = "TYPE",columnDefinition = "int default 0")
     @ApiModelProperty("自动注册 0，手动注册 1")
-    private String type;
+    private Integer type;
 
     @Column
     @ApiModelProperty("执行器组路由策略,默认随机")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java

@@ -40,4 +40,8 @@ public class ExecutorRegistryInfo extends BaseBean implements Serializable {
     @Column(name = "UPDATE_TIME")
     @ApiModelProperty("最近一次心跳时间")
     private Date updateTime;
+
+    @Column(name = "WEIGHT")
+    @ApiModelProperty("执行器权重")
+    private Integer weight;
 }

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;
+
 
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java

@@ -43,6 +43,10 @@ public class MethodLevelInfo extends BaseBean implements Serializable {
     @ApiModelProperty("当前层级的方法ID")
     private Long methodId;
 
+    @Column(name = "METHOD_NAME")
+    @ApiModelProperty("方法名称")
+    private String methodName;
+
     @Transient
     @ApiModelProperty("方法的参数关系列表")
     private List<MethodLevelParamInfo> paramInfoList;

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.po;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.*;
 
 import javax.persistence.Column;
@@ -47,6 +48,12 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable {
     @Column(name = "METHOD_ID")
     @ApiModelProperty("对应的当前层级的方法Id")
     private Long methodId;
+    /**
+     * 对应方法的名字,todo 临时字段 2021/8/1
+     */
+    @Column(name = "METHOD_NAME")
+    @ApiModelProperty("对应的当前层级的方法的名字")
+    private String methodName;
 
     @Column(name = "METHOD_GROUP_ID")
     @ApiModelProperty("对应方法组的Id")
@@ -54,13 +61,20 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable {
     /**
      * 原有方法的入参是否必须，做验证
      */
-    @Column(name = "require")
+    @Column(name = "REQUIRE_TYPE",columnDefinition = "int")
     @ApiModelProperty("原有方法的入参是否必须，做调用前验证")
-    private Integer require;
+    private Integer requireType;
     /**
      * 参数类型，验证是否正确
      */
-    @Column(name = "type")
+    @Column(name = "TYPE")
     @ApiModelProperty("参数类型验证")
     private String type;
+
+    /**
+     * 层级的入参
+     */
+    @Column(name = "LEVEL")
+    @ApiModelProperty("层级的入参")
+    private String level;
 }