From f24fe9eae374b37c08e5590da7e5119f35435cf6 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 24 Feb 2022 09:46:22 +0800 Subject: [PATCH] BSP pojo --- .../pojo/bsp/client/bean/po/RegistryParam.java | 2 +- .../server/bean/po/ExecutorGroupRegistryInfo.java | 10 ++++----- .../bsp/server/bean/po/ExecutorRegistryInfo.java | 4 ++-- .../bean/po/ExecutorRegistryMethodDocInfo.java | 26 ++-------------------- .../server/bean/po/ExecutorRegistryMethodInfo.java | 4 ++-- .../bsp/server/bean/screen/InvokeMethodModel.java | 3 +++ .../pojo/bsp/server/bean/vo/GroupValidVo.java | 2 +- .../pojo/bsp/server/bean/vo/MethodStatusVo.java | 21 +++++++++++++++++ .../pojo/bsp/server/dao/IRegistryGroupDao.java | 19 ++++++++++++++++ .../pojo/mdm/bean/master/MdmSyncDataThrough.java | 3 --- .../pojo/wms/bean/EngineScriptPersistence.java | 2 +- 11 files changed, 57 insertions(+), 39 deletions(-) create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodStatusVo.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IRegistryGroupDao.java diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java index cbea100..1b11d0d 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java @@ -19,7 +19,7 @@ import java.util.List; @Api("执行器注册的信息") public class RegistryParam implements Serializable { @ApiParam("执行器的名称") - private Integer appType; + private String appname; @ApiParam("执行器的地址") private String address; @ApiParam(value = "注册类型 1:自动 2:手动", defaultValue = "1") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java index 7a36391..aa849fa 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java @@ -30,9 +30,9 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable private static final long serialVersionUID = -3871002350228229604L; - @Column(name = "APP_TYPE") + @Column(name = "APP_NAME") @ApiModelProperty("执行器组的applicationType") - private Integer appType; + private String appName; @Column(name = "ADDRESS_STR") @ApiModelProperty("注册地址字符串，地址用逗号间隔") @@ -46,9 +46,9 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable @ApiModelProperty("执行器组路由策略,默认随机") private String routeStrategy; - @Column(name = "UPDATE_TIME") - @ApiModelProperty("更新时间") - private Date updateTime; +// @Column(name = "UPDATE_TIME") +// @ApiModelProperty("更新时间") +// private Date updateTime; @Column(name = "SOFT_TYPE") @ApiModelProperty("应用该类型") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java index cbe7b37..5371f4a 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java @@ -29,9 +29,9 @@ import java.util.Date; public class ExecutorRegistryInfo extends BaseBean implements Serializable { private static final long serialVersionUID = -736085114778936163L; - @Column(name = "APP_TYPE") + @Column(name = "APP_NAME") @ApiModelProperty("执行器类型,代替appName") - private Integer appType; + private String appName; @Column(name = "ADDRESS") @ApiModelProperty("执行器地址，包含ip:port") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java index bd220d4..0682701 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java @@ -30,8 +30,8 @@ public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializa private static final long serialVersionUID = 2770821289940006535L; @ApiModelProperty(value = "应用类型") - @Column(name = "APP_TYPE") - private Integer appType; + @Column(name = "APP_NAME") + private String appName; @Lob @ApiModelProperty(value = "markdown文本，前端渲染") @@ -46,27 +46,5 @@ public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializa @Lob @Column(name = "CLASSIFICATION") private String classification; -// @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 Long methodId; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java index cc2340f..85b3549 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java @@ -46,9 +46,9 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable @ApiModelProperty("方法的版本号") private String version; - @Column(name = "APP_TYPE") + @Column(name = "APP_NAME") @ApiModelProperty("所属执行器的appType") - private Integer appType; + private String appName; @Column(name = "METHOD_TYPE") @ApiModelProperty("方法类型，属于那个执行器类型,同枚举类method_group_type") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java index 4d651d0..eb5d187 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java @@ -27,4 +27,7 @@ public class InvokeMethodModel { @ApiParam("方法的入参map") private Map params; + + @ApiParam("方法入参为json") + private String paramsJson; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/GroupValidVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/GroupValidVo.java index 8319b01..877f6e5 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/GroupValidVo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/GroupValidVo.java @@ -18,7 +18,7 @@ import java.util.List; public class GroupValidVo { @ApiModelProperty("执行器组的id列表") - private List idList; + private List ids; @ApiModelProperty("执行器组的状态") private Integer isValid; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodStatusVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodStatusVo.java new file mode 100644 index 0000000..c8a61b2 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodStatusVo.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/2/16 9:41 + * @Modify: + **/ +@Data +@ApiModel(value = "方法启用、禁用") +public class MethodStatusVo { + + public List ids; + public Integer isValid; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IRegistryGroupDao.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IRegistryGroupDao.java new file mode 100644 index 0000000..02ad6e0 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IRegistryGroupDao.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.bsp.server.dao; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/2/16 10:48 + * @Modify: + **/ +public interface IRegistryGroupDao { + + /** + * 获取所有的应用名称 + * @return + */ + List getAllAppNames(); +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java index a1fd2c2..146325b 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java @@ -11,11 +11,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; /** * @Description : 主数据齿轮 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index efcf812..b1bff7d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -61,7 +61,7 @@ public class EngineScriptPersistence extends BaseBean { // 脚本的描述，包含脚本的用法，参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) - @AnnoOutputColumn(name = "脚本描述") + @AnnoOutputColumn(name = "脚本描述",required = false) private String scriptRemark; // 编译后的脚本内容，通过预编译加快脚本的运行速度