gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】【sys】更新包依赖

pull/57/head
fengshuonan 2023-06-18 09:24:48 +08:00
parent 6365ec535d
commit 32a7d63233
7 changed files with 55 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/pojo/vo/SysFileInfoRes.java
View File

@ -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();
}

17
kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java
View File

@ -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<SysLoginLogMapper, SysLoginLog> 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<SysLoginLogMapper, SysLo
BeanUtil.copyProperties(record, sysLoginLogDto);
// 填充用户姓名
SysUserDTO userInfoByUserId = userServiceApi.getUserInfoByUserId(sysLoginLogDto.getUserId());
SimpleUserDTO userInfoByUserId = sysUserServiceApi.getUserInfoByUserId(sysLoginLogDto.getUserId());
if (userInfoByUserId != null) {
sysLoginLogDto.setUserName(userInfoByUserId.getRealName());
}
sysLoginLogDtos.add(sysLoginLogDto);
}
return PageResultFactory.createPageResult(sysLoginLogDtos, page.getTotal(), Convert.toInt(page.getSize()), Convert.toInt(page.getCurrent()));
return PageResultFactory.createPageResult(sysLoginLogDtos, page.getTotal(), Convert.toInt(page.getSize()),
Convert.toInt(page.getCurrent()));
}
@Override
@ -163,7 +164,7 @@ public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLo
private SysLoginLog querySysLoginLogById(SysLoginLogRequest sysLoginLogRequest) {
SysLoginLog sysLoginLog = this.getById(sysLoginLogRequest.getLlgId());
if (ObjectUtil.isNull(sysLoginLog)) {
throw new ServiceException(LogExceptionEnum.LOG_NOT_EXIST);
throw new LogException(LogExceptionEnum.LOG_NOT_EXISTED, sysLoginLogRequest.getLlgId());
}
return sysLoginLog;
}

10
kernel-d-sms/sms-business-validation/src/main/java/cn/stylefeng/roses/kernel/sms/modular/service/impl/SysSmsInfoServiceImpl.java
View File

@ -31,6 +31,7 @@ import cn.hutool.core.util.StrUtil;
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.rule.exception.base.ServiceException;
import cn.stylefeng.roses.kernel.security.api.ImageCaptchaApi;
import cn.stylefeng.roses.kernel.sms.api.SmsSenderApi;
import cn.stylefeng.roses.kernel.sms.api.exception.SmsException;
@ -44,7 +45,6 @@ import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsInfoParam;
import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsSendParam;
import cn.stylefeng.roses.kernel.sms.modular.param.SysSmsVerifyParam;
import cn.stylefeng.roses.kernel.sms.modular.service.SysSmsInfoService;
import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException;
import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -83,10 +83,10 @@ public class SysSmsInfoServiceImpl extends ServiceImpl<SysSmsMapper, SysSms> 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<String, Object> params = sysSmsSendParam.getParams();
@ -114,7 +114,9 @@ public class SysSmsInfoServiceImpl extends ServiceImpl<SysSmsMapper, SysSms> 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);

4
kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/entity/SysTimers.java
View File

@ -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();
}

9
kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java
View File

@ -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;
}

16
kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java
View File

@ -115,4 +115,20 @@ public interface SysUserServiceApi {
*/
boolean getUserSuperAdminFlag(Long userId);
/**
* 查询所有的用户id集合
*
* @author fengshuonan
* @since 2023/6/18 9:05
*/
List<Long> queryAllUserIdList();
/**
* 判断用户是否存在
*
* @author fengshuonan
* @since 2023/6/18 9:06
*/
Boolean userExist(Long userId);
}

16
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java
View File

@ -226,4 +226,20 @@ public class UserIntegrationService implements SysUserServiceApi {
return YesOrNotEnum.Y.getCode().equals(result.getSuperAdminFlag());
}
@Override
public List<Long> queryAllUserIdList() {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.select(SysUser::getUserId);
List<SysUser> list = this.sysUserService.list(sysUserLambdaQueryWrapper);
return list.stream().map(SysUser::getUserId).collect(Collectors.toList());
}
@Override
public Boolean userExist(Long userId) {
LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysUser::getUserId, userId);
long count = this.sysUserService.count(wrapper);
return count > 0;
}
}