|
@@ -167,9 +167,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
List<SceneNumVo> groupBySceneSouceV4 = scenePlusService.getGroupBySceneSouceV4(user.getId());
|
|
|
groupBySceneSouceV4.addAll(groupBySceneSouceV3);
|
|
|
|
|
|
- List<String> keys = SceneEnum.getKeys();
|
|
|
- for (String key : keys) {
|
|
|
- hashMap.put(key,new SceneNumVo());
|
|
|
+ SceneEnum[] values = SceneEnum.values();
|
|
|
+ for (SceneEnum sceneEnum : values) {
|
|
|
+ if(sceneEnum.getObj() == 0){
|
|
|
+ SceneNumVo sceneNumVo1 = fdkkLaserService.getLaserSceneNumByUser(token, sceneEnum.getSceneSource().get(0));
|
|
|
+ hashMap.put(sceneEnum.getName(),sceneNumVo1);
|
|
|
+ }else {
|
|
|
+ Long cooperationSceneNum = sceneCooperationService.getCooperationSceneNum(user.getId(), sceneEnum.getSceneSource());
|
|
|
+ SceneNumVo vo = new SceneNumVo();
|
|
|
+ vo.setCooperationSceneNum(cooperationSceneNum);
|
|
|
+ hashMap.put(sceneEnum.getName(),vo);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
for (SceneNumVo vo : groupBySceneSouceV4) {
|