From 65480ebe96264249afb166b6c7dee359672ef01c Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期六, 20 一月 2024 11:30:49 +0800
Subject: [PATCH] update 优化代码格式
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java | 16 ++++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java | 7 -
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java | 4
ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java | 9 ++
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 24 +++++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 65 +++++++++++++++-
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java | 9 ++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java | 42 ++++++++++
ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java | 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java | 6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java | 44 +++++++++++
11 files changed, 209 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
index 87844dd..1a476a9 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
@@ -120,6 +120,7 @@
AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
captcha.setGenerator(codeGenerator);
captcha.createCode();
+ // 濡傛灉鏄暟瀛﹂獙璇佺爜锛屼娇鐢⊿pEL琛ㄨ揪寮忓鐞嗛獙璇佺爜缁撴灉
String code = captcha.getCode();
if (isMath) {
ExpressionParser parser = new SpelExpressionParser();
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java
index 4d4bc89..db9c271 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java
@@ -13,10 +13,19 @@
@AutoMapper(target = SysTenantVo.class)
public class TenantListVo {
+ /**
+ * 绉熸埛缂栧彿
+ */
private String tenantId;
+ /**
+ * 浼佷笟鍚嶇О
+ */
private String companyName;
+ /**
+ * 鍩熷悕
+ */
private String domain;
}
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
index 44eaece..a75b913 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
@@ -18,6 +18,11 @@
/**
* 鐧诲綍
+ *
+ * @param body 鐧诲綍瀵硅薄
+ * @param client 鎺堟潈绠＄悊瑙嗗浘瀵硅薄
+ * @param grantType 鎺堟潈绫诲瀷
+ * @return 鐧诲綍楠岃瘉淇℃伅
*/
static LoginVo login(String body, SysClientVo client, String grantType) {
// 鎺堟潈绫诲瀷鍜屽鎴风id
@@ -31,6 +36,10 @@
/**
* 鐧诲綍
+ *
+ * @param body 鐧诲綍瀵硅薄
+ * @param client 鎺堟潈绠＄悊瑙嗗浘瀵硅薄
+ * @return 鐧诲綍楠岃瘉淇℃伅
*/
LoginVo login(String body, SysClientVo client);
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java
index d6b312a..f8f155a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java
@@ -23,4 +23,20 @@
*/
String selectNicknameById(Long userId);
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵嬫満鍙�
+ *
+ * @param userId 鐢ㄦ埛id
+ * @return 鐢ㄦ埛鎵嬫満鍙�
+ */
+ String selectPhonenumberById(Long userId);
+
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛閭
+ *
+ * @param userId 鐢ㄦ埛id
+ * @return 鐢ㄦ埛閭
+ */
+ String selectEmailById(Long userId);
+
}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
index 058dee7..21acfb1 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -101,13 +101,18 @@
return Convert.toLong(getExtra(DEPT_KEY));
}
+ /**
+ * 鑾峰彇褰撳墠 Token 鐨勬墿灞曚俊鎭�
+ *
+ * @param key 閿��
+ * @return 瀵瑰簲鐨勬墿灞曟暟鎹�
+ */
private static Object getExtra(String key) {
try {
return StpUtil.getExtra(key);
} catch (Exception e) {
return null;
}
-
}
/**
@@ -135,12 +140,17 @@
return UserConstants.SUPER_ADMIN_ID.equals(userId);
}
+ /**
+ * 鏄惁涓鸿秴绾х鐞嗗憳
+ *
+ * @return 缁撴灉
+ */
public static boolean isSuperAdmin() {
return isSuperAdmin(getUserId());
}
/**
- * 鏄惁涓鸿秴绾х鐞嗗憳
+ * 鏄惁涓虹鎴风鐞嗗憳
*
* @param rolePermission 瑙掕壊鏉冮檺鏍囪瘑缁�
* @return 缁撴灉
@@ -149,10 +159,20 @@
return rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY);
}
+ /**
+ * 鏄惁涓虹鎴风鐞嗗憳
+ *
+ * @return 缁撴灉
+ */
public static boolean isTenantAdmin() {
return Convert.toBool(isTenantAdmin(getLoginUser().getRolePermission()));
}
+ /**
+ * 妫�鏌ュ綋鍓嶇敤鎴锋槸鍚﹀凡鐧诲綍
+ *
+ * @return 缁撴灉
+ */
public static boolean isLogin() {
return getLoginUser() != null;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java
index a8bc57b..2f6dfc9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java
@@ -31,12 +31,11 @@
*/
TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery);
-
/**
* 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆瀵硅薄瀛樺偍閰嶇疆
*
* @param bo 瀵硅薄瀛樺偍閰嶇疆鏂板涓氬姟瀵硅薄
- * @return
+ * @return 缁撴灉
*/
Boolean insertByBo(SysOssConfigBo bo);
@@ -44,7 +43,7 @@
* 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼瀵硅薄瀛樺偍閰嶇疆
*
* @param bo 瀵硅薄瀛樺偍閰嶇疆缂栬緫涓氬姟瀵硅薄
- * @return
+ * @return 缁撴灉
*/
Boolean updateByBo(SysOssConfigBo bo);
@@ -53,7 +52,7 @@
*
* @param ids 涓婚敭闆嗗悎
* @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
- * @return
+ * @return 缁撴灉
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
index 2dfe01f..057c068 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
@@ -19,18 +19,62 @@
*/
public interface ISysOssService {
+ /**
+ * 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
+ *
+ * @param sysOss OSS瀵硅薄瀛樺偍鍒嗛〉鏌ヨ瀵硅薄
+ * @param pageQuery 鍒嗛〉鏌ヨ瀹炰綋绫�
+ * @return 缁撴灉
+ */
TableDataInfo<SysOssVo> queryPageList(SysOssBo sysOss, PageQuery pageQuery);
+ /**
+ * 鏍规嵁涓�缁� ossIds 鑾峰彇瀵瑰簲鐨� SysOssVo 鍒楄〃
+ *
+ * @param ossIds 涓�缁勬枃浠跺湪鏁版嵁搴撲腑鐨勫敮涓�鏍囪瘑闆嗗悎
+ * @return 鍖呭惈 SysOssVo 瀵硅薄鐨勫垪琛�
+ */
List<SysOssVo> listByIds(Collection<Long> ossIds);
+ /**
+ * 鏍规嵁 ossId 浠庣紦瀛樻垨鏁版嵁搴撲腑鑾峰彇 SysOssVo 瀵硅薄
+ *
+ * @param ossId 鏂囦欢鍦ㄦ暟鎹簱涓殑鍞竴鏍囪瘑
+ * @return SysOssVo 瀵硅薄锛屽寘鍚枃浠朵俊鎭�
+ */
SysOssVo getById(Long ossId);
+ /**
+ * 涓婁紶 MultipartFile 鍒板璞″瓨鍌ㄦ湇鍔★紝骞朵繚瀛樻枃浠朵俊鎭埌鏁版嵁搴�
+ *
+ * @param file 瑕佷笂浼犵殑 MultipartFile 瀵硅薄
+ * @return 涓婁紶鎴愬姛鍚庣殑 SysOssVo 瀵硅薄锛屽寘鍚枃浠朵俊鎭�
+ */
SysOssVo upload(MultipartFile file);
+ /**
+ * 涓婁紶鏂囦欢鍒板璞″瓨鍌ㄦ湇鍔★紝骞朵繚瀛樻枃浠朵俊鎭埌鏁版嵁搴�
+ *
+ * @param file 瑕佷笂浼犵殑鏂囦欢瀵硅薄
+ * @return 涓婁紶鎴愬姛鍚庣殑 SysOssVo 瀵硅薄锛屽寘鍚枃浠朵俊鎭�
+ */
SysOssVo upload(File file);
+ /**
+ * 鏂囦欢涓嬭浇鏂规硶锛屾敮鎸佷竴娆℃�т笅杞藉畬鏁存枃浠�
+ *
+ * @param ossId OSS瀵硅薄ID
+ * @param response HttpServletResponse瀵硅薄锛岀敤浜庤缃搷搴斿ご鍜屽悜瀹㈡埛绔彂閫佹枃浠跺唴瀹�
+ */
void download(Long ossId, HttpServletResponse response) throws IOException;
+ /**
+ * 鍒犻櫎OSS瀵硅薄瀛樺偍
+ *
+ * @param ids OSS瀵硅薄ID涓�
+ * @param isValid 鍒ゆ柇鏄惁闇�瑕佹牎楠�
+ * @return 缁撴灉
+ */
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
index a5a28cb..19334f2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
@@ -206,8 +206,8 @@
/**
* 閫氳繃閮ㄩ棬id鏌ヨ褰撳墠閮ㄩ棬鎵�鏈夌敤鎴�
*
- * @param deptId
- * @return
+ * @param deptId 閮ㄩ棬id
+ * @return 缁撴灉
*/
List<SysUserVo> selectUserListByDept(Long deptId);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java
index db71710..9c930a0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java
@@ -59,10 +59,10 @@
final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent"));
final String ip = ServletUtils.getClientIP(request);
// 瀹㈡埛绔俊鎭�
- String clientid = request.getHeader(LoginHelper.CLIENT_KEY);
+ String clientId = request.getHeader(LoginHelper.CLIENT_KEY);
SysClientVo client = null;
- if (StringUtils.isNotBlank(clientid)) {
- client = clientService.queryByClientId(clientid);
+ if (StringUtils.isNotBlank(clientId)) {
+ client = clientService.queryByClientId(clientId);
}
String address = AddressUtils.getRealAddressByIP(ip);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 565995d..1df221c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.OssService;
@@ -25,8 +27,6 @@
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
import org.dromara.system.service.ISysOssService;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.NotNull;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.MediaType;
@@ -36,7 +36,10 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* 鏂囦欢涓婁紶 鏈嶅姟灞傚疄鐜�
@@ -49,6 +52,13 @@
private final SysOssMapper baseMapper;
+ /**
+ * 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
+ *
+ * @param bo OSS瀵硅薄瀛樺偍鍒嗛〉鏌ヨ瀵硅薄
+ * @param pageQuery 鍒嗛〉鏌ヨ瀹炰綋绫�
+ * @return 缁撴灉
+ */
@Override
public TableDataInfo<SysOssVo> queryPageList(SysOssBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysOss> lqw = buildQueryWrapper(bo);
@@ -58,6 +68,12 @@
return TableDataInfo.build(result);
}
+ /**
+ * 鏍规嵁涓�缁� ossIds 鑾峰彇瀵瑰簲鐨� SysOssVo 鍒楄〃
+ *
+ * @param ossIds 涓�缁勬枃浠跺湪鏁版嵁搴撲腑鐨勫敮涓�鏍囪瘑闆嗗悎
+ * @return 鍖呭惈 SysOssVo 瀵硅薄鐨勫垪琛�
+ */
@Override
public List<SysOssVo> listByIds(Collection<Long> ossIds) {
List<SysOssVo> list = new ArrayList<>();
@@ -75,6 +91,12 @@
return list;
}
+ /**
+ * 鏍规嵁涓�缁� ossIds 鑾峰彇瀵瑰簲鏂囦欢鐨� URL 鍒楄〃
+ *
+ * @param ossIds 浠ラ�楀彿鍒嗛殧鐨� ossId 瀛楃涓�
+ * @return 浠ラ�楀彿鍒嗛殧鐨勬枃浠� URL 瀛楃涓�
+ */
@Override
public String selectUrlByIds(String ossIds) {
List<String> list = new ArrayList<>();
@@ -107,12 +129,25 @@
return lqw;
}
+ /**
+ * 鏍规嵁 ossId 浠庣紦瀛樻垨鏁版嵁搴撲腑鑾峰彇 SysOssVo 瀵硅薄
+ *
+ * @param ossId 鏂囦欢鍦ㄦ暟鎹簱涓殑鍞竴鏍囪瘑
+ * @return SysOssVo 瀵硅薄锛屽寘鍚枃浠朵俊鎭�
+ */
@Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId")
@Override
public SysOssVo getById(Long ossId) {
return baseMapper.selectVoById(ossId);
}
+
+ /**
+ * 鏂囦欢涓嬭浇鏂规硶锛屾敮鎸佷竴娆℃�т笅杞藉畬鏁存枃浠�
+ *
+ * @param ossId OSS瀵硅薄ID
+ * @param response HttpServletResponse瀵硅薄锛岀敤浜庤缃搷搴斿ご鍜屽悜瀹㈡埛绔彂閫佹枃浠跺唴瀹�
+ */
@Override
public void download(Long ossId, HttpServletResponse response) throws IOException {
SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId);
@@ -122,7 +157,7 @@
FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
OssClient storage = OssFactory.instance(sysOss.getService());
- try(InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) {
+ try (InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) {
int available = inputStream.available();
IoUtil.copy(inputStream, response.getOutputStream(), available);
response.setContentLength(available);
@@ -131,6 +166,13 @@
}
}
+ /**
+ * 涓婁紶 MultipartFile 鍒板璞″瓨鍌ㄦ湇鍔★紝骞朵繚瀛樻枃浠朵俊鎭埌鏁版嵁搴�
+ *
+ * @param file 瑕佷笂浼犵殑 MultipartFile 瀵硅薄
+ * @return 涓婁紶鎴愬姛鍚庣殑 SysOssVo 瀵硅薄锛屽寘鍚枃浠朵俊鎭�
+ * @throws ServiceException 濡傛灉涓婁紶杩囩▼涓彂鐢熷紓甯革紝鍒欐姏鍑� ServiceException 寮傚父
+ */
@Override
public SysOssVo upload(MultipartFile file) {
String originalfileName = file.getOriginalFilename();
@@ -146,6 +188,12 @@
return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
}
+ /**
+ * 涓婁紶鏂囦欢鍒板璞″瓨鍌ㄦ湇鍔★紝骞朵繚瀛樻枃浠朵俊鎭埌鏁版嵁搴�
+ *
+ * @param file 瑕佷笂浼犵殑鏂囦欢瀵硅薄
+ * @return 涓婁紶鎴愬姛鍚庣殑 SysOssVo 瀵硅薄锛屽寘鍚枃浠朵俊鎭�
+ */
@Override
public SysOssVo upload(File file) {
String originalfileName = file.getName();
@@ -169,6 +217,13 @@
return this.matchingUrl(sysOssVo);
}
+ /**
+ * 鍒犻櫎OSS瀵硅薄瀛樺偍
+ *
+ * @param ids OSS瀵硅薄ID涓�
+ * @param isValid 鍒ゆ柇鏄惁闇�瑕佹牎楠�
+ * @return 缁撴灉
+ */
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
@@ -183,7 +238,7 @@
}
/**
- * 鍖归厤Url
+ * 妗剁被鍨嬩负 private 鐨刄RL 淇敼涓轰复鏃禪RL鏃堕暱涓�120s
*
* @param oss OSS瀵硅薄
* @return oss 鍖归厤Url鐨凮SS瀵硅薄
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index 5dcd683..70da652 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -524,8 +524,8 @@
/**
* 閫氳繃閮ㄩ棬id鏌ヨ褰撳墠閮ㄩ棬鎵�鏈夌敤鎴�
*
- * @param deptId
- * @return
+ * @param deptId 閮ㄩ棬ID
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
public List<SysUserVo> selectUserListByDept(Long deptId) {
@@ -535,6 +535,12 @@
return baseMapper.selectVoList(lqw);
}
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛璐︽埛
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 鐢ㄦ埛璐︽埛
+ */
@Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
@Override
public String selectUserNameById(Long userId) {
@@ -543,6 +549,12 @@
return ObjectUtil.isNull(sysUser) ? null : sysUser.getUserName();
}
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛璐︽埛
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 鐢ㄦ埛璐︽埛
+ */
@Override
@Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId")
public String selectNicknameById(Long userId) {
@@ -550,4 +562,30 @@
.select(SysUser::getNickName).eq(SysUser::getUserId, userId));
return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName();
}
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵嬫満鍙�
+ *
+ * @param userId 鐢ㄦ埛id
+ * @return 鐢ㄦ埛鎵嬫満鍙�
+ */
+ @Override
+ public String selectPhonenumberById(Long userId) {
+ SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId));
+ return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber();
+ }
+
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛閭
+ *
+ * @param userId 鐢ㄦ埛id
+ * @return 鐢ㄦ埛閭
+ */
+ @Override
+ public String selectEmailById(Long userId) {
+ SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getEmail).eq(SysUser::getUserId, userId));
+ return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail();
+ }
+
}
--
Gitblit v1.9.3