传感器配置、动力学配置、车辆配置公有删除接口

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

@@ -35,12 +35,12 @@ import java.util.Map;
 @Service
 public class AlgorithmServiceImpl implements AlgorithmService {
 
-    AlgoPlatformService algoPlatformService;
-    SchedulerService schedulerService;
-    FileDownService fileDownService;
-    AlgorithmMapper algorithmMapper;
-    DictService dictService;
-    GitConfiguration gitConfiguration;
+    private AlgoPlatformService algoPlatformService;
+    private SchedulerService schedulerService;
+    private FileDownService fileDownService;
+    private AlgorithmMapper algorithmMapper;
+    private DictService dictService;
+    private GitConfiguration gitConfiguration;
 
     @Autowired
     private SimulationProjectService simulationProjectService;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -106,9 +106,6 @@ public class ScenePackageController {
     //查询一个测试包列表
     @PostMapping("/queryScenePackageSublistList")
     public ResponseBodyVO<List<ScenePackageSublistVO>> queryScenePackageSublistList(@RequestBody ScenePackageParam parms) {
-        if (ObjectUtil.isNull(parms.getPackageId())) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 packageId 不能为空，请检查");
-        }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, scenePackageService.queryScenePackageSublistList(parms));
     }
 
@@ -116,18 +113,12 @@ public class ScenePackageController {
     @PostMapping("/instShareList")
     @PreAuthorize("@AuthorityCheck.admin()")
     public ResponseBodyVO<String> instShareList(@RequestBody ScenePackageParam parms) {
-        if (ObjectUtil.isNull(parms.getPackageId())) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数PackageId不能为空，请检查");
-        }
         return scenePackageService.instShareList(parms);
     }
 
     //测试包删除
     @PostMapping("/deleteList")
     public ResponseBodyVO<String> deleteList(@RequestBody ScenePackageParam parms) {
-        if (ObjectUtil.isNull(parms.getPackageId())) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 packageId 不能为空，请检查");
-        }
         scenePackageService.deleteList(parms);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageMapper.java

