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
ca71e3af
Commit
ca71e3af
authored
Nov 17, 2026
by
wujipeng
Browse files
优化项
parent
091a5b1e
Changes
13
Show whitespace changes
Inline
Side-by-side
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/CourseAdminScheduleSwapDTO.java
0 → 100644
View file @
ca71e3af
package
com.platform.business.model.dto
;
import
lombok.Data
;
/** 班级详情中“与已有课次对调”的请求。 */
@Data
public
class
CourseAdminScheduleSwapDTO
{
/** 目标排课组;必须与路径中的源排课组属于同一班级且不能相同。 */
private
String
targetScheduleGroupId
;
/** 产品规定的必填调课原因。 */
private
String
reason
;
/** 可选调课说明,服务端限制最多60字。 */
private
String
note
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/ClassSubjectEntity.java
View file @
ca71e3af
...
@@ -68,6 +68,18 @@ public class ClassSubjectEntity {
...
@@ -68,6 +68,18 @@ public class ClassSubjectEntity {
@ApiModelProperty
(
value
=
"课程类型:理论/实训/考核"
)
@ApiModelProperty
(
value
=
"课程类型:理论/实训/考核"
)
private
String
type
;
private
String
type
;
/** 是否参加过最近一次课次对调;组内所有课程保持相同值。 */
private
Boolean
adjusted
;
/** 最近一次对调的另一排课组ID,用于列表悬浮说明。 */
private
String
adjustmentCounterpartGroupId
;
/** 最近一次调课原因。 */
private
String
adjustmentReason
;
/** 最近一次调课说明,产品限制最多60字。 */
private
String
adjustmentNote
;
/** 记录创建时间,由管理端新增接口维护。 */
/** 记录创建时间,由管理端新增接口维护。 */
@TableField
(
"create_time"
)
@TableField
(
"create_time"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/CourseAdminScheduleGroupVO.java
View file @
ca71e3af
...
@@ -26,4 +26,9 @@ public class CourseAdminScheduleGroupVO {
...
@@ -26,4 +26,9 @@ public class CourseAdminScheduleGroupVO {
private
Integer
subjectTimes
;
private
Integer
subjectTimes
;
private
BigDecimal
totalHours
;
private
BigDecimal
totalHours
;
private
List
<
CourseAdminScheduleVO
>
items
;
private
List
<
CourseAdminScheduleVO
>
items
;
/** 最近一次调课信息从组内课程聚合,供列表标签与悬浮详情使用。 */
private
Boolean
adjusted
;
private
String
adjustmentCounterpartGroupId
;
private
String
adjustmentReason
;
private
String
adjustmentNote
;
}
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/CourseAdminScheduleVO.java
View file @
ca71e3af
...
@@ -40,6 +40,10 @@ public class CourseAdminScheduleVO {
...
@@ -40,6 +40,10 @@ public class CourseAdminScheduleVO {
private
String
location
;
private
String
location
;
private
String
type
;
private
String
type
;
private
String
remark
;
private
String
remark
;
private
Boolean
adjusted
;
private
String
adjustmentCounterpartGroupId
;
private
String
adjustmentReason
;
private
String
adjustmentNote
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
private
Date
createTime
;
...
...
practical-business/src/main/java/com/platform/business/controller/CourseAdminController.java
View file @
ca71e3af
...
@@ -3,6 +3,7 @@ package com.platform.business.controller;
...
@@ -3,6 +3,7 @@ package com.platform.business.controller;
import
com.platform.business.model.dto.CourseAdminBatchSaveDTO
;
import
com.platform.business.model.dto.CourseAdminBatchSaveDTO
;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleSwapDTO
;
import
com.platform.business.model.entity.UserEntity
;
import
com.platform.business.model.entity.UserEntity
;
import
com.platform.business.model.vo.ClassAdminTreeVO
;
import
com.platform.business.model.vo.ClassAdminTreeVO
;
import
com.platform.business.model.vo.CourseAdminDetailVO
;
import
com.platform.business.model.vo.CourseAdminDetailVO
;
...
@@ -117,6 +118,16 @@ public class CourseAdminController {
...
@@ -117,6 +118,16 @@ public class CourseAdminController {
return
Result
.
data
(
courseAdminService
.
updateSchedule
(
scheduleGroupId
,
body
));
return
Result
.
data
(
courseAdminService
.
updateSchedule
(
scheduleGroupId
,
body
));
}
}
@ApiOperation
(
"与同班已有课次对调"
)
@PostMapping
(
"/schedules/{scheduleGroupId}/swap"
)
public
Result
<
List
<
CourseAdminScheduleGroupVO
>>
swapSchedule
(
@PathVariable
(
"scheduleGroupId"
)
String
scheduleGroupId
,
@RequestBody
CourseAdminScheduleSwapDTO
body
,
HttpServletRequest
request
)
{
requireAdmin
(
request
);
return
Result
.
data
(
courseAdminService
.
swapSchedule
(
scheduleGroupId
,
body
));
}
@ApiOperation
(
"删除未产生业务数据的课程"
)
@ApiOperation
(
"删除未产生业务数据的课程"
)
@DeleteMapping
(
"/{courseId}"
)
@DeleteMapping
(
"/{courseId}"
)
public
Result
<
Boolean
>
delete
(
@PathVariable
(
"courseId"
)
Integer
courseId
,
public
Result
<
Boolean
>
delete
(
@PathVariable
(
"courseId"
)
Integer
courseId
,
...
...
practical-business/src/main/java/com/platform/business/service/CourseAdminService.java
View file @
ca71e3af
...
@@ -3,6 +3,7 @@ package com.platform.business.service;
...
@@ -3,6 +3,7 @@ package com.platform.business.service;
import
com.platform.business.model.dto.CourseAdminBatchSaveDTO
;
import
com.platform.business.model.dto.CourseAdminBatchSaveDTO
;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleSwapDTO
;
import
com.platform.business.model.vo.ClassAdminTreeVO
;
import
com.platform.business.model.vo.ClassAdminTreeVO
;
import
com.platform.business.model.vo.CourseAdminDetailVO
;
import
com.platform.business.model.vo.CourseAdminDetailVO
;
import
com.platform.business.model.vo.CourseAdminOptionsVO
;
import
com.platform.business.model.vo.CourseAdminOptionsVO
;
...
@@ -36,6 +37,10 @@ public interface CourseAdminService {
...
@@ -36,6 +37,10 @@ public interface CourseAdminService {
CourseAdminScheduleGroupVO
updateSchedule
(
String
scheduleGroupId
,
CourseAdminScheduleGroupVO
updateSchedule
(
String
scheduleGroupId
,
CourseAdminScheduleGroupSaveDTO
request
);
CourseAdminScheduleGroupSaveDTO
request
);
/** 与同班另一课次交换日期、时段、课次和课时,课程内容及教师保持不变。 */
List
<
CourseAdminScheduleGroupVO
>
swapSchedule
(
String
scheduleGroupId
,
CourseAdminScheduleSwapDTO
request
);
void
delete
(
Integer
courseId
);
void
delete
(
Integer
courseId
);
void
export
(
Integer
classId
,
Date
startDate
,
Date
endDate
,
void
export
(
Integer
classId
,
Date
startDate
,
Date
endDate
,
...
...
practical-business/src/main/java/com/platform/business/service/impl/CourseAdminServiceImpl.java
View file @
ca71e3af
...
@@ -9,6 +9,7 @@ import com.platform.business.model.dto.CourseAdminBatchSaveDTO;
...
@@ -9,6 +9,7 @@ import com.platform.business.model.dto.CourseAdminBatchSaveDTO;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleItemSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleItemSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleSwapDTO
;
import
com.platform.business.model.entity.ClassEntity
;
import
com.platform.business.model.entity.ClassEntity
;
import
com.platform.business.model.entity.ClassSubjectEntity
;
import
com.platform.business.model.entity.ClassSubjectEntity
;
import
com.platform.business.model.vo.ClassAdminOptionVO
;
import
com.platform.business.model.vo.ClassAdminOptionVO
;
...
@@ -555,6 +556,7 @@ public class CourseAdminServiceImpl implements CourseAdminService {
...
@@ -555,6 +556,7 @@ public class CourseAdminServiceImpl implements CourseAdminService {
PreparedCourse
prepared
=
prepareCourse
(
request
,
existing
.
getClassId
(),
managedClass
,
null
);
PreparedCourse
prepared
=
prepareCourse
(
request
,
existing
.
getClassId
(),
managedClass
,
null
);
prepared
.
entity
.
setId
(
courseId
);
prepared
.
entity
.
setId
(
courseId
);
prepared
.
entity
.
setScheduleGroupId
(
resolveStoredGroupId
(
existing
));
prepared
.
entity
.
setScheduleGroupId
(
resolveStoredGroupId
(
existing
));
copyAdjustmentMetadata
(
existing
,
prepared
.
entity
);
prepared
.
entity
.
setUpdateTime
(
new
Date
());
prepared
.
entity
.
setUpdateTime
(
new
Date
());
ensureNoConflict
(
prepared
.
entity
,
prepared
.
timeRanges
,
ensureNoConflict
(
prepared
.
entity
,
prepared
.
timeRanges
,
Collections
.
singletonList
(
courseId
));
Collections
.
singletonList
(
courseId
));
...
@@ -605,6 +607,10 @@ public class CourseAdminServiceImpl implements CourseAdminService {
...
@@ -605,6 +607,10 @@ public class CourseAdminServiceImpl implements CourseAdminService {
value
.
setSubjectTimes
(
0
);
value
.
setSubjectTimes
(
0
);
value
.
setTotalHours
(
BigDecimal
.
ZERO
);
value
.
setTotalHours
(
BigDecimal
.
ZERO
);
value
.
setItems
(
new
ArrayList
<>());
value
.
setItems
(
new
ArrayList
<>());
value
.
setAdjusted
(
Boolean
.
TRUE
.
equals
(
course
.
getAdjusted
()));
value
.
setAdjustmentCounterpartGroupId
(
course
.
getAdjustmentCounterpartGroupId
());
value
.
setAdjustmentReason
(
course
.
getAdjustmentReason
());
value
.
setAdjustmentNote
(
course
.
getAdjustmentNote
());
return
value
;
return
value
;
});
});
group
.
getItems
().
add
(
course
);
group
.
getItems
().
add
(
course
);
...
@@ -658,6 +664,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
...
@@ -658,6 +664,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
classId
,
managedClass
,
null
);
classId
,
managedClass
,
null
);
ensureNoSubmittedConflict
(
prepared
,
preparedCourses
);
ensureNoSubmittedConflict
(
prepared
,
preparedCourses
);
prepared
.
entity
.
setScheduleGroupId
(
normalizedGroupId
);
prepared
.
entity
.
setScheduleGroupId
(
normalizedGroupId
);
// 新增的上午/下午 item 继承排课组调课信息,保证同组标签始终一致。
copyAdjustmentMetadata
(
existingCourses
.
get
(
0
),
prepared
.
entity
);
if
(
item
.
getId
()
!=
null
)
{
if
(
item
.
getId
()
!=
null
)
{
ClassSubjectEntity
existing
=
existingById
.
get
(
item
.
getId
());
ClassSubjectEntity
existing
=
existingById
.
get
(
item
.
getId
());
...
@@ -668,6 +676,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
...
@@ -668,6 +676,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
throw
new
BusinessException
(
"同一课程ID不能重复提交"
);
throw
new
BusinessException
(
"同一课程ID不能重复提交"
);
}
}
prepared
.
entity
.
setId
(
item
.
getId
());
prepared
.
entity
.
setId
(
item
.
getId
());
// 课程编辑不能清除既有调课标记;该元数据只由“课次对调”入口维护。
copyAdjustmentMetadata
(
existing
,
prepared
.
entity
);
if
(!
sameCourseContent
(
existing
,
prepared
.
entity
)
if
(!
sameCourseContent
(
existing
,
prepared
.
entity
)
&&
hasCourseDependencies
(
item
.
getId
()))
{
&&
hasCourseDependencies
(
item
.
getId
()))
{
throw
new
BusinessException
(
"课程已产生签到、请假或评价数据,不能修改"
);
throw
new
BusinessException
(
"课程已产生签到、请假或评价数据,不能修改"
);
...
@@ -718,6 +728,75 @@ public class CourseAdminServiceImpl implements CourseAdminService {
...
@@ -718,6 +728,75 @@ public class CourseAdminServiceImpl implements CourseAdminService {
.
orElseThrow
(()
->
new
BusinessException
(
"课程保存成功但读取失败,请刷新后重试"
));
.
orElseThrow
(()
->
new
BusinessException
(
"课程保存成功但读取失败,请刷新后重试"
));
}
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
List
<
CourseAdminScheduleGroupVO
>
swapSchedule
(
String
scheduleGroupId
,
CourseAdminScheduleSwapDTO
request
)
{
String
sourceGroupId
=
requireScheduleGroupId
(
scheduleGroupId
);
if
(
request
==
null
)
throw
new
BusinessException
(
"调课信息不能为空"
);
String
targetGroupId
=
requireScheduleGroupId
(
request
.
getTargetScheduleGroupId
());
if
(
sourceGroupId
.
equals
(
targetGroupId
))
throw
new
BusinessException
(
"不能与当前课次对调"
);
String
reason
=
requireText
(
request
.
getReason
(),
"调课原因"
,
32
);
String
note
=
optionalText
(
request
.
getNote
(),
"调课说明"
,
60
);
List
<
ClassSubjectEntity
>
sourceSnapshot
=
classSubjectMapper
.
selectAdminCourseGroupEntities
(
sourceGroupId
);
List
<
ClassSubjectEntity
>
targetSnapshot
=
classSubjectMapper
.
selectAdminCourseGroupEntities
(
targetGroupId
);
if
(
sourceSnapshot
==
null
||
sourceSnapshot
.
isEmpty
()
||
targetSnapshot
==
null
||
targetSnapshot
.
isEmpty
())
{
throw
new
BusinessException
(
"源课次或目标课次不存在,请刷新后重试"
);
}
int
classId
=
requireSingleGroupClass
(
sourceSnapshot
);
if
(
requireSingleGroupClass
(
targetSnapshot
)
!=
classId
)
{
throw
new
BusinessException
(
"只能与同一班级的课次对调"
);
}
lockAndLoadClass
(
classId
);
// 取得班级锁后必须重新读取,防止等待锁期间另一管理员已修改候选课次。
List
<
ClassSubjectEntity
>
source
=
classSubjectMapper
.
selectAdminCourseGroupEntities
(
sourceGroupId
);
List
<
ClassSubjectEntity
>
target
=
classSubjectMapper
.
selectAdminCourseGroupEntities
(
targetGroupId
);
if
(
source
==
null
||
source
.
isEmpty
()
||
target
==
null
||
target
.
isEmpty
()
||
requireSingleGroupClass
(
source
)
!=
classId
||
requireSingleGroupClass
(
target
)
!=
classId
)
{
throw
new
BusinessException
(
"课次信息已发生变化,请刷新后重试"
);
}
lockTeachers
(
java
.
util
.
stream
.
Stream
.
concat
(
source
.
stream
(),
target
.
stream
())
.
map
(
ClassSubjectEntity:
:
getTeacherId
).
filter
(
Objects:
:
nonNull
)
.
distinct
().
sorted
().
collect
(
Collectors
.
toList
()));
TemporalPayload
sourceTime
=
captureTemporalPayload
(
source
);
TemporalPayload
targetTime
=
captureTemporalPayload
(
target
);
applyTemporalPayload
(
source
,
targetTime
);
applyTemporalPayload
(
target
,
sourceTime
);
List
<
Integer
>
excludedIds
=
java
.
util
.
stream
.
Stream
.
concat
(
source
.
stream
(),
target
.
stream
())
.
map
(
ClassSubjectEntity:
:
getId
).
collect
(
Collectors
.
toList
());
Date
now
=
new
Date
();
for
(
ClassSubjectEntity
course
:
source
)
{
markAdjustment
(
course
,
targetGroupId
,
reason
,
note
,
now
);
ensureNoConflict
(
course
,
normalizeStoredFrames
(
course
.
getTimeFrame
()),
excludedIds
);
}
for
(
ClassSubjectEntity
course
:
target
)
{
markAdjustment
(
course
,
sourceGroupId
,
reason
,
note
,
now
);
ensureNoConflict
(
course
,
normalizeStoredFrames
(
course
.
getTimeFrame
()),
excludedIds
);
}
for
(
ClassSubjectEntity
course
:
java
.
util
.
stream
.
Stream
.
concat
(
source
.
stream
(),
target
.
stream
())
.
collect
(
Collectors
.
toList
()))
{
if
(
classSubjectMapper
.
updateAdminCourse
(
course
)
!=
1
)
{
throw
new
BusinessException
(
"课次信息已发生变化,请刷新后重试"
);
}
}
CourseAdminDetailVO
refreshed
=
detail
(
classId
,
null
,
null
);
Set
<
String
>
swappedIds
=
new
HashSet
<>(
java
.
util
.
Arrays
.
asList
(
sourceGroupId
,
targetGroupId
));
return
refreshed
.
getSchedules
().
stream
()
.
filter
(
group
->
swappedIds
.
contains
(
group
.
getScheduleGroupId
()))
.
collect
(
Collectors
.
toList
());
}
@Override
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
delete
(
Integer
courseId
)
{
public
void
delete
(
Integer
courseId
)
{
...
@@ -1180,6 +1259,86 @@ public class CourseAdminServiceImpl implements CourseAdminService {
...
@@ -1180,6 +1259,86 @@ public class CourseAdminServiceImpl implements CourseAdminService {
return
groupId
==
null
?
"legacy-"
+
existing
.
getId
()
:
groupId
;
return
groupId
==
null
?
"legacy-"
+
existing
.
getId
()
:
groupId
;
}
}
/** 复制只由调课入口维护的元数据,普通编辑不得清空或伪造这些字段。 */
private
void
copyAdjustmentMetadata
(
ClassSubjectEntity
source
,
ClassSubjectEntity
target
)
{
target
.
setAdjusted
(
Boolean
.
TRUE
.
equals
(
source
.
getAdjusted
()));
target
.
setAdjustmentCounterpartGroupId
(
source
.
getAdjustmentCounterpartGroupId
());
target
.
setAdjustmentReason
(
source
.
getAdjustmentReason
());
target
.
setAdjustmentNote
(
source
.
getAdjustmentNote
());
}
/** 把一个排课组压缩为可交换的时间载荷,课程内容和教师不进入载荷。 */
private
TemporalPayload
captureTemporalPayload
(
List
<
ClassSubjectEntity
>
courses
)
{
List
<
String
>
frames
=
courses
.
stream
()
.
flatMap
(
course
->
splitStoredFrames
(
course
.
getTimeFrame
()).
stream
())
.
distinct
()
.
sorted
(
Comparator
.
comparing
(
frame
->
parseTimeRange
(
frame
).
start
))
.
collect
(
Collectors
.
toList
());
if
(
frames
.
isEmpty
())
throw
new
BusinessException
(
"课次缺少有效时段,无法调课"
);
int
subjectTimes
=
courses
.
stream
().
mapToInt
(
ClassSubjectEntity:
:
getSubjectTimes
).
sum
();
BigDecimal
hours
=
courses
.
stream
().
map
(
ClassSubjectEntity:
:
getSubjectHour
)
.
filter
(
Objects:
:
nonNull
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
);
return
new
TemporalPayload
(
courses
.
get
(
0
).
getDate
(),
frames
,
subjectTimes
,
hours
);
}
/**
* 将来源课次的时间载荷应用到目标课程内容上。
*
* <p>一条课程时直接接收整天时段;上午/下午两条课程时按中午分割,并按时段数
* 分摊课次和课时,确保组级总数与来源课次完全一致。</p>
*/
private
void
applyTemporalPayload
(
List
<
ClassSubjectEntity
>
destination
,
TemporalPayload
payload
)
{
if
(
destination
.
size
()
>
2
)
{
throw
new
BusinessException
(
"当前课次包含两条以上独立课程,暂不支持与其对调"
);
}
if
(
destination
.
size
()
==
1
)
{
applyTemporalPart
(
destination
.
get
(
0
),
payload
.
date
,
payload
.
frames
,
payload
.
subjectTimes
,
payload
.
hours
);
return
;
}
List
<
String
>
morning
=
payload
.
frames
.
stream
()
.
filter
(
frame
->
parseTimeRange
(
frame
).
start
.
isBefore
(
NOON
))
.
collect
(
Collectors
.
toList
());
List
<
String
>
afternoon
=
payload
.
frames
.
stream
()
.
filter
(
frame
->
!
parseTimeRange
(
frame
).
start
.
isBefore
(
NOON
))
.
collect
(
Collectors
.
toList
());
if
(
morning
.
isEmpty
()
||
afternoon
.
isEmpty
())
{
throw
new
BusinessException
(
"源课次没有完整的上午、下午时段,无法与双课程课次对调"
);
}
int
totalFrames
=
payload
.
frames
.
size
();
int
morningTimes
=
payload
.
subjectTimes
*
morning
.
size
()
/
totalFrames
;
int
afternoonTimes
=
payload
.
subjectTimes
-
morningTimes
;
BigDecimal
morningHours
=
payload
.
hours
.
multiply
(
BigDecimal
.
valueOf
(
morning
.
size
()))
.
divide
(
BigDecimal
.
valueOf
(
totalFrames
),
1
,
java
.
math
.
RoundingMode
.
HALF_UP
);
BigDecimal
afternoonHours
=
payload
.
hours
.
subtract
(
morningHours
);
applyTemporalPart
(
destination
.
get
(
0
),
payload
.
date
,
morning
,
morningTimes
,
morningHours
);
applyTemporalPart
(
destination
.
get
(
1
),
payload
.
date
,
afternoon
,
afternoonTimes
,
afternoonHours
);
}
private
void
applyTemporalPart
(
ClassSubjectEntity
course
,
Date
date
,
List
<
String
>
frames
,
int
subjectTimes
,
BigDecimal
hours
)
{
course
.
setDate
(
date
);
course
.
setWeek
(
chineseWeekday
(
date
));
course
.
setTimeFrame
(
String
.
join
(
","
,
frames
));
course
.
setSubjectTimes
(
subjectTimes
);
course
.
setSubjectHour
(
hours
);
}
private
List
<
TimeRange
>
normalizeStoredFrames
(
String
stored
)
{
return
normalizeTimeFrames
(
splitStoredFrames
(
stored
));
}
/** 两组均写入同一原因和说明,只把对方组ID分别保存。 */
private
void
markAdjustment
(
ClassSubjectEntity
course
,
String
counterpartGroupId
,
String
reason
,
String
note
,
Date
now
)
{
course
.
setAdjusted
(
Boolean
.
TRUE
);
course
.
setAdjustmentCounterpartGroupId
(
counterpartGroupId
);
course
.
setAdjustmentReason
(
reason
);
course
.
setAdjustmentNote
(
note
);
course
.
setUpdateTime
(
now
);
}
private
void
lockTeachers
(
List
<
String
>
teacherIds
)
{
private
void
lockTeachers
(
List
<
String
>
teacherIds
)
{
if
(!
teacherIds
.
isEmpty
())
{
if
(!
teacherIds
.
isEmpty
())
{
classSubjectMapper
.
lockAdminCourseTeachers
(
teacherIds
);
classSubjectMapper
.
lockAdminCourseTeachers
(
teacherIds
);
...
@@ -1390,6 +1549,22 @@ public class CourseAdminServiceImpl implements CourseAdminService {
...
@@ -1390,6 +1549,22 @@ public class CourseAdminServiceImpl implements CourseAdminService {
}
}
}
}
/** 课次交换只携带时间维度,明确隔离课程名称、教师等不可交换内容。 */
private
static
final
class
TemporalPayload
{
private
final
Date
date
;
private
final
List
<
String
>
frames
;
private
final
int
subjectTimes
;
private
final
BigDecimal
hours
;
private
TemporalPayload
(
Date
date
,
List
<
String
>
frames
,
int
subjectTimes
,
BigDecimal
hours
)
{
this
.
date
=
date
;
this
.
frames
=
frames
;
this
.
subjectTimes
=
subjectTimes
;
this
.
hours
=
hours
;
}
}
/** 单个半开时间区间[start, end),相邻课程因此不会被误判为冲突。 */
/** 单个半开时间区间[start, end),相邻课程因此不会被误判为冲突。 */
private
static
final
class
TimeRange
{
private
static
final
class
TimeRange
{
private
final
LocalTime
start
;
private
final
LocalTime
start
;
...
...
practical-business/src/main/resources/com/platform/business/mapper/ClassSubjectMapper.xml
View file @
ca71e3af
...
@@ -375,6 +375,10 @@
...
@@ -375,6 +375,10 @@
subject.location,
subject.location,
subject.type,
subject.type,
subject.remark,
subject.remark,
subject.adjusted,
subject.adjustment_counterpart_group_id as adjustmentCounterpartGroupId,
subject.adjustment_reason as adjustmentReason,
subject.adjustment_note as adjustmentNote,
subject.create_time as createTime,
subject.create_time as createTime,
subject.update_time as updateTime
subject.update_time as updateTime
from class_subject subject
from class_subject subject
...
@@ -405,6 +409,10 @@
...
@@ -405,6 +409,10 @@
subject.location,
subject.location,
subject.type,
subject.type,
subject.remark,
subject.remark,
subject.adjusted,
subject.adjustment_counterpart_group_id as adjustmentCounterpartGroupId,
subject.adjustment_reason as adjustmentReason,
subject.adjustment_note as adjustmentNote,
subject.create_time as createTime,
subject.create_time as createTime,
subject.update_time as updateTime
subject.update_time as updateTime
from class_subject subject
from class_subject subject
...
@@ -420,7 +428,8 @@
...
@@ -420,7 +428,8 @@
resultType=
"com.platform.business.model.entity.ClassSubjectEntity"
>
resultType=
"com.platform.business.model.entity.ClassSubjectEntity"
>
select
select
id, class_id, schedule_group_id, date, week, subject_times, time_frame,
id, class_id, schedule_group_id, date, week, subject_times, time_frame,
subject_hour, subject_name, teacher_id, location, type, remark,
subject_hour, subject_name, teacher_id, location, type, remark, adjusted,
adjustment_counterpart_group_id, adjustment_reason, adjustment_note,
create_time, update_time
create_time, update_time
from class_subject
from class_subject
where schedule_group_id = #{scheduleGroupId}
where schedule_group_id = #{scheduleGroupId}
...
@@ -497,6 +506,10 @@
...
@@ -497,6 +506,10 @@
type = #{type},
type = #{type},
remark = #{remark,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
schedule_group_id = #{scheduleGroupId},
schedule_group_id = #{scheduleGroupId},
adjusted = #{adjusted},
adjustment_counterpart_group_id = #{adjustmentCounterpartGroupId,jdbcType=VARCHAR},
adjustment_reason = #{adjustmentReason,jdbcType=VARCHAR},
adjustment_note = #{adjustmentNote,jdbcType=VARCHAR},
update_time = #{updateTime}
update_time = #{updateTime}
where id = #{id}
where id = #{id}
</update>
</update>
...
...
practical-business/src/main/resources/course-management-api.md
View file @
ca71e3af
...
@@ -175,19 +175,27 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
...
@@ -175,19 +175,27 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
请假或评价的课程允许原样回传,但不能修改或删除;改变组日期也会被视为修改组内每条课程。
请假或评价的课程允许原样回传,但不能修改或删除;改变组日期也会被视为修改组内每条课程。
成功后返回刷新后的单个排课组。
成功后返回刷新后的单个排课组。
## 6. 兼容的单课程编辑与删除
## 6. 与同班已有课次对调
`POST /class/subject/admin/schedules/{scheduleGroupId}/swap`
请求提交
`targetScheduleGroupId`
、必填
`reason`
和最多60字的可选
`note`
。源、目标排课组必须属于
同一班级。服务端只交换日期、星期、时段、课次和课时,课程名称、授课教师、地点、类型和备注
保持在原课程上;两组均记录“已调课”、对方组ID、原因和说明。成功后返回交换后的两个排课组。
## 7. 兼容的单课程编辑与删除
-
`PUT /class/subject/admin/{courseId}`
:保留旧单课程编辑接口,同时执行时段和冲突校验;
-
`PUT /class/subject/admin/{courseId}`
:保留旧单课程编辑接口,同时执行时段和冲突校验;
-
`DELETE /class/subject/admin/{courseId}`
:删除没有签到、请假或评价数据的独立课程。
-
`DELETE /class/subject/admin/{courseId}`
:删除没有签到、请假或评价数据的独立课程。
##
7
. 导出课程表
##
8
. 导出课程表
`GET /class/subject/admin/classes/{classId}/export`
`GET /class/subject/admin/classes/{classId}/export`
支持与列表相同的日期范围参数,返回
带UTF-8 BOM的CSV。各课程按独立行输出,并包含
支持与列表相同的日期范围参数,返回
与导入参考文件一致的
`.docx`
课程安排表;同一排课组按
排课组ID和
`AM/PM/ALL_DAY`
期间,确保不同课程名或教师的信息不会在导出时丢失
。
标准七列表格合并日期、课次、时段和课时,上午、下午课程及教师按原模板分行展示
。
##
8
. 从Word课程安排表导入
##
9
. 从Word课程安排表导入
`POST /class/subject/admin/classes/{classId}/import`
,使用
`multipart/form-data`
上传
`file`
,仅支持
`POST /class/subject/admin/classes/{classId}/import`
,使用
`multipart/form-data`
上传
`file`
,仅支持
`.docx`
且文件不超过10MB。模板表头必须包含日期、课次、时段、课时、课程和授课教师。
`.docx`
且文件不超过10MB。模板表头必须包含日期、课次、时段、课时、课程和授课教师。
...
...
practical-business/src/main/resources/sql/course_management.sql
View file @
ca71e3af
...
@@ -38,6 +38,28 @@ begin
...
@@ -38,6 +38,28 @@ begin
comment
'课程管理页面排课组ID,组内课程仍保留独立主键'
after
class_id
;
comment
'课程管理页面排课组ID,组内课程仍保留独立主键'
after
class_id
;
end
if
;
end
if
;
-- 调课信息跟随排课组内每条课程保存,避免列表刷新后丢失“已调课”标签。
if
not
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'class_subject'
and
column_name
=
'adjusted'
)
then
alter
table
class_subject
add
column
adjusted
tinyint
(
1
)
not
null
default
0
comment
'是否参加过最近一次课次对调'
after
type
;
end
if
;
if
not
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'class_subject'
and
column_name
=
'adjustment_counterpart_group_id'
)
then
alter
table
class_subject
add
column
adjustment_counterpart_group_id
varchar
(
32
)
null
comment
'最近一次对调的另一排课组ID'
after
adjusted
;
end
if
;
if
not
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'class_subject'
and
column_name
=
'adjustment_reason'
)
then
alter
table
class_subject
add
column
adjustment_reason
varchar
(
32
)
null
comment
'最近一次调课原因'
after
adjustment_counterpart_group_id
;
end
if
;
if
not
exists
(
select
1
from
information_schema
.
columns
where
table_schema
=
database
()
and
table_name
=
'class_subject'
and
column_name
=
'adjustment_note'
)
then
alter
table
class_subject
add
column
adjustment_note
varchar
(
60
)
null
comment
'最近一次调课说明'
after
adjustment_reason
;
end
if
;
-- 编辑弹窗仅携带全局唯一的排课组ID,组ID前导索引避免首次定位班级时扫描全表。
-- 编辑弹窗仅携带全局唯一的排课组ID,组ID前导索引避免首次定位班级时扫描全表。
if
not
exists
(
if
not
exists
(
select
1
from
information_schema
.
statistics
select
1
from
information_schema
.
statistics
...
...
practical-business/src/test/java/com/platform/business/controller/CourseAdminControllerTest.java
View file @
ca71e3af
...
@@ -2,6 +2,7 @@ package com.platform.business.controller;
...
@@ -2,6 +2,7 @@ package com.platform.business.controller;
import
com.platform.business.model.entity.UserEntity
;
import
com.platform.business.model.entity.UserEntity
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleSwapDTO
;
import
com.platform.business.model.vo.CourseAdminOptionsVO
;
import
com.platform.business.model.vo.CourseAdminOptionsVO
;
import
com.platform.business.service.AuthenticatedUserService
;
import
com.platform.business.service.AuthenticatedUserService
;
import
com.platform.business.service.CourseAdminService
;
import
com.platform.business.service.CourseAdminService
;
...
@@ -74,4 +75,17 @@ class CourseAdminControllerTest {
...
@@ -74,4 +75,17 @@ class CourseAdminControllerTest {
verify
(
authenticatedUserService
).
requireAdmin
(
administrator
);
verify
(
authenticatedUserService
).
requireAdmin
(
administrator
);
verify
(
courseAdminService
).
updateSchedule
(
"group-1"
,
body
);
verify
(
courseAdminService
).
updateSchedule
(
"group-1"
,
body
);
}
}
@Test
void
swapScheduleShouldRequireAdminAndDelegateGroupId
()
{
MockHttpServletRequest
request
=
new
MockHttpServletRequest
();
UserEntity
administrator
=
new
UserEntity
();
CourseAdminScheduleSwapDTO
body
=
new
CourseAdminScheduleSwapDTO
();
when
(
authenticatedUserService
.
current
(
request
)).
thenReturn
(
administrator
);
controller
.
swapSchedule
(
"group-1"
,
body
,
request
);
verify
(
authenticatedUserService
).
requireAdmin
(
administrator
);
verify
(
courseAdminService
).
swapSchedule
(
"group-1"
,
body
);
}
}
}
practical-business/src/test/java/com/platform/business/service/impl/CourseAdminServiceImplTest.java
View file @
ca71e3af
...
@@ -7,6 +7,7 @@ import com.platform.business.model.dto.CourseAdminBatchSaveDTO;
...
@@ -7,6 +7,7 @@ import com.platform.business.model.dto.CourseAdminBatchSaveDTO;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleGroupSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleItemSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleItemSaveDTO
;
import
com.platform.business.model.dto.CourseAdminScheduleSwapDTO
;
import
com.platform.business.model.entity.ClassEntity
;
import
com.platform.business.model.entity.ClassEntity
;
import
com.platform.business.model.entity.ClassSubjectEntity
;
import
com.platform.business.model.entity.ClassSubjectEntity
;
import
com.platform.business.model.vo.CourseAdminDetailVO
;
import
com.platform.business.model.vo.CourseAdminDetailVO
;
...
@@ -392,6 +393,50 @@ class CourseAdminServiceImplTest {
...
@@ -392,6 +393,50 @@ class CourseAdminServiceImplTest {
verify
(
classSubjectMapper
,
never
()).
updateAdminCourse
(
any
(
ClassSubjectEntity
.
class
));
verify
(
classSubjectMapper
,
never
()).
updateAdminCourse
(
any
(
ClassSubjectEntity
.
class
));
}
}
@Test
void
swapScheduleShouldExchangeOnlyTemporalFieldsAndMarkBothGroups
()
{
ClassSubjectEntity
source
=
existingCourse
(
11
,
"group-1"
,
"09:00-10:20"
);
source
.
setSubjectName
(
"源课程"
);
ClassSubjectEntity
target
=
existingCourse
(
22
,
"group-2"
,
"13:00-16:00"
);
target
.
setDate
(
Date
.
valueOf
(
testCourseDate
().
toLocalDate
().
plusDays
(
2
)));
target
.
setWeek
(
"周四"
);
target
.
setSubjectTimes
(
4
);
target
.
setSubjectHour
(
new
BigDecimal
(
"4.0"
));
target
.
setSubjectName
(
"目标课程"
);
when
(
classSubjectMapper
.
selectAdminCourseGroupEntities
(
"group-1"
))
.
thenReturn
(
Collections
.
singletonList
(
source
));
when
(
classSubjectMapper
.
selectAdminCourseGroupEntities
(
"group-2"
))
.
thenReturn
(
Collections
.
singletonList
(
target
));
mockWritableClass
();
when
(
classSubjectMapper
.
selectAdminConflictCandidates
(
any
(),
eq
(
1
),
any
(),
anyList
()))
.
thenReturn
(
Collections
.
emptyList
());
when
(
classSubjectMapper
.
updateAdminCourse
(
any
(
ClassSubjectEntity
.
class
))).
thenReturn
(
1
);
CourseAdminDetailVO
detail
=
new
CourseAdminDetailVO
();
detail
.
setClassId
(
1
);
when
(
classSubjectMapper
.
selectAdminCourseClass
(
1
)).
thenReturn
(
detail
);
CourseAdminScheduleVO
sourceView
=
exportCourse
(
11
,
"group-1"
,
"13:00-16:00"
,
"源课程"
,
"教师1"
);
CourseAdminScheduleVO
targetView
=
exportCourse
(
22
,
"group-2"
,
"09:00-10:20"
,
"目标课程"
,
"教师1"
);
when
(
classSubjectMapper
.
selectAdminCourseList
(
1
,
null
,
null
))
.
thenReturn
(
Arrays
.
asList
(
sourceView
,
targetView
));
CourseAdminScheduleSwapDTO
request
=
new
CourseAdminScheduleSwapDTO
();
request
.
setTargetScheduleGroupId
(
"group-2"
);
request
.
setReason
(
"教师冲突"
);
request
.
setNote
(
"双方已确认"
);
List
<
CourseAdminScheduleGroupVO
>
result
=
service
.
swapSchedule
(
"group-1"
,
request
);
assertEquals
(
2
,
result
.
size
());
assertEquals
(
"目标课程"
,
target
.
getSubjectName
());
assertEquals
(
"09:00-10:20"
,
target
.
getTimeFrame
());
assertEquals
(
"源课程"
,
source
.
getSubjectName
());
assertEquals
(
"13:00-16:00"
,
source
.
getTimeFrame
());
assertTrue
(
Boolean
.
TRUE
.
equals
(
source
.
getAdjusted
()));
assertEquals
(
"group-2"
,
source
.
getAdjustmentCounterpartGroupId
());
assertEquals
(
"教师冲突"
,
target
.
getAdjustmentReason
());
verify
(
classSubjectMapper
,
org
.
mockito
.
Mockito
.
times
(
2
))
.
updateAdminCourse
(
any
(
ClassSubjectEntity
.
class
));
}
@Test
@Test
void
parseImportShouldSkipUnitTrainingAndSelectTargetClassShift
()
throws
Exception
{
void
parseImportShouldSkipUnitTrainingAndSelectTargetClassShift
()
throws
Exception
{
when
(
classSubjectMapper
.
selectAdminCourseTeacherOptions
()).
thenReturn
(
Arrays
.
asList
(
when
(
classSubjectMapper
.
selectAdminCourseTeacherOptions
()).
thenReturn
(
Arrays
.
asList
(
...
...
practical-business/src/test/java/com/platform/business/sql/CourseMigrationSqlTest.java
View file @
ca71e3af
...
@@ -44,6 +44,10 @@ class CourseMigrationSqlTest {
...
@@ -44,6 +44,10 @@ class CourseMigrationSqlTest {
assertTrue
(
sql
.
contains
(
"idx_subject_schedule_group"
));
assertTrue
(
sql
.
contains
(
"idx_subject_schedule_group"
));
assertTrue
(
sql
.
contains
(
"schedule_group_id, id"
));
assertTrue
(
sql
.
contains
(
"schedule_group_id, id"
));
assertTrue
(
sql
.
contains
(
"missing_schedule_group_count"
));
assertTrue
(
sql
.
contains
(
"missing_schedule_group_count"
));
assertTrue
(
sql
.
contains
(
"adjusted tinyint(1) not null default 0"
));
assertTrue
(
sql
.
contains
(
"adjustment_counterpart_group_id varchar(32)"
));
assertTrue
(
sql
.
contains
(
"adjustment_reason varchar(32)"
));
assertTrue
(
sql
.
contains
(
"adjustment_note varchar(60)"
));
}
}
private
static
String
resource
(
String
path
)
throws
Exception
{
private
static
String
resource
(
String
path
)
throws
Exception
{
...
...
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