项目管理

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

@@ -28,4 +28,6 @@ public interface IProjectService extends IService<Project> {
     void addScene(ProjectAddSceneParam param);
 
     void delScene(ProjectAddSceneParam param);
+
+    List<Project> listShow();
 }

src/main/java/com/fdkankan/manage_jp/service/impl/DownService.java

@@ -338,7 +338,7 @@ public class DownService implements IDownService {
             throw new BusinessException(ResultCode.SS_SCENE_DOWN_ERROR);
         }
         downVo.setStatus(1003);
-        if(vo.getStatus() == 0  || vo.getStatus() == 3){    //下载中
+        if(vo.getStatus() == 0 || vo.getStatus() == 2 || vo.getStatus() == 3){    //下载中
             ssNumProcessNumE57Map.merge(num, 1, Integer::sum);
             Integer percent = ssNumProcessNumE57Map.get(num);
             percent = percent /2;
@@ -348,7 +348,7 @@ public class DownService implements IDownService {
             downVo.setStatus(1001);
             downVo.setPercent(percent);
         }
-        if(vo.getStatus() == 1 || vo.getStatus() == 2){    //下载完成
+        if(vo.getStatus() == 1 ){    //下载完成
             ssNumProcessNumE57Map.remove(num);
             downVo.setPercent(100);
             downVo.setUrl(vo.getUrl());

src/main/java/com/fdkankan/manage_jp/service/impl/ProjectSceneGpsServiceImpl.java

@@ -150,7 +150,7 @@ public class ProjectSceneGpsServiceImpl extends ServiceImpl<IProjectSceneGpsMapp
             if(!roleIds.contains(5L)) {      //平台管理员
                 projectList =  projectService.listByCompanyId(param.getCompanyId());
             }else {
-                projectList = projectService.list();
+                projectList = projectService.listShow();
             }
             for (Project project : projectList) {
                 projectMap.put(project.getId(),project);

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

@@ -86,9 +86,16 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         List<Long> userIds = userList.stream().map(User::getId).collect(Collectors.toList());
         LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(Project::getCreateId,userIds);
+        wrapper.in(Project::getIsShow,1);
         return this.list(wrapper);
     }
 
+    @Override
+    public List<Project> listShow() {
+        LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(Project::getIsShow,1);
+        return this.list(wrapper);
+    }
 
     @Override
     public void addScene(ProjectAddSceneParam param) {