From f39be3ab9b6bfdb6836ee400323047089a0266b6 Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 19 Jun 2020 18:17:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91=E7=9A=84@?= =?UTF-8?q?=20Override?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java | 3 +++ .../framework/config/FastJson2JsonRedisSerializer.java | 2 ++ .../monitor/service/impl/SysOperLogServiceImpl.java | 1 + .../java/com/ruoyi/project/system/domain/SysRole.java | 1 + .../project/system/service/impl/SysConfigServiceImpl.java | 1 + .../system/service/impl/SysDictDataServiceImpl.java | 1 + .../system/service/impl/SysDictTypeServiceImpl.java | 3 +++ .../project/system/service/impl/SysMenuServiceImpl.java | 1 + .../project/system/service/impl/SysNoticeServiceImpl.java | 1 + .../project/system/service/impl/SysPostServiceImpl.java | 2 ++ .../project/system/service/impl/SysRoleServiceImpl.java | 6 ++++++ .../system/service/impl/SysUserOnlineServiceImpl.java | 1 + .../project/system/service/impl/SysUserServiceImpl.java | 5 ++++- .../project/tool/gen/service/GenTableServiceImpl.java | 8 ++++++-- 14 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java index 9e1bbeb..fa74297 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java @@ -376,6 +376,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return UUID 的哈希码值。 */ + @Override public int hashCode() { long hilo = mostSigBits ^ leastSigBits; @@ -391,6 +392,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false} */ + @Override public boolean equals(Object obj) { if ((null == obj) || (obj.getClass() != UUID.class)) @@ -414,6 +416,7 @@ public final class UUID implements java.io.Serializable, Comparable * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。 * */ + @Override public int compareTo(UUID val) { // The ordering is intentionally set up so that the UUIDs diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java index b623cae..56bbdbf 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java @@ -36,6 +36,7 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer this.clazz = clazz; } + @Override public byte[] serialize(T t) throws SerializationException { if (t == null) @@ -45,6 +46,7 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET); } + @Override public T deserialize(byte[] bytes) throws SerializationException { if (bytes == null || bytes.length <= 0) diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java index 65193dd..954bc08 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java @@ -47,6 +47,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService * @param operIds 需要删除的操作日志ID * @return 结果 */ + @Override public int deleteOperLogByIds(Long[] operIds) { return operLogMapper.deleteOperLogByIds(operIds); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java index ca33e32..677c2e4 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java @@ -178,6 +178,7 @@ public class SysRole extends BaseEntity this.deptIds = deptIds; } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("roleId", getRoleId()) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java index e0b008c..88f5475 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java @@ -147,6 +147,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 清空缓存数据 */ + @Override public void clearCache() { Collection keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java index 05c2a8d..065a2ce 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java @@ -62,6 +62,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService * @param dictCodes 需要删除的字典数据ID * @return 结果 */ + @Override public int deleteDictDataByIds(Long[] dictCodes) { int row = dictDataMapper.deleteDictDataByIds(dictCodes); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java index 4f6f4c5..10fe23b 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java @@ -107,6 +107,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * @param dictType 字典类型 * @return 字典类型 */ + @Override public SysDictType selectDictTypeByType(String dictType) { return dictTypeMapper.selectDictTypeByType(dictType); @@ -118,6 +119,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * @param dictIds 需要删除的字典ID * @return 结果 */ + @Override public int deleteDictTypeByIds(Long[] dictIds) { for (Long dictId : dictIds) @@ -139,6 +141,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 清空缓存数据 */ + @Override public void clearCache() { DictUtils.clearDictCache(); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java index 56900ef..e5dda00 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java @@ -121,6 +121,7 @@ public class SysMenuServiceImpl implements ISysMenuService * @param roleId 角色ID * @return 选中菜单列表 */ + @Override public List selectMenuListByRoleId(Long roleId) { return menuMapper.selectMenuListByRoleId(roleId); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java index 8d0f372..2b0191d 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java @@ -84,6 +84,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService * @param noticeIds 需要删除的公告ID * @return 结果 */ + @Override public int deleteNoticeByIds(Long[] noticeIds) { return noticeMapper.deleteNoticeByIds(noticeIds); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java index e60dc06..b013cbb 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java @@ -66,6 +66,7 @@ public class SysPostServiceImpl implements ISysPostService * @param userId 用户ID * @return 选中岗位ID列表 */ + @Override public List selectPostListByUserId(Long userId) { return postMapper.selectPostListByUserId(userId); @@ -138,6 +139,7 @@ public class SysPostServiceImpl implements ISysPostService * @return 结果 * @throws Exception 异常 */ + @Override public int deletePostByIds(Long[] postIds) { for (Long postId : postIds) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java index 077d1ac..71f3c66 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java @@ -81,6 +81,7 @@ public class SysRoleServiceImpl implements ISysRoleService * * @return 角色列表 */ + @Override public List selectRoleAll() { return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); @@ -92,6 +93,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param userId 用户ID * @return 选中角色ID列表 */ + @Override public List selectRoleListByUserId(Long userId) { return roleMapper.selectRoleListByUserId(userId); @@ -103,6 +105,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param roleId 角色ID * @return 角色对象信息 */ + @Override public SysRole selectRoleById(Long roleId) { return roleMapper.selectRoleById(roleId); @@ -149,6 +152,7 @@ public class SysRoleServiceImpl implements ISysRoleService * * @param role 角色信息 */ + @Override public void checkRoleAllowed(SysRole role) { if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) @@ -207,6 +211,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param role 角色信息 * @return 结果 */ + @Override public int updateRoleStatus(SysRole role) { return roleMapper.updateRole(role); @@ -296,6 +301,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @param roleIds 需要删除的角色ID * @return 结果 */ + @Override public int deleteRoleByIds(Long[] roleIds) { for (Long roleId : roleIds) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java index 756b20e..fb45b80 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java @@ -72,6 +72,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService * @param user 用户信息 * @return 在线用户 */ + @Override public SysUserOnline loginUserToUserOnline(LoginUser user) { if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser())) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java index 77affcb..28788e4 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java @@ -192,6 +192,7 @@ public class SysUserServiceImpl implements ISysUserService * * @param user 用户信息 */ + @Override public void checkUserAllowed(SysUser user) { if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) @@ -268,10 +269,11 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户头像 * - * @param userId 用户ID + * @param userName 用户名 * @param avatar 头像地址 * @return 结果 */ + @Override public boolean updateUserAvatar(String userName, String avatar) { return userMapper.updateUserAvatar(userName, avatar) > 0; @@ -376,6 +378,7 @@ public class SysUserServiceImpl implements ISysUserService * @param userIds 需要删除的用户ID * @return 结果 */ + @Override public int deleteUserByIds(Long[] userIds) { for (Long userId : userIds) diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java index c9fda50..bd551ad 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java @@ -80,6 +80,7 @@ public class GenTableServiceImpl implements IGenTableService * @param genTable 业务信息 * @return 数据库表集合 */ + @Override public List selectDbTableList(GenTable genTable) { return genTableMapper.selectDbTableList(genTable); @@ -91,6 +92,7 @@ public class GenTableServiceImpl implements IGenTableService * @param tableNames 表名称组 * @return 数据库表集合 */ + @Override public List selectDbTableListByNames(String[] tableNames) { return genTableMapper.selectDbTableListByNames(tableNames); @@ -121,7 +123,7 @@ public class GenTableServiceImpl implements IGenTableService /** * 删除业务对象 * - * @param ids 需要删除的数据ID + * @param tableIds 需要删除的数据ID * @return 结果 */ @Override @@ -173,6 +175,7 @@ public class GenTableServiceImpl implements IGenTableService * @param tableId 表编号 * @return 预览数据列表 */ + @Override public Map previewCode(Long tableId) { Map dataMap = new LinkedHashMap<>(); @@ -277,6 +280,7 @@ public class GenTableServiceImpl implements IGenTableService * * @param genTable 业务信息 */ + @Override public void validateEdit(GenTable genTable) { if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) @@ -301,7 +305,7 @@ public class GenTableServiceImpl implements IGenTableService /** * 设置主键列信息 * - * @param genTable 业务表信息 + * @param table 业务表信息 * @param columns 业务字段列表 */ public void setPkColumn(GenTable table, List columns)