21

src/main/java/com/fdkankan/site/controller/ProjectController.java

@@ -47,8 +47,9 @@ public class ProjectController extends BaseController {
     }
 
     @GetMapping("/info")
-    public ResultData info(@RequestParam(required = false) Integer projectId){
-        return ResultData.ok(projectService.getProjectInfo(projectId));
+    public ResultData info(@RequestParam(required = false) Integer projectId,
+                           @RequestParam(required = false,defaultValue = "desc") String sceneOrder){
+        return ResultData.ok(projectService.getProjectInfo(projectId,sceneOrder));
     }
 
     @PostMapping("/list")

src/main/java/com/fdkankan/site/service/IProjectService.java

@@ -27,7 +27,7 @@ public interface IProjectService extends IService<Project> {
 
     Object pageList(ProjectListParam param, String token);
 
-    ProjectInfoVo getProjectInfo(Integer projectId);
+    ProjectInfoVo getProjectInfo(Integer projectId,String sceneOrder);
 
     List<SceneVo> getSceneList(Integer projectId);
 

src/main/java/com/fdkankan/site/service/impl/ProjectServiceImpl.java

@@ -141,7 +141,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
     }
 
     @Override
-    public ProjectInfoVo getProjectInfo(Integer projectId) {
+    public ProjectInfoVo getProjectInfo(Integer projectId,String sceneOrder) {
         VUtils.isTure(projectId == null).throwMessage(ResultCode.PARAM_MISS);
         Project project = this.getById(projectId);
         VUtils.isTure(project == null).throwMessage(ResultCode.PROJECT_NOT_EXIST);
@@ -151,8 +151,11 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         if(projectCreater!= null){
             infoVo.setProjectCreater(projectCreater.getUserName());
         }
-
-        infoVo.setSceneList(this.getSceneList(projectId));
+        List<SceneVo> sceneList = this.getSceneList(projectId);
+        if(StringUtils.isNotBlank(sceneOrder) && sceneOrder.equals("asc")){
+            Collections.reverse(sceneList);         //这个方法已经把list给倒叙，复制
+        }
+        infoVo.setSceneList(sceneList);
         ProjectBim bim = null;
         List<ProjectBim> projectBims = projectBimService.getByProjectId(projectId);
         for (ProjectBim projectBim : projectBims) {