Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
practical_train
Commits
2af67ae4
Commit
2af67ae4
authored
Nov 19, 2026
by
wujipeng
Browse files
优化项
parent
3a853711
Changes
2
Hide whitespace changes
Inline
Side-by-side
practical-business/src/main/java/com/platform/business/service/impl/UserServiceImpl.java
View file @
2af67ae4
...
@@ -36,10 +36,8 @@ import javax.annotation.Resource;
...
@@ -36,10 +36,8 @@ import javax.annotation.Resource;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.*
;
import
java.io.*
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Objects
;
import
java.util.stream.Collectors
;
@Service
@Service
public
class
UserServiceImpl
extends
ServiceImpl
<
UserMapper
,
UserEntity
>
implements
UserService
{
public
class
UserServiceImpl
extends
ServiceImpl
<
UserMapper
,
UserEntity
>
implements
UserService
{
...
@@ -465,30 +463,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
...
@@ -465,30 +463,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
@Override
@Override
public
UserVO
getUserMessage
(
String
userName
)
{
public
UserVO
getUserMessage
(
String
userName
)
{
UserVO
userVO
=
baseMapper
.
queryByUserName
(
userName
);
UserVO
userVO
=
baseMapper
.
queryByUserName
(
userName
);
//获取用户角色 注:此处不是系统角色
/*
//系统中账户就是为手机号
* phone_role 保存的是“学生/教师/管理员”三类端口身份,前端依赖这个字段决定
* 应展示哪一端以及切换端口时有哪些入口。sys_user_and_role 中的 roleName 则是
* “管理端教师”等细粒度权限角色,两者不能合并或互相覆盖。
*
* 旧逻辑在用户只有一个端口身份时,会用细粒度权限角色重新创建列表,导致教师
* 收到“管理端教师”而不是“教师”。前端无法识别该端口身份,最终停留在管理端
* 空白壳层,切换端口页也没有可选入口。因此这里必须原样返回 phone_role 结果。
*/
List
<
SysPhoneRoleEntity
>
sysPhoneRoleEntities
=
sysPhoneRoleService
.
queryByPhone
(
userName
);
List
<
SysPhoneRoleEntity
>
sysPhoneRoleEntities
=
sysPhoneRoleService
.
queryByPhone
(
userName
);
//查询系统角色
userVO
.
setSysPhoneRoleEntities
(
sysPhoneRoleEntities
);
SysPhoneRoleEntity
sysPhoneRoleEntity
=
null
;
if
(
StringUtils
.
isNotEmpty
(
userVO
.
getRoleName
()))
{
sysPhoneRoleEntity
=
new
SysPhoneRoleEntity
();
sysPhoneRoleEntity
.
setRoleName
(
userVO
.
getRoleName
());
sysPhoneRoleEntity
.
setPhone
(
userName
);
}
//去重
if
(
sysPhoneRoleEntities
.
size
()
>
1
)
{
if
(!
ObjectUtils
.
isEmpty
(
sysPhoneRoleEntity
))
{
sysPhoneRoleEntities
.
add
(
sysPhoneRoleEntity
);
}
sysPhoneRoleEntities
=
sysPhoneRoleEntities
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
userVO
.
setSysPhoneRoleEntities
(
sysPhoneRoleEntities
);
}
else
{
if
(!
ObjectUtils
.
isEmpty
(
sysPhoneRoleEntity
))
{
sysPhoneRoleEntities
=
new
ArrayList
<>();
sysPhoneRoleEntities
.
add
(
sysPhoneRoleEntity
);
}
userVO
.
setSysPhoneRoleEntities
(
sysPhoneRoleEntities
);
}
Integer
roleId
=
userVO
.
getRoleId
();
Integer
roleId
=
userVO
.
getRoleId
();
if
(
roleId
!=
null
)
{
if
(
roleId
!=
null
)
{
List
<
SysRoleAndMenuVO
>
sysRoleAndMenuVOList
=
sysRoleAndMenuService
.
queryByRoleId
(
roleId
);
List
<
SysRoleAndMenuVO
>
sysRoleAndMenuVOList
=
sysRoleAndMenuService
.
queryByRoleId
(
roleId
);
...
...
practical-business/src/test/java/com/platform/business/service/impl/UserServiceImplTest.java
0 → 100644
View file @
2af67ae4
package
com.platform.business.service.impl
;
import
com.platform.business.mapper.UserMapper
;
import
com.platform.business.model.entity.SysPhoneRoleEntity
;
import
com.platform.business.model.vo.UserVO
;
import
com.platform.business.service.SysPhoneRoleService
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.mockito.Mock
;
import
org.mockito.junit.jupiter.MockitoExtension
;
import
org.springframework.test.util.ReflectionTestUtils
;
import
java.util.Collections
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertSame
;
import
static
org
.
mockito
.
Mockito
.
when
;
/**
* 用户会话信息回归测试。
*
* <p>端口身份来自 phone_role,系统权限角色来自 sys_user_and_role。两类角色名称可能分别为
* “教师”和“管理端教师”,若发生混用,前端将无法匹配教师端路由和端口切换入口。</p>
*/
@ExtendWith
(
MockitoExtension
.
class
)
class
UserServiceImplTest
{
@Mock
private
UserMapper
userMapper
;
@Mock
private
SysPhoneRoleService
sysPhoneRoleService
;
private
UserServiceImpl
userService
;
@BeforeEach
void
setUp
()
{
userService
=
new
UserServiceImpl
();
// ServiceImpl 的 baseMapper 由 MyBatis-Plus 在生产环境注入;单元测试显式注入以隔离数据库。
ReflectionTestUtils
.
setField
(
userService
,
"baseMapper"
,
userMapper
);
ReflectionTestUtils
.
setField
(
userService
,
"sysPhoneRoleService"
,
sysPhoneRoleService
);
}
@Test
void
getUserMessageShouldKeepTeacherPortalRoleWhenPermissionRoleHasDifferentName
()
{
String
phoneNumber
=
"13240384580"
;
UserVO
databaseUser
=
new
UserVO
();
databaseUser
.
setRoleName
(
"管理端教师"
);
SysPhoneRoleEntity
teacherPortalRole
=
new
SysPhoneRoleEntity
();
teacherPortalRole
.
setPhone
(
phoneNumber
);
teacherPortalRole
.
setRoleName
(
"教师"
);
when
(
userMapper
.
queryByUserName
(
phoneNumber
)).
thenReturn
(
databaseUser
);
when
(
sysPhoneRoleService
.
queryByPhone
(
phoneNumber
))
.
thenReturn
(
Collections
.
singletonList
(
teacherPortalRole
));
UserVO
result
=
userService
.
getUserMessage
(
phoneNumber
);
assertEquals
(
1
,
result
.
getSysPhoneRoleEntities
().
size
());
assertSame
(
teacherPortalRole
,
result
.
getSysPhoneRoleEntities
().
get
(
0
));
assertEquals
(
"教师"
,
result
.
getSysPhoneRoleEntities
().
get
(
0
).
getRoleName
());
// 细粒度权限角色仍保留在 roleName,供权限菜单使用,但不得写入端口身份列表。
assertEquals
(
"管理端教师"
,
result
.
getRoleName
());
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment