数据库添加双目文件夹

src/main/java/com/fdkankan/ucenter/common/OssPath.java

@@ -5,5 +5,5 @@ public class OssPath {
     public final static String houseTypePath = "scene_edit_data/%s/user/houseType.json";
     public final static String v3_statusPath = "data/data%s/status.json";
     public final static String v4_statusPath = "scene_view_data/%s/data/status.json";
-    public final static String localStatusPath = System.getProperty("java.io.tmpdir") +"/status.json";   //获取临时文件目录
+    public final static String localStatusPath = System.getProperty("java.io.tmpdir") +"status.json";   //获取临时文件目录
 }

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

@@ -391,10 +391,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             folderNum = allFolderIds.size();
             HashMap<Long,Long> map = folderSceneService.getGroupByFolderIds(allFolderIds);
             for (SceneVo vo : sceneVoPage.getRecords()) {
-                if(vo.getIsFolder() == 1){
+                if(vo.getIsFolder() == 1 && vo.getType()!= 3){
                     Long sceneNum = map.get(vo.getId()) == null ? 0L : map.get(vo.getId());
                     vo.setSceneNum(sceneNum);
                     vo.setCreateTimeStr(vo.getCreateTime());
+                }else if(vo.getType() == 3){
+                    Integer count = sceneService.getCountByUserId(user.getId());
+                    vo.setSceneNum(Long.valueOf(count));
                 }
             }
         }
@@ -412,19 +415,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
             }
         }
-        if(param.getSceneSource()!= null && param.getSceneSource().equals("1")
-                && param.getPageNum() == 1 && param.getHasFolder() == 1 && param.getFolderId() == null){         //增加双目文件夹
-            SceneVo sceneVo = new SceneVo();
-            sceneVo.setIsFolder(1);
-            sceneVo.setName("双目文件夹");
-            sceneVo.setType(3);
-            Integer count = sceneService.getCountByUserId(user.getId());
-            if(count >0){
-                sceneVo.setSceneNum(Long.valueOf(count));
-                folderList.add(sceneVo);
-            }
-
-        }
 
         List<SceneVo> sceneList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 0).collect(Collectors.toList());
         if(sceneList.size() >0){