|
@@ -212,7 +212,7 @@ export class TaskService implements OnModuleInit {
|
|
|
return task
|
|
return task
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- getMessage(task: Task) {
|
|
|
|
|
|
|
+ getMessage(task: Task, taskItem: TaskItem) {
|
|
|
let message = task.message
|
|
let message = task.message
|
|
|
if (!message) {
|
|
if (!message) {
|
|
|
return ''
|
|
return ''
|
|
@@ -225,7 +225,7 @@ export class TaskService implements OnModuleInit {
|
|
|
// 内容混淆
|
|
// 内容混淆
|
|
|
if (task.confusion !== ConfusionType.NONE) {
|
|
if (task.confusion !== ConfusionType.NONE) {
|
|
|
const timestamp = Math.round(Date.now() / 1000)
|
|
const timestamp = Math.round(Date.now() / 1000)
|
|
|
- const confusionText = `${task.id}-msg-${timestamp}`
|
|
|
|
|
|
|
+ const confusionText = `${task.id}-${taskItem.id}-msg-${timestamp}`
|
|
|
|
|
|
|
|
switch (task.confusion) {
|
|
switch (task.confusion) {
|
|
|
case ConfusionType.HEAD:
|
|
case ConfusionType.HEAD:
|
|
@@ -1317,7 +1317,7 @@ export class TaskService implements OnModuleInit {
|
|
|
devices.map(async (device, i) => {
|
|
devices.map(async (device, i) => {
|
|
|
const items = taskItems
|
|
const items = taskItems
|
|
|
.slice(i * 5, i * 5 + 5)
|
|
.slice(i * 5, i * 5 + 5)
|
|
|
- .map((item) => ({ ...item, message: this.getMessage(task), img: task.img }))
|
|
|
|
|
|
|
+ .map((item) => ({ ...item, message: this.getMessage(task, item), img: task.img }))
|
|
|
if (items.length === 0) return
|
|
if (items.length === 0) return
|
|
|
try {
|
|
try {
|
|
|
const res: any = await this.eventsGateway.sendForResult(
|
|
const res: any = await this.eventsGateway.sendForResult(
|