|
@@ -143,14 +143,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
sceneNumVoKk.setTotalNum(oldNum + sceneNumVoKk.getTotalNum());
|
|
|
|
|
|
SceneNumVo sceneNumVoKj = getSceneNumVoByType(Collections.singletonList(3), user.getId());
|
|
|
- SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token);
|
|
|
|
|
|
+ SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token,4);
|
|
|
SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId());
|
|
|
+
|
|
|
+ SceneNumVo sceneNumVoSG = fdkkLaserService.getLaserSceneNumByUser(token,5);
|
|
|
+ SceneNumVo sceneNumVoSGObj = getSceneNumVoByObjType(Arrays.asList(5), user.getId());
|
|
|
HashMap<String, SceneNumVo> hashMap = new HashMap<>();
|
|
|
hashMap.put("kk",sceneNumVoKk);
|
|
|
hashMap.put("kJ",sceneNumVoKj);
|
|
|
hashMap.put("SS",sceneNumVoSS);
|
|
|
hashMap.put("SS_OBJ",sceneNumVoSSObj);
|
|
|
+ hashMap.put("SG",sceneNumVoSG);
|
|
|
+ hashMap.put("SG_OBJ",sceneNumVoSGObj);
|
|
|
return hashMap;
|
|
|
}
|
|
|
|