Merge remote-tracking branch 'origin/master'

api-common/src/main/java/api/common/pojo/po/project/SimulationAutomaticProjectPo.java

@@ -78,6 +78,12 @@ public class SimulationAutomaticProjectPo extends BasePo {
     //算法类型
     private String algorithmType;
 
+    //算法数组（公私有）
+    private String algorithmArray;
+    //车辆模型数组（公私有）
+    private String vehicleArray;
+    //场景测试包数组（公私有）
+    private String sceneArray;
 
 
 

api-common/src/main/java/api/common/pojo/po/scene/ScenePackageSublistPO.java

@@ -35,7 +35,7 @@ public class ScenePackageSublistPO implements Serializable {
     private String treeNode;//模板预览node节点
     private String templateId;//泛化模板id
     private String exampleId;//泛化实例id
-
+    private String ruleNameArray;//打分规则公私有回显
 
 
 

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

@@ -32,4 +32,17 @@ public class AutomaticProjectVo {
     private String isChoiceGpu;
     //最大仿真时间
     private String maxSimulationTime;
+
+    //算法数组（公私有）
+    private String algorithmArray;
+    //车辆模型数组（公私有）
+    private String vehicleArray;
+    //场景测试包数组（公私有）
+    private String sceneArray;
+    //算法数组（公私有）
+    private String[] algorithmArrayS;
+    //车辆模型数组（公私有）
+    private String[] vehicleArrayS;
+    //场景测试包数组（公私有）
+    private String[] sceneArrayS;
 }

api-common/src/main/java/api/common/pojo/vo/scene/ScenePackageSublistVO.java

@@ -35,4 +35,7 @@ public class ScenePackageSublistVO implements Serializable {
     private String templateId;//泛化模板id
     private String exampleId;//泛化实例id
     private String share;//公有私有
+    private String[] ruleNameArrayS;//打分规则公私有回显
+    private String ruleNameArray;//打分规则公私有回显
+
 }

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

@@ -4086,6 +4086,16 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             isChoiceGpu = "未知";
         }
         automaticProjectVo.setIsChoiceGpu(isChoiceGpu);
+
+        if (ObjectUtil.isNotNull(automaticProjectVo.getAlgorithmArray())) {
+            automaticProjectVo.setAlgorithmArrayS(automaticProjectVo.getAlgorithmArray().split(","));
+        }
+        if (ObjectUtil.isNotNull(automaticProjectVo.getVehicleArray())) {
+            automaticProjectVo.setVehicleArrayS(automaticProjectVo.getVehicleArray().split(","));
+        }
+        if (ObjectUtil.isNotNull(automaticProjectVo.getSceneArray())) {
+            automaticProjectVo.setSceneArrayS(automaticProjectVo.getSceneArray().split(","));
+        }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, automaticProjectVo);
 
     }
@@ -4125,6 +4135,17 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         }
         SimulationManualProjectSingleVo vo = new SimulationManualProjectSingleVo();
         convertPoToVo(po, vo);
+
+        if (ObjectUtil.isNotNull(po.getAlgorithmArray())) {
+            vo.setAlgorithmArrayS(po.getAlgorithmArray().split(","));
+        }
+        if (ObjectUtil.isNotNull(po.getVehicleArray())) {
+            vo.setVehicleArrayS(po.getVehicleArray().split(","));
+        }
+        if (ObjectUtil.isNotNull(po.getSceneArray())) {
+            vo.setSceneArrayS(po.getSceneArray().split(","));
+        }
+
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vo);
 
     }
@@ -4188,6 +4209,16 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 //        po.setNowRunState(param.getNowRunState());
         po.setAutomaticRunState(param.getAutomaticRunState());
         po.setAlgorithmType(param.getAlgorithmType());
