|
|
@@ -383,16 +383,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
|
|
|
Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
|
|
|
|
- List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream()
|
|
|
- .peek(entity -> {
|
|
|
- // 当计算时，返回给前端的状态为计算中
|
|
|
- if (entity.getStatus() == -1) {
|
|
|
- entity.setStatus(0);
|
|
|
- } else if (entity.getStatus() == 500) {
|
|
|
- entity.setStatus(-1);
|
|
|
- }
|
|
|
- })
|
|
|
- .filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
|
|
|
+ List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
|
|
|
Long totalSceneNum = 0L;
|
|
|
if(folderList.size() >0){
|
|
|
List<Long> folderIds = folderList.parallelStream().map(SceneVo::getId).collect(Collectors.toList());
|
|
|
@@ -407,6 +398,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
Integer count = sceneService.getCountByUserId(user.getId());
|
|
|
vo.setSceneNum(Long.valueOf(count));
|
|
|
}
|
|
|
+ if(vo.getIsFolder() == 0 && vo.getStatus() !=null){
|
|
|
+ if(vo.getStatus() == 500){ //500状态为数据库中手动修改值，当场景本身异常，算法，算不了
|
|
|
+ vo.setStatus(-1);
|
|
|
+ }
|
|
|
+ if(vo.getStatus() == -1){ //计算失败，钉钉通知之后，判定是否重算，还是修改为 500
|
|
|
+ vo.setStatus(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
//设置协作者信息
|
lyhzzz