|
@@ -142,14 +142,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;
|
|
|
}
|
|
|
|
|
@@ -567,7 +572,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
totalSceneNum = folderSceneService.getCountByFolderAndSon(param.getFolderId());
|
|
|
}else if(param.getIsObj() != null && param.getIsObj() ==1){
|
|
|
if(param.getUserId()!= null){
|
|
|
- totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId());
|
|
|
+ totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId(),Integer.valueOf(param.getSceneSource()));
|
|
|
}
|
|
|
}
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
@@ -576,19 +581,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
return jsonObject;
|
|
|
}
|
|
|
|
|
|
- private Long getCountByLaserAndIsObj(Long userId) {
|
|
|
+ private Long getCountByLaserAndIsObj(Long userId,Integer sceneSource) {
|
|
|
Long proCount = 0L;
|
|
|
Long plusCount = 0L;
|
|
|
LambdaQueryWrapper<ScenePro> proWr = new LambdaQueryWrapper<>();
|
|
|
proWr.eq(ScenePro::getUserId,userId);
|
|
|
- proWr.eq(ScenePro::getSceneSource,4);
|
|
|
+ proWr.eq(ScenePro::getSceneSource,sceneSource);
|
|
|
proWr.eq(ScenePro::getIsObj,1);
|
|
|
proWr.eq(ScenePro::getIsUpgrade,0);
|
|
|
proCount = this.count(proWr);
|
|
|
|
|
|
LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
|
|
|
plusWr.eq(ScenePlus::getUserId,userId);
|
|
|
- plusWr.eq(ScenePlus::getSceneSource,4);
|
|
|
+ plusWr.eq(ScenePlus::getSceneSource,sceneSource);
|
|
|
List<ScenePlus> list = scenePlusService.list(plusWr);
|
|
|
if(list.size() >0){
|
|
|
List<Long> plusIds = list.stream().map(ScenePlus::getId).collect(Collectors.toList());
|
|
@@ -1094,7 +1099,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if(sceneProEntity.getSceneSource() != 4){
|
|
|
+ if(sceneProEntity.getSceneSource() != 4 && sceneProEntity.getSceneSource() != 5){
|
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3003, "只能操作激光场景");
|
|
|
}
|
|
|
|
|
@@ -1145,7 +1150,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
|
|
|
}
|
|
|
|
|
|
- if(scenePlus.getSceneSource() != 4){
|
|
|
+ if(scenePlus.getSceneSource() != 4 && scenePlus.getSceneSource() !=5){
|
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3003, "只能操作激光场景");
|
|
|
}
|
|
|
|