From 59569cef66185f6fc97a6602067788f373ce1762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Sep 2019 15:01:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=8E=BB=E6=8E=89=E4=B9=90=E8=A7=82=E9=94=81=EF=BC=88?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?JOB=E4=B8=80=E4=B8=AA=E4=BA=8B=E5=8A=A1=E5=86=85=E5=AF=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=A1=A8=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=B8=A4?= =?UTF-8?q?=E6=AC=A1=E6=93=8D=E4=BD=9C=E4=B8=8D=E8=A1=8C=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=8E=A5=E6=8C=82=E6=8E=89?= =?UTF-8?q?=EF=BC=8C=E4=BA=8B=E5=8A=A1=E4=B9=9F=E6=B2=A1=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=EF=BC=89+=20=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=88=E5=87=BA=E5=85=A5=E7=A7=BB=E5=BA=93=EF=BC=89?= =?UTF-8?q?=EF=BC=9A=E5=BE=85=E5=85=A5=E5=BA=93=E7=9A=84=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E5=90=88=E6=A0=BC=E7=9A=84+=20=E5=85=AC?= =?UTF-8?q?=E5=85=B1PDA=E7=BB=84=E4=BB=B6=E6=8A=9B=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=80=BC=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 0ffaeb3..08bd2ef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -144,10 +144,10 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "设备编号") public String fixId; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; public WmsMoveMaster(){}; From 51974a46b938f875b17578b5b6e7a57bc3c5dae4 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 12 Sep 2019 16:16:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?WebService=20=E8=B0=83=E7=94=A8=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 16 ++++++++++++---- .../i3plus/pojo/model/softswitch/SoftswitchIocModel.java | 16 ++++++++++++++++ .../i3plus/pojo/model/softswitch/SuitClientModel.java | 13 ++++++------- .../i3plus/pojo/model/softswitch/SuitServerModel.java | 15 +++++++++++++-- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 ++-- 5 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 5fe61aa..b387a47 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -111,14 +111,15 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFTS_WITCH_ACTION{ /* WebService */ - SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"serverWebServiceSendEmail","软适配服务邮件服务"), - CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"), + SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), + SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), + CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), /* 数据源 */ - CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"), + CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), /* Restful */ - CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"imppHttpRestfulClient","Restful Client Impp Test"); + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"); private int value; private String description; @@ -126,6 +127,13 @@ public class BlockSoftSwitchEnumUtil { private SUIT_MODE mode; private CASE_TYPE type; + SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String description) { + this.value = value; + this.description = description; + this.mode = mode; + this.type = type; + } + SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String clazzName, String description) { this.value = value; this.description = description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java new file mode 100644 index 0000000..596233a --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/12 下午2:00 + * @Modify: + **/ +@Data +public class SoftswitchIocModel { + private String beanName; + private Object obj; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index b668b4f..88ab98d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -9,6 +9,8 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.HashMap; + /** * @Description : * @Reference : @@ -17,7 +19,7 @@ import lombok.Data; * @Modify: **/ @Data -@XStreamAlias("model") +@XStreamAlias("client") public class SuitClientModel { /** @@ -31,7 +33,7 @@ public class SuitClientModel { private Integer caseTypeId; @ApiParam(value = "适配命令(枚举)") - private Integer suitServerActionId; + private Integer actionId; /** * 适配器信息 @@ -75,15 +77,12 @@ public class SuitClientModel { public SuitClientModel() { } - public SuitClientModel(BlockSoftSwitchEnumUtil.REQUEST_SOURCE source, BsSuitCaseModel suitCaseModel) { - new SuitClientModel(source.getValue(),suitCaseModel); - } - public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); - this.suitServerActionId = suitCaseModel.getBsSuitCase().getSuitServerActionId(); + this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId(); + this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode(); this.suitCaseModel = suitCaseModel; // 设置默认 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index d0a336e..fb0d0aa 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; @@ -14,11 +15,12 @@ import java.util.Map; * @Modify: **/ @Data -@XStreamAlias("model") +@XStreamAlias("server") public class SuitServerModel { // 执行方法命令 - private String action; + @ApiParam(value = "适配命令(枚举)") + private Integer actionId; /* 认证使用 以后使用 */ private String token; // 传输单对象 @@ -30,4 +32,13 @@ public class SuitServerModel { // 传输 JSON 数据 private String json; + /** + * 适配结果信息 + */ + private String suitMessage; + /** + * 适配状态码 + */ + private String suitCaseStatusCode; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 61e7853..eba3850 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -75,9 +75,9 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配模式(枚举,主动，被动)") private Integer suitModeId; - @Column(name = "SUIT_SERVER_ACTION_ID") + @Column(name = "SUIT_ACTION_ID") @ApiParam(value = "Server 适配命令") - private Integer suitServerActionId; + private Integer suitActionId; @Column(name = "SUIT_CASE_HOST") @ApiParam(value = "适配主机") From 510485d2f09a7e2eadac0ef47049afa9c548377c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 12 Sep 2019 17:19:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?excel=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96--?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=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/base/bean/BaseBean.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 79ce1a2..457b27d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; @@ -66,8 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(hidden = true) - //启用停用 + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 0354924..67c14bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -79,8 +79,8 @@ public class WmsCSOrderMaster extends BaseBean { public String year; @Column(name = "IS_SYNC_ERP") - @ApiParam("是否同步ERP: 1=已同步，2=未同步") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description") + @ApiParam("是否同步ERP") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isSyncErp; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index f0201cb..a137f31 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -56,6 +58,7 @@ public class WmsTaskInfo extends BaseBean { */ @Column(name = "TASK_STATUS") @ApiParam(value = "任务状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TASK_INFO_STATUS.class,refForeignKey = "value",value = "description") public Integer taskStatus; @Column(name = "TRANS_TYPE_CODE") @@ -68,10 +71,12 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "IS_ONE_STEP") @ApiParam("是否一步法操作") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isOneStep; @ApiParam("作业类型名称") @Transient + @AnnoOutputColumn(refClass = WmsEnumUtil.OP_TYPE_CODE.class,refForeignKey = "value",value = "description") public String opTypeName; @ApiParam("作业任务明细") @@ -80,6 +85,7 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "IS_CHECK_SN") @ApiParam("是否校验条码") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isCheckSn; @Transient