mlx

api-common/src/main/java/api/common/pojo/param/project/SimulationManualProjectKafkaParam.java

@@ -10,17 +10,11 @@ import lombok.Setter;
 @Setter
 public class SimulationManualProjectKafkaParam {
 
-    private String projectId;
-
-    private String algorithmId;
-
-    private String vehicleConfigId;
-
-    private String scenePackageId;
-
-    private Long maxSimulationTime;
-
-    private Integer parallelism;
-
-    private String type;
+    private String projectId;   // 项目 id
+    private String algorithmId; // 算法 id
+    private String vehicleConfigId; // 车辆配置 id
+    private String scenePackageId;  // 场景测试包 id
+    private Long maxSimulationTime; //  最大仿真时间
+    private Integer parallelism;    // 并行度
+    private String type;    // 项目类型
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/project/ctrl/SimulationProjectCtrl.java

@@ -86,7 +86,7 @@ public class SimulationProjectCtrl {
      */
     @RequestMapping("updateProjectNowRunState")
     @ResponseBody
-    public ResponseBodyVO updateProjectNowRunState(@RequestBody SimulationManualProjectParam param) {
+    public ResponseBodyVO<String> updateProjectNowRunState(@RequestBody SimulationManualProjectParam param) {
         return service.updateProjectNowRunState(param);
     }
 

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

@@ -264,20 +264,18 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     /**
-     * 手动运行项目状态吸怪
-     * @param param
-     * @return
+     * 修改手动运行项目状态
      */
     @SneakyThrows
     @Override
-    public ResponseBodyVO updateProjectNowRunState(SimulationManualProjectParam param) {
-
+    public ResponseBodyVO<String> updateProjectNowRunState(SimulationManualProjectParam param) {
+        //1 根据 id 查询项目信息
         if (isEmpty(param.getId()) || isEmpty(param.getNowRunState())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
         }
         SimulationManualProjectPo po = simulationProjectMapper.selectProjectById(param);
         if (po == null) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "数据没有找到。");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "数据没有找到。");
         }
 
         // 已经完成的项目再次运行
@@ -292,7 +290,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             po.setFinishTime(null);
             int add = simulationProjectMapper.add(po);
             if (add <= 0) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "生成新工作失败");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "生成新工作失败");
             }
             //Kafka推送消息
             projectRunToKafka(po);
@@ -301,27 +299,22 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             if ("20".equals(param.getNowRunState())) {
                 //设置开始时间
                 param.setStartTime(new Date());
-
                 //Kafka推送消息
                 projectRunToKafka(po);
-
             } else if ("30".equals(param.getNowRunState())) {
                 //设置完成时间
                 param.setFinishTime(new Date());
-
             }
             int i = simulationProjectMapper.updateProjectNowRunState(param);
             if (i <= 0) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE);
-
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
             }
-
         }
         //项目终止，推送到kafka
         if (DictConstants.PROJECT_TERMINATED.equals(param.getNowRunState())) {
             projectStopToKafka(po);
         }
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
     private void projectRunToKafka(SimulationManualProjectPo po) throws JsonProcessingException {

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java

@@ -21,7 +21,7 @@ public interface SimulationProjectService {
 
     ResponseBodyVO deleteProjectByids(SimulationManualProjectParam param);
 
-    ResponseBodyVO updateProjectNowRunState(SimulationManualProjectParam param);
+    ResponseBodyVO<String> updateProjectNowRunState(SimulationManualProjectParam param);
 
     ResponseBodyVO selectProjectDetailsById(SimulationManualProjectParam param);