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
e0044f7b
Commit
e0044f7b
authored
Aug 31, 2026
by
王蔡翾
Browse files
问题修复
parent
085d8779
Changes
17
Show whitespace changes
Inline
Side-by-side
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/TrainingRoomEntity.java
View file @
e0044f7b
...
...
@@ -42,13 +42,17 @@ public class TrainingRoomEntity {
@TableField
(
"open_end"
)
private
String
openEnd
;
/** 当前启用的机位总数,
机位编号固定为1至seatCount
。 */
/** 当前启用的机位总数,
由layoutRows * layoutColumns计算
。 */
@TableField
(
"seat_count"
)
private
Integer
seatCount
;
/** 机位布局的文字描述。 */
@TableField
(
"layout_description"
)
private
String
layoutDescription
;
/** 机位布局行数,必须大于0。 */
@TableField
(
"layout_rows"
)
private
Integer
layoutRows
;
/** 机位布局列数,必须大于0。 */
@TableField
(
"layout_columns"
)
private
Integer
layoutColumns
;
/** 负责人用户ID,关联 user.id。 */
@TableField
(
"manager_id"
)
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AttendanceCourseStatisticsVO.java
View file @
e0044f7b
...
...
@@ -38,6 +38,6 @@ public class AttendanceCourseStatisticsVO {
private
long
absentCount
;
/** 已批准请假人次;统计出勤率时不计为出勤。 */
private
long
leaveCount
;
/** 出勤率百分比:
(
正常
+迟到)
/应出勤×100。 */
/** 出勤率百分比:正常
签到
/应出勤×100
;迟到属于异常人次
。 */
private
BigDecimal
attendanceRate
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AttendanceStudentStatisticsVO.java
View file @
e0044f7b
...
...
@@ -23,6 +23,6 @@ public class AttendanceStudentStatisticsVO {
private
long
absentCount
;
/** 请假课次;计算出勤率时按未出勤处理。 */
private
long
leaveCount
;
/** 出勤率百分比:
(
正常
+迟到)
/应出勤×100。 */
/** 出勤率百分比:正常
签到
/应出勤×100
;迟到属于异常人次
。 */
private
BigDecimal
attendanceRate
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/AttendanceSummaryVO.java
View file @
e0044f7b
...
...
@@ -8,6 +8,12 @@ import java.util.List;
/** 管理端出勤统计总览,同时包含按学员和按课程两个明细维度。 */
@Data
public
class
AttendanceSummaryVO
{
/**
* 当前班级的在班学员数。班级筛选存在时直接统计班级成员,避免因尚未生成出勤记录漏算学员。
*/
private
long
studentCount
;
/** 当前筛选日期范围内的排课数。 */
private
long
courseCount
;
/** 应出勤总人次,包含请假。 */
private
long
requiredCount
;
/** 正常签到总人次。 */
...
...
@@ -18,7 +24,12 @@ public class AttendanceSummaryVO {
private
long
absentCount
;
/** 请假总人次;计算出勤率时不计入出勤。 */
private
long
leaveCount
;
/** 总出勤率百分比:(正常+迟到)/应出勤×100。 */
/** 异常总人次:迟到、缺勤和请假的合计。 */
private
long
abnormalCount
;
/**
* 班级出勤率百分比:正常签到/应出勤×100。
* 迟到、请假和缺勤均属于管理端看板展示的异常人次,不计入此分子。
*/
private
BigDecimal
attendanceRate
;
/** 按学员汇总的统计列表。 */
private
List
<
AttendanceStudentStatisticsVO
>
studentStatistics
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/TrainingRoomSeatVO.java
View file @
e0044f7b
...
...
@@ -12,6 +12,12 @@ public class TrainingRoomSeatVO {
/** 实训室内的机位编号。 */
private
Integer
seatNo
;
/** 机位所在行,从1开始。 */
private
Integer
rowNo
;
/** 机位所在列,从1开始。 */
private
Integer
columnNo
;
/** free、booked、using。 */
private
String
status
;
...
...
practical-business/src/main/java/com/platform/business/service/impl/EvaluationServiceImpl.java
View file @
e0044f7b
...
...
@@ -355,12 +355,23 @@ public class EvaluationServiceImpl implements EvaluationService {
/** 管理端和学员端共同使用的筛选校验及状态标准化。 */
private
EvaluationTaskQueryDTO
normalizeQuery
(
EvaluationTaskQueryDTO
query
,
boolean
studentSide
)
{
EvaluationTaskQueryDTO
safe
=
query
==
null
?
new
EvaluationTaskQueryDTO
()
:
query
;
// 页面下拉框会使用 ALL、“全部”或0表示不限。如果把这些值直接交给SQL,
// 则新建任务虽然成功,随后刷新列表仍会被不存在的“全部”类型或0号班级过滤掉。
safe
.
setCourseName
(
normalizeOptionalFilter
(
safe
.
getCourseName
()));
safe
.
setTeacherId
(
normalizeOptionalFilter
(
safe
.
getTeacherId
()));
safe
.
setType
(
normalizeOptionalFilter
(
safe
.
getType
()));
if
(
safe
.
getClassId
()
!=
null
&&
safe
.
getClassId
()
<=
0
)
{
safe
.
setClassId
(
null
);
}
if
(
safe
.
getStartDate
()
!=
null
&&
safe
.
getEndDate
()
!=
null
&&
safe
.
getStartDate
().
after
(
safe
.
getEndDate
()))
{
throw
new
BusinessException
(
"上课开始时间不能晚于结束时间"
);
}
if
(!
isBlank
(
safe
.
getStatus
()))
{
String
status
=
safe
.
getStatus
().
trim
().
toUpperCase
(
Locale
.
ROOT
);
String
normalizedStatus
=
normalizeOptionalFilter
(
safe
.
getStatus
());
if
(
normalizedStatus
==
null
)
{
safe
.
setStatus
(
null
);
}
else
{
String
status
=
normalizedStatus
.
toUpperCase
(
Locale
.
ROOT
);
if
(!
EvaluationConstants
.
ALLOWED_TASK_STATUSES
.
contains
(
status
)
||
(
studentSide
&&
EvaluationConstants
.
TASK_REVOKED
.
equals
(
status
)))
{
throw
new
BusinessException
(
"评价状态不正确"
);
...
...
@@ -370,6 +381,19 @@ public class EvaluationServiceImpl implements EvaluationService {
return
safe
;
}
/**
* 清理可选文本筛选值,并兼容前端下拉框常用的“全部”哨兵值。
*
* <p>这些哨兵值只对列表筛选生效,不影响创建和提交接口的业务字段校验。</p>
*/
private
String
normalizeOptionalFilter
(
String
value
)
{
if
(
isBlank
(
value
))
{
return
null
;
}
String
normalized
=
value
.
trim
();
return
"ALL"
.
equalsIgnoreCase
(
normalized
)
||
"全部"
.
equals
(
normalized
)
?
null
:
normalized
;
}
/** 七个维度均为必填,并统一转换为数据库使用的大写枚举值。 */
private
void
validateSubmission
(
EvaluationSubmitDTO
request
)
{
if
(
request
==
null
)
{
...
...
practical-business/src/main/java/com/platform/business/service/impl/TrainingRoomServiceImpl.java
View file @
e0044f7b
...
...
@@ -173,9 +173,7 @@ public class TrainingRoomServiceImpl extends ServiceImpl<TrainingRoomMapper, Tra
if
(
room
.
getName
().
length
()
>
100
||
room
.
getLocation
().
length
()
>
200
)
{
throw
new
BusinessException
(
"实训室名称或位置长度超出限制"
);
}
if
(
room
.
getSeatCount
()
==
null
||
room
.
getSeatCount
()
<
1
)
{
throw
new
BusinessException
(
"机位总数必须大于0"
);
}
normalizeStructuredLayout
(
room
);
if
(
room
.
getArea
()
!=
null
&&
room
.
getArea
().
compareTo
(
BigDecimal
.
ZERO
)
<
0
)
{
throw
new
BusinessException
(
"实训室面积不能小于0"
);
}
...
...
@@ -197,6 +195,29 @@ public class TrainingRoomServiceImpl extends ServiceImpl<TrainingRoomMapper, Tra
}
}
/**
* 校验结构化行列布局,并将机位总数统一为行数与列数的乘积。
*
* <p>行列是布局的唯一事实来源;seatCount仅作为统计和机位同步的冗余字段。
* 旧客户端如果同时传入seatCount,数值不一致时明确拒绝,避免生成无法映射到矩阵的机位。</p>
*/
private
void
normalizeStructuredLayout
(
TrainingRoomDTO
room
)
{
if
(
room
.
getLayoutRows
()
==
null
||
room
.
getLayoutRows
()
<
1
)
{
throw
new
BusinessException
(
"布局行数必须大于0"
);
}
if
(
room
.
getLayoutColumns
()
==
null
||
room
.
getLayoutColumns
()
<
1
)
{
throw
new
BusinessException
(
"布局列数必须大于0"
);
}
long
calculatedSeatCount
=
(
long
)
room
.
getLayoutRows
()
*
room
.
getLayoutColumns
();
if
(
calculatedSeatCount
>
Integer
.
MAX_VALUE
)
{
throw
new
BusinessException
(
"实训室布局超出支持范围"
);
}
if
(
room
.
getSeatCount
()
!=
null
&&
room
.
getSeatCount
()
!=
calculatedSeatCount
)
{
throw
new
BusinessException
(
"机位总数必须等于布局行数乘以列数"
);
}
room
.
setSeatCount
((
int
)
calculatedSeatCount
);
}
/** 管理员字段可以为空;有值时必须关联到有效的user.id。 */
private
void
validateManager
(
String
managerId
)
{
if
(!
StringUtils
.
hasText
(
managerId
))
{
...
...
@@ -239,8 +260,8 @@ public class TrainingRoomServiceImpl extends ServiceImpl<TrainingRoomMapper, Tra
target
.
setOpenStart
(
source
.
getOpenStart
());
target
.
setOpenEnd
(
source
.
getOpenEnd
());
target
.
setSeatCount
(
source
.
getSeatCount
());
target
.
setLayout
Description
(
StringUtils
.
hasText
(
source
.
getLayout
Description
())
?
source
.
getLayoutDescription
().
trim
()
:
source
.
getSeatCount
()
+
"个机位"
);
target
.
setLayout
Rows
(
source
.
getLayout
Rows
())
;
target
.
setLayoutColumns
(
source
.
getLayoutColumns
()
);
target
.
setManagerId
(
StringUtils
.
hasText
(
source
.
getManagerId
())
?
source
.
getManagerId
().
trim
()
:
null
);
target
.
setRemark
(
StringUtils
.
hasText
(
source
.
getRemark
())
?
source
.
getRemark
().
trim
()
:
null
);
return
target
;
...
...
practical-business/src/main/resources/attendance-api.md
View file @
e0044f7b
...
...
@@ -35,7 +35,9 @@
## 管理端
-
`POST /attendance/admin/records/page`
:按班级、课程、状态、日期范围分页查询。
-
`POST /attendance/admin/statistics`
:统计应到、正常、迟到、缺勤、请假及出勤率。管理员接口不修改出勤状态。
-
`POST /attendance/admin/statistics`
:按班级、课程和日期范围返回班级人数、课程数、应到、正常签到、迟到、缺勤、请假、异常人次及出勤率。管理员接口不修改出勤状态。
管理端班级看板口径:
`出勤率 = 正常签到 ÷ 应到人次 × 100%`
;迟到、请假、缺勤均归入异常人次。因此图片示例中的 250 次正常签到、15 次迟到、12 次请假、3 次缺勤,得到应到 280 次、异常 30 次、出勤率
`250 ÷ 280 = 89.3%`
。
## IP网段配置
...
...
@@ -51,4 +53,4 @@ attendance:
`allowed-ip-cidrs`
为空时系统会拒绝签到。只有入口网关会清洗并重写转发头时,才能把
`trust-forwarded-headers`
设为
`true`
。
审批通过的请假会把所关联课程的出勤状态同步为
`LEAVE`
。统计时,请假计入应到和
请假次数
,但不计入
出勤人数
,因此会降低出勤率。
审批通过的请假会把所关联课程的出勤状态同步为
`LEAVE`
。统计时,请假计入应到和
异常人次
,但不计入
正常签到
,因此会降低
管理端
出勤率。
practical-business/src/main/resources/com/platform/business/mapper/ClassSubjectAttendanceMapper.xml
View file @
e0044f7b
...
...
@@ -194,16 +194,33 @@
order by student.nick_name asc, student.phone_number asc
</select>
<!-- 请假计入应出勤分母,但只有NORMAL和LATE计入出勤率分子。 -->
<!--
管理端班级看板的口径:NORMAL为正常签到;LATE、ABSENT、LEAVE均为异常。
班级人数和课程数独立于出勤记录统计,确保无记录的在班学员和已排课程不会被遗漏。
-->
<select
id=
"querySummary"
resultType=
"com.platform.business.model.vo.AttendanceSummaryVO"
>
select
case when #{classId} is null then count(distinct a.user_id)
else (select count(*) from class_student member where member.class_id = #{classId})
end as studentCount,
(
select count(*)
from class_subject scoped_subject
<where>
<if
test=
"subjectId != null"
>
and scoped_subject.id = #{subjectId}
</if>
<if
test=
"classId != null"
>
and scoped_subject.class_id = #{classId}
</if>
<if
test=
"startDate != null"
>
and scoped_subject.date
>
= #{startDate}
</if>
<if
test=
"endDate != null"
>
and scoped_subject.date
<
= #{endDate}
</if>
</where>
) as courseCount,
count(a.id) as requiredCount,
sum(case when a.status = 'NORMAL' then 1 else 0 end) as normalCount,
sum(case when a.status = 'LATE' then 1 else 0 end) as lateCount,
sum(case when a.status = 'ABSENT' then 1 else 0 end) as absentCount,
sum(case when a.status = 'LEAVE' then 1 else 0 end) as leaveCount,
sum(case when a.status in ('LATE', 'ABSENT', 'LEAVE') then 1 else 0 end) as abnormalCount,
case when count(a.id) = 0 then 0
else round(sum(case when a.status
in (
'NORMAL'
, 'LATE')
then 1 else 0 end) * 100.0 / count(a.id), 2)
else round(sum(case when a.status
=
'NORMAL' then 1 else 0 end) * 100.0 / count(a.id), 2)
end as attendanceRate
from class_subject_attendance a
inner join class_subject s on s.id = a.subject_id
...
...
@@ -217,7 +234,7 @@
</where>
</select>
<!-- 按学员汇总,使用与总览相同的出勤率口径。 -->
<!-- 按学员汇总,使用与
管理端
总览相同的
“正常签到/应到”
出勤率口径。 -->
<select
id=
"queryStudentStatistics"
resultType=
"com.platform.business.model.vo.AttendanceStudentStatisticsVO"
>
select
a.user_id as studentId,
...
...
@@ -228,7 +245,7 @@
sum(case when a.status = 'LATE' then 1 else 0 end) as lateCount,
sum(case when a.status = 'ABSENT' then 1 else 0 end) as absentCount,
sum(case when a.status = 'LEAVE' then 1 else 0 end) as leaveCount,
round(sum(case when a.status
in (
'NORMAL'
, 'LATE')
then 1 else 0 end) * 100.0 / count(a.id), 2) as attendanceRate
round(sum(case when a.status
=
'NORMAL' then 1 else 0 end) * 100.0 / count(a.id), 2) as attendanceRate
from class_subject_attendance a
inner join class_subject s on s.id = a.subject_id
left join user student on student.id = a.user_id
...
...
@@ -261,7 +278,7 @@
sum(case when a.status = 'LATE' then 1 else 0 end) as lateCount,
sum(case when a.status = 'ABSENT' then 1 else 0 end) as absentCount,
sum(case when a.status = 'LEAVE' then 1 else 0 end) as leaveCount,
round(sum(case when a.status
in (
'NORMAL'
, 'LATE')
then 1 else 0 end) * 100.0 / count(a.id), 2) as attendanceRate
round(sum(case when a.status
=
'NORMAL' then 1 else 0 end) * 100.0 / count(a.id), 2) as attendanceRate
from class_subject_attendance a
inner join class_subject s on s.id = a.subject_id
left join class c on c.id = s.class_id
...
...
practical-business/src/main/resources/com/platform/business/mapper/TrainingRoomMapper.xml
View file @
e0044f7b
...
...
@@ -6,7 +6,8 @@
<sql
id=
"roomColumns"
>
r.id, r.name, r.location, r.area,
r.all_day AS allDay, r.open_start AS openStart, r.open_end AS openEnd,
r.seat_count AS seatCount, r.layout_description AS layoutDescription,
r.seat_count AS seatCount,
r.layout_rows AS layoutRows, r.layout_columns AS layoutColumns,
r.manager_id AS managerId, r.status, r.remark,
r.create_time AS createTime, r.update_time AS updateTime,
manager.nick_name AS managerName, manager.phone_number AS managerPhone,
...
...
practical-business/src/main/resources/com/platform/business/mapper/TrainingRoomSeatMapper.xml
View file @
e0044f7b
...
...
@@ -18,11 +18,15 @@
<!-- 预约状态只针对所选日期和时段计算,不写回机位基础表。 -->
<select
id=
"selectAvailability"
resultType=
"com.platform.business.model.vo.TrainingRoomSeatVO"
>
SELECT s.id, s.seat_no AS seatNo,
FLOOR((s.seat_no - 1) / r.layout_columns) + 1 AS rowNo,
MOD(s.seat_no - 1, r.layout_columns) + 1 AS columnNo,
CASE WHEN b.status = 'using' THEN 'using'
WHEN b.status = 'booked' THEN 'booked'
ELSE 'free' END AS status,
b.id AS bookingId
FROM training_room_seat s
INNER JOIN training_room r
ON r.id = s.room_id AND r.del_flag = 0
LEFT JOIN training_room_booking b
ON b.room_id = s.room_id AND b.seat_no = s.seat_no
AND b.booking_date = #{bookingDate} AND b.slot_code = #{slotCode}
...
...
practical-business/src/main/resources/sql/training_room_layout.sql
0 → 100644
View file @
e0044f7b
-- 实训室结构化布局增量迁移脚本(MySQL 5.7+/8.0)。
--
-- 设计说明:
-- 1. layout_rows和layout_columns替代不可靠的layout_description文本。
-- 2. 标准的3X4、3×4、3*4可自动迁移;行列乘积必须和seat_count一致。
-- 3. 无法安全解析的历史文本回退为1行、seat_count列,保证机位不丢失。
-- 4. 完成数据回填和非空约束后删除layout_description,后续不再保存文本布局。
delimiter
$$
drop
procedure
if
exists
migrate_training_room_layout
$$
create
procedure
migrate_training_room_layout
()
begin
if
not
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'training_room'
and
column_name
=
'layout_rows'
)
then
alter
table
training_room
add
column
layout_rows
int
null
comment
'机位布局行数'
after
seat_count
;
end
if
;
if
not
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'training_room'
and
column_name
=
'layout_columns'
)
then
alter
table
training_room
add
column
layout_columns
int
null
comment
'机位布局列数'
after
layout_rows
;
end
if
;
if
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'training_room'
and
column_name
=
'layout_description'
)
then
-- 将常见分隔符归一为X,仅迁移纯数字的行列格式。
update
training_room
set
layout_rows
=
cast
(
substring_index
(
upper
(
replace
(
replace
(
replace
(
trim
(
layout_description
),
'×'
,
'X'
),
'*'
,
'X'
),
' '
,
''
)),
'X'
,
1
)
as
unsigned
),
layout_columns
=
cast
(
substring_index
(
upper
(
replace
(
replace
(
replace
(
trim
(
layout_description
),
'×'
,
'X'
),
'*'
,
'X'
),
' '
,
''
)),
'X'
,
-
1
)
as
unsigned
)
where
upper
(
replace
(
replace
(
replace
(
trim
(
layout_description
),
'×'
,
'X'
),
'*'
,
'X'
),
' '
,
''
))
regexp
'^[1-9][0-9]{0,8}X[1-9][0-9]{0,8}$'
;
-- 只保留与seat_count一致的解析结果,防止错误文本改变现有机位数量。
update
training_room
set
layout_rows
=
null
,
layout_columns
=
null
where
layout_rows
is
not
null
and
layout_rows
*
layout_columns
!=
seat_count
;
end
if
;
update
training_room
set
layout_rows
=
1
,
layout_columns
=
greatest
(
coalesce
(
seat_count
,
1
),
1
),
seat_count
=
greatest
(
coalesce
(
seat_count
,
1
),
1
)
where
layout_rows
is
null
or
layout_columns
is
null
or
layout_rows
<
1
or
layout_columns
<
1
or
layout_rows
*
layout_columns
!=
seat_count
;
alter
table
training_room
modify
column
layout_rows
int
not
null
comment
'机位布局行数'
,
modify
column
layout_columns
int
not
null
comment
'机位布局列数'
;
if
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'training_room'
and
column_name
=
'layout_description'
)
then
alter
table
training_room
drop
column
layout_description
;
end
if
;
end
$$
call
migrate_training_room_layout
()
$$
drop
procedure
if
exists
migrate_training_room_layout
$$
delimiter
;
-- 部署后核验:结果应为0。
select
count
(
*
)
as
invalid_training_room_layout_count
from
training_room
where
layout_rows
<
1
or
layout_columns
<
1
or
seat_count
!=
layout_rows
*
layout_columns
;
practical-business/src/main/resources/training-room-layout-api.md
0 → 100644
View file @
e0044f7b
# 实训室结构化布局接口说明
布局不再使用
`layoutDescription`
文本,而是使用整数字段
`layoutRows`
和
`layoutColumns`
。
`seatCount`
由服务端按两者乘积计算,请求可以不传;如果传入,
必须与乘积一致。
## 新增或编辑布局
3行4列实训室请求示例:
```
json
{
"name"
:
"第一实训室"
,
"location"
:
"A101"
,
"allDay"
:
true
,
"layoutRows"
:
3
,
"layoutColumns"
:
4
}
```
列表、详情和新增成功响应会返回:
```
json
{
"seatCount"
:
12
,
"layoutRows"
:
3
,
"layoutColumns"
:
4
}
```
## 查询机位状态
管理端:
`GET /training/room/admin/{roomId}/seats?bookingDate=2026-08-31&slotCode=1`
学员端:
`GET /training/room/student/{roomId}/seats?bookingDate=2026-08-31&slotCode=1`
机位位置由服务端返回,前端不再解析布局文本:
```
json
{
"data"
:
[
{
"id"
:
"seat-1"
,
"seatNo"
:
1
,
"rowNo"
:
1
,
"columnNo"
:
1
,
"status"
:
"free"
,
"bookingId"
:
null
},
{
"id"
:
"seat-2"
,
"seatNo"
:
2
,
"rowNo"
:
1
,
"columnNo"
:
2
,
"status"
:
"booked"
,
"bookingId"
:
"booking-1"
}
]
}
```
机位状态:
-
`free`
:该日期和时段可预约。
-
`booked`
:已预约、尚未开始。
-
`using`
:正在使用。
停用机位不会出现在可用性响应中。
## 数据库迁移
部署新版本前执行
`sql/training_room_layout.sql`
。脚本会将可识别的旧布局文本转为
行列数,然后删除
`layout_description`
字段。
practical-business/src/test/java/com/platform/business/mapper/AttendanceStatisticsMapperXmlTest.java
0 → 100644
View file @
e0044f7b
package
com.platform.business.mapper
;
import
com.platform.business.model.dto.AttendanceQueryDTO
;
import
org.apache.ibatis.builder.xml.XMLMapperBuilder
;
import
org.apache.ibatis.io.Resources
;
import
org.apache.ibatis.mapping.BoundSql
;
import
org.apache.ibatis.session.Configuration
;
import
org.junit.jupiter.api.Test
;
import
java.io.InputStream
;
import
java.util.Calendar
;
import
java.util.Date
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertTrue
;
/** 管理端出勤看板SQL口径的解析测试,防止迟到再次被误计为正常签到。 */
class
AttendanceStatisticsMapperXmlTest
{
@Test
void
summaryShouldExposeDashboardCountsAndUseNormalOnlyForAttendanceRate
()
throws
Exception
{
Configuration
configuration
=
new
Configuration
();
parse
(
configuration
,
"com/platform/business/mapper/ClassSubjectAttendanceMapper.xml"
);
AttendanceQueryDTO
query
=
new
AttendanceQueryDTO
();
query
.
setClassId
(
12
);
query
.
setStartDate
(
date
(
2026
,
Calendar
.
AUGUST
,
1
));
query
.
setEndDate
(
date
(
2026
,
Calendar
.
AUGUST
,
31
));
BoundSql
boundSql
=
configuration
.
getMappedStatement
(
"com.platform.business.mapper.ClassSubjectAttendanceMapper.querySummary"
)
.
getBoundSql
(
query
);
String
sql
=
compact
(
boundSql
.
getSql
());
// 班级人数来自成员关系、课程数来自排课,二者不依赖是否已经生成出勤记录。
assertTrue
(
sql
.
contains
(
"select count(*) from class_student member where member.class_id = ?"
));
assertTrue
(
sql
.
contains
(
"from class_subject scoped_subject"
));
assertTrue
(
sql
.
contains
(
"as studentCount"
));
assertTrue
(
sql
.
contains
(
"as courseCount"
));
// 图片口径:仅NORMAL进入出勤率分子,其他三个状态组成异常人次。
assertTrue
(
sql
.
contains
(
"a.status in ('LATE', 'ABSENT', 'LEAVE') then 1 else 0 end) as abnormalCount"
));
assertTrue
(
sql
.
contains
(
"sum(case when a.status = 'NORMAL' then 1 else 0 end) * 100.0 / count(a.id)"
));
}
private
static
void
parse
(
Configuration
configuration
,
String
resource
)
throws
Exception
{
try
(
InputStream
input
=
Resources
.
getResourceAsStream
(
resource
))
{
new
XMLMapperBuilder
(
input
,
configuration
,
resource
,
configuration
.
getSqlFragments
()).
parse
();
}
}
/** 构造不受当前时区与时分秒影响的日期筛选条件。 */
private
static
Date
date
(
int
year
,
int
month
,
int
day
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
clear
();
calendar
.
set
(
year
,
month
,
day
,
0
,
0
,
0
);
return
calendar
.
getTime
();
}
private
static
String
compact
(
String
sql
)
{
return
sql
.
replaceAll
(
"\\s+"
,
" "
).
trim
();
}
}
practical-business/src/test/java/com/platform/business/service/impl/EvaluationServiceImplTest.java
View file @
e0044f7b
...
...
@@ -5,6 +5,7 @@ import com.platform.business.mapper.EvaluationRecordMapper;
import
com.platform.business.mapper.EvaluationTaskMapper
;
import
com.platform.business.model.dto.EvaluationSubmitDTO
;
import
com.platform.business.model.dto.EvaluationTaskCreateDTO
;
import
com.platform.business.model.dto.EvaluationTaskQueryDTO
;
import
com.platform.business.model.dto.NotificationPublishDTO
;
import
com.platform.business.model.entity.ClassSubjectEntity
;
import
com.platform.business.model.entity.EvaluationRecordEntity
;
...
...
@@ -25,9 +26,11 @@ import org.mockito.junit.jupiter.MockitoExtension;
import
java.text.SimpleDateFormat
;
import
java.util.Arrays
;
import
java.util.Calendar
;
import
java.util.Collections
;
import
java.util.Date
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertNull
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertThrows
;
import
static
org
.
mockito
.
ArgumentMatchers
.
any
;
import
static
org
.
mockito
.
ArgumentMatchers
.
eq
;
...
...
@@ -135,6 +138,31 @@ class EvaluationServiceImplTest {
assertEquals
(
"评价已提交,不能重复提交或修改"
,
exception
.
getMessage
());
}
@Test
void
queryAdminTasksShouldIgnorePageAllSentinels
()
{
EvaluationTaskQueryDTO
query
=
new
EvaluationTaskQueryDTO
();
query
.
setCourseName
(
" "
);
query
.
setClassId
(
0
);
query
.
setTeacherId
(
"ALL"
);
query
.
setType
(
"全部"
);
query
.
setStatus
(
"all"
);
when
(
taskMapper
.
queryAdminTasks
(
any
(
EvaluationTaskQueryDTO
.
class
)))
.
thenReturn
(
Collections
.
emptyList
());
service
.
queryAdminTasks
(
query
);
// 页面表示“不限”的默认值必须在进入Mapper前清空,否则会把刚新增的任务过滤掉。
ArgumentCaptor
<
EvaluationTaskQueryDTO
>
queryCaptor
=
ArgumentCaptor
.
forClass
(
EvaluationTaskQueryDTO
.
class
);
verify
(
taskMapper
).
queryAdminTasks
(
queryCaptor
.
capture
());
EvaluationTaskQueryDTO
normalized
=
queryCaptor
.
getValue
();
assertNull
(
normalized
.
getCourseName
());
assertNull
(
normalized
.
getClassId
());
assertNull
(
normalized
.
getTeacherId
());
assertNull
(
normalized
.
getType
());
assertNull
(
normalized
.
getStatus
());
}
private
EvaluationTaskEntity
pendingTask
()
{
Calendar
deadline
=
Calendar
.
getInstance
();
deadline
.
add
(
Calendar
.
DAY_OF_MONTH
,
1
);
...
...
practical-business/src/test/java/com/platform/business/service/impl/TrainingRoomServiceImplTest.java
0 → 100644
View file @
e0044f7b
package
com.platform.business.service.impl
;
import
com.platform.business.mapper.TrainingRoomMapper
;
import
com.platform.business.model.dto.TrainingRoomDTO
;
import
com.platform.business.model.entity.TrainingRoomEntity
;
import
com.platform.business.service.TrainingRoomSeatService
;
import
com.platform.business.service.UserService
;
import
com.platform.exception.BusinessException
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.mockito.ArgumentCaptor
;
import
org.mockito.Mock
;
import
org.mockito.junit.jupiter.MockitoExtension
;
import
org.springframework.test.util.ReflectionTestUtils
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertThrows
;
import
static
org
.
mockito
.
ArgumentMatchers
.
any
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
when
;
/** 实训室结构化布局校验和机位同步测试。 */
@ExtendWith
(
MockitoExtension
.
class
)
class
TrainingRoomServiceImplTest
{
@Mock
private
TrainingRoomMapper
mapper
;
@Mock
private
TrainingRoomSeatService
seatService
;
@Mock
private
UserService
userService
;
private
TrainingRoomServiceImpl
service
;
@BeforeEach
void
setUp
()
{
service
=
new
TrainingRoomServiceImpl
();
ReflectionTestUtils
.
setField
(
service
,
"baseMapper"
,
mapper
);
ReflectionTestUtils
.
setField
(
service
,
"trainingRoomSeatService"
,
seatService
);
ReflectionTestUtils
.
setField
(
service
,
"userService"
,
userService
);
}
@Test
void
createRoomShouldDeriveSeatCountFromRowsAndColumns
()
{
TrainingRoomDTO
request
=
room
(
3
,
4
);
when
(
mapper
.
countSameName
(
"结构化布局实训室"
,
null
)).
thenReturn
(
0
);
when
(
mapper
.
insert
(
any
(
TrainingRoomEntity
.
class
))).
thenReturn
(
1
);
service
.
createRoom
(
request
);
ArgumentCaptor
<
TrainingRoomEntity
>
roomCaptor
=
ArgumentCaptor
.
forClass
(
TrainingRoomEntity
.
class
);
verify
(
mapper
).
insert
(
roomCaptor
.
capture
());
TrainingRoomEntity
saved
=
roomCaptor
.
getValue
();
assertEquals
(
3
,
saved
.
getLayoutRows
());
assertEquals
(
4
,
saved
.
getLayoutColumns
());
assertEquals
(
12
,
saved
.
getSeatCount
());
// 机位编号仍保持1至行列乘积的连续编号,供预约状态查询使用。
verify
(
seatService
).
synchronizeSeats
(
saved
.
getId
(),
12
);
}
@Test
void
createRoomShouldRejectSeatCountThatConflictsWithLayout
()
{
TrainingRoomDTO
request
=
room
(
3
,
4
);
request
.
setSeatCount
(
10
);
BusinessException
exception
=
assertThrows
(
BusinessException
.
class
,
()
->
service
.
createRoom
(
request
));
assertEquals
(
"机位总数必须等于布局行数乘以列数"
,
exception
.
getMessage
());
}
/** 构造全天开放的最小有效实训室请求,使测试仅聚焦布局规则。 */
private
TrainingRoomDTO
room
(
int
rows
,
int
columns
)
{
TrainingRoomDTO
room
=
new
TrainingRoomDTO
();
room
.
setName
(
"结构化布局实训室"
);
room
.
setLocation
(
"A101"
);
room
.
setAllDay
(
true
);
room
.
setLayoutRows
(
rows
);
room
.
setLayoutColumns
(
columns
);
return
room
;
}
}
practical-business/src/test/java/com/platform/business/sql/TrainingRoomLayoutMigrationSqlTest.java
0 → 100644
View file @
e0044f7b
package
com.platform.business.sql
;
import
org.junit.jupiter.api.Test
;
import
java.io.ByteArrayOutputStream
;
import
java.io.InputStream
;
import
java.nio.charset.StandardCharsets
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertTrue
;
/** 验证实训室布局迁移会回填结构化行列并移除文本字段。 */
class
TrainingRoomLayoutMigrationSqlTest
{
@Test
void
migrationShouldCreateStructuredLayoutAndRemoveTextColumn
()
throws
Exception
{
String
sql
=
resource
(
"sql/training_room_layout.sql"
).
toLowerCase
();
assertTrue
(
sql
.
contains
(
"add column layout_rows int"
));
assertTrue
(
sql
.
contains
(
"add column layout_columns int"
));
assertTrue
(
sql
.
contains
(
"layout_rows * layout_columns != seat_count"
));
assertTrue
(
sql
.
contains
(
"drop column layout_description"
));
assertTrue
(
sql
.
contains
(
"invalid_training_room_layout_count"
));
}
/** 从测试资源读取SQL,确保验证的正是最终打包内容。 */
private
String
resource
(
String
path
)
throws
Exception
{
try
(
InputStream
input
=
Thread
.
currentThread
().
getContextClassLoader
()
.
getResourceAsStream
(
path
))
{
assertTrue
(
input
!=
null
,
"迁移SQL资源必须存在:"
+
path
);
ByteArrayOutputStream
output
=
new
ByteArrayOutputStream
();
byte
[]
buffer
=
new
byte
[
4096
];
int
length
;
while
((
length
=
input
.
read
(
buffer
))
>=
0
)
{
output
.
write
(
buffer
,
0
,
length
);
}
return
new
String
(
output
.
toByteArray
(),
StandardCharsets
.
UTF_8
);
}
}
}
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