1

src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -24,6 +24,7 @@ public class SceneVo {
     private String algorithmTime;  //v4场景计算完成时间
 
     private Integer isObj =1 ;
+    private Integer isFolder ;
 
     private String companyName;     //企业名称
 

src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -6,7 +6,7 @@
         select f.id, f.name as sceneName,null as num ,null as create_time,null as sn_code,null as sceneSize
         ,null as user_name,null as view_count,null as status,null as pay_status,null as scene_version,null as webSite,null as thumb
         ,null as algorithmTime,null as child_name,null as camera_id,null as laser_title,co.company_name,null as location,null as scene_source,null as shoot_count,null as map_show
-        ,1 as sort_order
+        ,1 as sort_order,1 as isFolder
         from t_manage_folder f
         left join t_company co on f.company_id = co.id
         where f.rec_status = 'A'
@@ -34,7 +34,7 @@
         select s.id,s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
         ,null as algorithmTime,c.child_name,s.camera_id,s.laser_title,co.company_name,null as location,s.scene_source,s.shoot_count,s.map_show
-        ,2 as sort_order
+        ,2 as sort_order,0 as isFolder
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -48,7 +48,7 @@
         select s.id, s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as webSite,thumb
         ,algorithm_time,c.child_name,s.camera_id,s.laser_title,co.company_name,e.location,s.scene_source,e.shoot_count,s.map_show
-        ,3 as sort_order
+        ,3 as sort_order,0 as isFolder
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>