+
+        if (ObjectUtil.isNotNull(param.getVehicleArrayS())) {
+            po.setVehicleArray(StringUtils.join(Arrays.asList(param.getVehicleArrayS()), ','));
+        }
+        if (ObjectUtil.isNotNull(param.getAlgorithmArrayS())) {
+            po.setAlgorithmArray(StringUtils.join(Arrays.asList(param.getAlgorithmArrayS()), ','));
+        }
+        if (ObjectUtil.isNotNull(param.getSceneArrayS())) {
+            po.setSceneArray(StringUtils.join(Arrays.asList(param.getSceneArrayS()), ','));
+        }
         return po;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -15,6 +15,7 @@ import com.css.simulation.resource.scene.mapper.*;
 import com.css.simulation.resource.system.service.ParameterService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -209,6 +210,13 @@ public class ScenePackageService {
         root.setRemarks(vo.getRemarks());
         root.setTreeNode(vo.getTreeNode());
         scenePackageSublistVOS.add(0, root);
+
+        scenePackageSublistVOS.forEach(
+                ScenePackageSublistVO -> {
+                    if (ObjectUtil.isNotNull(ScenePackageSublistVO.getRuleNameArray())) {
+                        ScenePackageSublistVO.setRuleNameArrayS(ScenePackageSublistVO.getRuleNameArray().split(","));
+                    }
+                });
         //list转tree
         return listToTree(scenePackageSublistVOS);
     }
@@ -578,6 +586,9 @@ public class ScenePackageService {
             params.setShare(share);
             params.setPackageLevel(level);
             params.setTreeNode(parentVoList.get(i).getTreeNode());
+            if(ObjectUtil.isNotNull(parentVoList.get(i).getRuleNameArrayS())){
+                params.setRuleNameArray(StringUtils.join(Arrays.asList(parentVoList.get(i).getRuleNameArrayS()), ','));
+            }
             List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getChildren();
             poList.add(params);
             if (cvoList != null && cvoList.size() > 0) {
@@ -674,6 +685,9 @@ public class ScenePackageService {
             params.setShare(share);
             params.setPackageLevel(level);
             params.setTreeNode(parentVoList.get(i).getTreeNode());
+            if(ObjectUtil.isNotNull(parentVoList.get(i).getRuleNameArrayS())){
+                params.setRuleNameArray(StringUtils.join(Arrays.asList(parentVoList.get(i).getRuleNameArrayS()), ','));
+            }
             List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getChildren();
             poList.add(params);
             if (cvoList != null && cvoList.size() > 0) {

simulation-resource-server/src/main/resources/mapper/project/SimulationAutomaticProjectMapper.xml

@@ -105,7 +105,10 @@
          create_user_id,
          modify_time,
          modify_user_id,
-         is_deleted)
+         is_deleted,
+         algorithm_array,
+         vehicle_array,
+         scene_array)
         values (#{id,jdbcType=VARCHAR},
                 #{projectDate,jdbcType=INTEGER},
                 #{projectNum,jdbcType=INTEGER},
@@ -128,7 +131,10 @@
                 #{createUserId,jdbcType=VARCHAR},
                 #{modifyTime,jdbcType=TIMESTAMP},
                 #{modifyUserId,jdbcType=VARCHAR},
-                #{isDeleted,jdbcType=VARCHAR})
+                #{isDeleted,jdbcType=VARCHAR},
+                #{algorithmArray,jdbcType=VARCHAR},
+                #{vehicleArray,jdbcType=VARCHAR},
+                #{sceneArray,jdbcType=VARCHAR})
     </insert>
 
     <!--修改项目信息-->
@@ -146,7 +152,10 @@
             max_simulation_time = #{maxSimulationTime},
             is_choice_gpu       = #{isChoiceGpu,jdbcType=VARCHAR},
             modify_time         = #{modifyTime,jdbcType=TIMESTAMP},
-            modify_user_id      = #{modifyUserId,jdbcType=VARCHAR}
+            modify_user_id      = #{modifyUserId,jdbcType=VARCHAR},
+            algorithm_array       = #{algorithmArray,jdbcType=VARCHAR},
+            vehicle_array       = #{vehicleArray,jdbcType=VARCHAR},
+            scene_array       = #{sceneArray,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
           and is_deleted = '0'
     </update>
@@ -201,7 +210,10 @@
                p.vehicle,
                a.algorithm_name,
                s.package_name as sceneName,
-               p.max_simulation_time
+               p.max_simulation_time,
+                p.algorithm_array,
+               p.vehicle_array,
+               p.scene_array
         from simulation_automatic_project p
                  left join algorithm a on p.algorithm = a.id
                  left join scene_package s on p.scene = s.package_id

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageSublistMapper.xml

@@ -8,7 +8,7 @@
         scene_natural_ids,scene_traffic_ids,scene_statue_ids,scene_generalization_ids,
         scene_num,parent_id,root_id,seq,package_level,remarks,
         create_user_id,create_time,modify_user_id,modify_time,
-         is_deleted,share,tree_node,template_id,example_id)
+         is_deleted,share,tree_node,template_id,example_id,rule_name_array)
         values (#{id,jdbcType=VARCHAR},#{sublistName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},#{ruleName,jdbcType=VARCHAR},
         #{packageAndRules,jdbcType=VARCHAR},
         #{sceneNaturalIds}, #{sceneTrafficIds}, #{sceneStatueIds}, #{sceneGeneralizationIds},
@@ -16,7 +16,7 @@
          #{packageLevel},#{remarks},
          #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
         #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR},
-        #{templateId,jdbcType=VARCHAR},#{item.exampleId,jdbcType=VARCHAR})
+        #{templateId,jdbcType=VARCHAR},#{exampleId,jdbcType=VARCHAR},#{ruleNameArray,jdbcType=VARCHAR})
     </insert>
 
 
@@ -27,7 +27,7 @@
         scene_natural_ids,scene_traffic_ids,scene_statue_ids,scene_generalization_ids,
         scene_num,parent_id,root_id,seq,package_level,remarks,
         create_user_id,create_time,modify_user_id,modify_time,
-        is_deleted,share,tree_node,template_id,example_id) values
+        is_deleted,share,tree_node,template_id,example_id,rule_name_array) values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.id,jdbcType=VARCHAR},#{item.sublistName,jdbcType=VARCHAR},#{item.weight,jdbcType=VARCHAR},#{item.ruleName,jdbcType=VARCHAR},
             #{item.packageAndRules,jdbcType=VARCHAR},
