From 620a4b0c998027642436fe0b07b77cc862578a68 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 14 Dec 2018 17:14:13 +0800 Subject: [PATCH 01/13] #3015,#3017,#3018,#3041,#3045 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 68219ca..6f0b15f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; -import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -32,13 +31,17 @@ public class WmsOperationBean extends BaseBean { public String alId; /** - * 触发源:10=扫描枪, - * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除) + * 触发源: + * 10=扫描枪, + * 20=提交按钮, + * 30=重置按钮, + * 40=查看明细, + * 50=明细(删除), * 60=明细（清空） */ @ApiParam("触发源") public int sourceOwner; @ApiParam("选中的明细数据") - public List> details; + public List details; } From f77596819476c1bad61eddcec1ef3843ef2436fa Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Fri, 14 Dec 2018 18:12:29 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=9D=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 +++++++ modules/i3plus-pojo-form/pom.xml | 17 +++++++++++++++++ modules/i3plus-pojo-hardswitch/pom.xml | 17 +++++++++++++++++ modules/i3plus-pojo-jobflow/pom.xml | 17 +++++++++++++++++ modules/i3plus-pojo-report/pom.xml | 17 +++++++++++++++++ modules/i3plus-pojo-softswitch/pom.xml | 17 +++++++++++++++++ modules/i3plus-pojo-workflow/pom.xml | 17 +++++++++++++++++ pom.xml | 6 ++++++ readme.txt | 2 +- 9 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-form/pom.xml create mode 100644 modules/i3plus-pojo-hardswitch/pom.xml create mode 100644 modules/i3plus-pojo-jobflow/pom.xml create mode 100644 modules/i3plus-pojo-report/pom.xml create mode 100644 modules/i3plus-pojo-softswitch/pom.xml create mode 100644 modules/i3plus-pojo-workflow/pom.xml 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 88ff33c..9ece2d7 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 @@ -20,6 +20,13 @@ public class CommonEnumUtil { CORE(2, "i3core", "i3业务平台"), WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), + QMS(5, "i3qms", "质量管理软件"), + FORM(80,"block-form","智能表单"), + REPORT(81,"block-report","智能报表"), + WORKFLOW(82,"block-workflow","智能工作流"), + JOBFLOW(83,"block-jobflow","智能作业流"), + SOFTSWITCH(84,"block-softswitch","智能软件适配器"), + HARDSWITCH(85,"block-hardswitch","智能硬件适配器"), CONSOLE(95,"impp-console","服务监控台"), GATEWAY(96,"impp-gateway","服务网关"), CLOUD(97,"i3cloud","微服务"), diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml new file mode 100644 index 0000000..f58676d --- /dev/null +++ b/modules/i3plus-pojo-form/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-form + jar + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml new file mode 100644 index 0000000..0ba3645 --- /dev/null +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-hardswitch + jar + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml new file mode 100644 index 0000000..6706323 --- /dev/null +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-jobflow + jar + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml new file mode 100644 index 0000000..37211b4 --- /dev/null +++ b/modules/i3plus-pojo-report/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-report + jar + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml new file mode 100644 index 0000000..848da05 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-softswitch + jar + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml new file mode 100644 index 0000000..93f9732 --- /dev/null +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-workflow + jar + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ead6373..b8f4488 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,12 @@ modules/i3plus-pojo-model modules/i3plus-pojo-mes modules/i3plus-pojo-wms + modules/i3plus-pojo-form + modules/i3plus-pojo-hardswitch + modules/i3plus-pojo-jobflow + modules/i3plus-pojo-report + modules/i3plus-pojo-softswitch + modules/i3plus-pojo-workflow diff --git a/readme.txt b/readme.txt index 13041ee..d8fd773 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ 模型工程 -主要用于各类对象木星 +主要用于各类对象模型 i3plus-pojo-mes:生产相关的对象模型 i3plus-pojo-wms:仓库相关的对象模型 From 90f4662416a828dcc04af93bcc5ab2ba395c04e2 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 17 Dec 2018 10:59:21 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0?= 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 8eddef9..a59084a 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 @@ -832,6 +832,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); From 44367c924055e4e41756f2f4597fe84698871524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 17 Dec 2018 17:21:49 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/BaseComponetsParam.java | 38 ++++++++++++++++++++++ .../estsh/i3plus/pojo/model/wms/TransSnModle.java | 21 ++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java new file mode 100644 index 0000000..62715bd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 基类：组件参数 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-12-17 11:39 + * @Modify: + **/ +@Data +public abstract class BaseComponetsParam implements Serializable { + + @ApiParam(value = "单据号") + public String orderNo; + + @ApiParam(value = "单据类型") + public String orderType; + + @ApiParam(value = "条码") + public String sn; + + @ApiParam(value = "条码类型") + public String snType; + + @ApiParam(value = "用户编号") + public String userNo; + + @ApiParam(value = "设备编号") + public String fixNo; + + @ApiParam(value = "工厂代码") + public String organizeCode; +} 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 new file mode 100644 index 0000000..f663b5d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 收货扫描条码组件 参数封装 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-12-17 11:50 + * @Modify: + **/ +@Data +public class TransSnModle extends BaseComponetsParam{ + + @ApiParam(value = "移动单号") + public String moveNo; + + @ApiParam(value = "交易类型代码") + public String transTypeCode; +} From bb289774d96a602745dd82bc335f6765e2ca56a3 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 17 Dec 2018 20:09:43 +0800 Subject: [PATCH 05/13] =?UTF-8?q?dashboard=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseResultBean.java | 33 ++++++++++++-- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 50 +++++++++++++++++++--- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 10 +++++ .../i3plus/pojo/platform/bean/SysLogException.java | 9 ++++ .../i3plus/pojo/platform/bean/SysLogOperate.java | 9 ++++ 5 files changed, 101 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index 5b3a15c..d2b930a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -96,16 +96,43 @@ public class BaseResultBean { } public static BaseResultBean buildBaseResultBean(boolean success,String msg){ - BaseResultBean rs = new BaseResultBean(); + BaseResultBean rs = new BaseResultBean(); rs.success = success; - if(success) { + if (success) { rs.msg = msg; rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); - }else { + } else { rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); rs.errorMsg = msg; } return rs; } + + public BaseResultBean setResultList(List resultList) { + this.resultList = resultList; + return this; + } + + public BaseResultBean setResultObject(Obj resultObject) { + this.resultObject = resultObject; + return this; + } + + public BaseResultBean setResultMap(Map resultMap) { + this.resultMap = resultMap; + return this; + } + + public BaseResultBean setPager(Pager pager) { + this.pager = pager; + return this; + } + + public BaseResultBean setListPager(ListPager listPager) { + this.listPager = listPager; + this.setPager(listPager.getObjectPager()); + this.setResultList(listPager.getObjectList()); + return this; + } } 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 aaf9729..9dad1f1 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 @@ -615,27 +615,53 @@ public class CommonEnumUtil { * 服务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CLOUD_STATUS { - REGISTERED(1, "注册"), - DISCONNECT(2, "断开"); + public enum CLOUD_APP_STATUS { + UP(1,"UP" ,"在线"), + DOWN(2, "DOWN","断线"); private int value; + private String code; private String description; + private CLOUD_APP_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + public int getValue() { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } - private CLOUD_STATUS(int value, String description) { - this.value = value; - this.description = description; + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; } - public static String valueOf(int val) { + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -644,6 +670,16 @@ public class CommonEnumUtil { } return tmp; } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 62417e6..5b5d3a7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -209,6 +209,16 @@ public class ImppEnumUtil { return tmp; } + public static String valueOfName(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java index c0b0e4e..88b11a5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,6 +34,14 @@ public class SysLogException extends BaseBean { @ApiParam(value ="系统模块（枚举）", example = "1") private Integer excModule; + private String excModuleName; + public String getExcModuleName(){ + if(this.excModule != null){ + return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule); + } + return excModuleName; + } + @Column(name="EXC_CLASS_NAME") @ApiParam(value ="异常类名") private String excClassName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java index 77ea17d..11e1875 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -35,6 +36,14 @@ public class SysLogOperate extends BaseBean { @ApiParam(value ="系统模块（枚举）", example = "1") private Integer operateModule; + private String operateModuleName; + public String getOperateModuleName(){ + if(this.operateModule != null){ + return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule); + } + return operateModuleName; + } + //ImppEnumUtil.OPERATE_TYPE（枚举） @Column(name="OPERATE_TYPE") @ApiParam(value ="操作类型" , example = "-1") From c221d618ea50a6223639c3bc3a997640ebf4399c Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 17 Dec 2018 20:12:59 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 124 +++++++++++++++++++++ .../i3plus/pojo/platform/bean/SysLogUserLogin.java | 5 + 2 files changed, 129 insertions(+) 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 5795927..491e3ac 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 @@ -639,4 +639,128 @@ public class CommonEnumUtil { } } + /** + * 客户端操作系统 + * return "Windows"; + * return "Mac"; + * return "Unix"; + * return "Android"; + * return "IPhone"; + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_LOGIN_PLATFORM { + WINDOWS(1, "Windows", "Windows 操作系统"), + MAC(2, "Mac", "Mac 操作系统"), + UNIX(3, "Unix", "Linux 操作系统"), + ANDROID(4, "Android", "Android 操作系统"), + IPHONE(5, "IPhone", "IPhone 操作系统"); + + private int value; + private String name; + private String description; + + LOG_LOGIN_PLATFORM() { + } + + LOG_LOGIN_PLATFORM(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].getName(); + } + } + return tmp; + } + + /** + * -1 未识别操作系统 + * @param desc + * @return + */ + public static int descOf(String desc) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 用户登录状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_LOGIN_STATUS { + LOGIN_SUCCESS(1, "登录成功", "登录成功"), + WRONG_PASSWORD(3, "密码错误", "Linux 密码错误"), + WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"), + USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"), + USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"), + SYSTEM_ERROR(6, "系统异常", "系统异常"); + + private int value; + private String name; + private String description; + + USER_LOGIN_STATUS() { + } + + USER_LOGIN_STATUS(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].getName(); + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index b2b572c..179d637 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.servlet.http.HttpServletRequest; /** * @Description : 用户登录记录 @@ -47,6 +48,10 @@ public class SysLogUserLogin extends BaseBean { @Column(name="LOG_LOGIN_HOST") @ApiParam(value ="登录IP" , access ="登录IP") private String logLoginHost; + + @Column(name="LOG_LOGIN_BROWSER") + @ApiParam(value ="登录浏览器" , access ="登录的浏览器") + private String logLoginBrowser; @Column(name="LOG_LOGIN_DATE_TIME") @ApiParam(value ="登录时间" , access ="登录时间") From cb8d841aee143cd099130cc3853ca9a8f04f9917 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 18 Dec 2018 09:47:18 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index 179d637..4be79ff 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.servlet.http.HttpServletRequest; /** * @Description : 用户登录记录 @@ -32,19 +31,19 @@ public class SysLogUserLogin extends BaseBean { @Column(name="USER_ID") @ApiParam(value ="用户ID" , access ="用户ID") private Long userId; - + @Column(name="LOG_LOGIN_NAME") @ApiParam(value ="登录名称" , access ="登录名称") private String logLoginName; - + @Column(name="LOG_LOGIN_STATUS") @ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1") private Integer logLoginStatus; - + @Column(name="LOG_LOGIN_PLATFORM") @ApiParam(value ="登录平台ID（枚举）" , example ="1") private Integer logLoginPlatform; - + @Column(name="LOG_LOGIN_HOST") @ApiParam(value ="登录IP" , access ="登录IP") private String logLoginHost; @@ -52,7 +51,7 @@ public class SysLogUserLogin extends BaseBean { @Column(name="LOG_LOGIN_BROWSER") @ApiParam(value ="登录浏览器" , access ="登录的浏览器") private String logLoginBrowser; - + @Column(name="LOG_LOGIN_DATE_TIME") @ApiParam(value ="登录时间" , access ="登录时间") private String logLoginDateTime; From 6821bb17cc34d4386ade3766db9f619f7da5390e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 18 Dec 2018 10:48:49 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b774dcb..6b96b68 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 @@ -382,7 +382,7 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), - DISABLE(2, "禁止", "fa fa-disabled cell-fa fa-times-circle"), + DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), LOCKING(3, "锁定", "fa cell-fa fa-lock"); private int value; From 1d4ab876c135c2b7ad4745e5d43ac2456e82ce1b Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 11:44:56 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/{bean => platbean}/SysLogException.java | 2 +- .../i3plus/pojo/platform/{bean => platbean}/SysLogOperate.java | 2 +- .../estsh/i3plus/pojo/platform/{bean => platbean}/SysLogSystem.java | 2 +- .../SysLogExceptionRepository.java | 4 ++-- .../SysLogOperateRepository.java | 4 ++-- .../SysLogSystemRepository.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{bean => platbean}/SysLogException.java (96%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{bean => platbean}/SysLogOperate.java (97%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{bean => platbean}/SysLogSystem.java (98%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repositorymongo => platrepositorymongo}/SysLogExceptionRepository.java (72%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repositorymongo => platrepositorymongo}/SysLogOperateRepository.java (72%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repositorymongo => platrepositorymongo}/SysLogSystemRepository.java (71%) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index c0b0e4e..04eec4b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java similarity index 97% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 77ea17d..b838fe5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.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/bean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java similarity index 98% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index bd6783d..cc22486 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.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/repositorymongo/SysLogExceptionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java similarity index 72% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java index 100f739..6fe78cc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.platform.repositorymongo; +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysLogException; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; /** * @Description : 异常记录表(使用Mongodb) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java similarity index 72% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java index 6fc7766..e33b7c7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.platform.repositorymongo; +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; /** * @Description : 操作日志表(使用Mongodb) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java similarity index 71% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java index dab92ce..eddc176 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.platform.repositorymongo; +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; /** * @Description : 系统日志表 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 3833ebd..0aa94fb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -1,9 +1,9 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; -import cn.estsh.i3plus.pojo.platform.bean.SysLogException; -import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; import com.mongodb.BasicDBObject; import org.bson.conversions.Bson; From 91a438697857d2f4a8fcd3b7e8b0e02c8d738566 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 11:48:47 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=B0=83=E6=95=B4software=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 aaf9729..be9cc6b 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 @@ -21,17 +21,17 @@ public class CommonEnumUtil { WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), QMS(5, "i3qms", "质量管理软件"), - FORM(80,"block-form","智能表单"), - REPORT(81,"block-report","智能报表"), - WORKFLOW(82,"block-workflow","智能工作流"), - JOBFLOW(83,"block-jobflow","智能作业流"), - SOFTSWITCH(84,"block-softswitch","智能软件适配器"), - HARDSWITCH(85,"block-hardswitch","智能硬件适配器"), - CONSOLE(95,"impp-console","服务监控台"), - GATEWAY(96,"impp-gateway","服务网关"), - CLOUD(97,"i3cloud","微服务"), + FORM(20,"block-form","智能表单"), + REPORT(21,"block-report","智能报表"), + WORKFLOW(22,"block-workflow","智能工作流"), + JOBFLOW(23,"block-jobflow","智能作业流"), + SOFTSWITCH(24,"block-softswitch","智能软件适配器"), + HARDSWITCH(25,"block-hardswitch","智能硬件适配器"), + CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), - CENTER(99,"icloud-server","注册中心"); + CLOUD(97,"i3cloud","微服务"), + GATEWAY(96,"impp-gateway","服务网关"), + CONSOLE(95,"impp-console","服务监控台"); private int value; private String code; From fe675467680bd8120970f10158ce5810e81c1292 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 18 Dec 2018 13:45:56 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E6=89=AB=E6=8F=8F=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=20=E6=89=AB=E6=8F=8F=E7=AE=B1=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=20=E5=A4=84=E7=90=86=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 8a52ad2..4432ac7 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 @@ -1265,7 +1265,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_STATUS { - CREATE(1, "新建"), + CREATE(1, "创建"), FINISH(5, "待处理"), FAIL(10, "已完成"), CLOSE(90, "已关闭"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index c930713..d703238 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -42,10 +42,10 @@ public class WmsQCMaster extends BaseBean { public Integer orderType; /** - * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消 + * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消 */ @Column(name="ORDER_STATUS") - @ApiParam(value = "状态", example = "0") + @ApiParam(value = "状态", example = "1") public Integer orderStatus; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index 7177ecf..c5e5990 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -37,10 +37,10 @@ public class WmsQCTrans extends BaseBean { public String item; /** - * 状态:0=创建,10=已处理 + * 状态:1=创建,10=已处理 */ @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") + @ApiParam(value = "状态", example = "1") public Integer itemStatus; @Column(name="REMARK") From 3a86ae3980efd82a529d217d7189a49ba189fb04 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 14:24:29 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 15 ++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 96 ++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index a3b1b31..728affc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -252,4 +252,19 @@ public interface BaseRepository extends JpaReposito public boolean isExitBySql(String sql); + public double countSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double countSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + public double countAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double countAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + public double findMaxByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double findMaxByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + public double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index c6ae550..07acd52 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1018,4 +1018,100 @@ public class BaseRepositoryImpl extends SimpleJpaRep public boolean isExitBySql(String sql) { return findBySqlCount(sql) > 0; } + + @Override + public double countSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return countSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double countSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } + + @Override + public double countAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return countAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double countAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select avg(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } + + @Override + public double findMaxByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findMaxByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select max(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } + + @Override + public double findMinByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findMinByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double findMinByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select min(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } } From fc2a6c515c2e799a60b4c5a233f7bd5905aac686 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 15:09:26 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D=E8=B0=83=E6=95=B4=E4=B8=BAfind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 8 ++++---- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 728affc..cbedf52 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -252,13 +252,13 @@ public interface BaseRepository extends JpaReposito public boolean isExitBySql(String sql); - public double countSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + public double findSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double countSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + public double findSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); - public double countAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + public double findAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double countAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + public double findAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); public double findMaxByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 07acd52..21b6e96 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1020,12 +1020,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public double countSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return countSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + public double findSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override - public double countSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + public double findSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,paramName,paramValue); @@ -1044,12 +1044,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public double countAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return countAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + public double findAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override - public double countAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + public double findAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { StringBuffer sb = new StringBuffer("select avg(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,paramName,paramValue);