From ff572a219e63782eedfe04743c52c654931d47f9 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 14 Dec 2018 15:43:56 +0800 Subject: [PATCH 1/6] dragon --- .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 43 +++++++++++++--------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index 23941de..04ab940 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -27,20 +27,20 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_LOG_DETAILS") -@Api(value="作业记录明细表",description = "作业记录表") +@Table(name = "WMS_ACTION_LOG_DETAILS") +@Api(value = "作业记录明细表", description = "作业记录表") public class WmsActionLogDetails extends BaseBean { - @Column(name="AL_ID") + @Column(name = "AL_ID") @ApiParam(value = "作业流程ID", example = "1") @JsonSerialize(using = ToStringSerializer.class) public Long alId; //get单独处理 public Long getAlId() { - if(alId != null) { + if (alId != null) { return alId.longValue(); - }else{ + } else { return alId; } } @@ -49,56 +49,65 @@ public class WmsActionLogDetails extends BaseBean { @ApiParam(value = "流程名称") public String agNameC; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") public Integer seq; - @Column(name="OK_SEQ") + @Column(name = "OK_SEQ") @ApiParam(value = "成功跳转步骤", example = "1") public Integer okSeq; - @Column(name="NG_SEQ") + @Column(name = "NG_SEQ") @ApiParam(value = "失败跳转步骤", example = "1") public Integer ngSeq; // 10=只输入一次,20=输入多次,30=输入多次不允许重复,40=本流程结束 - @Column(name="VALUE_TYPE") + @Column(name = "VALUE_TYPE") @ApiParam(value = "动作类型", example = "1") public Integer valueType; // 1=是,2=否 - @Column(name="TO_UPPER") + @Column(name = "TO_UPPER") @ApiParam(value = "是否转为大写", example = "1") public Integer toUpper; - @Column(name="LEN_CHECK") + @Column(name = "LEN_CHECK") @ApiParam(value = "长度检查", example = "1") public Integer lenCheck; - @Column(name="AS_ID") + @Column(name = "AS_ID") @ApiParam(value = "作业步骤", example = "1") @JsonSerialize(using = ToStringSerializer.class) public Long asId; //get单独处理 public Long getAsId() { - if(asId != null) { + if (asId != null) { return asId.longValue(); - }else{ + } else { return asId; } } - @Column(name="ALD_STATUS") + @Column(name = "ALD_STATUS") @ApiParam(value = "执行状态", example = "1") public Integer aldStatus; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam(value = "开始执行时间") public String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @ApiParam(value = "结束执行时间") public String endTime; + public WmsActionLogDetails() { + + } + + public WmsActionLogDetails(String createUser, Long id, Integer seq) { + this.createUser = createUser; + this.id = id; + this.seq = seq; + } } From 290e2e00c9253fe43ae5de5bb63835336a3cbc9f Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 14 Dec 2018 16:23:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= 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, 6 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 cf3573d..8eddef9 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 @@ -181,8 +181,12 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); - HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); - HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); + if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) { + HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); + } + if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) { + HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); + } getStringBuilderPack(wmsIbCheckPlan, result); From 620a4b0c998027642436fe0b07b77cc862578a68 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 14 Dec 2018 17:14:13 +0800 Subject: [PATCH 3/6] #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 4/6] =?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 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 5/6] =?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 6/6] =?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")