lyhzzz 2 years ago
parent
commit
d51fa34515

+ 2 - 1
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -268,7 +268,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(param.getCompanyId()!= null){ //客户场景
                 List<CameraDetail> cameraDetails = cameraDetailService.getListByCompanyId(param.getCompanyId());
                 if(cameraDetails.size() >0){
-                    Set<Long> cameraIds = cameraDetails.stream().map(CameraDetail::getCameraId).collect(Collectors.toSet());
+                    Set<Long> cameraIds = cameraDetails.stream()
+                            .filter(entity -> entity.getGoodsId() == 10).map(CameraDetail::getCameraId).collect(Collectors.toSet());
                     List<Camera> cameraList = cameraService.listByIds(cameraIds);
                     List<String> snCodes = cameraList.stream().map(Camera::getSnCode).collect(Collectors.toList());
                     param.setSnCodes(snCodes);

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/SpaceSdkServiceImpl.java

@@ -120,7 +120,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         }
         this.updateById(managerSdkEntity);
         // 删除本地文件
-        FileUtils.deleteFile(filePath);
+        //FileUtils.deleteFile(filePath);
 
         return url;
     }