Merge remote-tracking branch 'origin/20240309-saq-fix' into lcytest

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

@@ -0,0 +1,18 @@
+package api.common.pojo.param.project;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class AddOrUpdateMultiSimulationSceneCarParam {
+    private String mapId;
+
+    private String sceneId;
+
+    private List<MultiSimulationSceneCarParam> paramList;
+}

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

@@ -331,8 +331,8 @@ public class JobManageController {
     return multiSimulationProjectService.deleteMultiSimulationProject(param);
   }
 
-  @RequestMapping("/updateMultiSimulationProject")
-  public ResponseBodyVO<String> updateMultiSimulationProject(@RequestBody MultiSimulationProjectParam param) {
+  @RequestMapping("/updateMultiSimulationProjectDetail")
+  public ResponseBodyVO<String> updateMultiSimulationProjectDetail(@RequestBody MultiSimulationProjectParam param) {
     return multiSimulationProjectService.updateMultiSimulationProject(param);
   }
 
@@ -375,9 +375,14 @@ public class JobManageController {
     return multiSimulationProjectService.addOrUpdateMultiSimulationSceneCar(param);
   }
 
+//  @RequestMapping("/addOrUpdateMultiSimulationSceneCarList")
+//  public ResponseBodyVO<List<MultiSimulationSceneCarVO>> addOrUpdateMultiSimulationSceneCarList(@RequestBody List<MultiSimulationSceneCarParam> paramList) {
+//    return multiSimulationProjectService.addOrUpdateMultiSimulationSceneCarList(paramList);
+//  }
+
   @RequestMapping("/addOrUpdateMultiSimulationSceneCarList")
-  public ResponseBodyVO<List<MultiSimulationSceneCarVO>> addOrUpdateMultiSimulationSceneCarList(@RequestBody List<MultiSimulationSceneCarParam> paramList) {
-    return multiSimulationProjectService.addOrUpdateMultiSimulationSceneCarList(paramList);
+  public ResponseBodyVO<List<MultiSimulationSceneCarVO>> addOrUpdateMultiSimulationSceneCarList(@RequestBody AddOrUpdateMultiSimulationSceneCarParam param) {
+    return multiSimulationProjectService.addOrUpdateMultiSimulationSceneCarList(param);
   }
 
   @RequestMapping("/setMultiSimulationSceneCarView")

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/MultiSimulationProjectServiceImpl.java

@@ -4,10 +4,7 @@ import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.enums.MultiSimulationResultTypeEnum;
 import api.common.pojo.enums.MultiSimulationStatusEnum;
-import api.common.pojo.param.project.MultiSimulationProjectParam;
-import api.common.pojo.param.project.MultiSimulationProjectResultParam;
-import api.common.pojo.param.project.MultiSimulationSceneCarParam;
-import api.common.pojo.param.project.MultiSimulationSceneParam;
+import api.common.pojo.param.project.*;
 import api.common.pojo.po.algorithm.AlgorithmPO;
 import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.project.MultiSimulationProjectPO;
@@ -315,18 +312,21 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
             }
         } else {
             int i = sceneCarMapper.updateMultiSimulationSceneCar(param);
-            if (i > 0) {
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, MultiSimulationSceneCarVO.builder().sceneCarId(param.getSceneCarId()).build());
-            }
+//            if (i > 0) {
+//                return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, MultiSimulationSceneCarVO.builder().sceneCarId(param.getSceneCarId()).build());
+//            }
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, MultiSimulationSceneCarVO.builder().sceneCarId(param.getSceneCarId()).build());
         }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
     }
 
     @Transactional
