From 3088b05027f8401cf2f6eb21772c447531cfa6b4 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 23 Mar 2022 16:22:55 +0800 Subject: [PATCH] =?UTF-8?q?sweb=E7=BB=9F=E4=B8=80=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 66 +++++++++++++++++++++- .../pojo/model/platform/UserDetailModel.java | 5 +- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 6 ++ 3 files changed, 75 insertions(+), 2 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 947138e..2b48693 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 @@ -94,7 +94,12 @@ public class CommonEnumUtil { /** * 智能调度系统 */ - LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"); + LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"), + + /** + * SWEB调用 + */ + SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务"); /** * 产品ID @@ -1059,7 +1064,66 @@ public class CommonEnumUtil { return tmp; } } + /** + * 客户端授权子系统标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTH_PLATFORM { + PC_IMPP_CORE(10, "PC-IMPP", "PC平台管理端"), + PC_WMS_SWEB(20, "PC-SWEB", "PC_SWEB后台管理端"); + + + private int value; + private String name; + private String description; + + AUTH_PLATFORM() { + } + + AUTH_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 AUTH_PLATFORM valueOf(int val) { + AUTH_PLATFORM tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + 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; + } +} /** * 用户登录状态 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 5054632..901f40b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -163,6 +163,9 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="登录次数") private Integer userLoginNum; + @ApiParam(value = "登录平台权限") + private String authPlatform; + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); @@ -176,7 +179,7 @@ public class UserDetailModel extends BaseBean { user.setLanguageCode(this.userLanguageCode); user.setOrganizeCode(this.organizeCode); user.setUserLoginNum(this.userLoginNum); - + user.setAuthPlatform(this.authPlatform); return user; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 2e48409..ca1d071 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -97,6 +97,12 @@ public class SysUser extends BaseBean { @ApiParam(value = "账号最后登录时间") private String userLoginLastDateTime; + /** + * 枚举类型 + */ + @Column(name = "AUTH_PLATFORM") + @ApiParam(value = "账号授权的应用列表") + private String authPlatform; /********************************** 关系信息 ********************************/ @Column(name = "DEPARTMENT_ID")