From 700d0bdb308d1c417fb038024b59b5b9097bf030 Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Sun, 10 Jan 2021 18:38:52 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E3=80=90sysUser=E3=80=91=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=AF=86=E7=A0=81=E6=96=B9=E6=B3=95=20=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E6=8C=AA=E8=87=B3?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/auth/api/expander/AuthConfigExpander.java | 10 ---------- .../kernel/system/expander/SystemConfigExpander.java | 12 ++++++++++++ .../modular/user/factory/SysUserCreateFactory.java | 4 ++-- .../user/service/impl/SysUserServiceImpl.java | 8 ++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java index 3f7cc22aa..e98e28c51 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java @@ -110,16 +110,6 @@ public class AuthConfigExpander { return ConfigContext.me().getSysConfigValueWithDefault("SYS_AUTH_PARAM_NAME", String.class, DEFAULT_AUTH_PARAM_NAME); } - /** - * 获取默认密码 - * - * @author luojie - * @date 2020/11/6 10:05 - */ - public static String getDefaultPassWord() { - return ConfigContext.me().getSysConfigValueWithDefault("SYS_DEFAULT_PASSWORD", String.class, DEFAULT_PASSWORD); - } - /** * 会话信息是否增加保存在 cookie 中 *

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/expander/SystemConfigExpander.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/expander/SystemConfigExpander.java index 55065acc2..094b3b841 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/expander/SystemConfigExpander.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/expander/SystemConfigExpander.java @@ -3,6 +3,8 @@ package cn.stylefeng.roses.kernel.system.expander; import cn.stylefeng.roses.kernel.config.api.context.ConfigContext; import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import static cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants.DEFAULT_PASSWORD; + /** * 系统的一些基础信息 * @@ -51,4 +53,14 @@ public class SystemConfigExpander { return ConfigContext.me().getSysConfigValueWithDefault("SYS_SYSTEM_NAME", String.class, SystemConstants.DEFAULT_SYSTEM_NAME); } + /** + * 获取默认密码 + * + * @author luojie + * @date 2020/11/6 10:05 + */ + public static String getDefaultPassWord() { + return ConfigContext.me().getSysConfigValueWithDefault("SYS_DEFAULT_PASSWORD", String.class, DEFAULT_PASSWORD); + } + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java index 998782767..8d80c0815 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java @@ -3,11 +3,11 @@ package cn.stylefeng.roses.kernel.system.modular.user.factory; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; -import cn.stylefeng.roses.kernel.auth.api.expander.AuthConfigExpander; import cn.stylefeng.roses.kernel.auth.api.password.PasswordStoredEncryptApi; import cn.stylefeng.roses.kernel.rule.enums.SexEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.system.enums.UserStatusEnum; +import cn.stylefeng.roses.kernel.system.expander.SystemConfigExpander; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; @@ -36,7 +36,7 @@ public class SysUserCreateFactory { // 密码为空则设置为默认密码 PasswordStoredEncryptApi passwordStoredEncryptApi = SpringUtil.getBean(PasswordStoredEncryptApi.class); if (ObjectUtil.isEmpty(sysUser.getPassword())) { - String defaultPassword = AuthConfigExpander.getDefaultPassWord(); + String defaultPassword = SystemConfigExpander.getDefaultPassWord(); sysUser.setPassword(passwordStoredEncryptApi.encrypt(defaultPassword)); } else { // 密码不为空，则将密码加密存储到库中 diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index 05d8e0c50..d349ba32b 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.auth.api.SessionManagerApi; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; -import cn.stylefeng.roses.kernel.auth.api.expander.AuthConfigExpander; import cn.stylefeng.roses.kernel.auth.api.password.PasswordStoredEncryptApi; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleUserInfo; @@ -22,14 +21,13 @@ import cn.stylefeng.roses.kernel.system.RoleServiceApi; import cn.stylefeng.roses.kernel.system.enums.UserStatusEnum; import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; +import cn.stylefeng.roses.kernel.system.expander.SystemConfigExpander; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; import cn.stylefeng.roses.kernel.system.modular.user.factory.SysUserCreateFactory; import cn.stylefeng.roses.kernel.system.modular.user.factory.UserLoginInfoFactory; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserMapper; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService; @@ -37,8 +35,10 @@ import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService; import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeResponse; import cn.stylefeng.roses.kernel.system.pojo.role.response.SysRoleResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse; import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; +import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.util.DataScopeUtil; import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -209,7 +209,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser sysUser = this.querySysUser(sysUserRequest); // 获取系统配置的默认密码 - String password = AuthConfigExpander.getDefaultPassWord(); + String password = SystemConfigExpander.getDefaultPassWord(); sysUser.setPassword(passwordStoredEncryptApi.encrypt(password)); this.updateById(sysUser); From adb94b92772e6a648948258b32ca164305a25fa4 Mon Sep 17 00:00:00 2001 From: TSQ <1970742763@qq.com> Date: Tue, 12 Jan 2021 13:42:14 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-d-log/log-business-manage/pom.xml | 7 +++++++ .../controller/LogManagerController.java | 20 ++++++++++++++++++ .../log/db/DbLogManagerServiceImpl.java | 2 +- .../kernel/log/db/service/SysLogService.java | 11 ++++++++++ .../db/service/impl/SysLogServiceImpl.java | 21 +++++++++++++++++++ 5 files changed, 60 insertions(+), 1 deletion(-) diff --git a/kernel-d-log/log-business-manage/pom.xml b/kernel-d-log/log-business-manage/pom.xml index e80709c5b..8333eb481 100644 --- a/kernel-d-log/log-business-manage/pom.xml +++ b/kernel-d-log/log-business-manage/pom.xml @@ -48,6 +48,13 @@ 1.0.0 + + + cn.stylefeng.roses + log-sdk-db + 1.0.0 + + org.springframework.boot diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java index 0f775fcd7..1cbca2532 100644 --- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java +++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java @@ -2,11 +2,13 @@ package cn.stylefeng.roses.kernel.log.modular.manage.controller; import cn.stylefeng.roses.kernel.log.api.LogManagerApi; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam; +import cn.stylefeng.roses.kernel.log.db.service.SysLogService; import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -28,6 +30,11 @@ public class LogManagerController { */ @Resource private LogManagerApi logManagerApi; + /** + * 日志管理service + */ + @Resource + private SysLogService sysLogService; /** * 查询日志列表 @@ -63,4 +70,17 @@ public class LogManagerController { return new SuccessResponseData(); } + /** + * 查看日志详情 + * + * @param + * @return + * @author TSQ + * @date 2021/1/11 17:36 + */ + @GetResource(name = "查看日志详情", path = "/logManager/detail") + public ResponseData detail(@Validated(LogManagerParam.detail.class) LogManagerParam logManagerParam) { + return new SuccessResponseData(sysLogService.detail(logManagerParam)); + } + } diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java index af66704c3..4ec3589ac 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java @@ -181,7 +181,7 @@ public class DbLogManagerServiceImpl implements LogManagerApi { // 开始时间为空则用当天时间开始时间 if (StrUtil.isEmpty(logManagerParam.getBeginDateTime())) { - String beginDateTime = DateUtil.beginOfDay(DateUtil.date()).toString(DatePattern.NORM_DATETIME_FORMAT); + String beginDateTime = DateUtil.beginOfDay(DateUtil.parse("2021-01-01 00:00:00")).toString(DatePattern.NORM_DATETIME_FORMAT); logManagerParam.setBeginDateTime(beginDateTime); } diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java index 0c0215f57..7a920e568 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.log.db.service; +import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam; import cn.stylefeng.roses.kernel.log.db.entity.SysLog; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +12,14 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface SysLogService extends IService { + /** + * 查看日志详情 + * + * @param + * @return + * @author TSQ + * @date 2021/1/11 17:51 + */ + SysLog detail(LogManagerParam logManagerParam); + } diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java index 1eaace865..5bd4b645b 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java @@ -1,5 +1,8 @@ package cn.stylefeng.roses.kernel.log.db.service.impl; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam; import cn.stylefeng.roses.kernel.log.db.entity.SysLog; import cn.stylefeng.roses.kernel.log.db.mapper.SysLogMapper; import cn.stylefeng.roses.kernel.log.db.service.SysLogService; @@ -15,4 +18,22 @@ import org.springframework.stereotype.Service; @Service public class SysLogServiceImpl extends ServiceImpl implements SysLogService { + @Override + public SysLog detail(LogManagerParam logManagerParam) { + return this.querySysLog(logManagerParam); + } + + /** + * 查询日志详细信息 + * + * @param + * @return + * @author TSQ + * @date 2021/1/11 17:54 + */ + private SysLog querySysLog(LogManagerParam logManagerParam) { + SysLog hrOrganization = this.getById(logManagerParam.getLogId()); + return hrOrganization; + } + } From eceec0401eddd76be5bc37e41dbc239c5447dfab Mon Sep 17 00:00:00 2001 From: TSQ <1970742763@qq.com> Date: Tue, 12 Jan 2021 14:02:40 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/modular/manage/controller/LogManagerController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java index 1cbca2532..a0f5922bb 100644 --- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java +++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java @@ -8,7 +8,6 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; From 51fd74b889abe856a2c4568a18edc71a68f1ec88 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 12 Jan 2021 18:46:43 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=90menu=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E4=B8=AAauth=E4=B8=BA=E7=A9=BA=E5=BA=94=E4=B8=BAnull?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/menu/modular/factory/AntdMenusFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java index 46b99226d..2d97e03be 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java @@ -47,7 +47,7 @@ public class AntdMenusFactory { // 填充哪个角色绑定了这个菜单 List roles = antdSysMenuResponse.getRoles(); AuthorityItem authorityItem = new AuthorityItem(); - if (roles != null) { + if (roles != null && roles.size() > 0) { ArrayList auths = new ArrayList<>(); for (SimpleRoleInfo role : roles) { auths.add(role.getRoleCode()); From dcf4a0bf36efc7b385fa00619c772879ce0984ea Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Tue, 12 Jan 2021 19:55:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E3=80=90SysUserRule=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=88=86=E9=85=8D?= =?UTF-8?q?=E8=A7=92=E8=89=B2ID=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/user/pojo/response/SysUserResponse.java | 5 +++++ .../modular/user/service/SysUserRoleService.java | 10 ++++++++++ .../user/service/impl/SysUserRoleServiceImpl.java | 11 ++++++++++- .../modular/user/service/impl/SysUserServiceImpl.java | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java index 8403d336e..1c5875cff 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; +import java.util.List; /** * 系统用户结果 @@ -80,4 +81,8 @@ public class SysUserResponse { */ private Integer statusFlag; + /** + * 用户角色id + */ + private List grantRoleIdList; } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java index c0f2552cc..19ebf8518 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java @@ -23,6 +23,16 @@ public interface SysUserRoleService extends IService { */ List getUserRoles(Long userId); + /** + * 获取账号绑定的角色id集合 + * + * @param userId 用户id + * @return 角色id集合 + * @author chenjinlong + * @date 2021/1/12 19:42 + */ + List getUserRoleIds(Long userId); + /** * 给某个用户授权角色 * diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java index 25e8bbc00..cd769ecf4 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java @@ -4,8 +4,8 @@ import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserRoleMapper; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; +import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 系统用户角色service接口实现类 @@ -37,6 +38,14 @@ public class SysUserRoleServiceImpl extends ServiceImpl getUserRoleIds(Long userId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysUserRole::getUserId, userId); + List list = this.list(wrapper); + return list.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); + } + @Override @Transactional(rollbackFor = Exception.class) public void grantRole(SysUserRequest sysUserRequest) { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index d349ba32b..2579c73ab 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -313,6 +313,9 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUserResponse.setOrgId(userOrgInfo.getOrgId()); sysUserResponse.setPositionId(userOrgInfo.getPositionId()); + // 获取用户角色信息 + sysUserResponse.setGrantRoleIdList(sysUserRoleService.getUserRoleIds(sysUser.getUserId())); + return sysUserResponse; } From ffc37d9259a6b6010f4e4f611e24a318ab83fd34 Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Tue, 12 Jan 2021 20:55:45 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E3=80=90SysUserMapper=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E5=AD=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/modular/user/mapper/mapping/SysUserMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml index 7aa78a465..09c7154c1 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml @@ -22,16 +22,16 @@ left join sys_user_org suorg on suser.user_id = suorg.user_id - and sys_user.real_name like concat('%',#{sysUserRequest.realName},'%') + and suser.real_name like concat('%',#{sysUserRequest.realName},'%') - and sys_user.account like concat('%',#{sysUserRequest.account},'%') + and suser.account like concat('%',#{sysUserRequest.account},'%') - and sys_user.status_flag like concat('%',#{sysUserRequest.statusFlag},'%') + and suser.status_flag like concat('%',#{sysUserRequest.statusFlag},'%') - and suorg.org_id = #{sysUserRequest.orgId} + and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or org_id=#{sysUserRequest.orgId}) and suser.del_flag = 'N' order by suser.create_time desc From 5df222138976b5306eb56231491a122913705f5c Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 12 Jan 2021 21:08:20 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E3=80=90user=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/modular/user/service/impl/SysUserServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index e159f26f2..abd580125 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -576,6 +576,11 @@ public class SysUserServiceImpl extends ServiceImpl impl LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (ObjectUtil.isNotNull(sysUserRequest)) { + // 组装账号的查询条件 + if (ObjectUtil.isNotEmpty(sysUserRequest.getUserId())) { + queryWrapper.eq(SysUser::getUserId, sysUserRequest.getUserId()); + } + // 组装账号的查询条件 if (ObjectUtil.isNotEmpty(sysUserRequest.getAccount())) { queryWrapper.like(SysUser::getAccount, sysUserRequest.getAccount()); From 3c0a528f31ea1edcc6b49d107e336139fe7028fa Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 12 Jan 2021 21:08:43 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=90timer=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/timer/api/TimerExeService.java | 16 +++++++ .../modular/listener/TaskRunListener.java | 47 +++++++++++++++++++ .../hutool/HutoolTimerExeServiceImpl.java | 14 ++++++ .../main/resources/META-INF/spring.factories | 4 +- 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java diff --git a/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/TimerExeService.java b/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/TimerExeService.java index 7ab977b51..81d5d296d 100644 --- a/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/TimerExeService.java +++ b/kernel-d-timer/timer-api/src/main/java/cn/stylefeng/roses/kernel/timer/api/TimerExeService.java @@ -8,6 +8,22 @@ package cn.stylefeng.roses.kernel.timer.api; */ public interface TimerExeService { + /** + * 开启定时器调度 + * + * @author fengshuonan + * @date 2021/1/12 20:33 + */ + void start(); + + /** + * 关闭定时器调度 + * + * @author fengshuonan + * @date 2021/1/12 20:33 + */ + void stop(); + /** * 启动一个定时器 *

diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java new file mode 100644 index 000000000..710150c98 --- /dev/null +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java @@ -0,0 +1,47 @@ +package cn.stylefeng.roses.kernel.timer.modular.listener; + +import cn.hutool.extra.spring.SpringUtil; +import cn.stylefeng.roses.kernel.timer.api.TimerExeService; +import cn.stylefeng.roses.kernel.timer.api.enums.TimerJobStatusEnum; +import cn.stylefeng.roses.kernel.timer.modular.entity.SysTimers; +import cn.stylefeng.roses.kernel.timer.modular.param.SysTimersParam; +import cn.stylefeng.roses.kernel.timer.modular.service.SysTimersService; +import org.springframework.boot.context.event.ApplicationStartedEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.core.Ordered; + +import java.util.List; + +/** + * 项目启动，将数据库所有定时任务开启 + * + * @author fengshuonan + * @date 2021/1/12 20:40 + */ +public class TaskRunListener implements ApplicationListener, Ordered { + + @Override + public void onApplicationEvent(ApplicationStartedEvent event) { + + SysTimersService sysTimersService = SpringUtil.getBean(SysTimersService.class); + TimerExeService timerExeService = SpringUtil.getBean(TimerExeService.class); + + // 开启任务调度 + timerExeService.start(); + + // 获取数据库所有开启状态的任务 + SysTimersParam sysTimersParam = new SysTimersParam(); + sysTimersParam.setJobStatus(TimerJobStatusEnum.RUNNING.getCode()); + List list = sysTimersService.list(sysTimersParam); + + // 添加定时任务到调度器 + for (SysTimers sysTimers : list) { + timerExeService.startTimer(String.valueOf(sysTimers.getTimerId()), sysTimers.getCron(), sysTimers.getActionClass()); + } + } + + @Override + public int getOrder() { + return LOWEST_PRECEDENCE; + } +} diff --git a/kernel-d-timer/timer-sdk-hutool/src/main/java/cn/stylefeng/roses/kernel/hutool/HutoolTimerExeServiceImpl.java b/kernel-d-timer/timer-sdk-hutool/src/main/java/cn/stylefeng/roses/kernel/hutool/HutoolTimerExeServiceImpl.java index 7d9c7f44e..4f240eec9 100644 --- a/kernel-d-timer/timer-sdk-hutool/src/main/java/cn/stylefeng/roses/kernel/hutool/HutoolTimerExeServiceImpl.java +++ b/kernel-d-timer/timer-sdk-hutool/src/main/java/cn/stylefeng/roses/kernel/hutool/HutoolTimerExeServiceImpl.java @@ -19,6 +19,20 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class HutoolTimerExeServiceImpl implements TimerExeService { + @Override + public void start() { + // 设置秒级别的启用 + CronUtil.setMatchSecond(true); + + // 启动定时器执行器 + CronUtil.start(); + } + + @Override + public void stop() { + CronUtil.stop(); + } + @Override public void startTimer(String taskId, String cron, String className) { diff --git a/kernel-d-timer/timer-spring-boot-starter/src/main/resources/META-INF/spring.factories b/kernel-d-timer/timer-spring-boot-starter/src/main/resources/META-INF/spring.factories index f409a39e5..cca2bad7e 100644 --- a/kernel-d-timer/timer-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/kernel-d-timer/timer-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.stylefeng.roses.kernel.timer.starter.GunsTimerAutoConfiguration \ No newline at end of file + cn.stylefeng.roses.kernel.timer.starter.GunsTimerAutoConfiguration +org.springframework.context.ApplicationListener=\ + cn.stylefeng.roses.kernel.timer.modular.listener.TaskRunListener From 34a8da547716b3cc7363cd2d158953f1dbf82d1a Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 12 Jan 2021 21:53:07 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=90log=E3=80=91=E6=95=B4=E7=90=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/LogManagerController.java | 3 +-- .../kernel/log/db/DbLogManagerServiceImpl.java | 13 ------------- .../roses/kernel/log/db/service/SysLogService.java | 2 -- .../log/db/service/impl/SysLogServiceImpl.java | 7 +------ 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java index a0f5922bb..1aeb2d94e 100644 --- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java +++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java @@ -29,6 +29,7 @@ public class LogManagerController { */ @Resource private LogManagerApi logManagerApi; + /** * 日志管理service */ @@ -72,8 +73,6 @@ public class LogManagerController { /** * 查看日志详情 * - * @param - * @return * @author TSQ * @date 2021/1/11 17:36 */ diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java index 4ec3589ac..d90a1234a 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java @@ -1,8 +1,6 @@ package cn.stylefeng.roses.kernel.log.db; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; @@ -179,17 +177,6 @@ public class DbLogManagerServiceImpl implements LogManagerApi { logManagerParam.setPageSize(DEFAULT_PAGE_SIZE); } - // 开始时间为空则用当天时间开始时间 - if (StrUtil.isEmpty(logManagerParam.getBeginDateTime())) { - String beginDateTime = DateUtil.beginOfDay(DateUtil.parse("2021-01-01 00:00:00")).toString(DatePattern.NORM_DATETIME_FORMAT); - logManagerParam.setBeginDateTime(beginDateTime); - } - - // 结束时间为空则默认用当前时间加一天 - if (StrUtil.isEmpty(logManagerParam.getEndDateTime())) { - String endDateTime = DateUtil.beginOfDay(DateUtil.tomorrow()).toString(DatePattern.NORM_DATETIME_FORMAT); - logManagerParam.setEndDateTime(endDateTime); - } } } diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java index 7a920e568..7441e79f9 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java @@ -15,8 +15,6 @@ public interface SysLogService extends IService { /** * 查看日志详情 * - * @param - * @return * @author TSQ * @date 2021/1/11 17:51 */ diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java index 5bd4b645b..f660fe6f0 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java @@ -1,7 +1,5 @@ package cn.stylefeng.roses.kernel.log.db.service.impl; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam; import cn.stylefeng.roses.kernel.log.db.entity.SysLog; import cn.stylefeng.roses.kernel.log.db.mapper.SysLogMapper; @@ -26,14 +24,11 @@ public class SysLogServiceImpl extends ServiceImpl impleme /** * 查询日志详细信息 * - * @param - * @return * @author TSQ * @date 2021/1/11 17:54 */ private SysLog querySysLog(LogManagerParam logManagerParam) { - SysLog hrOrganization = this.getById(logManagerParam.getLogId()); - return hrOrganization; + return this.getById(logManagerParam.getLogId()); } } From bdd25530130737844efbd767fa476a676e0ad563 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 12 Jan 2021 21:56:29 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=90menu=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/pojo/menu/SysMenuRequest.java | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java index 0545aadbd..997a82f76 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java @@ -6,8 +6,6 @@ import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -78,48 +76,46 @@ public class SysMenuRequest extends BaseRequest { @NotNull(message = "排序不能为空", groups = {add.class, edit.class}) private BigDecimal menuSort; - /** - * 图标 - */ - private String icon; - - /** - * 路由地址 - */ - private String router; - - /** - * 组件地址 - */ - private String component; - - /** - * 外部链接打开方式：1-内置外链，2-新页面外链 - */ - @Min(value = 1, message = "打开方式格式错误，请检查openType参数", groups = {add.class, edit.class}) - @Max(value = 2, message = "打开方式格式错误，请检查openType参数", groups = {add.class, edit.class}) - private Integer linkOpenType; - - /** - * 外部链接地址 - */ - private String linkUrl; - /** * 备注 */ private String remark; /** - * 菜单的路径，适用于layui-beetl版本 + * 菜单的路径（适用于layui-beetl版本） */ private String layuiPath; /** - * 菜单的图标，适用于layui-beetl版本 + * 菜单的图标（适用于layui-beetl版本） */ private String layuiIcon; + /** + * 路由地址，浏览器显示的URL，例如/menu（适用于antd vue版本） + */ + private String antdvRouter; + + /** + * 图标（适用于antd vue版本） + */ + private String antdvIcon; + + /** + * 前端组件名（适用于antd vue版本） + */ + private String antdvComponent; + + /** + * 外部链接打开方式：1-内置打开外链，2-新页面外链（适用于antd vue版本） + */ + private Integer antdvLinkOpenType; + + /** + * 外部链接地址（适用于antd vue版本） + */ + private String antdvLinkUrl; + /** * 获取主页左侧菜单列表（适配Antd Vue的版本） */ From c4aed67af7889538aab4f6419f7218fe47cb48bb Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 12 Jan 2021 22:14:28 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=90log=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/log/db/DbLogManagerServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java index d90a1234a..87679d3cf 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java @@ -104,7 +104,9 @@ public class DbLogManagerServiceImpl implements LogManagerApi { private void createQueryCondition(LogManagerParam logManagerParam, LambdaQueryWrapper sysLogLambdaQueryWrapper) { // 设置查询条件的起始时间和结束时间 - sysLogLambdaQueryWrapper.between(SysLog::getCreateTime, logManagerParam.getBeginDateTime(), logManagerParam.getEndDateTime()); + if (StrUtil.isNotBlank(logManagerParam.getBeginDateTime()) && StrUtil.isNotBlank(logManagerParam.getEndDateTime())) { + sysLogLambdaQueryWrapper.between(SysLog::getCreateTime, logManagerParam.getBeginDateTime(), logManagerParam.getEndDateTime()); + } // 根据日志名称查询 String name = logManagerParam.getLogName();