场景库模块代码

api-common/src/main/java/api/common/pojo/param/scene/ScenePackageSublistParam.java

@@ -16,7 +16,7 @@ import java.util.List;
 @AllArgsConstructor
 public class ScenePackageSublistParam implements Serializable {
 
-    private String sublistId  ;//主键Id
+    private String id  ;//主键Id
     private String sublistName ; //指标名称
     private String weight;//权重
     private String ruleName ; //规则名称

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

@@ -15,7 +15,7 @@ import java.sql.Timestamp;
 @AllArgsConstructor
 public class ScenePackageSublistPO implements Serializable {
 
-    private String sublistId  ;//主键Id
+    private String id  ;//主键Id
     private String sublistName ; //指标名称
     private String weight;//权重
     private String ruleName ; //规则名称

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

@@ -15,7 +15,7 @@ import java.util.List;
 @AllArgsConstructor
 public class ScenePackageSublistVO implements Serializable {
 
-    private String sublistId  ;//主键Id
+    private String id  ;//主键Id
     private String sublistName ; //指标名称
     private String weight;//权重
     private String ruleName;//打分规则名称
@@ -31,5 +31,5 @@ public class ScenePackageSublistVO implements Serializable {
     private String remarks;//备注
     private int seq;//在当前层级下的顺序，由小到大
     private boolean hasChildren;
-    private List<ScenePackageSublistVO>  list;
+    private List<ScenePackageSublistVO>  children;
 }

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

@@ -45,7 +45,7 @@ public class ScenePackageController {
     }
 
 
-    //新增打分规则
+    //新增测试包
     @PostMapping("/saveScenePackage")
     @ResponseBody
     public ResponseBodyVO<String> saveScoringRules(@RequestBody ScenePackageNewParam parms) {

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

@@ -131,11 +131,11 @@ public class ScenePackageService {
         }else{
             //获取子节点集合
             for(ScenePackageSublistVO pvo : parentVoList){
-                params.setParentId(pvo.getSublistId());
+                params.setParentId(pvo.getId());
                 List<ScenePackageSublistVO> cvoList = scenePackageSublistMapper.queryScenePackageSublistList(params);
                 if(cvoList != null && cvoList.size() > 0){
                     //存入父节点集合中
-                    pvo.setList(cvoList);
+                    pvo.setChildren(cvoList);
                     pvo.setHasChildren(true);
                     //继续查找下一节点
                     selectScenePackageSubListTree(cvoList,false, null);
@@ -195,10 +195,10 @@ public class ScenePackageService {
                 params.setModifyTime(TimeUtil.getNowForMysql());
                 params.setCreateUserId(AuthUtil.getCurrentUserId());
                 String uuId= StringUtil.getRandomUUID();
-                params.setSublistId(uuId);   //主键ID
+                params.setId(uuId);   //主键ID
                 params.setIsDeleted("0");
                 params.setShare(share);
-                List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getList();
+                List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getChildren();
                 poList.add(params);
                 if(cvoList != null && cvoList.size() > 0){
                     //继续查找下一节点

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

@@ -9,7 +9,7 @@
         scene_num,parent_id,root_id,seq,package_level,remarks,
         create_user_id,create_time,modify_user_id,modify_time,
          is_deleted,share)
-        values (#{sublistId,jdbcType=VARCHAR},#{sublistName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},#{ruleName,jdbcType=VARCHAR},
+        values (#{id,jdbcType=VARCHAR},#{sublistName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},#{ruleName,jdbcType=VARCHAR},
         #{packageAndRules,jdbcType=VARCHAR},
         #{sceneNaturalIds}, #{sceneTrafficIds}, #{sceneStatueIds}, #{sceneGeneralizationIds},
         #{sceneNum},#{parentId,jdbcType=VARCHAR},#{rootId,jdbcType=VARCHAR},#{seq},
@@ -28,7 +28,7 @@
             create_user_id,create_time,modify_user_id,modify_time,
             is_deleted,share) values
         <foreach collection="list" index="index" item="item" separator=",">
-              (#{item.sublistId,jdbcType=VARCHAR},#{item.sublistName,jdbcType=VARCHAR},#{item.weight,jdbcType=VARCHAR},#{item.ruleName,jdbcType=VARCHAR},
+              (#{item.id,jdbcType=VARCHAR},#{item.sublistName,jdbcType=VARCHAR},#{item.weight,jdbcType=VARCHAR},#{item.ruleName,jdbcType=VARCHAR},
             #{item.packageAndRules,jdbcType=VARCHAR},
             #{item.sceneNaturalIds}, #{item.sceneTrafficIds}, #{item.sceneStatueIds}, #{item.sceneGeneralizationIds},
             #{item.sceneNum},#{item.parentId,jdbcType=VARCHAR},#{item.rootId,jdbcType=VARCHAR},#{item.seq},
@@ -40,14 +40,14 @@
 
     <select id="queryScenePackageSublistList" parameterType="api.common.pojo.po.scene.ScenePackageSublistPO" resultType="api.common.pojo.vo.scene.ScenePackageSublistVO">
         select
-        a.sublist_id,a.sublist_name,a.weight,b.rule_name,
+        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_natural_ids,a.scene_traffic_ids,a.scene_statue_ids,a.scene_generalization_ids
         from simulation.scene_package_sublist as a  left join simulation.scoring_rules as b on a.package_and_rules=b.rules_id
         <where>
             a.is_deleted = '0'
-            <if test="sublistId != null and sublistId != ''">
-                and a.sublist_id  = #{sublistId,jdbcType=VARCHAR}
+            <if test="id != null and id != ''">
+                and a.sublist_id  = #{id,jdbcType=VARCHAR}
             </if>
             <if test="sublistName != null and sublistName != ''">
                 and a.sublist_name  = #{sublistName,jdbcType=VARCHAR}
@@ -72,13 +72,13 @@
         where root_id = #{rootId,jdbcType=VARCHAR}
     </update>
 
-    <select id="queryBySublistName" parameterType="api.common.pojo.po.scene.ScenePackageSublistPO" resultType="api.common.pojo.vo.scene.ScenePackageNewVO">
-        select sublist_id,sublist_name
+    <select id="queryBySublistName" parameterType="api.common.pojo.po.scene.ScenePackageSublistPO" resultType="api.common.pojo.vo.scene.ScenePackageSublistVO">
+        select sublist_id id,sublist_name
         from simulation.scene_package_sublist
         <where>
             is_deleted = '0'
-            <if test="sublistId != null and sublistId != ''">
-                and a.sublist_id  != #{sublistId,jdbcType=VARCHAR}
+            <if test="id != null and id != ''">
+                and a.sublist_id  != #{id,jdbcType=VARCHAR}
             </if>
             <if test="sublistName != null and sublistName != ''">
                 and a.sublist_name  = #{sublistName,jdbcType=VARCHAR}