正在显示
14 个修改的文件
包含
33 行增加
和
3 行删除
| @@ -376,6 +376,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> | @@ -376,6 +376,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> | ||
| 376 | * | 376 | * |
| 377 | * @return UUID 的哈希码值。 | 377 | * @return UUID 的哈希码值。 |
| 378 | */ | 378 | */ |
| 379 | + @Override | ||
| 379 | public int hashCode() | 380 | public int hashCode() |
| 380 | { | 381 | { |
| 381 | long hilo = mostSigBits ^ leastSigBits; | 382 | long hilo = mostSigBits ^ leastSigBits; |
| @@ -391,6 +392,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> | @@ -391,6 +392,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> | ||
| 391 | * | 392 | * |
| 392 | * @return 如果对象相同,则返回 {@code true};否则返回 {@code false} | 393 | * @return 如果对象相同,则返回 {@code true};否则返回 {@code false} |
| 393 | */ | 394 | */ |
| 395 | + @Override | ||
| 394 | public boolean equals(Object obj) | 396 | public boolean equals(Object obj) |
| 395 | { | 397 | { |
| 396 | if ((null == obj) || (obj.getClass() != UUID.class)) | 398 | if ((null == obj) || (obj.getClass() != UUID.class)) |
| @@ -414,6 +416,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> | @@ -414,6 +416,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> | ||
| 414 | * @return 在此 UUID 小于、等于或大于 val 时,分别返回 -1、0 或 1。 | 416 | * @return 在此 UUID 小于、等于或大于 val 时,分别返回 -1、0 或 1。 |
| 415 | * | 417 | * |
| 416 | */ | 418 | */ |
| 419 | + @Override | ||
| 417 | public int compareTo(UUID val) | 420 | public int compareTo(UUID val) |
| 418 | { | 421 | { |
| 419 | // The ordering is intentionally set up so that the UUIDs | 422 | // The ordering is intentionally set up so that the UUIDs |
| @@ -36,6 +36,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> | @@ -36,6 +36,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> | ||
| 36 | this.clazz = clazz; | 36 | this.clazz = clazz; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | + @Override | ||
| 39 | public byte[] serialize(T t) throws SerializationException | 40 | public byte[] serialize(T t) throws SerializationException |
| 40 | { | 41 | { |
| 41 | if (t == null) | 42 | if (t == null) |
| @@ -45,6 +46,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> | @@ -45,6 +46,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> | ||
| 45 | return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET); | 46 | return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET); |
| 46 | } | 47 | } |
| 47 | 48 | ||
| 49 | + @Override | ||
| 48 | public T deserialize(byte[] bytes) throws SerializationException | 50 | public T deserialize(byte[] bytes) throws SerializationException |
| 49 | { | 51 | { |
| 50 | if (bytes == null || bytes.length <= 0) | 52 | if (bytes == null || bytes.length <= 0) |
| @@ -47,6 +47,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService | @@ -47,6 +47,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService | ||
| 47 | * @param operIds 需要删除的操作日志ID | 47 | * @param operIds 需要删除的操作日志ID |
| 48 | * @return 结果 | 48 | * @return 结果 |
| 49 | */ | 49 | */ |
| 50 | + @Override | ||
| 50 | public int deleteOperLogByIds(Long[] operIds) | 51 | public int deleteOperLogByIds(Long[] operIds) |
| 51 | { | 52 | { |
| 52 | return operLogMapper.deleteOperLogByIds(operIds); | 53 | return operLogMapper.deleteOperLogByIds(operIds); |
| @@ -178,6 +178,7 @@ public class SysRole extends BaseEntity | @@ -178,6 +178,7 @@ public class SysRole extends BaseEntity | ||
| 178 | this.deptIds = deptIds; | 178 | this.deptIds = deptIds; |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | + @Override | ||
| 181 | public String toString() { | 182 | public String toString() { |
| 182 | return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) | 183 | return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
| 183 | .append("roleId", getRoleId()) | 184 | .append("roleId", getRoleId()) |
| @@ -147,6 +147,7 @@ public class SysConfigServiceImpl implements ISysConfigService | @@ -147,6 +147,7 @@ public class SysConfigServiceImpl implements ISysConfigService | ||
| 147 | /** | 147 | /** |
| 148 | * 清空缓存数据 | 148 | * 清空缓存数据 |
| 149 | */ | 149 | */ |
| 150 | + @Override | ||
| 150 | public void clearCache() | 151 | public void clearCache() |
| 151 | { | 152 | { |
| 152 | Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); | 153 | Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); |
| @@ -62,6 +62,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService | @@ -62,6 +62,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService | ||
| 62 | * @param dictCodes 需要删除的字典数据ID | 62 | * @param dictCodes 需要删除的字典数据ID |
| 63 | * @return 结果 | 63 | * @return 结果 |
| 64 | */ | 64 | */ |
| 65 | + @Override | ||
| 65 | public int deleteDictDataByIds(Long[] dictCodes) | 66 | public int deleteDictDataByIds(Long[] dictCodes) |
| 66 | { | 67 | { |
| 67 | int row = dictDataMapper.deleteDictDataByIds(dictCodes); | 68 | int row = dictDataMapper.deleteDictDataByIds(dictCodes); |
| @@ -107,6 +107,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService | @@ -107,6 +107,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService | ||
| 107 | * @param dictType 字典类型 | 107 | * @param dictType 字典类型 |
| 108 | * @return 字典类型 | 108 | * @return 字典类型 |
| 109 | */ | 109 | */ |
| 110 | + @Override | ||
| 110 | public SysDictType selectDictTypeByType(String dictType) | 111 | public SysDictType selectDictTypeByType(String dictType) |
| 111 | { | 112 | { |
| 112 | return dictTypeMapper.selectDictTypeByType(dictType); | 113 | return dictTypeMapper.selectDictTypeByType(dictType); |
| @@ -118,6 +119,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService | @@ -118,6 +119,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService | ||
| 118 | * @param dictIds 需要删除的字典ID | 119 | * @param dictIds 需要删除的字典ID |
| 119 | * @return 结果 | 120 | * @return 结果 |
| 120 | */ | 121 | */ |
| 122 | + @Override | ||
| 121 | public int deleteDictTypeByIds(Long[] dictIds) | 123 | public int deleteDictTypeByIds(Long[] dictIds) |
| 122 | { | 124 | { |
| 123 | for (Long dictId : dictIds) | 125 | for (Long dictId : dictIds) |
| @@ -139,6 +141,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService | @@ -139,6 +141,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService | ||
| 139 | /** | 141 | /** |
| 140 | * 清空缓存数据 | 142 | * 清空缓存数据 |
| 141 | */ | 143 | */ |
| 144 | + @Override | ||
| 142 | public void clearCache() | 145 | public void clearCache() |
| 143 | { | 146 | { |
| 144 | DictUtils.clearDictCache(); | 147 | DictUtils.clearDictCache(); |
| @@ -121,6 +121,7 @@ public class SysMenuServiceImpl implements ISysMenuService | @@ -121,6 +121,7 @@ public class SysMenuServiceImpl implements ISysMenuService | ||
| 121 | * @param roleId 角色ID | 121 | * @param roleId 角色ID |
| 122 | * @return 选中菜单列表 | 122 | * @return 选中菜单列表 |
| 123 | */ | 123 | */ |
| 124 | + @Override | ||
| 124 | public List<Integer> selectMenuListByRoleId(Long roleId) | 125 | public List<Integer> selectMenuListByRoleId(Long roleId) |
| 125 | { | 126 | { |
| 126 | return menuMapper.selectMenuListByRoleId(roleId); | 127 | return menuMapper.selectMenuListByRoleId(roleId); |
| @@ -84,6 +84,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService | @@ -84,6 +84,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService | ||
| 84 | * @param noticeIds 需要删除的公告ID | 84 | * @param noticeIds 需要删除的公告ID |
| 85 | * @return 结果 | 85 | * @return 结果 |
| 86 | */ | 86 | */ |
| 87 | + @Override | ||
| 87 | public int deleteNoticeByIds(Long[] noticeIds) | 88 | public int deleteNoticeByIds(Long[] noticeIds) |
| 88 | { | 89 | { |
| 89 | return noticeMapper.deleteNoticeByIds(noticeIds); | 90 | return noticeMapper.deleteNoticeByIds(noticeIds); |
| @@ -66,6 +66,7 @@ public class SysPostServiceImpl implements ISysPostService | @@ -66,6 +66,7 @@ public class SysPostServiceImpl implements ISysPostService | ||
| 66 | * @param userId 用户ID | 66 | * @param userId 用户ID |
| 67 | * @return 选中岗位ID列表 | 67 | * @return 选中岗位ID列表 |
| 68 | */ | 68 | */ |
| 69 | + @Override | ||
| 69 | public List<Integer> selectPostListByUserId(Long userId) | 70 | public List<Integer> selectPostListByUserId(Long userId) |
| 70 | { | 71 | { |
| 71 | return postMapper.selectPostListByUserId(userId); | 72 | return postMapper.selectPostListByUserId(userId); |
| @@ -138,6 +139,7 @@ public class SysPostServiceImpl implements ISysPostService | @@ -138,6 +139,7 @@ public class SysPostServiceImpl implements ISysPostService | ||
| 138 | * @return 结果 | 139 | * @return 结果 |
| 139 | * @throws Exception 异常 | 140 | * @throws Exception 异常 |
| 140 | */ | 141 | */ |
| 142 | + @Override | ||
| 141 | public int deletePostByIds(Long[] postIds) | 143 | public int deletePostByIds(Long[] postIds) |
| 142 | { | 144 | { |
| 143 | for (Long postId : postIds) | 145 | for (Long postId : postIds) |
| @@ -81,6 +81,7 @@ public class SysRoleServiceImpl implements ISysRoleService | @@ -81,6 +81,7 @@ public class SysRoleServiceImpl implements ISysRoleService | ||
| 81 | * | 81 | * |
| 82 | * @return 角色列表 | 82 | * @return 角色列表 |
| 83 | */ | 83 | */ |
| 84 | + @Override | ||
| 84 | public List<SysRole> selectRoleAll() | 85 | public List<SysRole> selectRoleAll() |
| 85 | { | 86 | { |
| 86 | return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); | 87 | return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); |
| @@ -92,6 +93,7 @@ public class SysRoleServiceImpl implements ISysRoleService | @@ -92,6 +93,7 @@ public class SysRoleServiceImpl implements ISysRoleService | ||
| 92 | * @param userId 用户ID | 93 | * @param userId 用户ID |
| 93 | * @return 选中角色ID列表 | 94 | * @return 选中角色ID列表 |
| 94 | */ | 95 | */ |
| 96 | + @Override | ||
| 95 | public List<Integer> selectRoleListByUserId(Long userId) | 97 | public List<Integer> selectRoleListByUserId(Long userId) |
| 96 | { | 98 | { |
| 97 | return roleMapper.selectRoleListByUserId(userId); | 99 | return roleMapper.selectRoleListByUserId(userId); |
| @@ -103,6 +105,7 @@ public class SysRoleServiceImpl implements ISysRoleService | @@ -103,6 +105,7 @@ public class SysRoleServiceImpl implements ISysRoleService | ||
| 103 | * @param roleId 角色ID | 105 | * @param roleId 角色ID |
| 104 | * @return 角色对象信息 | 106 | * @return 角色对象信息 |
| 105 | */ | 107 | */ |
| 108 | + @Override | ||
| 106 | public SysRole selectRoleById(Long roleId) | 109 | public SysRole selectRoleById(Long roleId) |
| 107 | { | 110 | { |
| 108 | return roleMapper.selectRoleById(roleId); | 111 | return roleMapper.selectRoleById(roleId); |
| @@ -149,6 +152,7 @@ public class SysRoleServiceImpl implements ISysRoleService | @@ -149,6 +152,7 @@ public class SysRoleServiceImpl implements ISysRoleService | ||
| 149 | * | 152 | * |
| 150 | * @param role 角色信息 | 153 | * @param role 角色信息 |
| 151 | */ | 154 | */ |
| 155 | + @Override | ||
| 152 | public void checkRoleAllowed(SysRole role) | 156 | public void checkRoleAllowed(SysRole role) |
| 153 | { | 157 | { |
| 154 | if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) | 158 | if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) |
| @@ -207,6 +211,7 @@ public class SysRoleServiceImpl implements ISysRoleService | @@ -207,6 +211,7 @@ public class SysRoleServiceImpl implements ISysRoleService | ||
| 207 | * @param role 角色信息 | 211 | * @param role 角色信息 |
| 208 | * @return 结果 | 212 | * @return 结果 |
| 209 | */ | 213 | */ |
| 214 | + @Override | ||
| 210 | public int updateRoleStatus(SysRole role) | 215 | public int updateRoleStatus(SysRole role) |
| 211 | { | 216 | { |
| 212 | return roleMapper.updateRole(role); | 217 | return roleMapper.updateRole(role); |
| @@ -296,6 +301,7 @@ public class SysRoleServiceImpl implements ISysRoleService | @@ -296,6 +301,7 @@ public class SysRoleServiceImpl implements ISysRoleService | ||
| 296 | * @param roleIds 需要删除的角色ID | 301 | * @param roleIds 需要删除的角色ID |
| 297 | * @return 结果 | 302 | * @return 结果 |
| 298 | */ | 303 | */ |
| 304 | + @Override | ||
| 299 | public int deleteRoleByIds(Long[] roleIds) | 305 | public int deleteRoleByIds(Long[] roleIds) |
| 300 | { | 306 | { |
| 301 | for (Long roleId : roleIds) | 307 | for (Long roleId : roleIds) |
| @@ -72,6 +72,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService | @@ -72,6 +72,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService | ||
| 72 | * @param user 用户信息 | 72 | * @param user 用户信息 |
| 73 | * @return 在线用户 | 73 | * @return 在线用户 |
| 74 | */ | 74 | */ |
| 75 | + @Override | ||
| 75 | public SysUserOnline loginUserToUserOnline(LoginUser user) | 76 | public SysUserOnline loginUserToUserOnline(LoginUser user) |
| 76 | { | 77 | { |
| 77 | if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser())) | 78 | if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser())) |
| @@ -192,6 +192,7 @@ public class SysUserServiceImpl implements ISysUserService | @@ -192,6 +192,7 @@ public class SysUserServiceImpl implements ISysUserService | ||
| 192 | * | 192 | * |
| 193 | * @param user 用户信息 | 193 | * @param user 用户信息 |
| 194 | */ | 194 | */ |
| 195 | + @Override | ||
| 195 | public void checkUserAllowed(SysUser user) | 196 | public void checkUserAllowed(SysUser user) |
| 196 | { | 197 | { |
| 197 | if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) | 198 | if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) |
| @@ -268,10 +269,11 @@ public class SysUserServiceImpl implements ISysUserService | @@ -268,10 +269,11 @@ public class SysUserServiceImpl implements ISysUserService | ||
| 268 | /** | 269 | /** |
| 269 | * 修改用户头像 | 270 | * 修改用户头像 |
| 270 | * | 271 | * |
| 271 | - * @param userId 用户ID | 272 | + * @param userName 用户名 |
| 272 | * @param avatar 头像地址 | 273 | * @param avatar 头像地址 |
| 273 | * @return 结果 | 274 | * @return 结果 |
| 274 | */ | 275 | */ |
| 276 | + @Override | ||
| 275 | public boolean updateUserAvatar(String userName, String avatar) | 277 | public boolean updateUserAvatar(String userName, String avatar) |
| 276 | { | 278 | { |
| 277 | return userMapper.updateUserAvatar(userName, avatar) > 0; | 279 | return userMapper.updateUserAvatar(userName, avatar) > 0; |
| @@ -376,6 +378,7 @@ public class SysUserServiceImpl implements ISysUserService | @@ -376,6 +378,7 @@ public class SysUserServiceImpl implements ISysUserService | ||
| 376 | * @param userIds 需要删除的用户ID | 378 | * @param userIds 需要删除的用户ID |
| 377 | * @return 结果 | 379 | * @return 结果 |
| 378 | */ | 380 | */ |
| 381 | + @Override | ||
| 379 | public int deleteUserByIds(Long[] userIds) | 382 | public int deleteUserByIds(Long[] userIds) |
| 380 | { | 383 | { |
| 381 | for (Long userId : userIds) | 384 | for (Long userId : userIds) |
| @@ -80,6 +80,7 @@ public class GenTableServiceImpl implements IGenTableService | @@ -80,6 +80,7 @@ public class GenTableServiceImpl implements IGenTableService | ||
| 80 | * @param genTable 业务信息 | 80 | * @param genTable 业务信息 |
| 81 | * @return 数据库表集合 | 81 | * @return 数据库表集合 |
| 82 | */ | 82 | */ |
| 83 | + @Override | ||
| 83 | public List<GenTable> selectDbTableList(GenTable genTable) | 84 | public List<GenTable> selectDbTableList(GenTable genTable) |
| 84 | { | 85 | { |
| 85 | return genTableMapper.selectDbTableList(genTable); | 86 | return genTableMapper.selectDbTableList(genTable); |
| @@ -91,6 +92,7 @@ public class GenTableServiceImpl implements IGenTableService | @@ -91,6 +92,7 @@ public class GenTableServiceImpl implements IGenTableService | ||
| 91 | * @param tableNames 表名称组 | 92 | * @param tableNames 表名称组 |
| 92 | * @return 数据库表集合 | 93 | * @return 数据库表集合 |
| 93 | */ | 94 | */ |
| 95 | + @Override | ||
| 94 | public List<GenTable> selectDbTableListByNames(String[] tableNames) | 96 | public List<GenTable> selectDbTableListByNames(String[] tableNames) |
| 95 | { | 97 | { |
| 96 | return genTableMapper.selectDbTableListByNames(tableNames); | 98 | return genTableMapper.selectDbTableListByNames(tableNames); |
| @@ -121,7 +123,7 @@ public class GenTableServiceImpl implements IGenTableService | @@ -121,7 +123,7 @@ public class GenTableServiceImpl implements IGenTableService | ||
| 121 | /** | 123 | /** |
| 122 | * 删除业务对象 | 124 | * 删除业务对象 |
| 123 | * | 125 | * |
| 124 | - * @param ids 需要删除的数据ID | 126 | + * @param tableIds 需要删除的数据ID |
| 125 | * @return 结果 | 127 | * @return 结果 |
| 126 | */ | 128 | */ |
| 127 | @Override | 129 | @Override |
| @@ -173,6 +175,7 @@ public class GenTableServiceImpl implements IGenTableService | @@ -173,6 +175,7 @@ public class GenTableServiceImpl implements IGenTableService | ||
| 173 | * @param tableId 表编号 | 175 | * @param tableId 表编号 |
| 174 | * @return 预览数据列表 | 176 | * @return 预览数据列表 |
| 175 | */ | 177 | */ |
| 178 | + @Override | ||
| 176 | public Map<String, String> previewCode(Long tableId) | 179 | public Map<String, String> previewCode(Long tableId) |
| 177 | { | 180 | { |
| 178 | Map<String, String> dataMap = new LinkedHashMap<>(); | 181 | Map<String, String> dataMap = new LinkedHashMap<>(); |
| @@ -277,6 +280,7 @@ public class GenTableServiceImpl implements IGenTableService | @@ -277,6 +280,7 @@ public class GenTableServiceImpl implements IGenTableService | ||
| 277 | * | 280 | * |
| 278 | * @param genTable 业务信息 | 281 | * @param genTable 业务信息 |
| 279 | */ | 282 | */ |
| 283 | + @Override | ||
| 280 | public void validateEdit(GenTable genTable) | 284 | public void validateEdit(GenTable genTable) |
| 281 | { | 285 | { |
| 282 | if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) | 286 | if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) |
| @@ -301,7 +305,7 @@ public class GenTableServiceImpl implements IGenTableService | @@ -301,7 +305,7 @@ public class GenTableServiceImpl implements IGenTableService | ||
| 301 | /** | 305 | /** |
| 302 | * 设置主键列信息 | 306 | * 设置主键列信息 |
| 303 | * | 307 | * |
| 304 | - * @param genTable 业务表信息 | 308 | + * @param table 业务表信息 |
| 305 | * @param columns 业务字段列表 | 309 | * @param columns 业务字段列表 |
| 306 | */ | 310 | */ |
| 307 | public void setPkColumn(GenTable table, List<GenTableColumn> columns) | 311 | public void setPkColumn(GenTable table, List<GenTableColumn> columns) |
-
请 注册 或 登录 后发表评论