diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java index 603d7ae35..59cfcdd3a 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java @@ -27,7 +27,7 @@ package cn.stylefeng.roses.kernel.file.modular.pojo.vo; import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse; import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat; import cn.stylefeng.roses.kernel.rule.enums.FormatTypeEnum; -import cn.stylefeng.roses.kernel.system.api.format.UserFormatProcess; +import cn.stylefeng.roses.kernel.sys.api.format.UserNameFormatProcess; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,7 +42,7 @@ import lombok.EqualsAndHashCode; public class SysFileInfoRes extends SysFileInfoResponse { @Override - @SimpleFieldFormat(formatType = FormatTypeEnum.ADD_FIELD, processClass = UserFormatProcess.class) + @SimpleFieldFormat(formatType = FormatTypeEnum.ADD_FIELD, processClass = UserNameFormatProcess.class) public Long getUploadUserId() { return super.getUploadUserId(); } diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java index ee17e1cc6..295e95b0b 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java @@ -33,13 +33,13 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.log.api.LoginLogServiceApi; +import cn.stylefeng.roses.kernel.log.api.exception.LogException; +import cn.stylefeng.roses.kernel.log.api.exception.enums.LogExceptionEnum; import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogDto; import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; -import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; -import cn.stylefeng.roses.kernel.system.api.UserServiceApi; -import cn.stylefeng.roses.kernel.system.api.exception.enums.log.LogExceptionEnum; -import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; +import cn.stylefeng.roses.kernel.sys.api.SysUserServiceApi; +import cn.stylefeng.roses.kernel.sys.api.pojo.user.SimpleUserDTO; import cn.stylefeng.roses.kernel.system.modular.loginlog.constants.LoginLogConstant; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; import cn.stylefeng.roses.kernel.system.modular.loginlog.mapper.SysLoginLogMapper; @@ -63,7 +63,7 @@ import java.util.Date; public class SysLoginLogServiceImpl extends ServiceImpl implements SysLoginLogService, LoginLogServiceApi { @Resource - private UserServiceApi userServiceApi; + private SysUserServiceApi sysUserServiceApi; @Override public void del(SysLoginLogRequest sysLoginLogRequest) { @@ -88,14 +88,15 @@ public class SysLoginLogServiceImpl extends ServiceImpl imp String verKey = sysSmsSendParam.getVerKey(); String verCode = sysSmsSendParam.getVerCode(); if (StrUtil.isEmpty(verKey) || StrUtil.isEmpty(verCode)) { - throw new SystemModularException(ValidatorExceptionEnum.CAPTCHA_EMPTY); + throw new ServiceException(ValidatorExceptionEnum.CAPTCHA_EMPTY); } if (!captchaApi.validateCaptcha(verKey, verCode)) { - throw new SystemModularException(ValidatorExceptionEnum.CAPTCHA_ERROR); + throw new ServiceException(ValidatorExceptionEnum.CAPTCHA_ERROR); } Map params = sysSmsSendParam.getParams(); @@ -114,7 +114,9 @@ public class SysSmsInfoServiceImpl extends ServiceImpl imp // 4. 存储短信到数据库 Long smsId = this.saveSmsInfo(sysSmsSendParam, validateCode); - log.info("开始发送短信：发送的电话号码= " + sysSmsSendParam.getPhone() + ",发送的模板号=" + sysSmsSendParam.getTemplateCode() + "，发送的参数是：" + JSON.toJSONString(params)); + log.info( + "开始发送短信：发送的电话号码= " + sysSmsSendParam.getPhone() + ",发送的模板号=" + sysSmsSendParam.getTemplateCode() + "，发送的参数是：" + JSON.toJSONString( + params)); // 5. 发送短信 smsSenderApi.sendSms(sysSmsSendParam.getPhone(), sysSmsSendParam.getTemplateCode(), params); diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java index 096bf63a2..76edb0726 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java @@ -27,7 +27,7 @@ package cn.stylefeng.roses.kernel.timer.modular.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat; -import cn.stylefeng.roses.kernel.system.api.format.UserFormatProcess; +import cn.stylefeng.roses.kernel.sys.api.format.UserNameFormatProcess; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -100,7 +100,7 @@ public class SysTimers extends BaseEntity { private String delFlag; @Override - @SimpleFieldFormat(processClass = UserFormatProcess.class) + @SimpleFieldFormat(processClass = UserNameFormatProcess.class) public Long getCreateUser() { return super.getCreateUser(); } diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java index 8cc1a0492..598d6a3a5 100644 --- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java @@ -44,8 +44,7 @@ import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.socket.api.SocketOperatorApi; import cn.stylefeng.roses.kernel.socket.api.enums.ServerMessageTypeEnum; import cn.stylefeng.roses.kernel.socket.api.exception.SocketException; -import cn.stylefeng.roses.kernel.system.api.UserServiceApi; -import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.sys.api.SysUserServiceApi; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -69,7 +68,7 @@ public class MessageDbServiceImpl implements MessageApi { private SocketOperatorApi socketOperatorApi; @Resource - private UserServiceApi userServiceApi; + private SysUserServiceApi sysUserServiceApi; @Resource private SysMessageService sysMessageService; @@ -87,7 +86,7 @@ public class MessageDbServiceImpl implements MessageApi { // 发送所有人判断 if (MessageConstants.RECEIVE_ALL_USER_FLAG.equals(receiveUserIds)) { // 查询所有用户 - userIds = userServiceApi.queryAllUserIdList(new SysUserRequest()); + userIds = sysUserServiceApi.queryAllUserIdList(); } else { String[] userIdArr = receiveUserIds.split(","); userIds = Convert.toList(Long.class, userIdArr); @@ -102,7 +101,7 @@ public class MessageDbServiceImpl implements MessageApi { for (Long userId : userIdSet) { // 判断用户是否存在 - if (!userServiceApi.userExist(userId)) { + if (!sysUserServiceApi.userExist(userId)) { continue; } diff --git a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java index fa954b5c8..d1550cf2e 100644 --- a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java +++ b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java @@ -115,4 +115,20 @@ public interface SysUserServiceApi { */ boolean getUserSuperAdminFlag(Long userId); + /** + * 查询所有的用户id集合 + * + * @author fengshuonan + * @since 2023/6/18 9:05 + */ + List queryAllUserIdList(); + + /** + * 判断用户是否存在 + * + * @author fengshuonan + * @since 2023/6/18 9:06 + */ + Boolean userExist(Long userId); + } diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java index 2226a2abe..fe6b00a0e 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java @@ -226,4 +226,20 @@ public class UserIntegrationService implements SysUserServiceApi { return YesOrNotEnum.Y.getCode().equals(result.getSuperAdminFlag()); } + @Override + public List queryAllUserIdList() { + LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sysUserLambdaQueryWrapper.select(SysUser::getUserId); + List list = this.sysUserService.list(sysUserLambdaQueryWrapper); + return list.stream().map(SysUser::getUserId).collect(Collectors.toList()); + } + + @Override + public Boolean userExist(Long userId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysUser::getUserId, userId); + long count = this.sysUserService.count(wrapper); + return count > 0; + } + }