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
dd2bf60f
Commit
dd2bf60f
authored
Aug 19, 2026
by
wujipeng
Browse files
管理员-系统管理-账户管理
parent
9fc77652
Changes
32
Show whitespace changes
Inline
Side-by-side
practical-api/practical-auth-api/src/main/java/com/platform/auth/model/entity/User.java
View file @
dd2bf60f
...
...
@@ -57,6 +57,14 @@ public class User {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
updateTime
;
/** 管理端账户状态;认证服务在首次登录时负责把PENDING推进为STUDYING。 */
@TableField
(
"account_status"
)
private
String
accountStatus
;
/** 教师工号,允许教师使用工号或手机号登录。 */
@TableField
(
"employee_no"
)
private
String
employeeNo
;
@TableField
(
"id_type"
)
private
String
idType
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/AccountAdminQueryDTO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.dto
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
/**
* 管理员端账户分页及导出查询条件。
*
* <p>同一个查询对象同时服务学员、教师和管理员三个页签。服务层会统一清理文本、
* 校验状态和日期范围,Mapper 只接收已经规范化的数据,避免页面和导出出现两套口径。</p>
*/
@Data
public
class
AccountAdminQueryDTO
{
@ApiModelProperty
(
"页码,默认1"
)
private
Integer
pageNum
;
@ApiModelProperty
(
"每页条数,默认20,最大100"
)
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"账户类型:STUDENT/TEACHER/ADMIN"
,
required
=
true
)
private
String
accountType
;
@ApiModelProperty
(
"姓名、手机号、登录账号或工号关键字"
)
private
String
keyword
;
@ApiModelProperty
(
"班级ID,仅学员查询使用"
)
private
Integer
classId
;
@ApiModelProperty
(
"系统角色ID,仅教师和管理员查询使用"
)
private
Integer
roleId
;
@ApiModelProperty
(
"学员:PENDING/STUDYING/GRADUATED/ARCHIVED;教职工:ENABLED/DISABLED"
)
private
String
status
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@ApiModelProperty
(
"开始日期;学员按培训开始日期,教职工按最后登录时间"
)
private
Date
startDate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@ApiModelProperty
(
"结束日期;学员按培训结束日期,教职工按最后登录时间"
)
private
Date
endDate
;
@ApiModelProperty
(
"是否只查询结业超过6个月且尚未归档的学员"
)
private
Boolean
archiveOverSixMonths
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/AccountAdminSaveDTO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/** 管理员端新增、编辑账户时允许提交的字段。 */
@Data
public
class
AccountAdminSaveDTO
{
@ApiModelProperty
(
value
=
"账户类型:STUDENT/TEACHER/ADMIN"
,
required
=
true
)
private
String
accountType
;
@ApiModelProperty
(
value
=
"姓名"
,
required
=
true
)
private
String
name
;
@ApiModelProperty
(
"登录账号;学员固定使用手机号,教师和管理员必填"
)
private
String
username
;
@ApiModelProperty
(
"教师工号;教师账户必填"
)
private
String
employeeNo
;
@ApiModelProperty
(
value
=
"手机号"
,
required
=
true
)
private
String
phoneNumber
;
@ApiModelProperty
(
"身份证号,学员可选"
)
private
String
idCard
;
@ApiModelProperty
(
"单位名称,学员可选"
)
private
String
companyName
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
@ApiModelProperty
(
"班级ID,学员账户必填"
)
private
Integer
classId
;
@ApiModelProperty
(
"系统角色ID,教师和管理员账户必填"
)
private
Integer
roleId
;
@ApiModelProperty
(
"初始密码;新增时为空则使用Wssg@2026,编辑时忽略"
)
private
String
initialPassword
;
@ApiModelProperty
(
"账户状态;新增为空时学员默认PENDING,教职工默认ENABLED"
)
private
String
status
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/AccountBatchActionDTO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
/** 管理员端账户批量操作请求。 */
@Data
public
class
AccountBatchActionDTO
{
@ApiModelProperty
(
value
=
"账户ID列表,最多500条"
,
required
=
true
)
private
List
<
String
>
ids
;
@ApiModelProperty
(
value
=
"动作:GRADUATE/ARCHIVE/RESET_PASSWORD/ENABLE/DISABLE"
,
required
=
true
)
private
String
action
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/AccountImportRowDTO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/** Excel导入预览中的一行数据,同时也是确认导入阶段的内部传输模型。 */
@Data
public
class
AccountImportRowDTO
{
@ApiModelProperty
(
"Excel中的实际行号"
)
private
Integer
rowNumber
;
private
String
name
;
private
String
username
;
private
String
employeeNo
;
private
String
phoneNumber
;
private
String
roleName
;
private
Integer
roleId
;
private
String
remark
;
@ApiModelProperty
(
"该行是否通过校验"
)
private
Boolean
valid
;
@ApiModelProperty
(
"校验失败原因,多个原因使用中文分号分隔"
)
private
String
errorMessage
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/AccountStatusDTO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/** 单个账户状态修改请求。 */
@Data
public
class
AccountStatusDTO
{
@ApiModelProperty
(
value
=
"目标状态或动作"
,
required
=
true
)
private
String
status
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/SysRoleEntity.java
View file @
dd2bf60f
...
...
@@ -16,4 +16,7 @@ public class SysRoleEntity {
private
String
description
;
/** 角色可分配的账户类型:STUDENT/TEACHER/ADMIN。 */
private
String
accountType
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/UserEntity.java
View file @
dd2bf60f
...
...
@@ -52,6 +52,30 @@ public class UserEntity {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
updateTime
;
/** 账户创建时间,用于管理端稳定排序和审计展示。 */
@TableField
(
"create_time"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
/** 教师工号;管理员登录账号继续使用username字段。 */
@TableField
(
"employee_no"
)
private
String
employeeNo
;
/**
* 账户业务状态。学员使用PENDING/STUDYING/GRADUATED/ARCHIVED,
* 教师和管理员使用ENABLED/DISABLED;del_flag仍同步维护以兼容认证服务。
*/
@TableField
(
"account_status"
)
private
String
accountStatus
;
@TableField
(
"graduation_time"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
graduationTime
;
@TableField
(
"archive_time"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
archiveTime
;
@ApiModelProperty
(
"身份证号"
)
@TableField
(
"id_card"
)
private
String
idCard
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountAdminDetailVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
import
java.util.List
;
/**
* 账户详情。
*
* <p>教师和管理员主要使用基础字段;学员详情还会返回课程出勤、正式考试成绩和登录日志。
* 课时流水在当前数据库中没有独立来源,因此接口返回可核验的课程总课时与已出勤课时,
* 不伪造原型中的演示流水。</p>
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
AccountAdminDetailVO
extends
AccountAdminListVO
{
private
String
idCard
;
private
String
companyName
;
private
String
remark
;
private
String
certificateNo
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
graduationTime
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
archiveTime
;
private
Double
theoryScore
;
private
Double
practicalScore
;
private
Double
scheduledHours
;
private
Double
attendedHours
;
private
List
<
AccountAttendanceVO
>
attendanceRecords
;
private
List
<
AccountLoginLogVO
>
loginLogs
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountAdminListVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
/** 账户管理三个页签共用的列表行。 */
@Data
public
class
AccountAdminListVO
{
private
String
id
;
private
String
accountType
;
private
String
name
;
private
String
username
;
private
String
employeeNo
;
private
String
phoneNumber
;
private
Integer
classId
;
private
String
className
;
private
String
levelName
;
private
Integer
roleId
;
private
String
roleName
;
private
String
status
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
trainingStartDate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
trainingEndDate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
lastLoginTime
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
@ApiModelProperty
(
"是否为当前登录管理员本人,前端可据此禁用自我禁用按钮"
)
private
Boolean
currentUser
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountAdminOptionsVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
lombok.Data
;
import
java.util.List
;
/** 账户管理页面初始化时一次性加载的班级和角色选项。 */
@Data
public
class
AccountAdminOptionsVO
{
private
List
<
AccountOptionVO
>
classes
;
private
List
<
AccountOptionVO
>
teacherRoles
;
private
List
<
AccountOptionVO
>
adminRoles
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountAdminStatisticsVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
lombok.Data
;
/** 三个账户页签顶部角标所需的统计数据。 */
@Data
public
class
AccountAdminStatisticsVO
{
private
Long
studentTotal
;
private
Long
studentActive
;
private
Long
teacherTotal
;
private
Long
teacherEnabled
;
private
Long
adminTotal
;
private
Long
adminEnabled
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountAttendanceVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/** 学员详情中的真实排课及出勤记录。 */
@Data
public
class
AccountAttendanceVO
{
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
courseDate
;
private
String
courseName
;
private
String
timeFrame
;
private
BigDecimal
courseHours
;
private
String
attendanceStatus
;
private
String
teacherName
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountImportResultVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
com.platform.business.model.dto.AccountImportRowDTO
;
import
lombok.Data
;
import
java.util.List
;
/** Excel预览或确认导入结果。 */
@Data
public
class
AccountImportResultVO
{
private
Integer
totalCount
;
private
Integer
validCount
;
private
Integer
invalidCount
;
private
Integer
importedCount
;
private
Boolean
preview
;
private
List
<
AccountImportRowDTO
>
rows
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountLoginLogVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
java.util.Date
;
/** 账户登录日志展示对象。 */
@Data
public
class
AccountLoginLogVO
{
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
loginTime
;
private
String
ipAddress
;
private
String
device
;
private
String
result
;
private
String
failureReason
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AccountOptionVO.java
0 → 100644
View file @
dd2bf60f
package
com.platform.business.model.vo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/** 账户表单使用的通用下拉选项。 */
@Data
@NoArgsConstructor
@AllArgsConstructor
public
class
AccountOptionVO
{
private
String
value
;
private
String
label
;
private
String
extra
;
}
practical-auth/src/main/java/com/platform/auth/controller/UserController.java
View file @
dd2bf60f
...
...
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
@RestController
@RequestMapping
(
"/login"
)
...
...
@@ -19,7 +20,8 @@ public class UserController {
private
UserService
userService
;
@PostMapping
(
"/in"
)
public
Result
<
UserVO
>
login
(
@RequestBody
UserDTO
userDTO
)
{
return
userService
.
login
(
userDTO
);
public
Result
<
UserVO
>
login
(
@RequestBody
UserDTO
userDTO
,
HttpServletRequest
request
)
{
// remoteAddr由服务端容器提供,不直接信任可伪造的X-Forwarded-For。
return
userService
.
login
(
userDTO
,
request
.
getRemoteAddr
(),
request
.
getHeader
(
"User-Agent"
));
}
}
practical-auth/src/main/java/com/platform/auth/mapper/USerMapper.java
View file @
dd2bf60f
...
...
@@ -3,6 +3,7 @@ package com.platform.auth.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.platform.auth.model.entity.User
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
/**
* @author : wujipeng
...
...
@@ -12,4 +13,15 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public
interface
USerMapper
extends
BaseMapper
<
User
>
{
/**
* 登录日志采用独立插入语句,失败原因也会记录;调用方会捕获日志写入异常,
* 保证审计表短暂故障不会把正确密码的用户挡在系统外。
*/
int
insertLoginLog
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"loginName"
)
String
loginName
,
@Param
(
"ipAddress"
)
String
ipAddress
,
@Param
(
"device"
)
String
device
,
@Param
(
"result"
)
String
result
,
@Param
(
"failureReason"
)
String
failureReason
);
}
practical-auth/src/main/java/com/platform/auth/service/UserService.java
View file @
dd2bf60f
...
...
@@ -14,5 +14,6 @@ import com.platform.model.resp.Result;
*/
public
interface
UserService
extends
IService
<
User
>
{
Result
<
UserVO
>
login
(
UserDTO
userDTO
);
/** 登录并记录服务端识别到的IP和终端信息。 */
Result
<
UserVO
>
login
(
UserDTO
userDTO
,
String
ipAddress
,
String
device
);
}
practical-auth/src/main/java/com/platform/auth/service/impl/UserServiceImpl.java
View file @
dd2bf60f
...
...
@@ -12,6 +12,7 @@ import com.platform.auth.service.UserService;
import
com.platform.auth.utils.JwtTokenUtil
;
import
com.platform.auth.utils.PasswordUtil
;
import
com.platform.model.resp.Result
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
...
...
@@ -19,6 +20,7 @@ import java.util.Date;
import
java.util.List
;
@Service
@Slf4j
public
class
UserServiceImpl
extends
ServiceImpl
<
USerMapper
,
User
>
implements
UserService
{
@Resource
...
...
@@ -29,31 +31,51 @@ public class UserServiceImpl extends ServiceImpl<USerMapper, User> implements Us
private
UserRoleService
userRoleService
;
@Override
public
Result
<
UserVO
>
login
(
UserDTO
loginRequest
)
{
public
Result
<
UserVO
>
login
(
UserDTO
loginRequest
,
String
ipAddress
,
String
device
)
{
String
loginName
=
loginRequest
==
null
?
null
:
loginRequest
.
getPhoneNumber
();
if
(
loginName
==
null
||
loginName
.
trim
().
isEmpty
())
{
recordLogin
(
null
,
loginName
,
ipAddress
,
device
,
"FAILED"
,
"登录账号为空"
);
return
Result
.
fail
(
"请输入登录账号"
);
}
loginName
=
loginName
.
trim
();
final
String
normalizedLoginName
=
loginName
;
// 兼容历史学员手机号登录,同时让新建教师/管理员可使用工号或登录账号。
User
user
=
baseMapper
.
selectOne
(
new
LambdaQueryWrapper
<
User
>()
.
eq
(
User:
:
getPhoneNumber
,
loginRequest
.
getPhoneNumber
()));
.
and
(
wrapper
->
wrapper
.
eq
(
User:
:
getPhoneNumber
,
normalizedLoginName
)
.
or
().
eq
(
User:
:
getUsername
,
normalizedLoginName
))
.
last
(
"limit 1"
));
if
(
user
==
null
)
{
recordLogin
(
null
,
loginName
,
ipAddress
,
device
,
"FAILED"
,
"用户不存在"
);
return
Result
.
fail
(
"用户不存在"
);
}
//判断是否禁用
if
(
user
.
getDelFlag
())
{
if
(
Boolean
.
TRUE
.
equals
(
user
.
getDelFlag
()))
{
recordLogin
(
user
.
getId
(),
loginName
,
ipAddress
,
device
,
"FAILED"
,
"账户已禁用或归档"
);
return
Result
.
fail
(
"用户已禁用"
);
}
if
(!
passwordUtil
.
matches
(
loginRequest
.
getPassword
(),
user
.
getPassword
()))
{
if
(
loginRequest
.
getPassword
()
==
null
||
!
passwordUtil
.
matches
(
loginRequest
.
getPassword
(),
user
.
getPassword
()))
{
// 更新登录失败次数
user
.
setLoginFailNum
(
user
.
getLoginFailNum
()
+
1
);
user
.
setLoginFailNum
(
(
user
.
getLoginFailNum
()
==
null
?
0
:
user
.
getLoginFailNum
())
+
1
);
updateById
(
user
);
recordLogin
(
user
.
getId
(),
loginName
,
ipAddress
,
device
,
"FAILED"
,
"密码错误"
);
return
Result
.
fail
(
"密码错误"
);
}
// 响应中的firstLogin表示本次登录前是否首次登录,不能在字段清零后再读取。
boolean
firstLogin
=
!
Boolean
.
FALSE
.
equals
(
user
.
getFirstLoginFlag
());
// 重置登录失败次数
user
.
setLoginFailNum
(
0
);
user
.
setLoginDate
(
new
Date
());
user
.
setFirstLoginFlag
(
false
);
if
(
"PENDING"
.
equalsIgnoreCase
(
user
.
getAccountStatus
()))
{
user
.
setAccountStatus
(
"STUDYING"
);
}
updateById
(
user
);
recordLogin
(
user
.
getId
(),
loginName
,
ipAddress
,
device
,
"SUCCESS"
,
null
);
// 生成token
String
token
=
jwtTokenUtil
.
generateToken
(
user
.
getPhoneNumber
());
...
...
@@ -79,10 +101,27 @@ public class UserServiceImpl extends ServiceImpl<USerMapper, User> implements Us
response
.
setUsername
(
user
.
getUsername
());
response
.
setNickName
(
user
.
getNickName
());
response
.
setPhoneNumber
(
user
.
getPhoneNumber
());
response
.
setFirstLogin
(
user
.
getF
irstLogin
Flag
()
);
response
.
setFirstLogin
(
f
irstLogin
);
response
.
setLevel
(
user
.
getLevel
());
response
.
setExamFlag
(
user
.
getExamFlag
());
response
.
setExamOneselfId
(
user
.
getExamOneselfId
());
return
Result
.
data
(
response
);
}
/** 登录日志失败不影响主认证流程,但会输出服务端告警便于运维补偿。 */
private
void
recordLogin
(
String
userId
,
String
loginName
,
String
ipAddress
,
String
device
,
String
result
,
String
failureReason
)
{
try
{
baseMapper
.
insertLoginLog
(
userId
,
limit
(
loginName
,
100
),
limit
(
ipAddress
,
64
),
limit
(
device
,
255
),
result
,
limit
(
failureReason
,
255
));
}
catch
(
Exception
e
)
{
log
.
warn
(
"Failed to write account login log for user {}"
,
userId
,
e
);
}
}
private
String
limit
(
String
value
,
int
maxLength
)
{
if
(
value
==
null
)
return
null
;
String
trimmed
=
value
.
trim
();
return
trimmed
.
length
()
<=
maxLength
?
trimmed
:
trimmed
.
substring
(
0
,
maxLength
);
}
}
Prev
1
2
Next
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