From f810e358732ad9cd4c4cde63cdada2d4af6301a8 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 11 Apr 2019 09:22:11 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E6=95=B0=E6=8D=AE=E6=93=8D=E4=BD=9C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20DAO=20=E5=B1=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java | 2 +- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 ++++ .../cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 1e82aa4..95cb885 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -221,7 +221,7 @@ public class DynamicEntity extends BaseBean implements Serializable { */ public Object getDynProperty(String propName){ //初始化set方法 - String setMethodName = "get" + propName.substring(0,1).toUpperCase() + propName.substring(1); + String setMethodName = "get" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, propName); try { //获取方法 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 104f18e..6c19f95 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 @@ -521,6 +521,10 @@ public class CommonEnumUtil { return value; } + public String getValueStr() { + return value + ""; + } + public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 604535d..f52cb1b 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -38,6 +38,10 @@ public class BfElementPropertyVirtual extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long elementId; + @Column(name="PROPERTY_CODE") + @ApiParam(value ="类属性名称") + private String propertyCode; + @Column(name="PROPERTY_NAME") @ApiParam(value ="元素名称") private String propertyName; @@ -71,6 +75,10 @@ public class BfElementPropertyVirtual extends BaseBean { private List propertyList; @Transient + @ApiParam(value = "虚拟属性列表") + private List detailList; + + @Transient @ApiParam(value = "虚拟属性ID列表") @JsonSerialize(using = ToStringSerializer.class) private List propertyIdList; From 71279f2241380ba24b417af168116ccc816b82cc Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 11 Apr 2019 11:16:57 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= 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 839fb10..7f9574d 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 @@ -108,7 +108,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - + HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); getStringBuilderPack(wmsDocMovementDetails, result); return result.toString(); From 5a59437437dc62acf3fbf9a59f4f978189b2dbb4 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 11 Apr 2019 11:43:18 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 7f9574d..9271606 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 @@ -304,11 +304,11 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); From 3a5f43f97b62731e92221ad130a84e7536a89bc5 Mon Sep 17 00:00:00 2001 From: jiajack Date: Thu, 11 Apr 2019 15:01:10 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=88=A0=E9=99=A4iml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i3plus-pojo.iml | 66 --------------- modules/i3plus-pojo-base/i3plus-pojo-base.iml | 89 -------------------- modules/i3plus-pojo-form/i3plus-pojo-form.iml | 90 --------------------- .../i3plus-pojo-hardswitch.iml | 74 ----------------- .../i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml | 74 ----------------- .../i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml | 90 --------------------- modules/i3plus-pojo-mes/i3plus-pojo-mes.iml | 90 --------------------- modules/i3plus-pojo-model/i3plus-pojo-model.iml | 94 ---------------------- .../i3plus-pojo-platform/i3plus-pojo-platform.iml | 90 --------------------- modules/i3plus-pojo-report/i3plus-pojo-report.iml | 90 --------------------- .../i3plus-pojo-softswitch.iml | 90 --------------------- modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml | 90 --------------------- modules/i3plus-pojo-wms/i3plus-pojo-wms.iml | 90 --------------------- .../i3plus-pojo-workflow/i3plus-pojo-workflow.iml | 74 ----------------- 14 files changed, 1191 deletions(-) delete mode 100644 i3plus-pojo.iml delete mode 100644 modules/i3plus-pojo-base/i3plus-pojo-base.iml delete mode 100644 modules/i3plus-pojo-form/i3plus-pojo-form.iml delete mode 100644 modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml delete mode 100644 modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml delete mode 100644 modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml delete mode 100644 modules/i3plus-pojo-mes/i3plus-pojo-mes.iml delete mode 100644 modules/i3plus-pojo-model/i3plus-pojo-model.iml delete mode 100644 modules/i3plus-pojo-platform/i3plus-pojo-platform.iml delete mode 100644 modules/i3plus-pojo-report/i3plus-pojo-report.iml delete mode 100644 modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml delete mode 100644 modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml delete mode 100644 modules/i3plus-pojo-wms/i3plus-pojo-wms.iml delete mode 100644 modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml deleted file mode 100644 index ec94526..0000000 --- a/i3plus-pojo.iml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base/i3plus-pojo-base.iml b/modules/i3plus-pojo-base/i3plus-pojo-base.iml deleted file mode 100644 index 5dd064c..0000000 --- a/modules/i3plus-pojo-base/i3plus-pojo-base.iml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-form/i3plus-pojo-form.iml b/modules/i3plus-pojo-form/i3plus-pojo-form.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-form/i3plus-pojo-form.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml deleted file mode 100644 index 97faa2e..0000000 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-report/i3plus-pojo-report.iml b/modules/i3plus-pojo-report/i3plus-pojo-report.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-report/i3plus-pojo-report.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 73d1378f0d02fdbf066a708839ccdb34c634741f Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 11 Apr 2019 15:15:10 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E7=A0=81=E7=9A=84sql=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9271606..4ed65da 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 @@ -1656,8 +1656,8 @@ public class WmsHqlPack { */ public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); getStringBuilderPack(wmsDocMovementSn, result); From cc3b1a741c66858453a40ba7bdafe61e3b666b35 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 11 Apr 2019 15:28:20 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=85=83=E7=B4=A0=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 179 +++++++-------------- .../pojo/base/enumutil/BlockFormEnumUtil.java | 92 +++++++++++ 2 files changed, 153 insertions(+), 118 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 95cb885..99771c9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -1,12 +1,6 @@ package cn.estsh.i3plus.pojo.base.dynamic; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.google.common.base.CaseFormat; -import lombok.Getter; -import lombok.Setter; -import lombok.val; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,8 +8,6 @@ import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -32,14 +24,9 @@ public class DynamicEntity extends BaseBean implements Serializable { public static final Logger LOGGER = LoggerFactory.getLogger(DynamicEntity.class); - public String tableName; - /*private String uri; - private String method; - private Object[] args; - private Object result; - private String operator; - private String appName;*/ + private static final String ATTR_PREFIX = "$cglib_prop_"; + public String tableName; public List propertyList; public DynamicEntity(){ @@ -71,67 +58,14 @@ public class DynamicEntity extends BaseBean implements Serializable { */ public void initDynamic() { Field[] fields = this.getClass().getDeclaredFields(); - Method setMethod = null; - String setMethodName,propName; - Object fieldVal = null; - for(Field f : fields) { - propName = f.getName().replace("$cglib_prop_", ""); - if(!"LOGGER".equals(propName) && !"propertyList".equals(propName) && !"dynProperty".equals(propName)) { - this.getPropertyList().add(propName); //添加到属性list中 - setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1); - f.setAccessible(true); - try { - fieldVal = f.get(this); - } catch (IllegalAccessException e) { - fieldVal = null; - } - - if(fieldVal == null) { - if (f.getType() == Integer.class) { - fieldVal = 0; - } else if (f.getType() == Long.class) { - fieldVal = 0L; - } else if (f.getType() == Float.class) { - fieldVal = 0.0f; - } else if (f.getType() == Double.class) { - fieldVal = 0.0d; - } else if (f.getType() == String.class) { - fieldVal = ""; - }else if (f.getType() == Character.class) { - fieldVal = ""; - }else if (f.getType() == Boolean.class) { - fieldVal = true; - }else if (f.getType() == Byte.class) { - fieldVal = 0; - }else if (f.getType() == Date.class) { - fieldVal = new Date(); - }else { - fieldVal = ""; - } - } - - try { - setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()}); -// System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal); - setMethod.invoke(this, fieldVal); - } catch (ClassCastException e) { - e.printStackTrace(); - LOGGER.error("ClassCastException ：{}", setMethodName, e); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - LOGGER.error("IllegalArgumentException ：{}", setMethodName, e); - } catch (NoSuchMethodException e) { - LOGGER.error("没有方法：{}", setMethodName, e); - } catch (IllegalAccessException e) { - LOGGER.error("入参出错：{}:{}:{}", f, f.getType(), fieldVal, e); - } catch (InvocationTargetException e) { - LOGGER.error("方法返回出错：{}", setMethodName, e); - }catch (RuntimeException e) { - LOGGER.error("RuntimeException ：{}", setMethodName, e); - }catch (Exception e) { - LOGGER.error("Exception ：{}", setMethodName, e); - } + String propName = f.getName().replace(ATTR_PREFIX, ""); + if(!"LOGGER".equals(propName) && !"ATTR_PREFIX".equals(propName) + && !"propertyList".equals(propName) && !"dynProperty".equals(propName) ) { + // 添加到属性list中 + this.getPropertyList().add(propName); + // 属性初始化 + setDynProperty(propName,getDynProperty(propName)); } } } @@ -140,31 +74,13 @@ public class DynamicEntity extends BaseBean implements Serializable { public String toString() { String result = "{"; - Object fieldVal = null; Field[] fields = this.getClass().getDeclaredFields(); - String fieldName; for(Field f : fields) { - fieldName = f.getName().replace("$cglib_prop_", ""); - if(!"LOGGER".equals(fieldName) && !"propertyList".equals(fieldName)) { - f.setAccessible(true); - fieldVal = new Object(); - try { - fieldVal = f.get(this); - } catch (IllegalAccessException e) { - fieldVal = null; - } - - if (fieldVal == null) { - if (f.getType() == Integer.class || f.getType() == Long.class) { - fieldVal = 0; - } else if (f.getType() == Float.class || f.getType() == Double.class) { - fieldVal = 0.0; - } else { - fieldVal = ""; - } - } + String fieldName = f.getName().replace(ATTR_PREFIX, ""); + if (!"LOGGER".equals(fieldName) && !"ATTR_PREFIX".equals(fieldName) + && !"propertyList".equals(fieldName) && !"dynProperty".equals(fieldName)) { - result += "\"" + fieldName + "\":\"" + fieldVal + "\","; + result += "\"" + fieldName + "\":\"" + getDynProperty(fieldName) + "\","; } } if(fields.length > 0) { @@ -187,7 +103,6 @@ public class DynamicEntity extends BaseBean implements Serializable { /** * 根据属性名，设置属性值 - * //TODO wei.peng 设置为空时会无效 * @param propName * @param val * @throws InvocationTargetException @@ -195,12 +110,10 @@ public class DynamicEntity extends BaseBean implements Serializable { * @throws NoSuchMethodException */ public void setDynProperty(String propName,Object val){ - //初始化set方法 - String setMethodName = "set" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, propName); - //获取方法 - Method setMethod = null; + String setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1); try { - setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); + val = getValue(propName,val); + Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); setMethod.invoke(this, val); } catch (NoSuchMethodException e) { LOGGER.error("没有方法：{}",setMethodName,e); @@ -211,23 +124,12 @@ public class DynamicEntity extends BaseBean implements Serializable { } } - /** - * 获取属性值 - * @param propName - * @return - * @throws NoSuchMethodException - * @throws InvocationTargetException - * @throws IllegalAccessException - */ public Object getDynProperty(String propName){ - //初始化set方法 - String setMethodName = "get" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, propName); - + String setMethodName = "get" + propName.substring(0,1).toUpperCase() + propName.substring(1); + Object result = null; try { - //获取方法 Method getMethod = this.getClass().getDeclaredMethod(setMethodName); - //实现方法 - return getMethod.invoke(this); + result = getMethod.invoke(this); } catch (NoSuchMethodException e) { LOGGER.error("没有方法：{}:{}",setMethodName,propName,e); } catch (IllegalAccessException e) { @@ -235,7 +137,7 @@ public class DynamicEntity extends BaseBean implements Serializable { } catch (InvocationTargetException e) { LOGGER.error("方法返回出错：{}",setMethodName,e); } - return null; + return getValue(propName,result); } public List getPropertyList() { @@ -245,4 +147,45 @@ public class DynamicEntity extends BaseBean implements Serializable { public void setPropertyList(List propertyList) { this.propertyList = propertyList; } + + /** + * 获取默认值 + * @param propName + * @param val + * @return + */ + public Object getValue(String propName,Object val){ + if(val == null){ + try { + Field field = this.getClass().getDeclaredField(ATTR_PREFIX + propName); + if (field.getType() == Integer.class) { + val = 0; + } else if (field.getType() == Long.class) { + val = 0L; + } else if (field.getType() == Float.class) { + val = 0.0f; + } else if (field.getType() == Double.class) { + val = 0.0d; + } else if (field.getType() == String.class) { + val = ""; + }else if (field.getType() == Character.class) { + val = ""; + }else if (field.getType() == Boolean.class) { + val = true; + }else if (field.getType() == Byte.class) { + val = 0; + }else if (field.getType() == Date.class) { + val = new Date(); + }else { + val = ""; + } + }catch (NoSuchFieldException e){ + LOGGER.error("没有指定属性：{}:{}",propName,e); + }catch (SecurityException e){ + LOGGER.error("获取属性安全错误：{}",propName,e); + } + } + return val; + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 53777c6..f470c2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1055,7 +1055,99 @@ public class BlockFormEnumUtil { return tmp; } + public Object getPropertyVirtual(Object ... objs){ + if(this.getValue() == STRING_SPLICE.getValue()){ + return getPropertyVirtualString(objs); + }else if(this.getValue() == NUM_ADD.getValue()){ + return getPropertyVirtualDoubleAdd(objs); + }else if(this.getValue() == NUM_LESS.getValue()){ + return getPropertyVirtualDoubleLess(objs); + }else if(this.getValue() == NUM_MAKE.getValue()){ + return getPropertyVirtualDoubleMake(objs); + }else if(this.getValue() == NUM_DIVISION.getValue()){ + return getPropertyVirtualDoubleDivision(objs); + } + return objs; + } + + private String getPropertyVirtualString(Object ... objs){ + if(objs != null && objs.length > 0){ + StringBuffer result = new StringBuffer(); + for (Object o : objs) { + result.append(o == null ? "" : o.toString()); + } + return result.toString(); + } + return null; + } + + private Double getPropertyVirtualDoubleAdd(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result += Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } + + private Double getPropertyVirtualDoubleLess(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result -= Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } + private Double getPropertyVirtualDoubleMake(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result *= Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } + + private Double getPropertyVirtualDoubleDivision(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result /= Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } } /** From f1993e69c8c47ea3c24f6fba3593619e6b1e1186 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 11 Apr 2019 18:50:12 +0800 Subject: [PATCH 07/10] =?UTF-8?q?sweb=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 47cee30..0cee07c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -18,9 +18,9 @@ public class SwebEnumUtil { public enum ORDER_MASTER_STATUS { CREATE(10, "新建"), RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), + SURE(30, "已确认"), CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + DELIVERY(50, "已发货"); private int value; private String description; @@ -66,9 +66,9 @@ public class SwebEnumUtil { public enum ORDER_DETAILS_STATUS { CREATE(10, "新建"), RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), + SURE(30, "已确认"), CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + DELIVERY(50, "已发货"); private int value; private String description; From 8684d95c1ef3e69499d5b545caac706ef729cff8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 11 Apr 2019 19:30:06 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/OperationDbModle.java | 25 ++++++++ .../pojo/platform/platbean}/WmsActionLog.java | 2 +- .../pojo/platform/platbean}/WmsActionLogData.java | 2 +- .../platform/platbean}/WmsActionLogDetails.java | 2 +- .../WmsActionLogDataMongoRepository.java | 14 +++++ .../WmsActionLogDetailsMongoRepository.java | 14 +++++ .../WmsActionLogMongoRepository.java | 14 +++++ .../i3plus/pojo/platform/sqlpack/WmsBsonPack.java | 64 +++++++++++++++++++ modules/i3plus-pojo-wms/pom.xml | 9 +-- .../wms/repository/WmsActionLogDataRepository.java | 17 ----- .../repository/WmsActionLogDetailsRepository.java | 16 ----- .../wms/repository/WmsActionLogRepository.java | 16 ----- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 72 ---------------------- 13 files changed, 139 insertions(+), 128 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean => i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean}/WmsActionLog.java (98%) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean => i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean}/WmsActionLogData.java (97%) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean => i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean}/WmsActionLogDetails.java (98%) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java new file mode 100644 index 0000000..93d7698 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 操作数据库表数据 参数封装 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-04-11 11:50 + * @Modify: + **/ +@Data +public class OperationDbModle{ + + @ApiParam(value = "DAO名称") + public String daoName; + + @ApiParam(value = "数据操作实体") + public Object object; + + // 10:新增，20：修改 + @ApiParam(value = "数据库操作类型") + public int actionDbType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java similarity index 98% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java index 6776ce7..b498c26 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java similarity index 97% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java index d67742d..d162959 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java similarity index 98% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java index 001acec..f99297c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java new file mode 100644 index 0000000..61e25a7 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogData; + +/** + * @Description : 作业日志参数(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogDataMongoRepository extends BaseMongoRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java new file mode 100644 index 0000000..a87ced1 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogDetails; + +/** + * @Description : 作业日志明细(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogDetailsMongoRepository extends BaseMongoRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java new file mode 100644 index 0000000..873ae06 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLog; + +/** + * @Description : 作业日志(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogMongoRepository extends BaseMongoRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java new file mode 100644 index 0000000..d295913 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.platform.sqlpack; + +import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; +import cn.estsh.i3plus.pojo.platform.platbean.*; +import com.mongodb.BasicDBObject; +import org.bson.conversions.Bson; + +/** + * @Description : Bson对象封装 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-04-11 13:15 + * @Modify: + **/ +public class WmsBsonPack { + + /** + * 作业日志复杂查询 + * + * @param actionLog + * @return + */ + public static Bson packBsonByActionLog(WmsActionLog actionLog) { + Bson bson = new BasicDBObject(); + bson = BsonPackTool.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringEqualPack(actionLog.getOrderNo(), "orderNo", bson); + bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson); + bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson); + bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson); + bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson); + bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson); + return bson; + } + + /** + * 作业日志明细复杂查询 + * + * @param actionLogDetails + * @return + */ + public static Bson packBsonByActionLogDetails(WmsActionLogDetails actionLogDetails) { + Bson bson = new BasicDBObject(); + bson = BsonPackTool.getNumEqualPack(actionLogDetails.getAlId(), "alId", bson); + bson = BsonPackTool.getStringEqualPack(actionLogDetails.getOrganizeCode(), "organizeCode", bson); + bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsValid(), "isValid", bson); + bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsDeleted(), "isDeleted", bson); + return bson; + } + + /** + * 调用组件日志复杂查询 + * + * @param actionLogData + * @return + */ + public static Bson packBsonByActionLogData(WmsActionLogData actionLogData) { + Bson bson = new BasicDBObject(); + bson = BsonPackTool.getNumEqualPack(actionLogData.getAldId(), "aldId", bson); + bson = BsonPackTool.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", bson); + bson = BsonPackTool.getNumEqualPack(actionLogData.getIsValid(), "isValid", bson); + bson = BsonPackTool.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", bson); + return bson; + } +} diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..24c7bab 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -18,10 +18,11 @@ i3plus.pojo i3plus-pojo-base - - - - + + + + + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java deleted file mode 100644 index 8875b03..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-07 14:49 - * @Modify: - **/ -@Repository -public interface WmsActionLogDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java deleted file mode 100644 index 280d727..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails; -import org.springframework.stereotype.Repository; - -/** - * @Description : 作业记录明细 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 14:03 - * @Modify: - **/ -@Repository -public interface WmsActionLogDetailsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java deleted file mode 100644 index 2c2da0b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog; -import org.springframework.stereotype.Repository; - -/** - * @Description : 作业记录表 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 14:02 - * @Modify: - **/ -@Repository -public interface WmsActionLogRepository extends BaseRepository { -} 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 9271606..891ac98 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 @@ -6,12 +6,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -1306,20 +1304,6 @@ public class WmsHqlPack { return result; } - /** - * 作业记录参数信息 查询条件封装 - * - * @param wmsActionLogData - * @return - */ - public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); - getStringBuilderPack(wmsActionLogData, result); - - return result; - } /** * 作业步骤调用参数信息 查询条件封装 @@ -1339,62 +1323,6 @@ public class WmsHqlPack { } /** - * 作业记录 查询条件封装 - * @param wmsActionLog - * @return - */ - public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) { - DdlPackBean result = new DdlPackBean(); - - if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), - "startTime", result, true); - } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), - "endTime", result, true); - } - - // 作业流程编号 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); - // 作业流程名称 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); - // 单据编号 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); - // 设备编号 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); - // 交易类型代码 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); - // 流程状态 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); - - getStringBuilderPack(wmsActionLog, result); - - return result; - } - - /** - * 作业记录明细 查询条件封装 - * @param wmsActionLogDetails - * @return - */ - public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { - DdlPackBean result = new DdlPackBean(); - - //作业流程id（对应作业记录明细里自增的id） - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); - - getStringBuilderPack(wmsActionLogDetails, result); - - DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - - return result; - } - - /** * PO订单条码表 分页查询 * * @param wmsPoSn From 7020b1a53405a0be3628eeace9566a46dedbe002 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 11 Apr 2019 21:58:47 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=9A=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B=20=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=B8=B8=E9=87=8FTASK=5FJOB,TRANS?= =?UTF-8?q?=5FAM=20+=20=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20+=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90component?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=91=BD=E5=90=8D=20+=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=86=BB=E7=BB=93=E6=95=B0=E9=87=8FHQL=20+?= =?UTF-8?q?=20=E4=BA=A4=E6=98=93=E5=8F=8D=E5=90=91=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E4=BA=A4=E6=98=93=E8=BF=87=E6=9C=9F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E9=87=8F=E6=AF=94=E8=BE=83=E8=A6=81=E7=94=A8?= =?UTF-8?q?.doubleValue?= 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 | 1 + 1 file changed, 1 insertion(+) 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 839fb10..d240f9d 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 @@ -917,6 +917,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); From 4f31301ea15fffc2bbe11464d23ebf333a6ae209 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 12 Apr 2019 10:02:56 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=B8=9A=E5=8A=A1=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/model/wms/TransSnModle.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index ac49208..bdd6040 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.ToString; /** * @Description : 收货扫描条码组件 参数封装 @@ -11,6 +12,7 @@ import lombok.Data; * @Modify: **/ @Data +@ToString public class TransSnModle extends BaseComponetsParam{ @ApiParam(value = "移动单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index ccfdb36..42f8cf8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -22,6 +23,7 @@ import java.util.List; * @Modify: **/ @Data +@ToString @Entity @DynamicInsert @DynamicUpdate