diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java new file mode 100644 index 0000000..420f335 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +/** + * @Description :执行器注册参数 + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/11 16:57 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("注册/心跳") +public class RegistryMessageInfo { + + @ApiParam("appName,根据appName分执行器组") + private String appName; + + @ApiParam("执行器地址") + private String address; + + @ApiParam("方法列表") + private List methodRegistryParamList; + + +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java new file mode 100644 index 0000000..bac52b3 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/15 9:33 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("注册方法信息") +public class RegistryMethodInfo { + + @ApiParam("方法名") + private String methodName; + + @ApiParam("调用方法时的key") + private String methodHandlerKey; + + @ApiParam("参数列表") + private List methodParamList; + + /*-----------------------------------文档------------------------------------------------*/ + + @ApiParam("beanName") + private String beanName; + @ApiParam("方法版本号") + private String version; + + @ApiParam("受影响的表名,update/insert") + private List affectTableClassName; + + @ApiParam("系统要执行的逻辑") + private List systemProcess; + /** + * 参数验证 + */ + @ApiParam("参数验证") + private List validation; + + + +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java new file mode 100644 index 0000000..4bac2c0 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/15 9:35 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("方法祖册参数") +public class RegistryMethodParamInfo { + + @ApiParam("参数名") + private String name; + + @ApiParam("参数类型,入参1,出参0") + private Integer type; + + @ApiParam("数据类型,基本数据类型") + private String typeName; + + +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java new file mode 100644 index 0000000..b3448d3 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java @@ -0,0 +1,48 @@ +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 lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 13:21 + * @Modify: + **/ +@Entity +@Table(name = "executor_group_registry_info") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("执行器组") +public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3871002350228229604L; + + @Column(name = "app_name") + @ApiModelProperty("执行器组的applicationName") + private String appName; + + @Column(name = "address_str") + @ApiModelProperty("注册地址字符串,地址用逗号间隔") + private String addressStr; + + @Column(name = "type",columnDefinition = "int default 0") + @ApiModelProperty("自动注册 0,手动注册 1") + private String type; + + @Column(name = "update_time") + @ApiModelProperty("更新时间") + private Date updateTime; +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java new file mode 100644 index 0000000..a9924c4 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java @@ -0,0 +1,43 @@ +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 lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 13:33 + * @Modify: + **/ +@Entity +@Table(name = "executor_registry_info") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("执行器") +public class ExecutorRegistryInfo extends BaseBean implements Serializable { + private static final long serialVersionUID = -736085114778936163L; + + @Column(name = "application_name") + @ApiModelProperty("执行器application Name") + private String appName; + + @Column(name = "address") + @ApiModelProperty("执行器地址,包含ip:port") + private String address; + + @Column(name = "update_time") + @ApiModelProperty("最近一次心跳时间") + private Date updateTime; +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java new file mode 100644 index 0000000..c0eafdc --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java @@ -0,0 +1,57 @@ +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 lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 13:43 + * @Modify: + **/ +@Entity +@Table(name = "executor_registry_method_doc_info") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法doc") +public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializable { + private static final long serialVersionUID = 2770821289940006535L; + + @Column(name = "bean_name") + @ApiModelProperty("beanName") + private String beanName; + + @Column(name = "version") + @ApiModelProperty("方法版本") + private String version; + + @Column(name = "affect_table_str") + @ApiModelProperty("受影响的表名,逗号分割,原来为数组") + private String affectTableClassNameStr; + + @Column(name = "system_process_str") + @ApiModelProperty("系统要执行的逻辑 逗号分割,原来为数组") + private String systemProcessStr; + /** + * 参数验证 逗号分割,原来为数组 + */ + @Column(name = "validation") + @ApiModelProperty("参数验证 逗号分割,原来为数组") + private String validation; + + @Column(name = "method_id") + @ApiModelProperty("方法ID") + private Integer methodId; + //todo 缺少参数信息 +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java new file mode 100644 index 0000000..c35643c --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java @@ -0,0 +1,51 @@ +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 lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 13:39 + * @Modify: + **/ +@Table(name = "executor_registry_method_info") +@Entity +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法注册信息") +public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable { + private static final long serialVersionUID = 2096630767822598366L; + + @Column(name = "method_name") + @ApiModelProperty("方法名") + private String methodName; + + @Column(name = "method_handler_key") + @ApiModelProperty("调用方法需要的key") + private String methodHandlerKey; + + @Column(name = "bean_name") + @ApiModelProperty("beanName") + private String beanName; + + @Column(name = "version") + @ApiModelProperty("方法的版本号") + private String version; + + @Column(name = "app_name") + @ApiModelProperty("所属执行器的appName") + private String appName; + +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java new file mode 100644 index 0000000..3ef6195 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java @@ -0,0 +1,48 @@ +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 lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 13:36 + * @Modify: + **/ +@Entity +@Table(name = "executor_registry_param_info") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法注册参数信息") +public class ExecutorRegistryParamInfo extends BaseBean implements Serializable { + private static final long serialVersionUID = 7346454749822492424L; + + + @Column(name = "name") + @ApiModelProperty("参数名") + private String name; + + @Column(name = "type") + @ApiModelProperty("入参 1 ,出参 0") + private Integer type; + + @Column(name = "type_name") + @ApiModelProperty("数据类型,基本数据类型") + private String typeName; + + @Column(name = "method_id") + @ApiModelProperty("所属方法的ID") + private Integer methodId; + +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorGroupRegistryInfoRepository.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorGroupRegistryInfoRepository.java new file mode 100644 index 0000000..66029a7 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorGroupRegistryInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.ExecutorGroupRegistryInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 14:49 + * @Modify: + **/ +@Repository +public interface ExecutorGroupRegistryInfoRepository extends BaseRepository { +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryInfoRepository.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryInfoRepository.java new file mode 100644 index 0000000..fc8abb5 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.ExecutorRegistryInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 14:51 + * @Modify: + **/ +@Repository +public interface ExecutorRegistryInfoRepository extends BaseRepository { +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryMethodDocInfoRepository.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryMethodDocInfoRepository.java new file mode 100644 index 0000000..988b14d --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryMethodDocInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.ExecutorRegistryMethodDocInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 14:53 + * @Modify: + **/ +@Repository +public interface ExecutorRegistryMethodDocInfoRepository extends BaseRepository { +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryMethodInfoRepository.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryMethodInfoRepository.java new file mode 100644 index 0000000..80395db --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryMethodInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.ExecutorRegistryMethodInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 14:55 + * @Modify: + **/ +@Repository +public interface ExecutorRegistryMethodInfoRepository extends BaseRepository { +} diff --git a/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryParamInfoRepository.java b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryParamInfoRepository.java new file mode 100644 index 0000000..57854e5 --- /dev/null +++ b/modules/i3plush-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ExecutorRegistryParamInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.ExecutorRegistryParamInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/16 14:58 + * @Modify: + **/ +@Repository +public interface ExecutorRegistryParamInfoRepository extends BaseRepository { +} diff --git a/pom.xml b/pom.xml index f250672..c822cae 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ modules/i3plus-pojo-ics modules/i3plus-pojo-mdm modules/i3plus-pojo-screen + modules/i3plush-pojo-bsp