|
@@ -137,6 +137,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
|
|
|
SceneNumVo sceneNumVoKj = getSceneNumVoByType(Collections.singletonList(3), user.getId());
|
|
SceneNumVo sceneNumVoKj = getSceneNumVoByType(Collections.singletonList(3), user.getId());
|
|
SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token);
|
|
SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token);
|
|
|
|
+
|
|
|
|
+ SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId());
|
|
HashMap<String, SceneNumVo> hashMap = new HashMap<>();
|
|
HashMap<String, SceneNumVo> hashMap = new HashMap<>();
|
|
hashMap.put("kk",sceneNumVoKk);
|
|
hashMap.put("kk",sceneNumVoKk);
|
|
hashMap.put("kJ",sceneNumVoKj);
|
|
hashMap.put("kJ",sceneNumVoKj);
|
|
@@ -158,6 +160,24 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
|
|
sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
|
|
return sceneNumVo;
|
|
return sceneNumVo;
|
|
}
|
|
}
|
|
|
|
+ private SceneNumVo getSceneNumVoByObjType(List<Integer> sceneSourceList, Long userId){
|
|
|
|
+ SceneNumVo sceneNumVo = new SceneNumVo();
|
|
|
|
+ LambdaQueryWrapper<ScenePro> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
+ queryWrapper.eq(ScenePro::getUserId, userId);
|
|
|
|
+ queryWrapper.in(ScenePro::getSceneSource, sceneSourceList);
|
|
|
|
+ queryWrapper.eq(ScenePro::getIsUpgrade, 0);
|
|
|
|
+ queryWrapper.eq(ScenePro::getIsObj,1);
|
|
|
|
+ Integer sceneNum = Math.toIntExact(this.count(queryWrapper));
|
|
|
|
+
|
|
|
|
+ LambdaQueryWrapper<ScenePlusExt> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
+ wrapper.eq(ScenePlusExt::getIsObj,1);
|
|
|
|
+ List<ScenePlusExt> list = scenePlusExtService.list(wrapper);
|
|
|
|
+ long plusCount = list.size();
|
|
|
|
+ sceneNumVo.setCooperationSceneNum(0L);
|
|
|
|
+ sceneNumVo.setSceneNum(sceneNum + plusCount);
|
|
|
|
+ sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
|
|
|
|
+ return sceneNumVo;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|