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

Merge branch 'rose_guns_7.0.4-develop' into 7.0.4-develop

pull/17/head
feng.ling 2021-05-21 16:40:58 +08:00
parent cdb074427e 422a1a2e81
commit 158c4b5a61
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/factory/DruidDatasourceFactory.java
View File

@ -79,7 +79,7 @@ public class DruidDatasourceFactory {
dataSource.setMaxPoolPreparedStatementPerConnectionSize(druidProperties.getMaxPoolPreparedStatementPerConnectionSize());
// 检测连接是否有效的sql
if (StrUtil.isEmpty(druidProperties.getUrl())) {
if (StrUtil.isNotEmpty(druidProperties.getUrl())) {
dataSource.setValidationQuery(getValidateQueryByUrl(druidProperties.getUrl()));
}

14
kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java
View File

@ -76,26 +76,26 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
@Override
public SysMessage detail(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> queryWrapper = this.createWrapper(messageRequest);
LambdaQueryWrapper<SysMessage> queryWrapper = this.createWrapper(messageRequest, true);
return this.getOne(queryWrapper, false);
}
@Override
public PageResult<SysMessage> findPage(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest);
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest, true);
Page<SysMessage> page = this.page(PageFactory.defaultPage(), wrapper);
return PageResultFactory.createPageResult(page);
}
@Override
public List<SysMessage> findList(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest);
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest, true);
return this.list(wrapper);
}
@Override
public Integer findCount(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest);
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest, false);
return this.count(wrapper);
}
@ -119,14 +119,16 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
* @author liuhanqing
* @date 2021/1/8 14:16
*/
private LambdaQueryWrapper<SysMessage> createWrapper(MessageRequest messageRequest) {
private LambdaQueryWrapper<SysMessage> createWrapper(MessageRequest messageRequest, boolean needOrderBy) {
LambdaQueryWrapper<SysMessage> queryWrapper = new LambdaQueryWrapper<>();
// 查询未删除的
queryWrapper.ne(SysMessage::getDelFlag, YesOrNotEnum.Y.getCode());
// 按发送事件倒序
queryWrapper.orderByDesc(SysMessage::getMessageSendTime);
if (needOrderBy) {
queryWrapper.orderByDesc(SysMessage::getMessageSendTime);
}
if (ObjectUtil.isEmpty(messageRequest)) {
return queryWrapper;

12
kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml
View File

@ -2,16 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMenuButtonMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenuButton">
<id column="role_button_id" property="roleButtonId"/>
<result column="role_id" property="roleId"/>
<result column="button_id" property="buttonId"/>
<result column="button_code" property="buttonCode"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
</resultMap>
</mapper>