算法平台

api-common/src/main/java/api/common/pojo/vo/project/ManualProjectTaskVo.java

@@ -1,65 +1,32 @@
 package api.common.pojo.vo.project;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.util.Date;
 
 
-@Getter
-@Setter
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ManualProjectTaskVo {
-
-    //id
-    private String id;
-
-    //项目主表id
-    private String pId;
-
-    //最后一级指标id
-    private String lastTargerId;
-
-    //场景id
-    private String sceneId;
-
-    //场景名称
-    private String sceneName;
-
-    //场景数量
-    private Integer sceneNum;
-
-    //场景类型
-    private String sceneType;
-
-    //运行开始时间
-    private Date runStartTime;
-
-    //运行结束时间
-    private Date runEndTime;
-
-    //运行开始时间fmt
-    private String runStartTimeFmt;
-
-    //运行结束时间fmt
-    private String runEndTimeFmt;
-
-    //运行状态
-    private String runState;
-
-    //运行结果
-    private String runResult;
-
-    //得分
-    private Double score;
-
-    //指标评价
-    private String targetEvaluate;
-
-    //返回的场景id
-    private String returnSceneId;
-
-    //运行结果文件minio路径
-    private String runResultFilePath;
-
-
+    private String id; //id
+    private String pId; //项目主表id
+    private String lastTargerId; //最后一级指标id
+    private String sceneId; //场景id
+    private String sceneName; //场景名称
+    private Integer sceneNum; //场景数量
+    private String sceneType; //场景类型
+    private Date runStartTime; //运行开始时间
+    private Date runEndTime; //运行结束时间
+    private String runStartTimeFmt; //运行开始时间fmt
+    private String runEndTimeFmt; //运行结束时间fmt
+    private String runState; //运行状态
+    private String runResult; //运行结果
+    private Double score; //得分
+    private String targetEvaluate; //指标评价
+    private String returnSceneId; //返回的场景id
+    private String runResultFilePath; //运行结果文件minio路径
+    private String timeActual; // 实际用时
+    private String timeCorrection; // 修正时间
 }

api-common/src/main/java/api/common/pojo/vo/project/SublistScoreVo.java

@@ -1,13 +1,14 @@
 package api.common.pojo.vo.project;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 /**
  * 指标得分
  */
-@Getter
-@Setter
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SublistScoreVo {
 
     private String id;
@@ -27,8 +28,8 @@ public class SublistScoreVo {
     private String sceneType;
     private String returnSceneId;
     private String runResult;
-
     private String firTarget;
     private String lasTarget;
-
+    private String timeActual; // 实际用时
+    private String timeCorrection; // 修正时间
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/home_page/HomePageController.java

@@ -9,7 +9,7 @@ import api.common.pojo.vo.home.SystemServerVO;
 import com.css.simulation.resource.server.application.service.AlgorithmService;
 import com.css.simulation.resource.server.application.service.HomePageService;
 import com.css.simulation.resource.server.application.service.ConfigService;
-import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.application.service.SceneNaturalService;
 import com.css.simulation.resource.server.application.service.ClusterService;
 import com.github.pagehelper.PageInfo;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/JobManageController.java

@@ -5,7 +5,7 @@ import api.common.pojo.param.project.DictParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.*;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.application.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/job_manage/MonitorController.java

@@ -3,7 +3,7 @@ package com.css.simulation.resource.server.api.controller.job_manage;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/AlgorithmServiceImpl.java

@@ -15,7 +15,7 @@ import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.acl.SchedulerService;
 import com.css.simulation.resource.server.application.service.AlgorithmService;
 import com.css.simulation.resource.server.application.service.DictService;
-import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.domain.service.UserDomainService;
 import com.css.simulation.resource.server.infrastructure.common.configuration.git.GitConfiguration;
 import com.css.simulation.resource.server.infrastructure.common.util.AuthUtil;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/SimulationProjectServiceImpl.java

@@ -31,7 +31,7 @@ import com.css.simulation.resource.server.acl.FileDownService;
 import com.css.simulation.resource.server.acl.MonitorService;
 import com.css.simulation.resource.server.infrastructure.common.enums.ProjectRunStateEnum;
 import com.css.simulation.resource.server.infrastructure.common.enums.SceneTypeEnum;
-import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.infrastructure.common.util.PdfBuilder;
 import com.css.simulation.resource.server.application.service.DictService;
 import com.css.simulation.resource.server.infrastructure.common.util.ProjectUtil;
@@ -2076,6 +2076,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                         sublistScoreVo.setRunResult(task.getRunResult());
                         sublistScoreVo.setSceneScore(saveTwoDecimalPlaces(task.getScore())); // 得分
                         sublistScoreVo.setTargetEvaluate(task.getTargetEvaluate());// 指标评价
+                        sublistScoreVo.setTimeActual(task.getTimeActual());
+                        sublistScoreVo.setTimeCorrection(task.getTimeCorrection());
                         String sceneType = task.getSceneType();
                         String sceneId = task.getSceneId();
                         String sceneName = "";

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/SimulationProjectService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/SimulationProjectService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.server.application.service;
+package com.css.simulation.resource.server.application.service.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/domain/service/ProjectDomainService.java

@@ -9,7 +9,7 @@ import api.common.pojo.po.project.SimulationManualProjectPO;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.project.ProjectReportVO;
 import com.css.simulation.resource.server.acl.FileDownService;
-import com.css.simulation.resource.server.application.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticProjectEntity;
 import com.css.simulation.resource.server.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
 import com.css.simulation.resource.server.infrastructure.db.entity.SimulationManualProjectEntity;

simulation-resource-server/src/main/resources/mysql/mapper/SimulationManualProjectTaskMapper.xml

@@ -104,7 +104,9 @@
         modify_time,
         modify_user_id,
         is_deleted,
-        retry_count
+        retry_count,
+        time_actual,
+        time_correction
         from simulation_manual_project_task
         where is_deleted = '0' and p_id = #{pId,jdbcType=VARCHAR}
         <if test="taskId != null and taskId != ''">