feat: 任务编号移到卡片底部,改进任务编号生成唯一性
This commit is contained in:
parent
d4e462ee48
commit
67b2440ee9
@ -509,12 +509,27 @@ public class TaskService {
|
||||
|
||||
/**
|
||||
* 生成任务编号
|
||||
* 格式:TASK + yyyyMMddHHmmss + 4位随机数,确保唯一性
|
||||
*/
|
||||
private String generateTaskNo() {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
|
||||
String date = LocalDateTime.now().format(formatter);
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
||||
String datetime = LocalDateTime.now().format(formatter);
|
||||
String random = String.format("%04d", new Random().nextInt(10000));
|
||||
return "TASK" + date + random;
|
||||
String taskNo = "TASK" + datetime + random;
|
||||
|
||||
// 检查是否已存在,如果存在则重新生成
|
||||
int maxRetry = 10;
|
||||
while (maxRetry-- > 0) {
|
||||
if (taskMapper.selectOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, taskNo)) == null) {
|
||||
return taskNo;
|
||||
}
|
||||
// 重新生成
|
||||
datetime = LocalDateTime.now().format(formatter);
|
||||
random = String.format("%04d", new Random().nextInt(10000));
|
||||
taskNo = "TASK" + datetime + random;
|
||||
}
|
||||
// 如果重试10次仍然重复,添加毫秒级时间戳确保唯一
|
||||
return taskNo + System.currentTimeMillis() % 1000;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -357,6 +357,14 @@
|
||||
{{ canGrabTask(task).canGrab ? '抢单' : '不可接单' }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- 任务编号 -->
|
||||
<div class="task-footer">
|
||||
<div class="footer-item task-no-item">
|
||||
<Icon name="hash" size="sm" color="#31f08b" />
|
||||
<span style="color: #ffffff;">编号: {{ task.isSubTask ? task.itemNo : task.taskNo }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -541,11 +549,7 @@
|
||||
|
||||
<!-- 任务信息 -->
|
||||
<div class="task-info-wrapper">
|
||||
<div class="task-info">
|
||||
<div class="info-item">
|
||||
<span class="label">任务编号</span>
|
||||
<span class="value">{{ task.isSubTask ? task.itemNo : task.taskNo }}</span>
|
||||
</div>
|
||||
<div class="task-info task-info-3col">
|
||||
<div class="info-item">
|
||||
<span class="label">任务类型</span>
|
||||
<span class="value">{{ getTaskTypeName(task.taskTypeId, task.taskTypeName, task.taskSubType) }}</span>
|
||||
@ -861,11 +865,7 @@
|
||||
|
||||
<!-- 任务信息 -->
|
||||
<div class="task-info-wrapper">
|
||||
<div class="task-info">
|
||||
<div class="info-item">
|
||||
<span class="label">任务编号</span>
|
||||
<span class="value">{{ task.isSubTask ? task.itemNo : task.taskNo }}</span>
|
||||
</div>
|
||||
<div class="task-info task-info-3col">
|
||||
<div class="info-item">
|
||||
<span class="label">任务类型</span>
|
||||
<span class="value">{{ getTaskTypeName(task.taskTypeId, task.taskTypeName, task.taskSubType) }}</span>
|
||||
@ -997,8 +997,12 @@
|
||||
</a-button>
|
||||
</div>
|
||||
|
||||
<!-- 时间信息 -->
|
||||
<!-- 时间信息和任务编号 -->
|
||||
<div class="task-footer">
|
||||
<div class="footer-item task-no-item">
|
||||
<Icon name="hash" size="sm" color="#31f08b" />
|
||||
<span style="color: #ffffff;">编号: {{ task.isSubTask ? task.itemNo : task.taskNo }}</span>
|
||||
</div>
|
||||
<div class="footer-item">
|
||||
<Icon name="calendar" size="sm" color="#31f08b" />
|
||||
<span style="color: #ffffff;">发布: {{ formatDate(task.createTime) }}</span>
|
||||
@ -1210,11 +1214,7 @@
|
||||
|
||||
<!-- 任务信息 -->
|
||||
<div class="task-info-wrapper">
|
||||
<div class="task-info">
|
||||
<div class="info-item">
|
||||
<span class="label">任务编号</span>
|
||||
<span class="value">{{ task.isSubTask ? task.itemNo : task.taskNo }}</span>
|
||||
</div>
|
||||
<div class="task-info task-info-3col">
|
||||
<div class="info-item">
|
||||
<span class="label">任务类型</span>
|
||||
<span class="value">{{ getTaskTypeName(task.taskTypeId, task.taskTypeName, task.taskSubType) }}</span>
|
||||
@ -1553,11 +1553,7 @@
|
||||
|
||||
<!-- 任务信息 -->
|
||||
<div class="task-info-wrapper">
|
||||
<div class="task-info">
|
||||
<div class="info-item">
|
||||
<span class="label">任务编号</span>
|
||||
<span class="value">{{ task.isSubTask ? task.itemNo : task.taskNo }}</span>
|
||||
</div>
|
||||
<div class="task-info task-info-3col">
|
||||
<div class="info-item">
|
||||
<span class="label">任务类型</span>
|
||||
<span class="value">{{ getTaskTypeName(task.taskTypeId, task.taskTypeName, task.taskSubType) }}</span>
|
||||
@ -5142,6 +5138,29 @@ onUnmounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
// 任务底部信息(任务编号、时间等)
|
||||
.task-footer {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: $space-md;
|
||||
padding-top: $space-sm;
|
||||
border-top: 1px solid $border-primary;
|
||||
margin-top: $space-sm;
|
||||
|
||||
.footer-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
font-size: $font-size-xs;
|
||||
color: $text-tertiary;
|
||||
|
||||
&.task-no-item {
|
||||
font-family: 'Monaco', 'Consolas', monospace;
|
||||
color: $text-secondary;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.detail-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user