深时相机场景

src/main/java/com/fdkankan/ucenter/service/IScenePlusService.java

@@ -40,4 +40,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     Long copyV4Scene(ScenePlus scenePlus,String newNum, CameraDetail cameraDetail,String time) throws IOException, Exception;
 
     List<ScenePlus> getByIds(List<Long> plusIds);
+
+    List<ScenePlus> getListByUserId(Long id);
 }

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -93,4 +93,6 @@ public interface ISceneProService extends IService<ScenePro> {
      void updateOssStatus(String path,Integer payStatus) ;
 
     Integer getSceneSourceByNum(String sceneNum);
+
+    List<ScenePro> getListByUserId(Long id);
 }

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -159,10 +159,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     public PageInfo pageList(CameraParam param) {
         User user = userService.getByUserName(param.getUserName());
         Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(5L) && !roleIds.contains(6L)){
-            param.setUserId(user.getId());
-        }
-        if(roleIds.contains(6L)){
+        if(roleIds.contains(6L) || !roleIds.contains(5L)){
             param.setCompanyId(user.getCompanyId());
         }
         Page<CameraVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
@@ -176,6 +173,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             incrementMap = userIncrementService.findByCameraIds(cameraIdList);
         }
         for (CameraVo responseCamera : page.getRecords()) {
+
+            List<ScenePro> proList = sceneProService.getListByUserId(user.getId());
+            List<ScenePlus> plusList = scenePlusService.getListByUserId(user.getId());
+            Set<String> numList = proList.stream().map(ScenePro::getNum).collect(Collectors.toSet());
+            Set<String> numList2 = plusList.stream().map(ScenePlus::getNum).collect(Collectors.toSet());
+            numList.addAll(numList2);
+            responseCamera.setSceneList(new ArrayList<>(numList));
+
             responseCamera.setCameraType(param.getCameraType());
             if (responseCamera.getType() != 0){
                 responseCamera.setUsedSpaceStr(FileSizeUtil.formatFileSize(Long.parseLong(responseCamera.getUsedSpace())));

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -91,6 +91,12 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         wrapper.eq(ScenePlus::getCameraId,cameraId);
         return this.list(wrapper);
     }
+    @Override
+    public List<ScenePlus> getListByUserId(Long userId) {
+        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePlus::getUserId,userId);
+        return this.list(wrapper);
+    }
 
     @Override
     public void bindOrUnCamera(List<Long> cameraIds, Long userId) {

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -397,6 +397,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 .eq(ScenePro::getIsUpgrade,0);
         return this.list(wrapper);
     }
+    @Override
+    public List<ScenePro> getListByUserId(Long userId) {
+        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePro::getUserId,userId)
+                .eq(ScenePro::getIsUpgrade,0);
+        return this.list(wrapper);
+    }
 
     @Override
     public void bindOrUnCamera(List<Long> cameraIds, Long userId) {

src/main/java/com/fdkankan/ucenter/vo/response/CameraVo.java

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.vo.response;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CameraVo {
@@ -59,4 +60,6 @@ public class CameraVo {
     private String memberLevels;
 
     private  ResponseUserIncrement responseUserIncrement;
+
+    private List<String> sceneList;
 }