|
@@ -402,26 +402,35 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
|
|
|
@Override
|
|
|
public List<ScenePro> getListByCameraIds(List<Long> cameraIds) {
|
|
|
- LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.in(ScenePro::getCameraId,cameraIds)
|
|
|
- .eq(ScenePro::getIsUpgrade,0);
|
|
|
- return this.list(wrapper);
|
|
|
+ if(cameraIds.size() >0){
|
|
|
+ LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.in(ScenePro::getCameraId,cameraIds)
|
|
|
+ .eq(ScenePro::getIsUpgrade,0);
|
|
|
+ return this.list(wrapper);
|
|
|
+ }
|
|
|
+ return new ArrayList<>();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public List<ScenePro> getListByNums(List<String> numList) {
|
|
|
- LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.in(ScenePro::getNum,numList)
|
|
|
- .eq(ScenePro::getIsUpgrade,0);
|
|
|
- return this.list(wrapper);
|
|
|
+ if(numList.size() >0){
|
|
|
+ LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.in(ScenePro::getNum,numList)
|
|
|
+ .eq(ScenePro::getIsUpgrade,0);
|
|
|
+ return this.list(wrapper);
|
|
|
+ }
|
|
|
+ return new ArrayList<>();
|
|
|
}
|
|
|
@Override
|
|
|
public Long getCountByUserId(Long userId, List<?> resourceList) {
|
|
|
- LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.eq(ScenePro::getUserId,userId);
|
|
|
- wrapper.eq(ScenePro::getIsUpgrade,0);
|
|
|
- wrapper.in(ScenePro::getSceneSource,resourceList);
|
|
|
- return this.count(wrapper);
|
|
|
+ if(resourceList.size() >0){
|
|
|
+ LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.eq(ScenePro::getUserId,userId);
|
|
|
+ wrapper.eq(ScenePro::getIsUpgrade,0);
|
|
|
+ wrapper.in(ScenePro::getSceneSource,resourceList);
|
|
|
+ return this.count(wrapper);
|
|
|
+ }
|
|
|
+ return 0L;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -431,16 +440,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
|
|
|
@Override
|
|
|
public void deleteByIds(List<Long> sceneIds) {
|
|
|
- LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.in(ScenePro::getId,sceneIds)
|
|
|
- .eq(ScenePro::getIsUpgrade,0);
|
|
|
- List<ScenePro> proList = this.list(wrapper);
|
|
|
+ if(sceneIds.size() >0){
|
|
|
+ LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.in(ScenePro::getId,sceneIds)
|
|
|
+ .eq(ScenePro::getIsUpgrade,0);
|
|
|
+ List<ScenePro> proList = this.list(wrapper);
|
|
|
|
|
|
- LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
|
|
|
- plusWr.in(ScenePlus::getId,sceneIds);
|
|
|
- List<ScenePlus> plusList = scenePlusService.list(plusWr);
|
|
|
+ LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
|
|
|
+ plusWr.in(ScenePlus::getId,sceneIds);
|
|
|
+ List<ScenePlus> plusList = scenePlusService.list(plusWr);
|
|
|
+
|
|
|
+ this.deleteByList(proList,plusList);
|
|
|
+ }
|
|
|
|
|
|
- this.deleteByList(proList,plusList);
|
|
|
}
|
|
|
|
|
|
@Override
|