Przeglądaj źródła

修改状态转换逻辑

tianboguang 2 lat temu
rodzic
commit
c55188bb91

+ 13 - 9
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -401,14 +401,6 @@ 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().equals(500)){      //500状态为数据库中手动修改值,当场景本身异常,算法,算不了
-                        vo.setStatus(-1);
-                    }
-                    if(vo.getStatus().equals(-1)){       //计算失败,钉钉通知之后,判定是否重算,还是修改为 500
-                        vo.setStatus(0);
-                    }
-                }
             }
         }
         //设置协作者信息
@@ -426,7 +418,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
 
-        List<SceneVo> sceneList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 0).collect(Collectors.toList());
+        List<SceneVo> sceneList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 0)
+                .peek(vo->{
+                    if (ObjectUtils.isEmpty(vo.getStatus())) {
+                        return;
+                    }
+                    if (vo.getStatus().equals(500)) {      //500状态为数据库中手动修改值,当场景本身异常,算法,算不了
+                        vo.setStatus(-1);
+                    }
+                    if (vo.getStatus().equals(-1)) {       //计算失败,钉钉通知之后,判定是否重算,还是修改为 500
+                        vo.setStatus(0);
+                    }
+                }).collect(Collectors.toList());
+
         if(sceneList.size() >0){
             folderList.addAll(sceneList);
         }