@@ -36,7 +36,7 @@
             #{item.packageLevel},#{item.remarks},
             #{item.createUserId,jdbcType=VARCHAR},#{item.createTime},#{item.modifyUserId,jdbcType=VARCHAR},#{item.modifyTime},
             #{item.isDeleted,jdbcType=VARCHAR}, #{item.share,jdbcType=VARCHAR}, #{item.treeNode,jdbcType=VARCHAR},
-             #{item.templateId,jdbcType=VARCHAR},#{item.exampleId,jdbcType=VARCHAR})
+             #{item.templateId,jdbcType=VARCHAR},#{item.exampleId,jdbcType=VARCHAR},#{item.ruleNameArray,jdbcType=VARCHAR})
         </foreach>
     </insert>
 
@@ -44,7 +44,7 @@
             resultType="api.common.pojo.vo.scene.ScenePackageSublistVO">
         select
         a.sublist_id id,a.sublist_name,a.weight,b.rule_name,
-        a.scene_num,a.parent_id,a.root_id,a.package_level,a.remarks,a.seq,a.package_and_rules,
+        a.scene_num,a.parent_id,a.root_id,a.package_level,a.remarks,a.seq,a.package_and_rules,a.rule_name_array,
         a.scene_natural_ids,a.scene_traffic_ids,a.scene_statue_ids,a.scene_generalization_ids,a.tree_node,a.template_id,a.example_id
         from simulation.scene_package_sublist as a left join simulation.scoring_rules as b on
         a.package_and_rules=b.rules_id