From 41e90bab9cbf73b4cb8ae552daf0469f9379db24 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 31 Dec 2025 20:36:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(task):=20=E4=BF=AE=E5=A4=8D=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=87=8D=E5=A4=8D=E5=A4=84=E7=90=86=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=92=8C=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了创建任务日志中的敏感参数信息
- 更新重复任务日志以包含任务ID信息
- 移除了workerId重置逻辑，改为显式清除方法
- 修复TaskMapper中status字段的SQL语法问题
- 优化了任务参数更新的处理流程
---
 .../basic/service/task/impl/TaskTaskServiceImpl.java     | 9 +++++----
 src/main/resources/mapper/TaskMapper.xml                 | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java
index b45cee00..0c839ea0 100644
--- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java
@@ -399,7 +399,7 @@ public class TaskTaskServiceImpl implements TaskService {
             memberVideoEntity.setTemplateId(templateId);
             memberVideoEntity.setIsBuy(0);
             if (list.isEmpty()) {
-                log.info("创建任务! faceId:{},templateId:{},taskParams:{}", faceId, templateId, sourcesMap);
+                log.info("创建任务! faceId:{},templateId:{}", faceId, templateId);
                 ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(face.getScenicId());
                 TaskEntity taskEntity = null;
                 boolean isReuseOldTask = false;
@@ -439,15 +439,16 @@ public class TaskTaskServiceImpl implements TaskService {
                 }
                 memberVideoEntity.setTaskId(taskEntity.getId());
             } else {
-                log.info("重复task，更新旧任务! faceId:{},templateId:{},taskParams:{}", faceId, templateId, sourcesMap);
                 TaskRespVO existingTask = list.getFirst();
-                // 更新旧任务：重置workerId为空，status为0，更新taskParams
+                log.info("重复task，更新旧任务! faceId:{},templateId:{},taskId:{}", faceId, templateId, existingTask.getId());
+                // 更新旧任务：重置status为0，更新taskParams
                 TaskEntity taskUpdate = new TaskEntity();
                 taskUpdate.setId(existingTask.getId());
-                taskUpdate.setWorkerId(null);
                 taskUpdate.setStatus(0);
                 taskUpdate.setTaskParams(JacksonUtil.toJSONString(sourcesMap));
                 taskMapper.update(taskUpdate);
+                // 显式清除workerId（update方法的动态SQL会跳过null值）
+                taskMapper.deassign(existingTask.getId());
                 videoTaskRepository.clearTaskCache(existingTask.getId());
 
                 memberVideoEntity.setTaskId(existingTask.getId());
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index 5fdf4f82..d6c48cc2 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -15,7 +15,7 @@
             <if test="scenicId!= null">scenic_id = #{scenicId}, </if>
             <if test="taskParams!= null">task_params = #{taskParams}, </if>
             <if test="videoUrl!= null">video_url = #{videoUrl}, </if>
-            <if test="status!= null">status = #{status}, </if>
+            <if test="status!= null">`status` = #{status}, </if>
             <if test="result!= null">result = #{result}, </if>
         </set>
             where id = #{id}