优化场景列表接口

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -324,7 +324,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         param.setUserId(user.getId());
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
-        List<SceneVo> folderList =   sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
+        List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
         Integer folderNum = 0;
         if(folderList.size() >0){
             List<Long> folderIds = folderList.parallelStream().map(SceneVo::getId).collect(Collectors.toList());
@@ -334,7 +334,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             for (SceneVo vo : sceneVoPage.getRecords()) {
                 if(vo.getIsFolder() == 1){
                     Long sceneNum = map.get(vo.getId()) == null ? 0L : map.get(vo.getId());
-                    vo.setSceneNum(sceneNum );
+                    vo.setSceneNum(sceneNum);
                     vo.setCreateTimeStr(vo.getCreateTime());
                 }
             }

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

@@ -23,6 +23,11 @@ public class SceneVo {
     private Integer isUpgrade;
     private String createTime;
     private Integer viewCount;
+    /**
+     * 前端根据这个字段跳转不同的页面
+     * v1-edit, v2-editProPC, v3-epc, 空-edit
+     */
+    private String buildType;
 
     //文件夹相关
     private String createTimeStr;

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

@@ -22,10 +22,10 @@
     </select>
 
     <select id="pageListAndFolder" resultType="com.fdkankan.ucenter.vo.response.SceneVo">
-        <include refid="HasFolder"></include>
         SELECT * FROM (
+        <include refid="HasFolder"></include>
         SELECT  p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
-        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count
+        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type
         FROM t_scene_pro p 
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'
@@ -37,7 +37,7 @@
         </if>
         UNION
         SELECT  p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
-        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count
+        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>
@@ -60,7 +60,7 @@
     <sql id="HasFolder">
         <if test="param.hasFolder == 1">
             SELECT id,name,1 as isFolder,type,parent_id as parentId,create_time,null as num,null as scene_name,null as scene_dec,
-            null as status,null as pay_status,null as thumb,null as web_site,null as is_upgrade,null as sn_code,null as view_count
+            null as status,null as pay_status,null as thumb,null as web_site,null as is_upgrade,null as sn_code,null as view_count, null as build_type
             FROM t_folder WHERE rec_status = 'A' and type = #{param.folderType} and user_id =#{param.userId}
             <if test="param.folderId!=null">
                 AND parent_id = #{param.folderId}