场景库

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

@@ -58,4 +58,13 @@ public class SceneNaturalController {
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
+    //首页查询场景数量
+    @PostMapping("/querySceneNumBySy")
+    @ResponseBody
+    public ResponseBodyVO<Integer> querySceneNumBySy() {
+        Integer a=sceneNaturalService.querySceneNumBySy();
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,a);
+    }
+
+
 }

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

@@ -19,4 +19,6 @@ public interface SceneNaturalMapper {
 
     List<SceneNaturalPO> querySceneNaturaByName(SceneNaturalParam params);
 
+    Integer querySceneNumBySy(SceneNaturalParam params);
+
 }

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

@@ -246,4 +246,9 @@ public class SceneNaturalService {
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         sceneNaturalMapper.deleteSceneNatural(params);
     }
+    public Integer querySceneNumBySy() {
+        SceneNaturalParam params=new SceneNaturalParam();
+
+       return sceneNaturalMapper.querySceneNumBySy(params);
+    }
 }

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

@@ -245,11 +245,9 @@ public class ScenePackageService {
      */
     public List<ScenePackageSublistPO> instShareListTree(List<ScenePackageSublistVO> parentVoList,
                                        String scenePackageId, String rootId, List<ScenePackageSublistPO> poList
-            , String share,Integer a) {
-        {
+            , String share,Integer level) {
             //获取子节点集合
             for (int i = 0; i < parentVoList.size(); i++) {
-                ++a;
                 ScenePackageSublistPO params = new ScenePackageSublistPO();
                 BeanUtils.copyProperties(parentVoList.get(i), params);
                 params.setParentId(scenePackageId);
@@ -262,17 +260,19 @@ public class ScenePackageService {
                 params.setId(uuId);   //主键ID
                 params.setIsDeleted("0");
                 params.setShare(share);
-                params.setSeq(a);
+                params.setPackageLevel(level);
                 List<ScenePackageSublistVO> cvoList = parentVoList.get(i).getChildren();
                 poList.add(params);
                 if (cvoList != null && cvoList.size() > 0) {
                     //继续查找下一节点
-                    instShareListTree(cvoList, uuId, rootId, poList, share,a);
+                    int b=level+1;
+                    instShareListTree(cvoList, uuId, rootId, poList, share,b);
                 }
                 parentVoList.remove(parentVoList.get(i));
                 i--;
+
             }
-        }
+
 
         return poList;
     }

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

@@ -337,4 +337,24 @@
             </if>
         </where>
     </select>
+
+    <select id="querySceneNumBySy" parameterType="api.common.pojo.param.scene.SceneNaturalParam"
+            resultType="java.lang.Integer">
+      select count(id) from( select
+        natural_id id,share,create_user_id,is_deleted
+        from simulation.scene_natural union all select
+        accident_id id,share,create_user_id,is_deleted
+        from simulation.scene_accident  union all select
+        regulations_id id,share,create_user_id,is_deleted
+        from simulation.scene_standards_regulations ) a
+        <where>
+            is_deleted = '0'
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            </if>
+            <if test="share != null and share != ''">
+                and share=#{share,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -31,7 +31,7 @@
             (#{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},
+            #{item.sceneNum},#{item.parentId,jdbcType=VARCHAR},#{item.rootId,jdbcType=VARCHAR},#{index}+1,
             #{item.packageLevel},#{item.remarks},
             #{item.createUserId,jdbcType=VARCHAR},#{item.createTime},#{item.modifyUserId,jdbcType=VARCHAR},#{item.modifyTime},
             #{item.isDeleted,jdbcType=VARCHAR}, #{item.share,jdbcType=VARCHAR})
@@ -63,7 +63,7 @@
             <if test="rootId != null and rootId != ''">
                 and a.root_id = #{rootId}
             </if>
-            order by a.modify_time desc,a.seq
+            order by seq
         </where>
     </select>