@@ -15,69 +15,43 @@ import java.util.List;
 @Mapper
 @Repository
 public interface ScenePackageMapper {
-
     void saveScenePackage(ScenePackagePO params);
-
     void updateScenePackage(ScenePackagePO params);
-
     void deleteScenePackage(ScenePackagePO params);
-
-    //查询详情
     ScenePackagePO queryScenePackage(ScenePackageParam params);
-
     List<ScenePackagePO> queryScenePackageList(ScenePackageParam params);
-
-    //单独给查询一个测试包的列表用
     ScenePackageNewVO queryScenePackageBySublist(String packageId);
-
-    //测试包名查唯一
     ScenePackageNewVO queryByPackageName(ScenePackagePO params);
-
     ScenePackageNewVO querySelfOnly(@Param("packageName") String packageName, @Param("createUserId") String createUserId);
-
-    //测试包数量
     Integer queryPackageCount(ScenePackagePO params);
-
-    //改变状态是否禁用
     void updateIsUnavailable(ScenePackagePO params);
-
-    //改变状态是否禁用
     void updateIsUnavailable2(ScenePackagePO params);
-
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_natural_ids like concat('%', #{sceneId}, '%'))")
     void updateIsUnavailableByNaturalId(@Param("isUnavailable") String isUnavailable, @Param("sceneId") String sceneId);
-
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_statue_ids like concat('%', #{sceneId}, '%'))")
     void updateIsUnavailableByStandardsId(@Param("isUnavailable") String isUnavailable, @Param("sceneId") String sceneId);
-
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_traffic_ids like concat('%', #{sceneId}, '%'))")
     void updateIsUnavailableByAccidentId(@Param("isUnavailable") String isUnavailable, @Param("sceneId") String sceneId);
-
-
     @Select("select is_unavailable from scene_package where package_id = #{packageId}")
     String selectIsUnavailableByPackageId(@Param("packageId") String packageId);
-
     @Select("select is_deleted from scene_package where package_id = #{packageId}")
     String selectIsDeletedByPackageId(@Param("packageId") String packageId);
-
     @Update("update scene_package\n" +
             "set scene_num = scene_num - 1\n" +
             "where package_id in\n" +
             "      (select root_id from scene_package_sublist where scene_natural_ids like concat('%', #{naturalId}, '%'))")
     void updateSceneNumAfterDeleteSceneByNaturalId(@Param("naturalId") String naturalId);
-
     @Update("update scene_package\n" +
             "set scene_num = scene_num - 1\n" +
             "where package_id in\n" +
             "      (select root_id from scene_package_sublist where scene_statue_ids like concat('%', #{sceneId}, '%'))")
     void updateSceneNumAfterDeleteSceneByStandardsId(@Param("sceneId") String sceneId);
-
     @Update("update scene_package\n" +
             "set scene_num = scene_num - 1\n" +
             "where package_id in\n" +

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageSublistMapper.java

@@ -15,40 +15,27 @@ import java.util.List;
 public interface ScenePackageSublistMapper {
 
     void saveScenePackageSublist(ScenePackageSublistPO params);
-
     void saveScenePackageSublistAll(List<ScenePackageSublistPO> treeList);
-
     void deleteScenePackageSublist(String rootId);
-
     void deleteScenePackageSublistById(String sublistId);
-
     List<ScenePackageSublistVO> queryScenePackageSublistList(ScenePackageSublistPO params);
-
     //指标名查唯一
     List<ScenePackageSublistVO> queryBySublistName(ScenePackageSublistPO params);
-
-
     List<String> selectPackageIdById(SceneDeleteParam param);
     List<ScenePackageSublistPO> selectPackageFhById(SceneDeleteParam param);
-
-
     void updateScenePackageSublistById(SceneDeleteParam param);
-
     @Update("update scene_package_sublist\n" +
             "set scene_num = scene_num - 1\n" +
             "where scene_natural_ids like concat('%', #{naturalId}, '%')")
     void updateSceneNumAfterDeleteSceneByNaturalId(@Param("naturalId") String naturalId);
-
     @Update("update scene_package_sublist\n" +
             "set scene_num = scene_num - 1\n" +
             "where scene_statue_ids like concat('%', #{sceneId}, '%')")
     void updateSceneNumAfterDeleteSceneByStandardsId(@Param("sceneId")String sceneId);
-
     @Update("update scene_package_sublist\n" +
             "set scene_num = scene_num - 1\n" +
             "where scene_traffic_ids like concat('%', #{sceneId}, '%')")
     void updateSceneNumAfterDeleteSceneByAccidentId(@Param("sceneId")String sceneId);
-
     @Select("select sum(scene_num)\n" +
             "from scene_package_sublist\n" +
             "where root_id = #{scenePackageId}")

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

@@ -193,7 +193,11 @@ public class ScenePackageService {
         LogUtil.delete();
     }
 
-    //查询一个测试包的指标列表
+
+    /**
+     * 查询场景测试包详情
+     *
+     */
     @SneakyThrows
     public List<ScenePackageSublistVO> queryScenePackageSublistList(ScenePackageParam params) {
         ScenePackageNewVO vo = scenePackageMapper.queryScenePackageBySublist(params.getPackageId());
@@ -586,7 +590,7 @@ public class ScenePackageService {
             params.setShare(share);
             params.setPackageLevel(level);
             params.setTreeNode(parentVoList.get(i).getTreeNode());
-            if(ObjectUtil.isNotNull(parentVoList.get(i).getRuleNameArrayS())){
+            if (ObjectUtil.isNotNull(parentVoList.get(i).getRuleNameArrayS())) {
                 params.setRuleNameArray(StringUtils.join(Arrays.asList(parentVoList.get(i).getRuleNameArrayS()), ','));
             }
             List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getChildren();
@@ -685,7 +689,7 @@ public class ScenePackageService {
             params.setShare(share);
             params.setPackageLevel(level);
             params.setTreeNode(parentVoList.get(i).getTreeNode());
-            if(ObjectUtil.isNotNull(parentVoList.get(i).getRuleNameArrayS())){
+            if (ObjectUtil.isNotNull(parentVoList.get(i).getRuleNameArrayS())) {
                 params.setRuleNameArray(StringUtils.join(Arrays.asList(parentVoList.get(i).getRuleNameArrayS()), ','));
             }
             List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getChildren();

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

@@ -8,12 +8,12 @@
         (package_id, package_code, package_name, weight,
          package_and_rules, scene_num, remarks,
          create_user_id, create_time, modify_user_id, modify_time,
-         is_deleted, share, tree_node,is_unavailable)
+         is_deleted, share, tree_node, is_unavailable)
         values (#{packageId,jdbcType=VARCHAR}, #{packageCode,jdbcType=VARCHAR}, #{packageName,jdbcType=VARCHAR},
                 #{weight,jdbcType=VARCHAR},
                 #{packageAndRules,jdbcType=VARCHAR}, #{sceneNum}, #{remarks,jdbcType=VARCHAR},
                 #{createUserId,jdbcType=VARCHAR}, #{createTime}, #{modifyUserId,jdbcType=VARCHAR}, #{modifyTime},
-                #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR},'0')
+                #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR}, '0')
     </insert>
 
 
@@ -92,16 +92,22 @@
     <select id="queryScenePackageBySublist" parameterType="java.lang.String"
             resultType="api.common.pojo.vo.scene.ScenePackageNewVO">
         select
-        a.package_id ,a.package_name ,a.weight,a.package_code,
-        a.scene_num,a.remarks,a.tree_node
-        from simulation.scene_package as a
+        package_id,
+        package_name,
+        weight,
+        package_code,
+        scene_num,
+        remarks,
+        tree_node
+        from scene_package
         <where>
-            a.is_deleted = '0'
+            is_deleted = '0'
             <if test="packageId != null and packageId != ''">
-                and a.package_id = #{packageId,jdbcType=VARCHAR}
+                and package_id = #{packageId}
             </if>
         </where>
     </select>
+
     <update id="updateScenePackage" parameterType="api.common.pojo.po.scene.ScenePackagePO">
         update simulation.scene_package
         <set>
@@ -209,10 +215,11 @@
     <update id="updateIsUnavailable" parameterType="api.common.pojo.po.scene.ScenePackagePO">
         update simulation.scene_package
         set is_unavailable = #{isUnavailable},
-                modify_user_id = #{modifyUserId},
-                modify_time = #{modifyTime},
-               scene_num =scene_num-'${sceneNum}'
-        where is_deleted = '0' and package_id =#{packageId}
+            modify_user_id = #{modifyUserId},
+            modify_time    = #{modifyTime},
+            scene_num      =scene_num - '${sceneNum}'
+        where is_deleted = '0'
+          and package_id = #{packageId}
     </update>
 
     <update id="updateIsUnavailable2" parameterType="api.common.pojo.po.scene.ScenePackagePO">