commit

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/SceneEvaluationStatusMapper.java

@@ -1,18 +1,21 @@
 package com.css.simulation.resource.scheduler.infra.db.mysql.mapper;
 
-import api.common.pojo.po.system.SceneEvaluationStatusPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
+import java.sql.Timestamp;
+
 @Mapper
 @Repository
 public interface SceneEvaluationStatusMapper {
 
     @Update("UPDATE scene_import_task SET evaluation_status = #{evaluationStatus} AND evaluation_error_msg = #{evaluationErrorMsg} " +
             " AND start_evaluation_time = #{startEvaluationTime} AND end_evaluation_time = #{endEvaluationTime} WHERE id = #{id}")
-    void updateImportEvaluationStatus(SceneEvaluationStatusPO po);
+    void updateImportEvaluationStatus(@Param("evaluationStatus") String evaluationStatus, @Param("evaluationErrorMsg") String evaluationErrorMsg,
+                                      @Param("startEvaluationTime") Timestamp startEvaluationTime, @Param("endEvaluationTime") Timestamp endEvaluationTime, @Param("id") String id);
+
 
     @Update("UPDATE simulation_manual_project SET evaluation_json_msg = #{json} WHERE id = #{id}")
     void updateManualProjectEvaluationStatus(@Param("id") String id, @Param("json") String json);

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/runnable/SceneEvaluationComputeRunnable.java

@@ -309,7 +309,8 @@ public class SceneEvaluationComputeRunnable implements Runnable {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (StringUtils.equals(sceneEvaluationComputeParam.getComputeType(), DictConstants.COMPLEXITY)) {
             if (DictConstants.SCENE_IMPORT_EVALUATION_TYPE.equals(sceneEvaluationComputeParam.getType())) {
-                sceneEvaluationStatusMapper.updateImportEvaluationStatus(sceneEvaluationStatusPO);
+                sceneEvaluationStatusMapper.updateImportEvaluationStatus(sceneEvaluationStatusPO.getEvaluationStatus(), sceneEvaluationStatusPO.getEvaluationErrorMsg(),
+                        sceneEvaluationStatusPO.getStartEvaluationTime(), sceneEvaluationStatusPO.getEndEvaluationTime(), sceneEvaluationStatusPO.getId());
             } else if (DictConstants.SIMULATION_MANUAL_PROJECT_EVALUATION_TYPE.equals(sceneEvaluationComputeParam.getType())) {
                 // 查询 project 表
                 SimulationManualProjectMapper simulationManualProjectMapper = ApplicationContextAwareImpl.getApplicationContext().getBean(SimulationManualProjectMapper.class);