1

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

@@ -119,7 +119,11 @@ public class AppSceneService {
 
         HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(numList);
 
-        //账号密码登录 sceneSourceType 取值 1用户场景，2协作场景
+        Set<Long> cameraIdSet = page.getRecords().stream().map(AppSceneVo::getCameraId).collect(Collectors.toSet());
+        List<Long> cameraIds =  new ArrayList<>(cameraIdSet);
+        HashMap<Long, Camera> cameraHashMap = cameraService.getByIds(cameraIds);
+        //HashMap<Long, CameraDetail> detailHashMap = cameraDetailService.getByCameraIds(cameraIds);
+        //账号密码登录 sceneSourceType 取值 1用户场景，2协作场景 ,5同一公司，不是自己的场景
         //相机登录     sceneSourceType 取值皆为0
 
         for (AppSceneVo record : page.getRecords()) {
@@ -135,6 +139,10 @@ public class AppSceneService {
                     record.setWebSite(null);
                 }
             }
+            if(record.getCameraId() != null && cameraHashMap.get(record.getCameraId())!=null){
+                record.setChildName(cameraHashMap.get(record.getCameraId()).getChildName());
+                record.setSnCode(cameraHashMap.get(record.getCameraId()).getSnCode());
+            }
 
             if(coldMap.get(record.getNum()) != null ){
                 record.setColdStorage(coldMap.get(record.getNum()));
@@ -144,13 +152,13 @@ public class AppSceneService {
             } else if (record.getStatus() == 500) {
                 record.setStatus(-1);
             }
-            record.setSceneSourceType(2);
+            record.setSceneSourceType(1);
+            if(!cooperationNumList.isEmpty() && cooperationNumList.contains(record.getNum())){
+                record.setSceneSourceType(2);
+            }
             //用户场景
             if(param.getUserId() != null && record.getUserId() != null){
-                record.setSceneSourceType(record.getUserId().equals(param.getUserId()) ? 1 :2);
-            }
-            if(roleIds!= null && (roleIds.contains(5L) || roleIds.contains(6L))){
-                record.setSceneSourceType(1);
+                record.setSceneSourceType(record.getUserId().equals(param.getUserId()) ? 1 :5);
             }
         }
         return PageInfo.PageInfo(page);

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

@@ -42,14 +42,13 @@ public class AppUserService {
         }
         UserVo userVo = new UserVo();
         BeanUtils.copyProperties(user,userVo);
-        //Set<Long> roleIds = userRoleService.getByUser(user);
+        Set<Long> roleIds = userRoleService.getByUser(user);
         Long cameraCount = 0L;
-//        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
-//            cameraCount = cameraDetailService.getCountByUserId(user.getCompanyId(),user.getId(),cameraType);
-//        }else {
-//            cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),cameraType);
-//        }
-        cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),cameraType);
+        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
+            cameraCount = cameraDetailService.getCountByUserId(user.getCompanyId(),user.getId(),cameraType);
+        }else {
+            cameraCount = cameraDetailService.getCountByCompanyId(user.getCompanyId(),cameraType);
+        }
 
         Long proCount = sceneProService.getCountByUserId(user.getId(), cameraType);
         Long plusCount = scenePlusService.getCountByUserId(user.getId(), cameraType);

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

@@ -29,6 +29,7 @@ public class AppSceneVo {
     private String type;
 
     private Integer sceneSourceType;
+
     private Long userId;
 
     private String dataSource;