合并测试环境最新代码

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

@@ -251,7 +251,7 @@ public class AppSceneService {
 
     }
 
-    public void deleteForCameraName(Long cameraId, String sceneNum) {
+    public void deleteForCameraName(Long cameraId, String sceneNum,Long userId) {
         if(cameraId == null || StringUtils.isEmpty(sceneNum)){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001,LoginConstant.FAILURE_MSG_3001);
         }
@@ -280,10 +280,6 @@ public class AppSceneService {
         if(scenePlus!=null){
             plusList.add(scenePlus);
         }
-        sceneProService.deleteByList(proList,plusList);
-    }
-
-    public void deleteScene(String sceneNum) {
-        sceneProService.delete(sceneNum);
+        sceneProService.deleteByList(proList,plusList,userId);
     }
 }