From 7b2d2e816c5e3a241bc6a1b9d6b077da689570c3 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 21 Feb 2022 19:00:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?wms=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java | 2 ++ .../cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 25c2560..72f81e1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2129,7 +2129,9 @@ public class WmsEnumUtil { NUMBER(10, "数字"), STRING(20, "字符串"), CONFIGURABLE_STR(25, "可配字符串"), - OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); + OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"), + COMPONET(40,"组件"), + SCRIPT(50,"脚本"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java index 4d3f2fd..3b1b678 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java @@ -35,6 +35,8 @@ public class WmsAgImportModel implements Serializable { List ampList; @ApiParam("作业步骤参数类型集合") List astList; + @ApiParam("作业脚本参数集合") + List scriptList; @ApiParam("工厂代码") public String organizeCode; @ApiParam("是否覆盖") 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 da7d4e1..efcf812 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; @@ -33,28 +34,34 @@ public class EngineScriptPersistence extends BaseBean { private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) + @AnnoOutputColumn(name = "脚本编码") private String scriptNo; // 脚本的中文名称 @Column(name = "SCRIPT_NAME", length = 50) + @AnnoOutputColumn(name = "脚本名称") private String scriptName; // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 @Column(name = "SCRIPT_TYPE") + @AnnoOutputColumn(name = "脚本类型") private Integer scriptType; // 脚本编写的语言 // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby @Column(name = "LANGUAGE_TYPE") + @AnnoOutputColumn(name = "脚本语言") private Integer languageType; // 脚本的具体内容 @Lob @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @AnnoOutputColumn(name = "脚本内容") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) + @AnnoOutputColumn(name = "脚本描述") private String scriptRemark; // 编译后的脚本内容，通过预编译加快脚本的运行速度 From 13a3f308766d8436f69c4017554ff9f1c8af12d1 Mon Sep 17 00:00:00 2001 From: "ban.yuan" Date: Wed, 23 Feb 2022 13:34:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?BUG=20#19874=20=20=E6=9D=BE=E4=B8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c42721a..adde2b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -241,7 +241,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getFourthRemake(), "fourthRemake", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getAssignPlanDate(), "assignPlanDate", packBean); - DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getAssignSrcZoneNo(),"assignSrcZoneNo",packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getRemark(),"remark",packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); return packBean; From 60d250150550941f5de052424385802b7deac8f0 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 24 Feb 2022 09:45:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?wms=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E8=84=9A=E6=9C=AC=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index 3c4a3fa..0e48286 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -60,7 +60,7 @@ public class WmsActionModule extends BaseBean { @ApiParam(value = "作业类型") public String opTypeCode; - @Column(name = "IS_SHOW_INFO", nullable = false) + @Column(name = "IS_SHOW_INFO", columnDefinition = "int default 2") @ApiParam(value = "是否实现回显") @AnnoOutputColumn public Integer isShowInfo; From f24fe9eae374b37c08e5590da7e5119f35435cf6 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 24 Feb 2022 09:46:22 +0800 Subject: [PATCH 4/4] 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; // 编译后的脚本内容，通过预编译加快脚本的运行速度