This commit is contained in:
NanGua-QWQ
2026-02-22 15:42:34 +08:00
parent 27e85b64a3
commit 7616a664a0
8 changed files with 27 additions and 31 deletions
@@ -81,7 +81,7 @@ export class InitSchema2026011800000 implements MigrationInterface {
('迟到','纪律',-1,1,CURRENT_TIMESTAMP),
('未交作业','作业情况',-2,1,CURRENT_TIMESTAMP)
`)
if (!(await queryRunner.hasTable('tags'))) {
await queryRunner.query(`
CREATE TABLE "tags" (
+20 -18
View File
@@ -357,7 +357,7 @@ export class AutoScoreService extends Service {
// 使用AND/OR逻辑评估触发器
const matchedStudents = this.evaluateTriggersWithLogic(rule, studentsToScore)
if (matchedStudents.length > 0) {
for (const action of rule.actions || []) {
await this.executeAction(action, matchedStudents, rule.name)
@@ -387,7 +387,7 @@ export class AutoScoreService extends Service {
for (let i = 0; i < rule.triggers.length; i++) {
const trigger = rule.triggers[i]
const logic = getTriggerLogic(trigger.event)
if (!logic?.check) {
continue
}
@@ -404,9 +404,9 @@ export class AutoScoreService extends Service {
},
now: new Date()
}
const result = logic.check(context, trigger.value || '')
if (!result.matchedStudents || result.matchedStudents.length === 0) {
// 当前触发器没有匹配的学生
if (currentRelation === 'AND') {
@@ -418,13 +418,13 @@ export class AutoScoreService extends Service {
// 当前触发器有匹配的学生
if (currentRelation === 'AND') {
// AND关系下,取交集
currentGroup = currentGroup.filter(student =>
result.matchedStudents!.some(matched => matched.id === student.id)
currentGroup = currentGroup.filter((student) =>
result.matchedStudents!.some((matched) => matched.id === student.id)
)
} else {
// OR关系下,取并集
const newStudents = result.matchedStudents.filter(matched =>
!currentGroup.some(student => student.id === matched.id)
const newStudents = result.matchedStudents.filter(
(matched) => !currentGroup.some((student) => student.id === matched.id)
)
currentGroup = [...currentGroup, ...newStudents]
}
@@ -433,14 +433,14 @@ export class AutoScoreService extends Service {
// 处理下一个关系(如果存在)
if (i < rule.triggers.length - 1) {
const nextRelation = rule.triggers[i + 1].relation || 'AND'
if (nextRelation !== currentRelation) {
// 关系发生变化,处理当前组的结果
if (currentRelation === 'AND') {
// AND组结束,如果当前组不为空,则合并到结果
if (currentGroup.length > 0) {
resultStudents = resultStudents.filter(student =>
currentGroup.some(groupStudent => groupStudent.id === student.id)
resultStudents = resultStudents.filter((student) =>
currentGroup.some((groupStudent) => groupStudent.id === student.id)
)
} else {
// AND组为空,整个规则不匹配
@@ -448,12 +448,13 @@ export class AutoScoreService extends Service {
}
} else {
// OR组结束,合并当前组到结果
const newStudents = currentGroup.filter(groupStudent =>
!resultStudents.some(resultStudent => resultStudent.id === groupStudent.id)
const newStudents = currentGroup.filter(
(groupStudent) =>
!resultStudents.some((resultStudent) => resultStudent.id === groupStudent.id)
)
resultStudents = [...resultStudents, ...newStudents]
}
// 重置当前组为所有学生,开始新的关系组
currentGroup = [...initialStudents]
currentRelation = nextRelation
@@ -465,8 +466,8 @@ export class AutoScoreService extends Service {
if (currentRelation === 'AND') {
// AND组结束,如果当前组不为空,则合并到结果
if (currentGroup.length > 0) {
resultStudents = resultStudents.filter(student =>
currentGroup.some(groupStudent => groupStudent.id === student.id)
resultStudents = resultStudents.filter((student) =>
currentGroup.some((groupStudent) => groupStudent.id === student.id)
)
} else {
// AND组为空,整个规则不匹配
@@ -474,8 +475,9 @@ export class AutoScoreService extends Service {
}
} else {
// OR组结束,合并当前组到结果
const newStudents = currentGroup.filter(groupStudent =>
!resultStudents.some(resultStudent => resultStudent.id === groupStudent.id)
const newStudents = currentGroup.filter(
(groupStudent) =>
!resultStudents.some((resultStudent) => resultStudent.id === groupStudent.id)
)
resultStudents = [...resultStudents, ...newStudents]
}
+1 -1
View File
@@ -339,7 +339,7 @@ export class HttpServerService extends Service {
// ww
this.app.use
// 404处理
this.app.use((_req: Request, res: Response) => {
res.status(404).json({
@@ -569,7 +569,7 @@ export const AutoScoreManager: React.FC = () => {
/>
</Card>
<Card style={{ marginBottom: '24px', backgroundColor: 'var(--ss-card-bg)' }}>
<Card style={{ marginBottom: '24px' }}>
<Code
code={(() => {
if (editingRuleId !== null) {
-2
View File
@@ -3,8 +3,6 @@ import { useEffect } from 'react'
import Prism from 'prismjs'
import { useTheme } from '../contexts/ThemeContext'
// 预先导入所有主题
import 'prismjs/themes/prism-coy.min.css'
import 'prismjs/themes/prism-okaidia.min.css'
const Code = ({ code, language }) => {
@@ -43,7 +43,7 @@ const actionDefinitions: ActionDefinition[] = [
description: sendNotificationDescription,
component: SendNotificationAction,
hasReason: sendNotificationHasReason
},
}
]
actionDefinitions.forEach((def) => actionRegistry.register(def))
@@ -14,8 +14,4 @@ export { default as TriggerItemComponent } from './TriggerItem'
export { default as ActionItemComponent } from './ActionItem'
export { IntervalTimeTrigger, StudentTagTrigger, RandomTimeTrigger } from './triggers'
export {
AddScoreAction,
AddTagAction,
SendNotificationAction,
} from './actions'
export { AddScoreAction, AddTagAction, SendNotificationAction } from './actions'
@@ -36,8 +36,8 @@ const IntervalTimeTrigger: React.FC<TriggerComponentProps> = ({ value, onChange
numValue === undefined || isNaN(numValue)
? undefined
: unit === 'minutes'
? numValue
: Math.max(1, Math.round(numValue / 1440))
? numValue
: Math.max(1, Math.round(numValue / 1440))
return (
<Space>