From 2753f64b7ebfe81ce4c45667683701f40070a8cd Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 28 Nov 2018 19:07:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 10 +++++++++- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 ------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 23fa593..754a668 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -56,7 +56,15 @@ public class SysMenu extends BaseBean { @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") private String menuClassPath; - + + @Column(name="MENU_GRADE") + @ApiParam(value ="资源等级", example = "1") + private String menuGrade; + + @Column(name="MENU_SORT") + @ApiParam(value ="资源排序", example = "1") + private String menuSort; + @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") private String menuUrl; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7e2a33c..603a79a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -130,12 +130,6 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); - // 默认排序 - if(department.getOrderByParam().isEmpty()){ - department.setOrderByParam("departmentSort"); - department.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); - } - return result.toString(); } From 506f13d4b20a0ba43281d8b98dbc166a4d554c65 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 19:22:24 +0800 Subject: [PATCH 2/4] =?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 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 3a19099..52bdb57 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -44,9 +44,9 @@ public class WmsActionResponseBean { public List> details; @ApiParam(value = "结果代码") - public boolean codeStatus; + public Boolean codeStatus; - public WmsActionResponseBean(boolean codeStatus, String message) { + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; } 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 2e8af6e..8e9c428 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 @@ -1068,6 +1068,9 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + HqlPack.getNumEqualPack(wmsActionModule.getId(), "id", result); + HqlPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); + getStringBuilderPack(wmsActionModule, result); return result.toString(); From 7e4801938627daeb70126380070d0f57616fa58a Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 28 Nov 2018 22:55:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 6cafa8e..241a767 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,7 @@ public class CommonEnumUtil { CORE(2, "i3core", "i3业务平台"), WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), + CONSOLE(95,"impp-console","服务监控台"), GATEWAY(96,"impp-gateway","服务网关"), CLOUD(97,"i3cloud","微服务"), SURFACE(98,"i3surface","对外服务"), From 9dd0392bc047e983aa0ade8ad4c584e86cba893b Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 29 Nov 2018 09:25:58 +0800 Subject: [PATCH 4/4] =?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 --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 3595182..c790aca 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 @@ -1514,17 +1514,23 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RC_RESPONSE_TIPS { - OK(true, "正确"), - NG(false, "失败"); + OK(1, true, "正确"), + NG(2, false, "失败"); + private int value; private boolean codeStatus; private String description; - RC_RESPONSE_TIPS(boolean codeStatus, String description) { + RC_RESPONSE_TIPS(int value, boolean codeStatus, String description) { + this.value = value; this.codeStatus = codeStatus; this.description = description; } + public int getValue() { + return value; + } + public boolean getCodeStatus() { return codeStatus; }