1

src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -132,12 +132,16 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             HashMap<String,Model> map = modelService.getMapByNum(numList);
             for (SceneVo sceneVo : listAll) {
                 String createTime = sceneVo.getCreateTime();
+                String deptId = sceneVo.getDeptId();
+                String deptName = sceneVo.getDeptName();
                 Model model = map.get(sceneVo.getNum() + sceneVo.getType());
                 if(model == null){
                     continue;
                 }
                 BeanUtils.copyProperties(model,sceneVo);
                 sceneVo.setCreateTime(createTime);
+                sceneVo.setDeptId(deptId);
+                sceneVo.setDeptName(deptName);
             }
         }
         //官网删除的场景，删除对应资源
@@ -167,18 +171,6 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
                 listAll.add(sceneVo);
             }
         }
-        Set<String> snList = listAll.stream().filter(entity ->StringUtils.isNotBlank(entity.getSnCode()))
-                .map(SceneVo::getSnCode).collect(Collectors.toSet());
-        HashMap<String, TmDepartment> mapBySnCodes = tmCameraService.getMapBySnCodes(snList);
-        for (SceneVo sceneVo : listAll) {
-            if(StringUtils.isNotBlank(sceneVo.getSnCode())){
-                TmDepartment tmDepartment = mapBySnCodes.get(sceneVo.getSnCode().toUpperCase());
-                if(tmDepartment != null){
-                    sceneVo.setDeptId(tmDepartment.getId());
-                    sceneVo.setDeptName(tmDepartment.getName());
-                }
-            }
-        }
 
         Set<String> deptIdset = listAll.stream().filter(entity ->StringUtils.isNotBlank(entity.getDeptId())&& StringUtils.isBlank(entity.getDeptName()))
                 .map(SceneVo::getDeptId).collect(Collectors.toSet());