取消同步标记逻辑

xvji-admin/src/main/java/com/xvji/service/impl/PredictTaskServiceImpl.java

@@ -105,13 +105,13 @@ public class PredictTaskServiceImpl extends ServiceImpl<PredictTaskMapper, Predi
     private void syncToSysJob(PredictTask task) {
         // 检查是否是定时任务同步过来的更新，如果是则跳过
         // 通过判断任务名称是否包含特殊标记
-        if (task.getPTaskName() != null && task.getPTaskName().contains("[SYNCED]")) {
+        /*if (task.getPTaskName() != null && task.getPTaskName().contains("[SYNCED]")) {
             log.info("检测到是定时任务同步的更新，跳过反向同步");
             // 移除标记，避免影响显示
             task.setPTaskName(task.getPTaskName().replace("[SYNCED]", ""));
             this.updateById(task);
             return;
-        }
+        }*/
 
         Long taskId = task.getPTaskId();
         String exactInvokeTarget = "com.xvji.quartz.TaskQuartzJob.executePredictTask(" + taskId + ")";

xvji-admin/src/main/java/com/xvji/service/impl/TrainTaskServiceImpl.java

@@ -108,13 +108,13 @@ public class TrainTaskServiceImpl extends ServiceImpl<TrainTaskMapper, TrainTask
      */
     private void syncToSysJob(TrainTask task) {
         // 防循环：如果是定时任务同步过来的更新（名称带[SYNCED]），跳过反向同步
-        if (task.getTTaskName() != null && task.getTTaskName().contains("[SYNCED]")) {
+        /*if (task.getTTaskName() != null && task.getTTaskName().contains("[SYNCED]")) {
             log.info("训练任务[ID:{}]是定时任务同步的更新，跳过反向同步", task.getTTaskId());
             // 移除标记，避免显示异常
             task.setTTaskName(task.getTTaskName().replace("[SYNCED]", ""));
             this.updateById(task);
             return;
-        }
+        }*/
 
         Long taskId = task.getTTaskId();
         // 精确匹配定时任务的invoke_target

xvji-quartz/src/main/java/com/xvji/quartz/service/impl/SysJobServiceImpl.java

@@ -312,7 +312,8 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
                         return rows;
                     }
 
-                    Integer taskStatus = ScheduleConstants.Status.NORMAL.getValue().equals(job.getStatus()) ? 1 : 0;
+                    // Integer taskStatus = ScheduleConstants.Status.NORMAL.getValue().equals(job.getStatus()) ? 1 : 0;
+
                     Object predictTaskService = applicationContext.getBean("predictTaskServiceImpl");
                     if (predictTaskService == null) {
                         log.error("未找到predictTaskService");
@@ -328,7 +329,7 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
 
                     setPTaskId.invoke(predictTask, taskId);
                     setPCronExpression.invoke(predictTask, job.getCronExpression());
-                    setPTaskName.invoke(predictTask, job.getJobName() + "[SYNCED]");
+                    setPTaskName.invoke(predictTask, job.getJobName());
                     //setPTaskStatus.invoke(predictTask, taskStatus);
 
                     Method updateMethod = predictTaskService.getClass().getMethod("updateById", Object.class);
@@ -341,7 +342,6 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
             }
             else if ("TRAIN_TASK".equals(job.getJobGroup())) {
                 try {
-                    // 解析训练任务ID
                     Class<?> invokeTargetUtilsClass = Class.forName("com.xvji.utils.InvokeTargetUtils");
                     Method parseMethod = invokeTargetUtilsClass.getMethod("parseTaskIdFromInvokeTarget", String.class);
                     Long taskId = (Long) parseMethod.invoke(null, job.getInvokeTarget());
@@ -351,17 +351,14 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
                         return rows;
                     }
 
-                    // 状态转换
-                    Integer taskStatus = ScheduleConstants.Status.NORMAL.getValue().equals(job.getStatus()) ? 1 : 0;
+                    // Integer taskStatus = ScheduleConstants.Status.NORMAL.getValue().equals(job.getStatus()) ? 1 : 0;
 
-                    // 获取训练任务Service
                     Object trainTaskService = applicationContext.getBean("trainTaskServiceImpl");
                     if (trainTaskService == null) {
                         log.error("未找到trainTaskService");
                         return rows;
                     }
 
-                    // 反射设置训练任务属性
                     Class<?> trainTaskClass = Class.forName("com.xvji.domain.TrainTask");
                     Object trainTask = trainTaskClass.newInstance();
                     Method setTTaskId = trainTaskClass.getMethod("setTTaskId", Long.class);
@@ -371,10 +368,9 @@ public class SysJobServiceImpl implements ISysJobService, ApplicationContextAwar
 
                     setTTaskId.invoke(trainTask, taskId);
                     setTCronExpression.invoke(trainTask, job.getCronExpression());
-                    setTTaskName.invoke(trainTask, job.getJobName() + "[SYNCED]"); // 防循环标记
+                    setTTaskName.invoke(trainTask, job.getJobName());
                     //setTTaskStatus.invoke(trainTask, taskStatus);
 
-                    // 调用更新
                     Method updateMethod = trainTaskService.getClass().getMethod("updateById", Object.class);
                     updateMethod.invoke(trainTaskService, trainTask);
                     log.info("同步训练任务[ID:{}]成功", taskId);