diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 8db94dab..5bfcb059 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -9,6 +9,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.*; /** @@ -21,7 +22,7 @@ import java.util.*; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_dept") -public class SysDept +public class SysDept implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index eb81dea2..43ed6e0f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -11,6 +11,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -25,13 +26,13 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_dict_data") -public class SysDictData +public class SysDictData implements Serializable { private static final long serialVersionUID = 1L; /** 字典编码 */ @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) - @TableId(value = "dept_code",type = IdType.AUTO) + @TableId(value = "dict_code",type = IdType.AUTO) private Long dictCode; /** 字典排序 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index 09ca5f11..af2dca8a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -10,6 +10,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -23,8 +24,8 @@ import java.util.Map; @Data @NoArgsConstructor @Accessors(chain = true) -@TableName("sys_config") -public class SysDictType +@TableName("sys_dict_type") +public class SysDictType implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index 17e706d8..aa60c2d7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -8,6 +8,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.*; /** @@ -20,7 +21,7 @@ import java.util.*; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_menu") -public class SysMenu +public class SysMenu implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 5c86436d..ba89becc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -10,6 +10,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -24,7 +25,7 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_role") -public class SysRole +public class SysRole implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 73a05616..f39fd234 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -15,6 +15,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -30,7 +31,7 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_user") -public class SysUser +public class SysUser implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java index fb9c7f7b..ea5e05b2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -2,14 +2,7 @@ package com.ruoyi.framework.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator; -import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; -import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; -import com.baomidou.mybatisplus.core.injector.ISqlInjector; -import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.IllegalSQLInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.ruoyi.framework.mybatisplus.CreateAndUpdateMetaObjectHandler; @@ -29,7 +22,7 @@ public class MybatisPlusConfig { // 乐观锁插件 interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); // 阻断插件 - interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); +// interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); return interceptor; } @@ -58,9 +51,9 @@ public class MybatisPlusConfig { * 如果是对全表的删除或更新操作,就会终止该操作 * https://baomidou.com/guide/interceptor-block-attack.html */ - public BlockAttackInnerInterceptor blockAttackInnerInterceptor() { - return new BlockAttackInnerInterceptor(); - } +// public BlockAttackInnerInterceptor blockAttackInnerInterceptor() { +// return new BlockAttackInnerInterceptor(); +// } /** * sql性能规范插件(垃圾SQL拦截) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index a9314909..547e8961 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -10,6 +10,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -24,7 +25,7 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_config") -public class SysConfig { +public class SysConfig implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index 22fb8436..3182bc4c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -11,6 +11,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -25,7 +26,7 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_logininfor") -public class SysLogininfor { +public class SysLogininfor implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index a78636db..1efabf56 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -8,6 +8,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -21,7 +22,7 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_notice") -public class SysNotice { +public class SysNotice implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 87deccf1..03e5d26f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -11,6 +11,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -25,7 +26,7 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_oper_log") -public class SysOperLog { +public class SysOperLog implements Serializable { private static final long serialVersionUID = 1L; /** @@ -50,6 +51,7 @@ public class SysOperLog { /** * 业务类型数组 */ + @TableField(exist = false) private Integer[] businessTypes; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index cafd0a7d..5957ed9c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -10,6 +10,7 @@ import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -24,7 +25,7 @@ import java.util.Map; @NoArgsConstructor @Accessors(chain = true) @TableName("sys_post") -public class SysPost { +public class SysPost implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index fcc71f59..8658318b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -3,41 +3,11 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.SysLogininfor; -import java.util.List; - /** * 系统访问日志情况信息 数据层 * * @author ruoyi */ public interface SysLogininforMapper extends BaseMapper { - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - public void insertLogininfor(SysLogininfor logininfor); - /** - * 查询系统登录日志集合 - * - * @param logininfor 访问日志对象 - * @return 登录记录集合 - */ - public List selectLogininforList(SysLogininfor logininfor); - - /** - * 批量删除系统登录日志 - * - * @param infoIds 需要删除的登录日志ID - * @return 结果 - */ - public int deleteLogininforByIds(Long[] infoIds); - - /** - * 清空系统登录日志 - * - * @return 结果 - */ - public int cleanLogininfor(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index c1c0e424..9fe7165e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -3,59 +3,11 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.SysNotice; -import java.util.List; - /** * 通知公告表 数据层 * * @author ruoyi */ public interface SysNoticeMapper extends BaseMapper { - /** - * 查询公告信息 - * - * @param noticeId 公告ID - * @return 公告信息 - */ - public SysNotice selectNoticeById(Long noticeId); - /** - * 查询公告列表 - * - * @param notice 公告信息 - * @return 公告集合 - */ - public List selectNoticeList(SysNotice notice); - - /** - * 新增公告 - * - * @param notice 公告信息 - * @return 结果 - */ - public int insertNotice(SysNotice notice); - - /** - * 修改公告 - * - * @param notice 公告信息 - * @return 结果 - */ - public int updateNotice(SysNotice notice); - - /** - * 批量删除公告 - * - * @param noticeId 公告ID - * @return 结果 - */ - public int deleteNoticeById(Long noticeId); - - /** - * 批量删除公告信息 - * - * @param noticeIds 需要删除的公告ID - * @return 结果 - */ - public int deleteNoticeByIds(Long[] noticeIds); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index 6caf429e..d2bae7de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -3,47 +3,11 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.SysOperLog; -import java.util.List; - /** * 操作日志 数据层 * * @author ruoyi */ public interface SysOperLogMapper extends BaseMapper { - /** - * 新增操作日志 - * - * @param operLog 操作日志对象 - */ - public void insertOperlog(SysOperLog operLog); - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - public List selectOperLogList(SysOperLog operLog); - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - public int deleteOperLogByIds(Long[] operIds); - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - public SysOperLog selectOperLogById(Long operId); - - /** - * 清空操作日志 - */ - public void cleanOperLog(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index b02a07c4..d15facd7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -11,28 +11,6 @@ import java.util.List; * @author ruoyi */ public interface SysPostMapper extends BaseMapper { - /** - * 查询岗位数据集合 - * - * @param post 岗位信息 - * @return 岗位数据集合 - */ - public List selectPostList(SysPost post); - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - public List selectPostAll(); - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - public SysPost selectPostById(Long postId); /** * 根据用户ID获取岗位选择框列表 @@ -50,51 +28,4 @@ public interface SysPostMapper extends BaseMapper { */ public List selectPostsByUserName(String userName); - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - public int deletePostById(Long postId); - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - */ - public int deletePostByIds(Long[] postIds); - - /** - * 修改岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int updatePost(SysPost post); - - /** - * 新增岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int insertPost(SysPost post); - - /** - * 校验岗位名称 - * - * @param postName 岗位名称 - * @return 结果 - */ - public SysPost checkPostNameUnique(String postName); - - /** - * 校验岗位编码 - * - * @param postCode 岗位编码 - * @return 结果 - */ - public SysPost checkPostCodeUnique(String postCode); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index 56ceb314..10302702 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -19,14 +19,6 @@ public interface SysUserPostMapper extends BaseMapper { */ public int deleteUserPostByUserId(Long userId); - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - public int countUserPostById(Long postId); - /** * 批量删除用户和岗位关联 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 4acfeb3e..d5aeec2e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -91,10 +91,10 @@ public class SysConfigServiceImpl extends ServiceImpl params = config.getParams(); - lqw.apply(params.get("beginTime") != null, + lqw.apply(Validator.isNotEmpty(params.get("beginTime")), "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')", params.get("beginTime")); - lqw.apply(params.get("endTime") != null, + lqw.apply(Validator.isNotEmpty(params.get("endTime")), "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')", params.get("endTime")); return baseMapper.selectList(lqw); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 79a09e97..e554c001 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -32,8 +32,6 @@ import java.util.stream.Collectors; */ @Service public class SysDeptServiceImpl extends ServiceImpl implements ISysDeptService { - @Autowired - private SysDeptMapper deptMapper; @Autowired private SysRoleMapper roleMapper; @@ -109,7 +107,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public List selectDeptListByRoleId(Long roleId) { SysRole role = roleMapper.selectRoleById(roleId); - return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); + return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 935311cd..1949d305 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,8 +30,6 @@ import java.util.Map; */ @Service public class SysDictTypeServiceImpl extends ServiceImpl implements ISysDictTypeService { - @Autowired - private SysDictTypeMapper dictTypeMapper; @Autowired private SysDictDataMapper dictDataMapper; @@ -45,7 +44,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl dictDatas = dictDataMapper.selectList( new LambdaQueryWrapper() .eq(SysDictData::getStatus, 0) - .eq(SysDictData::getDictType, dictType) + .eq(SysDictData::getDictType, dictType.getDictType()) .orderByAsc(SysDictData::getDictSort)); DictUtils.setDictCache(dictType.getDictType(), dictDatas); } @@ -61,13 +60,13 @@ public class SysDictTypeServiceImpl extends ServiceImpl selectDictTypeList(SysDictType dictType) { Map params = dictType.getParams(); return list(new LambdaQueryWrapper() - .like(SysDictType::getDictName, dictType.getDictName()) - .eq(SysDictType::getStatus, dictType.getStatus()) - .like(SysDictType::getDictType, dictType.getDictType()) - .apply(params.get("beginTime") != null, + .like(StrUtil.isNotBlank(dictType.getDictName()),SysDictType::getDictName, dictType.getDictName()) + .eq(StrUtil.isNotBlank(dictType.getStatus()),SysDictType::getStatus, dictType.getStatus()) + .like(StrUtil.isNotBlank(dictType.getDictType()),SysDictType::getDictType, dictType.getDictType()) + .apply(Validator.isNotEmpty(params.get("beginTime")), "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')", params.get("beginTime")) - .apply(params.get("endTime") != null, + .apply(Validator.isNotEmpty(params.get("endTime")), "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')", params.get("endTime"))); } @@ -165,7 +164,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl 0) { DictUtils.clearDictCache(); } @@ -185,7 +184,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl() .set(SysDictData::getDictType, dictType.getDictType()) .eq(SysDictData::getDictType, oldDict.getDictType())); - int row = dictTypeMapper.updateById(dictType); + int row = baseMapper.updateById(dictType); if (row > 0) { DictUtils.clearDictCache(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 10ec41c5..8acb14f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -1,13 +1,17 @@ package com.ruoyi.system.service.impl; +import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.mapper.SysLogininforMapper; import com.ruoyi.system.service.ISysLogininforService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; +import java.util.Map; /** * 系统访问日志情况信息 服务层处理 @@ -17,9 +21,6 @@ import java.util.List; @Service public class SysLogininforServiceImpl extends ServiceImpl implements ISysLogininforService { - @Autowired - private SysLogininforMapper logininforMapper; - /** * 新增系统登录日志 * @@ -27,7 +28,7 @@ public class SysLogininforServiceImpl extends ServiceImpl selectLogininforList(SysLogininfor logininfor) { - return logininforMapper.selectLogininforList(logininfor); + Map params = logininfor.getParams(); + return list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(logininfor.getIpaddr()),SysLogininfor::getIpaddr,logininfor.getIpaddr()) + .eq(StrUtil.isNotBlank(logininfor.getStatus()),SysLogininfor::getStatus,logininfor.getStatus()) + .like(StrUtil.isNotBlank(logininfor.getUserName()),SysLogininfor::getUserName,logininfor.getUserName()) + .apply(Validator.isNotEmpty(params.get("beginTime")), + "date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')", + params.get("beginTime")) + .apply(Validator.isNotEmpty(params.get("endTime")), + "date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d'", + params.get("endTime")) + .orderByDesc(SysLogininfor::getInfoId)); } /** @@ -49,7 +61,7 @@ public class SysLogininforServiceImpl extends ServiceImpl()); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index abd4a173..04184d71 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -1,13 +1,15 @@ package com.ruoyi.system.service.impl; -import java.util.List; - +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.mapper.SysNoticeMapper; import com.ruoyi.system.service.ISysNoticeService; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; /** * 公告 服务层实现 @@ -16,8 +18,6 @@ import com.ruoyi.system.service.ISysNoticeService; */ @Service public class SysNoticeServiceImpl extends ServiceImpl implements ISysNoticeService { - @Autowired - private SysNoticeMapper noticeMapper; /** * 查询公告信息 @@ -27,7 +27,7 @@ public class SysNoticeServiceImpl extends ServiceImpl selectNoticeList(SysNotice notice) { - return noticeMapper.selectNoticeList(notice); + return list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(notice.getNoticeTitle()),SysNotice::getNoticeTitle,notice.getNoticeTitle()) + .eq(StrUtil.isNotBlank(notice.getNoticeType()),SysNotice::getNoticeType,notice.getNoticeType()) + .like(StrUtil.isNotBlank(notice.getCreateBy()),SysNotice::getCreateBy,notice.getCreateBy())); } /** @@ -49,7 +52,7 @@ public class SysNoticeServiceImpl extends ServiceImpl implements ISysOperLogService { - @Autowired - private SysOperLogMapper operLogMapper; /** * 新增操作日志 @@ -26,7 +29,7 @@ public class SysOperLogServiceImpl extends ServiceImpl selectOperLogList(SysOperLog operLog) { - return operLogMapper.selectOperLogList(operLog); + Map params = operLog.getParams(); + return list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(operLog.getTitle()),SysOperLog::getTitle,operLog.getTitle()) + .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, + SysOperLog::getBusinessType,operLog.getBusinessType()) + .func(f -> { + if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())){ + f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); + } + }) + .eq(operLog.getStatus() != null && operLog.getStatus() > 0, + SysOperLog::getStatus,operLog.getStatus()) + .like(StrUtil.isNotBlank(operLog.getOperName()),SysOperLog::getOperName,operLog.getOperName()) + .apply(Validator.isNotEmpty(params.get("beginTime")), + "date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')", + params.get("beginTime")) + .apply(Validator.isNotEmpty(params.get("endTime")), + "date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d'", + params.get("endTime")) + .orderByDesc(SysOperLog::getOperId)); } /** @@ -48,7 +70,7 @@ public class SysOperLogServiceImpl extends ServiceImpl()); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index 71035b9e..7d37faba 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -1,16 +1,20 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.exception.CustomException; import com.ruoyi.system.domain.SysPost; +import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.mapper.SysPostMapper; import com.ruoyi.system.mapper.SysUserPostMapper; import com.ruoyi.system.service.ISysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** @@ -20,8 +24,6 @@ import java.util.List; */ @Service public class SysPostServiceImpl extends ServiceImpl implements ISysPostService { - @Autowired - private SysPostMapper postMapper; @Autowired private SysUserPostMapper userPostMapper; @@ -34,7 +36,10 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public List selectPostList(SysPost post) { - return postMapper.selectPostList(post); + return list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode()) + .eq(StrUtil.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus()) + .like(StrUtil.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName())); } /** @@ -44,7 +49,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public List selectPostAll() { - return postMapper.selectPostAll(); + return list(); } /** @@ -55,7 +60,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public SysPost selectPostById(Long postId) { - return postMapper.selectPostById(postId); + return getById(postId); } /** @@ -66,7 +71,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public List selectPostListByUserId(Long userId) { - return postMapper.selectPostListByUserId(userId); + return baseMapper.selectPostListByUserId(userId); } /** @@ -78,7 +83,8 @@ public class SysPostServiceImpl extends ServiceImpl impl @Override public String checkPostNameUnique(SysPost post) { Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostNameUnique(post.getPostName()); + SysPost info = getOne(new LambdaQueryWrapper() + .eq(SysPost::getPostName, post.getPostName()).last("limit 1")); if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -94,7 +100,8 @@ public class SysPostServiceImpl extends ServiceImpl impl @Override public String checkPostCodeUnique(SysPost post) { Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); + SysPost info = getOne(new LambdaQueryWrapper() + .eq(SysPost::getPostCode, post.getPostCode()).last("limit 1")); if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -109,7 +116,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public int countUserPostById(Long postId) { - return userPostMapper.countUserPostById(postId); + return userPostMapper.selectCount(new LambdaQueryWrapper().eq(SysUserPost::getPostId,postId)); } /** @@ -120,7 +127,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public int deletePostById(Long postId) { - return postMapper.deletePostById(postId); + return baseMapper.deleteById(postId); } /** @@ -138,7 +145,7 @@ public class SysPostServiceImpl extends ServiceImpl impl throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName())); } } - return postMapper.deletePostByIds(postIds); + return baseMapper.deleteBatchIds(Arrays.asList(postIds)); } /** @@ -149,7 +156,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public int insertPost(SysPost post) { - return postMapper.insertPost(post); + return baseMapper.insert(post); } /** @@ -160,6 +167,6 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public int updatePost(SysPost post) { - return postMapper.updatePost(post); + return baseMapper.updateById(post); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index add7d539..a2e38bfb 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -16,42 +16,4 @@ - - insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) - values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) - - - - - - delete from sys_logininfor where info_id in - - #{infoId} - - - - - truncate table sys_logininfor - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 9ae9fe03..be3cd085 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -17,84 +17,4 @@ - - select notice_id, - notice_title, - notice_type, - cast(notice_content as char) as notice_content, - status, - create_by, - create_time, - update_by, - update_time, - remark - from sys_notice - - - - - - - - insert into sys_notice ( - notice_title, - notice_type, - notice_content, - status, - remark, - create_by, - create_time - )values( - #{noticeTitle}, - #{noticeType}, - #{noticeContent}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - update sys_notice - - notice_title = #{noticeTitle}, - notice_type = #{noticeType}, - notice_content = #{noticeContent}, - status = #{status}, - update_by = #{updateBy}, - update_time = sysdate() - - where notice_id = #{noticeId} - - - - delete - from sys_notice - where notice_id = #{noticeId} - - - - delete from sys_notice where notice_id in - - #{noticeId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index e6166ca2..9d40c6d9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -23,79 +23,4 @@ - - select oper_id, - title, - business_type, - method, - request_method, - operator_type, - oper_name, - dept_name, - oper_url, - oper_ip, - oper_location, - oper_param, - json_result, - status, - error_msg, - oper_time - from sys_oper_log - - - - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, - oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, - oper_time) - values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, - #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate()) - - - - - - delete from sys_oper_log where oper_id in - - #{operId} - - - - - - - truncate table sys_oper_log - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 4cefa34d..c009a6cf 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -29,30 +29,6 @@ from sys_post - - - - - - - - - - - - update sys_post - - post_code = #{postCode}, - post_name = #{postName}, - post_sort = #{postSort}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where post_id = #{postId} - - - - insert into sys_post( - post_id, - post_code, - post_name, - post_sort, - status, - remark, - create_by, - create_time - )values( - #{postId}, - #{postCode}, - #{postName}, - #{postSort}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - delete - from sys_post - where post_id = #{postId} - - - - delete from sys_post where post_id in - - #{postId} - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 4b420b1f..c893dcfc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -15,12 +15,6 @@ where user_id = #{userId} - - delete from sys_user_post where user_id in