diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b97d606..78e4f88 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -32,7 +32,7 @@ public class CommonEnumUtil { * Mes 服务 */ MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"), - MES_HISTORY(4,8310,11,103000010L,"i3mes-history","生产管理软件历史数据"), + MES_HISTORY(41,8310,11,103000010L,"i3mes-history","生产管理软件历史数据"), MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"), /** 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 index bcd60f7..1445a82 100644 --- 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 @@ -19,6 +19,10 @@ public class MethodListModel { private String appName; @ApiModelProperty(name = "方法的版本号") private String version; + @ApiModelProperty(name = "方法启用") + private Integer isValid; + @ApiModelProperty(name = "方法名") + private String methodName; } 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 82dbf4c..edb524e 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 @@ -49,4 +49,8 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable @Column(name = "UPDATE_TIME") @ApiModelProperty("更新时间") private Date updateTime; + + @Column(name = "SOFT_TYPE") + @ApiModelProperty("应用该类型") + private Integer softType; } 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 680ea4a..cc55180 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 @@ -44,4 +44,8 @@ public class ExecutorRegistryInfo extends BaseBean implements Serializable { @Column(name = "WEIGHT") @ApiModelProperty("执行器权重") private Integer weight; + + @Column(name = "HEART_BEAT") + @ApiModelProperty("心跳,存活1,2死掉") + private Integer heartBeat; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java index a5f3102..67d6f4d 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java @@ -47,4 +47,8 @@ public class MethodLog extends BaseBean implements Serializable { @ApiModelProperty("方法是否执行成功") @Column(name = "SUCCESS") private Integer success; + + @ApiModelProperty("方法所属应用冗余") + @Column(name = "APP_NAME_RDD") + private String appNameRdd; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/AppGroupVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/AppGroupVo.java new file mode 100644 index 0000000..ef33760 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/AppGroupVo.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/15 16:06 + * @Modify: + **/ +@ApiModel(value = "应用管理") +@Data +public class AppGroupVo { + + @ApiModelProperty("所属应用类型") + private Integer softType; + + @ApiModelProperty("服务地址") + private String appAddress; + + @ApiModelProperty("应用状态") + private Integer isValid; + + @ApiModelProperty("注册开始时间") + private String startTime; + + @ApiModelProperty("注册结束时间") + private String endTime; + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSuccessRate.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSuccessRate.java new file mode 100644 index 0000000..aef75f1 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSuccessRate.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/14 9:48 + * @Modify: + **/ +@Data +@ApiModel(value = "Dashboard调用成功率") +public class DashboardSuccessRate { + + @ApiModelProperty(value = "周环比") + private String weeksFrom; + + @ApiModelProperty(value = "日环比") + private String daysFrom; + + @ApiModelProperty(value = "日调用成功率") + private String successRate; +} 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 new file mode 100644 index 0000000..8319b01 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/GroupValidVo.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/15 17:21 + * @Modify: + **/ +@Data +@ApiModel("批量修改执行器组开启、禁用") +public class GroupValidVo { + + @ApiModelProperty("执行器组的id列表") + private List idList; + + @ApiModelProperty("执行器组的状态") + private Integer isValid; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/InstanceVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/InstanceVo.java new file mode 100644 index 0000000..79da76f --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/InstanceVo.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/15 17:30 + * @Modify: + **/ +@Data +@ApiModel("实例管理") +public class InstanceVo { + + @ApiModelProperty("所属应用类型") + private Integer softType; + + @ApiModelProperty("注册时间开始") + private String startTime; + + @ApiModelProperty("注册时间结束") + private String endTime; + + @ApiModelProperty("心跳状态") + private Integer heartBeat; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupVo.java new file mode 100644 index 0000000..d5ed9b5 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodGroupVo.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/14 14:45 + * @Modify: + **/ +@ApiModel(value = "查询方法组") +@Data +public class MethodGroupVo { + @ApiParam(value = "方法组名称") + private String groupName; + @ApiParam(value = "是否启用") + private Integer valid; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodLogVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodLogVo.java new file mode 100644 index 0000000..0cee45b --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodLogVo.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/1/15 13:36 + * @Modify: + **/ +@Data +@ApiModel(value = "历史日志查询") +public class MethodLogVo { + + @ApiModelProperty(value = "方法名称") + private String methodName; + + @ApiModelProperty(value = "所属应用") + private String appName; + +// @ApiModelProperty(value = "方法状态") +// private Integer isValid; + + @ApiModelProperty(value = "调用方法开始时间") + private String startTime; + + @ApiModelProperty(value = "调用方法结束时间") + private String endTime; +}