-    public ResponseBodyVO<List<MultiSimulationSceneCarVO>> addOrUpdateMultiSimulationSceneCarList(List<MultiSimulationSceneCarParam> paramList) {
-        if (CollectionUtils.isEmpty(paramList)) {
+    public ResponseBodyVO<List<MultiSimulationSceneCarVO>> addOrUpdateMultiSimulationSceneCarList(AddOrUpdateMultiSimulationSceneCarParam sceneCarParam) {
+        List<MultiSimulationSceneCarParam> paramList = sceneCarParam.getParamList();
+        if (CollectionUtils.isEmpty(paramList) || StringUtils.isBlank(sceneCarParam.getMapId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "数据为空");
         }
+
         for (MultiSimulationSceneCarParam param : paramList) {
             if (StringUtils.isNotBlank(param.getSceneCarId())) {
                 MultiSimulationSceneCarVO multiSimulationSceneCarVO = sceneCarMapper.selectSceneCarById(param);
@@ -343,6 +343,7 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
             }
             ids.add(responseBodyVO.getInfo());
         }
+        int i = simulationSceneMapper.updateMultiSimulationSceneMapId(sceneCarParam.getMapId(), sceneCarParam.getSceneId());
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, ids);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/job_manage/MultiSimulationProjectService.java

@@ -1,10 +1,7 @@
 package com.css.simulation.resource.server.app.service.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.param.project.MultiSimulationProjectParam;
-import api.common.pojo.param.project.MultiSimulationSceneCarParam;
-import api.common.pojo.param.project.MultiSimulationSceneParam;
-import api.common.pojo.param.project.SimulationManualProjectParam;
+import api.common.pojo.param.project.*;
 import api.common.pojo.vo.project.*;
 import com.github.pagehelper.PageInfo;
 
@@ -35,7 +32,7 @@ public interface MultiSimulationProjectService {
 
     ResponseBodyVO<MultiSimulationSceneCarVO> addOrUpdateMultiSimulationSceneCar(MultiSimulationSceneCarParam param);
 
-    ResponseBodyVO<List<MultiSimulationSceneCarVO>> addOrUpdateMultiSimulationSceneCarList(List<MultiSimulationSceneCarParam> param);
+    ResponseBodyVO<List<MultiSimulationSceneCarVO>> addOrUpdateMultiSimulationSceneCarList(AddOrUpdateMultiSimulationSceneCarParam param);
 
     ResponseBodyVO setMultiSimulationSceneCarView(MultiSimulationSceneCarParam param);
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/MultiSimulationProjectMapper.java

@@ -49,7 +49,7 @@ public interface MultiSimulationProjectMapper {
         "project_max_seconds = #{projectMaxSeconds} where id = #{projectId}")
     int updateMultiSimulationProject(MultiSimulationProjectParam param);
 
-    @Select("select id,project_key,project_name,project_status,create_time from multi_simulation_project where deleted = 0 " +
+    @Select("select id,project_key,project_name,project_status,create_time,project_description from multi_simulation_project where deleted = 0 " +
         "and id = #{id} limit 1")
     MultiSimulationProjectVO selectMultiSimulationProjectById(@Param("id") String projectId);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/MultiSimulationSceneMapper.java

@@ -19,6 +19,10 @@ public interface MultiSimulationSceneMapper {
         "(#{id},#{projectId},#{sceneName},#{mapId})")
     int addMultiSimulationSceneAll(MultiSimulationScenePO scenePO);
 
+    @Update("update multi_simulation_scene set map_id = #{mapId}" +
+        " where id = #{sceneId}")
+    int updateMultiSimulationSceneMapId(@Param("mapId")String mapId, @Param("sceneId")String sceneId);
+
     @Select("select count(*) from multi_simulation_scene where project_id = #{projectId} and deleted = 0")
     int selectSceneNumsByProjectId(@Param("projectId") String projectId);
 
@@ -36,6 +40,6 @@ public interface MultiSimulationSceneMapper {
         "select id,project_id,scene_name,map_id,create_time,project_result_overall_url,project_result_simulation_url from multi_simulation_scene where deleted = 0 " +
         "and id = #{sceneId}" +
         "</script>")
-    MultiSimulationSceneVO selectSceneDetailBySceneId(String sceneId);
+    MultiSimulationSceneVO selectSceneDetailBySceneId(@Param("sceneId") String sceneId);
 
 }