细节修改

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -63,9 +63,8 @@ public class SceneController {
         return Result.success();
     }
     @PostMapping("/delete")
-    public Result delete(@RequestBody SceneParam param,@RequestHeader String token) throws Exception {
-        String username = JwtUtil.getUsername(token);
-        sceneProService.delete(param.getSceneNum(),username);
+    public Result delete(@RequestBody SceneParam param) throws Exception {
+        sceneProService.delete(param.getSceneNum());
         return Result.success();
     }
 

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

@@ -22,7 +22,7 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     Integer deadlineNumber(String username);
 
-    void unbindCamera(List<Long> cameraIds,String userName);
+    void unbindCamera(List<Long> cameraIds);
 
     void bindCamera(List<Long> cameraIds,Long userId);
 

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

@@ -50,5 +50,5 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void updateSceneJson(String type,String videos,String newNum,String sceneName,String webSite,String thumb,Long id) throws Exception;
 
-    void delete(String sceneNum, String username);
+    void delete(String sceneNum);
 }

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

@@ -93,7 +93,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
-    public void unbindCamera(List<Long> cameraIds,String username) {
+    public void unbindCamera(List<Long> cameraIds) {
         HashMap<Long, CameraDetail> detailMap = this.getByCameraIds(cameraIds);
         HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIds);
         List<CameraDetail> detailIds = new ArrayList<>();

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

@@ -209,12 +209,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (String id : split) {
             cameraIds.add(Long.valueOf(id));
         }
-        cameraDetailService.unbindCamera(cameraIds,userName);         //取消相机用户关联
+        cameraDetailService.unbindCamera(cameraIds);                     //取消相机用户关联
         userIncrementService.unbindCamera(cameraIds);                   //取消关联用户权益
         sceneService.bindOrUnCamera(cameraIds,null);                //取消关联场景
         sceneProService.bindOrUnCamera(cameraIds,null);             //取消关联场景
         scenePlusService.bindOrUnCamera(cameraIds,null);            //取消关联场景
-        sceneResourceCameraService.deleteByCameraIds(cameraIds);            //删除协作相机
+        sceneResourceCameraService.deleteByCameraIds(cameraIds);       //删除协作相机
 
     }
 

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

@@ -204,28 +204,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 .in(ScenePlus::getId,lockedIds);
         scenePlusService.update(updatePlusWrapper);
 
-        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(ScenePro::getId,lockedIds);
-        List<ScenePro> list = this.list(wrapper);
-        for (ScenePro scenePro : list) {
-            try{
-                Map<String, Object> map = new HashMap<>();
-                map.put("payStatus", payStatus);
-                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + scenePro.getNum() + "/scene.json", map);
-                JSONObject statusJson = new JSONObject();
-                //临时将-2改成1，app还没完全更新
-                statusJson.put("status", scenePro.getStatus() == -2 ? 1 : scenePro.getStatus());
-                statusJson.put("webSite", scenePro.getWebSite());
-                statusJson.put("sceneNum", scenePro.getNum());
-                statusJson.put("thumb", scenePro.getThumb());
-                statusJson.put("payStatus", scenePro.getPayStatus());
-                FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+scenePro.getNum()+ File.separator+"status.json", statusJson.toString());
-                uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+scenePro.getNum()+File.separator+"status.json",
-                        "data/data"+scenePro.getNum()+File.separator+"status.json");
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-        }
     }
 
 
@@ -528,7 +506,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public void delete(String sceneNum, String username) {
+    public void delete(String sceneNum) {
         if(StringUtils.isEmpty(sceneNum)){
             throw  new BusinessException(LoginConstant.FAILURE_CODE_3001,LoginConstant.FAILURE_MSG_3001);
         }
@@ -541,19 +519,25 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     private void deleteByList(List<ScenePro> proList,List<ScenePlus> plusList) {
         HashMap<Long ,Long >cameraMap = new HashMap<>();
-        for (ScenePro scenePro : proList) {
-            cameraMap.merge(scenePro.getCameraId(), scenePro.getSpace(), Long::sum);
+        if(proList.size() >0){
+            for (ScenePro scenePro : proList) {
+                cameraMap.merge(scenePro.getCameraId(), scenePro.getSpace(), Long::sum);
+            }
+            List<Long> proIds = proList.parallelStream().map(ScenePro::getId).collect(Collectors.toList());
+            this.removeByIds(proIds);
         }
-        List<Long> proIds = proList.parallelStream().map(ScenePro::getId).collect(Collectors.toList());
-        List<Long> plusIds = plusList.parallelStream().map(ScenePlus::getId).collect(Collectors.toList());
-        HashMap<Long, ScenePlusExt> plusMap = scenePlusExtService.getByPlusIds(plusIds);
+        if(plusList.size() >0){
+            List<Long> plusIds = plusList.parallelStream().map(ScenePlus::getId).collect(Collectors.toList());
+            HashMap<Long, ScenePlusExt> plusMap = scenePlusExtService.getByPlusIds(plusIds);
 
-        for (ScenePlus scenePlus : plusList) {
-            cameraMap.merge(scenePlus.getCameraId(), plusMap.get(scenePlus.getId()).getSpace(), Long::sum);
+            for (ScenePlus scenePlus : plusList) {
+                cameraMap.merge(scenePlus.getCameraId(), plusMap.get(scenePlus.getId()).getSpace(), Long::sum);
+            }
+            scenePlusService.removeByIds(plusIds);
         }
-        this.removeByIds(proIds);
-        scenePlusService.removeByIds(plusIds);
         //恢复相机使用容量
-        cameraDetailService.addUsedSpace(cameraMap);
+        if(cameraMap.size() >0){
+            cameraDetailService.addUsedSpace(cameraMap);
+        }
     }
 }