From cdd0e5fc0523e71fa337a81a6b46c9204dd1be43 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Fri, 26 Apr 2019 13:07:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 205 +++++++++++++++++++++ .../pojo/sweb/modelbean/SwebLoginUserModel.java | 5 + 2 files changed, 210 insertions(+) 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 4b2e9fc..e55fa30 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 @@ -259,4 +259,209 @@ public class SwebEnumUtil { return tmp; } } + + /** + * 用户消息类型 + * 1.NOTICE：通知 + * 2.STATION_LETTER：站内信 + * 3.SWEB_NOTICE：SWEB通知 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_TYPE { + + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + + private int value; + private String name; + private String description; + + MESSAGE_TYPE() { + } + + MESSAGE_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return 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].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 附件来源 + * 1.NOTICE：通知 + * 2.STATION_LETTER：站内信 + * 3.SWEB_NOTICE：SWEB通知 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FILE_ATTACH_SOURCE { + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + + private int value; + private String name; + private String description; + + FILE_ATTACH_SOURCE() { + } + + FILE_ATTACH_SOURCE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return 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].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 前端系统平台 + * IMPP_FE：impp系统 + * SWEB_FE：sweb系统 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FE_PLATFORM { + IMPP_FE("IMPP_FE", "IMPP_FE", "impp系统"), + SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统"); + + private String value; + private String name; + private String description; + + FE_PLATFORM() { + } + + FE_PLATFORM(String value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(String 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 valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 8076ebd..3594480 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -31,4 +31,9 @@ public class SwebLoginUserModel implements Serializable { @ApiParam(value = "ip地址") private String ip; + + public SwebLoginUserModel(Long id, String userName) { + this.id = id; + this.userName = userName; + } } From 06dd8b42da51f3bc91d414a03b31ca9274c1696d Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 26 Apr 2019 14:04:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 5878f68..bad372f 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 @@ -874,19 +874,19 @@ public class WmsHqlPack { * @param wmsStockQuan * @return */ - public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); getStringBuilderPack(wmsStockQuan, result); - return result.toString(); + return result; } /** From 062d56573f24b0e24261a6fd804b0447a7728c40 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 26 Apr 2019 14:09:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 bad372f..9283733 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 @@ -375,16 +375,17 @@ public class WmsHqlPack { * @param wareHouse * @return */ - public static String packHqlWareHouseUnique(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWareHouseUnique(WareHouse wareHouse) { + DdlPackBean result = new DdlPackBean(); +// StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); - HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(wareHouse.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(wareHouse.getCode(), "code", result); + DdlPreparedPack.getNumNOEqualPack(wareHouse.getId(), "id", result); getStringBuilderPack(wareHouse, result); - return result.toString(); + return result; } /** From a91ff1feaf58b02e563acbe7e5eeb71ed00077b8 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 26 Apr 2019 14:28:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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/wms/sqlpack/WmsHqlPack.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 9283733..42555f9 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 @@ -377,7 +377,6 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWareHouseUnique(WareHouse wareHouse) { DdlPackBean result = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); DdlPreparedPack.getStringEqualPack(wareHouse.getName(), "name", result); DdlPreparedPack.getStringEqualPack(wareHouse.getCode(), "code", result); @@ -970,15 +969,15 @@ public class WmsHqlPack { * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); - return result.toString(); + return result; } /** @@ -989,7 +988,6 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { DdlPackBean packBean = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean); From 7f8217e644728509e790124daab012cdcdd22bdc Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 14:44:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/TestInfo.java | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java deleted file mode 100644 index 37c5121..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; - -/** - * @Description : 测试类 - * @Reference : - * @Author : yunhao - * @CreateDate : 2019-02-24 16:21 - * @Modify: - **/ -public class TestInfo extends BaseBean { - - - /** - * 执行耗时 - */ - private long executeTime; - - public TestInfo(){ - - } - - public TestInfo(long executeTime){ - this.executeTime = System.currentTimeMillis() - executeTime; - } -} From 85178af7f9197fa6640a9430e73f8aa289020578 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 15:59:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 5257aed..beb96bf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -100,6 +100,14 @@ public class SysMessage extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long readCount; + public long getReadCountVal(){ + if(readCount == null){ + return 0; + } else { + return readCount.longValue(); + } + } + public SysMessage() { }