From f4702e7a70f2f04b3872dc7ab3ede0855ae273a8 Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 14 Dec 2020 21:46:29 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/system/cache/DictCache.java | 11 +++++++++++ .../org/springblade/system/user/excel/UserExcel.java | 8 ++++++++ .../org/springblade/system/user/mapper/UserMapper.xml | 2 +- .../system/user/service/impl/UserServiceImpl.java | 10 +++++++--- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java index b9c5837b..15a8367d 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java @@ -65,6 +65,17 @@ public class DictCache { }, TENANT_MODE); } + /** + * 获取字典值 + * + * @param code 字典编号枚举 + * @param dictValue 字典值 + * @return String + */ + public static String getKey(DictEnum code, String dictValue) { + return getKey(code.getName(), dictValue); + } + /** * 获取字典键 * diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/excel/UserExcel.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/excel/UserExcel.java index bfce322c..0ed691d4 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/excel/UserExcel.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/excel/UserExcel.java @@ -42,6 +42,14 @@ public class UserExcel implements Serializable { @ExcelProperty("租户编号") private String tenantId; + @ExcelIgnore + @ExcelProperty("用户平台") + private String userType; + + @ColumnWidth(20) + @ExcelProperty("用户平台名称") + private String userTypeName; + @ColumnWidth(15) @ExcelProperty("账户") private String account; diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml index e197123e..307340e7 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml @@ -70,7 +70,7 @@ diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index 8906a7be..ad84c49b 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -20,7 +20,6 @@ package org.springblade.system.user.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.exceptions.ApiException; import lombok.AllArgsConstructor; import org.springblade.common.constant.CommonConstant; import org.springblade.common.constant.TenantConstant; @@ -34,9 +33,11 @@ import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.*; +import org.springblade.system.cache.DictCache; import org.springblade.system.cache.ParamCache; import org.springblade.system.cache.SysCache; import org.springblade.system.entity.Tenant; +import org.springblade.system.enums.DictEnum; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.*; @@ -271,6 +272,8 @@ public class UserServiceImpl extends BaseServiceImpl implement public void importUser(List data, Boolean isCovered) { data.forEach(userExcel -> { User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class)); + // 设置用户平台 + user.setUserType(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1)); // 设置部门ID user.setDeptId(SysCache.getDeptIds(userExcel.getTenantId(), userExcel.getDeptName())); // 设置岗位ID @@ -302,6 +305,7 @@ public class UserServiceImpl extends BaseServiceImpl implement public List exportUser(Wrapper queryWrapper) { List userList = baseMapper.exportUser(queryWrapper); userList.forEach(user -> { + user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType())); user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId()))); user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId()))); user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId()))); @@ -314,11 +318,11 @@ public class UserServiceImpl extends BaseServiceImpl implement public boolean registerGuest(User user, Long oauthId) { Tenant tenant = SysCache.getTenant(user.getTenantId()); if (tenant == null || tenant.getId() == null) { - throw new ApiException("租户信息错误!"); + throw new ServiceException("租户信息错误!"); } UserOauth userOauth = userOauthService.getById(oauthId); if (userOauth == null || userOauth.getId() == null) { - throw new ApiException("第三方登陆信息错误!"); + throw new ServiceException("第三方登陆信息错误!"); } user.setRealName(user.getName()); user.setAvatar(userOauth.getAvatar());